diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/AssignTasksConstants.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/AssignTasksConstants.java index e836847..00ff17e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/AssignTasksConstants.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/AssignTasksConstants.java @@ -29,9 +29,11 @@ public class AssignTasksConstants { /* 催办短信场景配置*/ public static final int ASSIGN_TASK_SCENE = 6; + /* 催办短信场景配置--测试环境*/ + public static final int ASSIGN_TASK_SCENE_TEST = 8; /* 到期短信场景配置*/ public static final int ASSIGN_TASK_REMIND_ADVANCE_SCENE = 7; - //截至日期3小时 + //截至日期3小时 -发短信使用 public static final String REMIND_ADVANCE_HOURS = "3"; /*办理人角色*/ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/job/task/ExpireRemindJob.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/job/task/ExpireRemindJob.java index 6f75468..fc09da7 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/job/task/ExpireRemindJob.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/job/task/ExpireRemindJob.java @@ -20,15 +20,9 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; - -import static com.zteits.urbanops.framework.common.util.servlet.ServletUtils.getClientIP; -import static com.zteits.urbanops.module.garden.service.assigntasksinfo.AssignTasksInfoServiceImpl.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** * @Classname ExpireRemindJob diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java index ece20b2..a7c7cd2 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java @@ -3,6 +3,7 @@ package com.zteits.urbanops.module.garden.service.assigntasksinfo; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.util.date.DateUtils; import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoPageReqVO; import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoSaveReqVO; @@ -26,6 +27,7 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.quartz.SchedulerException; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; @@ -77,20 +79,16 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { @Resource private QuartzRemindService quartzRemindService; // 定义固定时区（推荐东八区，避免服务器时区影响） - private static final ZoneId DEFAULT_ZONE = ZoneId.of("Asia/Shanghai"); - // 定义时间格式化器，统一日志输出格式 - private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"); - - - // 时间格式常量（与之前保持一致） - public static final String FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND = "yyyy-MM-dd HH:mm:ss"; // 提前提醒（3小时） private static final long REMIND_ADVANCE_HOURS = 3L; + @Value("${spring.profiles.active}") + private String profilesServer; + // 1. 定义线程安全的格式化器（全局复用，无需重复创建） private static final DateTimeFormatter DEADLINE_FORMATTER = DateTimeFormatter - .ofPattern(FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + .ofPattern(DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) .withZone(ZoneId.of("GMT+8")); // 时区与之前配置一致，避免偏移 @Override public Long createAssignTasksInfo(AssignTasksInfoSaveReqVO createReqVO) { @@ -187,13 +185,13 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { public void createRemindJob(LocalDateTime deadline, Long id){ // 2. 计算：当前时间 + 3小时 是否超过截止时间（即截止时间不足3小时） - LocalDateTime now = LocalDateTime.now(DEFAULT_ZONE); // 当前东八区时间 + LocalDateTime now = LocalDateTime.now(DateUtils.DEFAULT_ZONE); // 当前东八区时间 LocalDateTime remindThreshold = now.plusHours(REMIND_ADVANCE_HOURS); //核心判断：截止时间 <= （当前时间+3小时），不创建定时任务 if (deadline.isBefore(remindThreshold)) { - String formattedDeadline = deadline.format(DATE_FORMATTER); - String formattedThreshold = remindThreshold.format(DATE_FORMATTER); + String formattedDeadline = deadline.format(DateUtils.DATE_FORMATTER); + String formattedThreshold = remindThreshold.format(DateUtils.DATE_FORMATTER); log.info("任务ID={} 无需创建定时任务：截止时间={}，不足{}小时（阈值时间={}）", id, formattedDeadline, REMIND_ADVANCE_HOURS, formattedThreshold); return; // 直接返回，不创建定时任务 @@ -201,12 +199,12 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { // 3. 安全转换LocalDateTime到Date（指定东八区，避免时区问题） Date triggerDate = Date.from( - deadline.atZone(DEFAULT_ZONE) // 绑定东八区（业务时区） + deadline.atZone(DateUtils.DEFAULT_ZONE) // 绑定东八区（业务时区） .toInstant() // 转为Instant ); // 4. 规范日志输出（使用占位符，格式化时间） - String formattedDeadline = deadline.format(DATE_FORMATTER); + String formattedDeadline = deadline.format(DateUtils.DATE_FORMATTER); log.info("创建定时任务：任务ID={}, 截止时间(LocalDateTime)={}, 转换后Date时间={}", id, formattedDeadline, @@ -315,7 +313,11 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { continue; } SmsCodeSendReqDTO reqDTO = new SmsCodeSendReqDTO(); - reqDTO.setScene(AssignTasksConstants.ASSIGN_TASK_SCENE); + if ("prod".equals(profilesServer)) { + reqDTO.setScene(AssignTasksConstants.ASSIGN_TASK_SCENE); + } else { + reqDTO.setScene(AssignTasksConstants.ASSIGN_TASK_SCENE_TEST); + } reqDTO.setMobile(phonenumber);//手机号 reqDTO.setTemplateParams(templateParams);//短信参数 reqDTO.setCreateIp(getClientIP()); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/unitintegraltotal/UnitIntegralServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/unitintegraltotal/UnitIntegralServiceImpl.java index 0107090..7e70d96 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/unitintegraltotal/UnitIntegralServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/unitintegraltotal/UnitIntegralServiceImpl.java @@ -293,32 +293,32 @@ public class UnitIntegralServiceImpl implements UnitIntegralService{ // log.info("【单位积分重置】单位积分总额表删除完成，共删除{}条数据，删除的ID列表：{}", deleteCount, idList); } - // ========== 处理单位积分增加表 ========== - log.info("【单位积分重置】开始处理单位积分增加表数据"); - List unitIntegralAddList = unitIntegralAddMapper.selectList(UnitIntegralAddDO::getDeleted, 0); - if (CollectionUtils.isEmpty(unitIntegralAddList)) { - log.info("【单位积分重置】单位积分增加表无未重置数据，无需处理"); - } else { - List addIdList = unitIntegralAddList.stream() - .map(UnitIntegralAddDO::getId) - .collect(Collectors.toList()); - int addDeleteCount = unitIntegralAddMapper.deleteByIds(addIdList); - log.info("【单位积分重置】单位积分增加表重置完成，共重置{}条数据，重置的ID列表：{}", addDeleteCount, addIdList); - } - - // ========== 处理单位积分扣减表 ========== - log.info("【单位积分重置】开始处理单位积分扣减表数据"); - List unitIntegralSubList = unitIntegralSubMapper.selectList(UnitIntegralSubDO::getDeleted, 0); - if (CollectionUtils.isEmpty(unitIntegralSubList)) { - log.info("【单位积分重置】单位积分扣减表无未重置数据，无需处理"); - } else { - List subIdList = unitIntegralSubList.stream() - .map(UnitIntegralSubDO::getId) - .collect(Collectors.toList()); - int subDeleteCount = unitIntegralSubMapper.deleteByIds(subIdList); - // 修复原日志中“重置增加单位积分总额”的文案错误，改为“单位积分扣减表” - log.info("【单位积分重置】单位积分扣减表重置完成，共删除{}条数据，重置的ID列表：{}", subDeleteCount, subIdList); - } +// // ========== 处理单位积分增加表 ========== +// log.info("【单位积分重置】开始处理单位积分增加表数据"); +// List unitIntegralAddList = unitIntegralAddMapper.selectList(UnitIntegralAddDO::getDeleted, 0); +// if (CollectionUtils.isEmpty(unitIntegralAddList)) { +// log.info("【单位积分重置】单位积分增加表无未重置数据，无需处理"); +// } else { +// List addIdList = unitIntegralAddList.stream() +// .map(UnitIntegralAddDO::getId) +// .collect(Collectors.toList()); +// int addDeleteCount = unitIntegralAddMapper.deleteByIds(addIdList); +// log.info("【单位积分重置】单位积分增加表重置完成，共重置{}条数据，重置的ID列表：{}", addDeleteCount, addIdList); +// } +// +// // ========== 处理单位积分扣减表 ========== +// log.info("【单位积分重置】开始处理单位积分扣减表数据"); +// List unitIntegralSubList = unitIntegralSubMapper.selectList(UnitIntegralSubDO::getDeleted, 0); +// if (CollectionUtils.isEmpty(unitIntegralSubList)) { +// log.info("【单位积分重置】单位积分扣减表无未重置数据，无需处理"); +// } else { +// List subIdList = unitIntegralSubList.stream() +// .map(UnitIntegralSubDO::getId) +// .collect(Collectors.toList()); +// int subDeleteCount = unitIntegralSubMapper.deleteByIds(subIdList); +// // 修复原日志中“重置增加单位积分总额”的文案错误，改为“单位积分扣减表” +// log.info("【单位积分重置】单位积分扣减表重置完成，共删除{}条数据，重置的ID列表：{}", subDeleteCount, subIdList); +// } // 2. 记录方法执行成功 log.info("【单位积分重置】单位积分数据重置操作执行完成，所有表处理完毕"); diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/enums/sms/SmsSceneEnum.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/enums/sms/SmsSceneEnum.java index 412b110..45887b4 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/enums/sms/SmsSceneEnum.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/enums/sms/SmsSceneEnum.java @@ -23,6 +23,7 @@ public enum SmsSceneEnum implements ArrayValuable { USER_SMS_LOGIN(5, "SMS_319860269", "用户 - 手机号登陆"), YL_USER_SMS_SUBMISSION(6, "SMS_500485270", "园林派单业务催交发送短信"), YL_USER_SMS_REMIND_ADVANCE(7, "SMS_501726147", "园林派单业务到期前短信提醒"), + YL_USER_SMS_SUBMISSION_TEST(8, "SMS_493695107", "园林派单业务催交发送短信-测试环境模板"), ADMIN_MEMBER_LOGIN(21, "admin-sms-login", "后台用户 - 手机号登录"), ADMIN_MEMBER_REGISTER(22, "admin-sms-register", "后台用户 - 手机号注册"),