From 73ceaaa73dd6b73808aac425c70e0d9184f9f415 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 19 Apr 2024 17:33:53 +0800
Subject: [PATCH] 校园安全+议事问题优化
---
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 116 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 80 insertions(+), 36 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 3846c51..91c82c2 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
@@ -57,6 +57,8 @@
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;
@@ -237,22 +239,22 @@
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(),
commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
// 报事报修
- Integer bsbx = SpringUtils.getBean(ITaskReportForRepairsService.class).getStatistics(roleType > 0 ? AuthUtil.getUserId() : null, neiCode,commonParamSet.getRegionChildCodesList(),
+ 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);
@@ -262,17 +264,19 @@
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 xyjc = 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(),
@@ -289,6 +293,7 @@
objectObjectHashMap.put("xfyhzg", xfyhzg);// 消防隐患整改
objectObjectHashMap.put("jzzsq", jzzsq);// 居住证申请
objectObjectHashMap.put("wztj", wztj);// 无诈
+ objectObjectHashMap.put("xyjc", xyjc);// 校园检查
return objectObjectHashMap;
}
@@ -676,7 +681,7 @@
*
* @param param 传递给发送短信任务的参数，具体用途根据实现而定。
* @return 返回一个布尔值，通常用于指示任务是否创建成功。
- * 根据实际逻辑需要调整返回值，当前示例中返回值始终为false。
+ * 根据实际逻辑需要调整返回值，当前示例中返回值始终为false。
*/
@Override
public boolean createResidenceSendSms(String param) {
@@ -695,6 +700,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; // 根据实际逻辑调整返回值
+ }
/**
* 获取六个月前的日期。
@@ -703,8 +747,8 @@
* @return 返回一个LocalDate对象，表示六个月前的日期。
*/
private LocalDate getSixMonthsAgo() {
- // 获取当前日期并减去6个月
- return LocalDate.now().minus(6, ChronoUnit.MONTHS);
+ // 获取当前日期并减去6个月
+ return LocalDate.now().minus(6, ChronoUnit.MONTHS);
}
/**
@@ -713,35 +757,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