diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/aspect/TaskGenerateAspect.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/aspect/TaskGenerateAspect.java index d437893..82685fd 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/aspect/TaskGenerateAspect.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/aspect/TaskGenerateAspect.java @@ -1,25 +1,19 @@ package com.hnac.hzinfo.inspect.task.aspect; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.google.common.collect.Lists; import com.hnac.hzims.message.dto.PlanMsgRecordDto; import com.hnac.hzims.message.fegin.IMessageClient; import com.hnac.hzinfo.inspect.plan.entity.PlanEntity; import com.hnac.hzinfo.inspect.task.entity.TaskEntity; import com.hnac.hzinfo.inspect.task.entity.TaskUserEntity; -import com.hnac.hzinfo.inspect.task.job.service.TaskRemindManager; import com.hnac.hzinfo.inspect.task.service.ITaskService; import com.hnac.hzinfo.inspect.task.service.ITaskUserService; -import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.After; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; @@ -57,6 +51,9 @@ public class TaskGenerateAspect { **/ @Value("${hzims.inspect.task.templateCode.taskBegin}") private String taskBeginTemplateCode; + //20230627新增加短信配置 + @Value("${hzims.inspect.task.templateCode.taskBeginV2}") + private String taskBeginTemplateCodeV2; /** * 巡检任务结束前发送短信信息阿里云模板 @@ -115,7 +112,7 @@ public class TaskGenerateAspect { recordDto.setCreateUser(userId); Map smsMap = new HashMap<>(2); // 消息开始前提醒 - recordDto.setResourceCode(taskBeginTemplateCode); + recordDto.setResourceCode(taskBeginTemplateCodeV2); smsMap.put("one",taskEntity.getPlanName()); smsMap.put("two",df.format(taskEntity.getPlanStartTime())); recordDto.setPlanTime(taskEntity.getPlanStartTime());