From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 215 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 136 insertions(+), 79 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
index 71d36c3..3885146 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -17,14 +17,15 @@
package org.springblade.modules.task.service.impl;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.itextpdf.text.log.Logger;
import com.itextpdf.text.log.LoggerFactory;
+import com.xxl.job.core.enums.taskHandlerEnum;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.DictConstant;
@@ -33,6 +34,7 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.category.entity.CategoryEntity;
import org.springblade.modules.category.service.ICategoryService;
+import org.springblade.modules.threeColorTask.entity.CustomTaskEntity;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.entity.GridWorkLogEntity;
import org.springblade.modules.grid.service.IGridService;
@@ -42,21 +44,24 @@
import org.springblade.modules.house.vo.HouseRentalTenantVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.place.service.IPlaceExtService;
+import org.springblade.modules.place.service.IPlacePractitionerService;
import org.springblade.modules.place.service.IPlaceService;
+import org.springblade.modules.place.vo.PlacePractitionerVO;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.sms.service.ISmsSendService;
import org.springblade.modules.task.entity.*;
import org.springblade.modules.task.mapper.TaskMapper;
import org.springblade.modules.task.service.*;
+import org.springblade.modules.task.vo.TaskNoFraudReportingVO;
+import org.springblade.modules.task.vo.TaskSchoolEvenVO;
import org.springblade.modules.task.vo.TaskVO;
-import org.springblade.modules.task.service.ITaskPlaceRectificationService;
-import org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity;
-import org.springblade.modules.task.service.ITaskPlaceSelfCheckService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;
@@ -107,31 +112,6 @@
@Override
public IPage<TaskVO> selectTaskPage(IPage<TaskVO> page, TaskVO task) {
-// String roleName = SpringUtils.getRequestParam("roleName");
-// String communityCode = SpringUtils.getRequestParam("communityCode");
-// if (!Strings.isBlank(communityCode)) {
-// // 校验社区编号是否合规
-// if (null != SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
-// task.setCommunityCode(communityCode);
-// }
-// }
-// List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
-// Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
- // 网格编号集合
-// List<String> gridCodeList = new ArrayList<>();
- // 民警角色
-// if (!Strings.isBlank(roleName)) {
-// task.setRoleName(roleName);
-// if (roleName.equals("mj")) {
-// regionChildCodesList = SpringUtil.getBean(IPoliceAffairsGridService.class).getCommunityCodeListByUserId(AuthUtil.getUserId());
-// }
-// if (roleName.equals("wgy")) {
-// gridCodeList = SpringUtil.getBean(IGridService.class).getGridListByUserId(AuthUtil.getUserId());
-// }
-// }
-// if (AuthUtil.getUserAccount().equals("18879306957")) {
-// task.setCommunityCode("361102003027");
-// }
CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskVO.class, task);
if (null != task.getReportType() && task.getReportType() == 1) {
// 查询取保候审任务列表(人房相关)
@@ -237,22 +217,23 @@
public Object countTypeNumber(Integer roleType, String neiCode) {
TaskVO taskVO = new TaskVO();
Map<String, Object> objectObjectHashMap = new HashMap<>();
- taskVO.setStatus(1);
- taskVO.setUserId(roleType > 0 ? AuthUtil.getUserId() : null);
+ taskVO.setStatus(CommonConstant.NUMBER_ONE);
+ taskVO.setUserId(roleType > CommonConstant.NUMBER_ZERO ? AuthUtil.getUserId() : null);
taskVO.setNeiCode(neiCode);
- taskVO.setReportType(5);
- taskVO.setIsDeleted(0);
+ taskVO.setReportType(CommonConstant.NUMBER_FIVE);
+ taskVO.setIsDeleted(CommonConstant.NUMBER_ZERO);
CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskVO.class, taskVO);
// 标签报事-二手交易
Integer bqsj = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
- taskVO.setReportType(1);
+ taskVO.setReportType(CommonConstant.NUMBER_ONE);
// 取保候审
- Integer qbhs = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
+ Integer qbhs = baseMapper.selectTaskPageByPersonCount(taskVO, commonParamSet.getRegionChildCodesList(),
commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
// 报事报修
- Integer bsbx = SpringUtils.getBean(ITaskReportForRepairsService.class).getStatistics(roleType > 0 ? AuthUtil.getUserId() : null, neiCode);
+ Integer bsbx = SpringUtils.getBean(ITaskReportForRepairsService.class).getStatistics(roleType > 0 ? AuthUtil.getUserId() : null, neiCode, commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
// 住户审核
Integer zhsh = iHouseholdService.statistics(roleType > 0 ? AuthUtil.getUserId() : null, neiCode, 0);
// 出租审核
@@ -261,21 +242,45 @@
houseRentalTenantVO.setAuditStatus(2);
Integer czsh = iHouseRentalService.getStatisticsCount(houseRentalTenantVO);
// 场所审核
- Integer cssh = SpringUtils.getBean(IPlaceExtService.class).selectCount(roleType > 0 ? AuthUtil.getUserId() : null, neiCode, 1);
+ Integer cssh = SpringUtils.getBean(IPlaceExtService.class).selectCount(roleType > 0 ? AuthUtil.getUserId() : null, neiCode, CommonConstant.NUMBER_ONE);
// 走访日志
// 查询网格员对应的网格id
String gridCode = getGridCode();
- Integer zfrw = SpringUtils.getBean(IGridWorkLogService.class).getGridWorkCountHandleCount(gridCode, 1);
+ Integer zfrw = SpringUtils.getBean(IGridWorkLogService.class).getGridWorkCountHandleCount(gridCode, CommonConstant.NUMBER_ONE);
// 消防自查
- Integer xfzc = SpringUtils.getBean(ITaskPlaceSelfCheckService.class).getCount(neiCode, 1);
+ Integer xfzc = SpringUtils.getBean(ITaskPlaceSelfCheckService.class).getCount(neiCode, CommonConstant.NUMBER_ONE, CommonConstant.NUMBER_ONE);
+ // 校园安全隐患排除
+ // Integer xyaqyhpc = SpringUtils.getBean(ITaskPlaceSelfCheckService.class).getCount(neiCode, CommonConstant.NUMBER_ONE, CommonConstant.NUMBER_TWO);
// 消防隐患整改
- Integer xfyhzg = SpringUtils.getBean(ITaskPlaceRectificationService.class).getCount(neiCode, 1);
+ Integer xfyhzg = SpringUtils.getBean(ITaskPlaceRectificationService.class).getCount(neiCode, CommonConstant.NUMBER_ONE);
// 居住证申请
- Integer jzzsq = residencePermitApplyService.getCount(neiCode, 1);
+ Integer jzzsq = residencePermitApplyService.getCount(neiCode, CommonConstant.NUMBER_ONE);
// 无诈统计
- taskVO.setReportType(6);
- Integer wztj = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
+ ITaskNoFraudReportingService noFraudReportingService = SpringUtils.getBean(ITaskNoFraudReportingService.class);
+ TaskNoFraudReportingVO taskNoFraudReportingVO = new TaskNoFraudReportingVO();
+ taskNoFraudReportingVO.setStatus(1);
+ Integer wztj = noFraudReportingService.selectTaskNoFraudReportingCount(taskNoFraudReportingVO);
+
+ ITaskSchoolEvenService taskSchoolEvenService = SpringUtils.getBean(ITaskSchoolEvenService.class);
+ TaskSchoolEvenVO taskSchoolEvenVO = new TaskSchoolEvenVO();
+ taskSchoolEvenVO.setConfirmFlag(CommonConstant.NUMBER_ONE.toString());
+ taskSchoolEvenVO.setType(CommonConstant.NUMBER_ONE.toString());
+ // 校园隐患
+ long xyyh = taskSchoolEvenService.schoolEvenCount(taskSchoolEvenVO);
+ // 校园纠纷矛盾
+ taskSchoolEvenVO.setType(CommonConstant.NUMBER_TWO.toString());
+ long xyjfmd = taskSchoolEvenService.schoolEvenCount(taskSchoolEvenVO);
+ ;
+
+ taskVO.setReportType(CommonConstant.NUMBER_FOUR);
+ // 校园安全检查
+ Integer xyaqjc = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
+ PlacePractitionerVO placePractitionerVO = new PlacePractitionerVO();
+ placePractitionerVO.setConfirmFlag(CommonConstant.NUMBER_ONE);
+ // 从业人员审核
+ Integer cyrysh = SpringUtils.getBean(IPlacePractitionerService.class).selectPlacePractitionerCount(placePractitionerVO);
+
// 设置
objectObjectHashMap.put("qbhs", qbhs);// 取保候审
objectObjectHashMap.put("bqsj", bqsj);// 标签报事-二手交易
@@ -288,6 +293,11 @@
objectObjectHashMap.put("xfyhzg", xfyhzg);// 消防隐患整改
objectObjectHashMap.put("jzzsq", jzzsq);// 居住证申请
objectObjectHashMap.put("wztj", wztj);// 无诈
+ // objectObjectHashMap.put("xyaqyhpc", xyaqyhpc);// 校园安全隐患排除
+ objectObjectHashMap.put("xyyh", xyyh);// 校园隐患
+ objectObjectHashMap.put("xyjfmd", xyjfmd);// 校园纠纷矛盾
+ objectObjectHashMap.put("xyaqjc", xyaqjc);// 校园安全检查
+ objectObjectHashMap.put("cyrysh", cyrysh);// 从业人员审核
return objectObjectHashMap;
}
@@ -378,19 +388,22 @@
@Transactional(rollbackFor = Exception.class)
public boolean createTaskJob(String param) {
// 解析参数
- JSONObject jsonParam = JSON.parseObject(param);
+ CustomTaskEntity customTaskEntity = JSON.parseObject(param, CustomTaskEntity.class);
+ // CustomTaskEntity customTaskEntity = new CustomTaskEntity();
// String params = jsonParam.getString("params");
- boolean flag = false;
+// boolean flag = false;
// 校园安全自查任务生成
- createCampusReportingTask();
+// createCampusReportingTask();
// 打金店/二手车/二手手机任务生成
- createLabelReportingTask();
+// createLabelReportingTask();
// 旅馆安全自查任务生成
- createHotelReportingTask();
+// createHotelReportingTask();
// 人员类-肇事肇祸精神障碍患者走访任务生成
- createGridWordTask();
+ // createGridWordTask();
// 返回
- return flag;
+ TaskHandle handler = (TaskHandle) SpringUtils.getBean(Objects.requireNonNull(taskHandlerEnum.getNameByCode(customTaskEntity.getTaskType())));
+ handler.taskHandle(customTaskEntity);
+ return true;
}
@@ -659,10 +672,15 @@
} else if (task.getReportType().equals(CommonConstant.REPORT_TYPE_NO_FRAUD)) {
// 如果报告类型为无诈，尝试更新无诈报告状态
- ITaskNoFraudReportingService bean = SpringUtils.getBean(ITaskNoFraudReportingService.class);
- return bean.update(Wrappers.<TaskNoFraudReportingEntity>lambdaUpdate()
- .set(TaskNoFraudReportingEntity::getStatus, task.getStatus())
- .eq(TaskNoFraudReportingEntity::getTaskId, task.getId()));
+ ITaskNoFraudReportingService noFraudReportingService = SpringUtils.getBean(ITaskNoFraudReportingService.class);
+ LambdaUpdateWrapper<TaskNoFraudReportingEntity> objectLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ if (StringUtils.isNotBlank(task.getHouseCode())) {
+ objectLambdaUpdateWrapper.set(TaskNoFraudReportingEntity::getHouseCode, task.getHouseCode());
+ }
+ objectLambdaUpdateWrapper.set(TaskNoFraudReportingEntity::getStatus, task.getStatus());
+ objectLambdaUpdateWrapper.set(TaskNoFraudReportingEntity::getRemark, task.getRemark());
+ objectLambdaUpdateWrapper.eq(TaskNoFraudReportingEntity::getTaskId, task.getId());
+ return noFraudReportingService.update(objectLambdaUpdateWrapper);
}
// 如果没有匹配的报告类型，返回false
return false;
@@ -675,7 +693,7 @@
*
* @param param 传递给发送短信任务的参数，具体用途根据实现而定。
* @return 返回一个布尔值，通常用于指示任务是否创建成功。
- * 根据实际逻辑需要调整返回值，当前示例中返回值始终为false。
+ * 根据实际逻辑需要调整返回值，当前示例中返回值始终为false。
*/
@Override
public boolean createResidenceSendSms(String param) {
@@ -694,6 +712,45 @@
return false; // 根据实际逻辑调整返回值
}
+ @Override
+ public boolean createSchoolSendSms(String param) {
+ try {
+ // 计算当前时间加一天
+ LocalDate endDate = LocalDate.now().plusDays(1);
+ // 创建表示一天结束时刻的 LocalTime 对象
+ LocalTime endOfDayTime = LocalTime.of(23, 59, 59, 999_000_000); // 纳秒精度为999毫微秒，接近最大值
+ // 合并得到加一天后的最后时刻的 LocalDateTime
+ LocalDateTime endTime = LocalDateTime.of(endDate, endOfDayTime);
+ ITaskPlaceSelfCheckService taskPlaceSelfCheckService = SpringUtils.getBean(ITaskPlaceSelfCheckService.class);
+ // 查询整改完毕且未发送短信的记录
+ List<TaskPlaceSelfCheckEntity> list = taskPlaceSelfCheckService.list(new LambdaQueryWrapper<TaskPlaceSelfCheckEntity>()
+ .eq(TaskPlaceSelfCheckEntity::getRectificationFlag, CommonConstant.NUMBER_TWO)
+ .eq(TaskPlaceSelfCheckEntity::getSendSmsFlag, CommonConstant.NUMBER_ONE)
+ .le(TaskPlaceSelfCheckEntity::getRectificationEndTime, endTime));
+ if (list == null || list.isEmpty()) {
+ return false;
+ }
+ // 用于收集成功发送短信并需更新状态的实体列表
+ List<TaskPlaceSelfCheckEntity> updatedEntities = new ArrayList<>();
+ for (TaskPlaceSelfCheckEntity updatedEntity : list) {
+ // 尝试发送短信，发送成功则更新实体状态
+ Boolean smsSent = smsSendService.sendNotice(SMS_TEMPLATE_ID, updatedEntity.getId());
+ if (smsSent) {
+ updatedEntity.setSendSmsFlag("2"); // 标记为已发送短信
+ updatedEntities.add(updatedEntity); // 加入到需更新的实体列表中
+ }
+ }
+ // 若存在需更新的实体，则批量更新这些实体的状态
+ if (!updatedEntities.isEmpty()) {
+ taskPlaceSelfCheckService.updateBatchById(updatedEntities);
+ }
+ } catch (Exception e) {
+ // 处理发送短信过程中可能出现的异常，如记录日志
+ logger.error("Error occurred while sending SMS: " + e.getMessage(), e);
+ return false; // 根据异常处理逻辑决定是否返回false或其他值
+ }
+ return false; // 根据实际逻辑调整返回值
+ }
/**
* 获取六个月前的日期。
@@ -702,8 +759,8 @@
* @return 返回一个LocalDate对象，表示六个月前的日期。
*/
private LocalDate getSixMonthsAgo() {
- // 获取当前日期并减去6个月
- return LocalDate.now().minus(6, ChronoUnit.MONTHS);
+ // 获取当前日期并减去6个月
+ return LocalDate.now().minus(6, ChronoUnit.MONTHS);
}
/**
@@ -712,35 +769,35 @@
* @param sixMonthsAgo 六个月前的日期，用于筛选确认时间在六个月之前的申请记录。
* @return 返回一个包含所有符合条件的居住证申请实体的列表。
*/
- private List<TaskResidencePermitApplyEntity> queryEntitiesToSms(LocalDate sixMonthsAgo) {
- // 使用LambdaQueryWrapper构建查询条件，筛选出确认状态为2（即确认），且未发送过短信（发送短信标志为1），确认时间在指定日期（sixMonthsAgo）之前的所有申请记录。
- return residencePermitApplyService.list(new LambdaQueryWrapper<TaskResidencePermitApplyEntity>()
- .eq(TaskResidencePermitApplyEntity::getConfirmFlag, 2)
- .eq(TaskResidencePermitApplyEntity::getSendSmsFlag, 1)
- .le(TaskResidencePermitApplyEntity::getConfirmTime, sixMonthsAgo));
- }
+ private List<TaskResidencePermitApplyEntity> queryEntitiesToSms(LocalDate sixMonthsAgo) {
+ // 使用LambdaQueryWrapper构建查询条件，筛选出确认状态为2（即确认），且未发送过短信（发送短信标志为1），确认时间在指定日期（sixMonthsAgo）之前的所有申请记录。
+ return residencePermitApplyService.list(new LambdaQueryWrapper<TaskResidencePermitApplyEntity>()
+ .eq(TaskResidencePermitApplyEntity::getConfirmFlag, 2)
+ .eq(TaskResidencePermitApplyEntity::getSendSmsFlag, 1)
+ .le(TaskResidencePermitApplyEntity::getConfirmTime, sixMonthsAgo));
+ }
/**
* 发送短信并更新实体状态
*
* @param entitiesToSms 需要发送短信并更新状态的实体列表，每个实体代表一个居住证申请任务。
- * 实体列表中每个元素应包含至少一个ID属性，用于标识申请任务。
+ * 实体列表中每个元素应包含至少一个ID属性，用于标识申请任务。
*/
- private void sendSmsAndUpdateEntities(List<TaskResidencePermitApplyEntity> entitiesToSms) {
- List<TaskResidencePermitApplyEntity> updatedEntities = new ArrayList<>(); // 用于收集成功发送短信并需更新状态的实体列表
+ private void sendSmsAndUpdateEntities(List<TaskResidencePermitApplyEntity> entitiesToSms) {
+ List<TaskResidencePermitApplyEntity> updatedEntities = new ArrayList<>(); // 用于收集成功发送短信并需更新状态的实体列表
- for (TaskResidencePermitApplyEntity entity : entitiesToSms) {
- // 尝试发送短信，发送成功则更新实体状态
- Boolean smsSent = smsSendService.sendNotice(SMS_TEMPLATE_ID, entity.getId());
- if (smsSent) {
- entity.setSendSmsFlag(2); // 标记为已发送短信
- updatedEntities.add(entity); // 加入到需更新的实体列表中
- }
- }
-
- // 若存在需更新的实体，则批量更新这些实体的状态
- if (!updatedEntities.isEmpty()) {
- residencePermitApplyService.updateBatchById(updatedEntities);
+ for (TaskResidencePermitApplyEntity entity : entitiesToSms) {
+ // 尝试发送短信，发送成功则更新实体状态
+ Boolean smsSent = smsSendService.sendNotice(SMS_TEMPLATE_ID, entity.getId());
+ if (smsSent) {
+ entity.setSendSmsFlag(2); // 标记为已发送短信
+ updatedEntities.add(entity); // 加入到需更新的实体列表中
}
}
+
+ // 若存在需更新的实体，则批量更新这些实体的状态
+ if (!updatedEntities.isEmpty()) {
+ residencePermitApplyService.updateBatchById(updatedEntities);
+ }
+ }
}
--
Gitblit v1.9.3