隐患任务 V2

整改、验证提交时提醒

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/HiddenDangerTaskService.java

@@ -24,4 +24,6 @@ public interface HiddenDangerTaskService {
     void affirmSystem();
 
     R sendBackSystem(Map<String, String> map);
+
+    R submitSystem(Map<String, String> map);
 }

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/HiddenDangerTaskServiceImpl.java

@@ -321,6 +321,50 @@ public class HiddenDangerTaskServiceImpl implements HiddenDangerTaskService {
         return R.ok();
     }
 
+    @Override
+    public R submitSystem(Map<String, String> map) {
+        String id = map.getOrDefault("id", "");
+        if (StringUtils.isBlank(id)) {
+            log.error("任务ID为空");
+            return R.ok();
+        }
+        HiddenDangerTrackDo hiddenDangerTrackDo = hiddenDangerTrackService.getById(id);
+        if (null == hiddenDangerTrackDo) {
+            log.error("无法通过id:{}获取到任务列表", id);
+            return R.ok();
+        }
+        //发送人
+        List<String> userId = new ArrayList<>();
+        //发送内容
+        String context = null;
+        //发送标题
+        String title = null;
+        String state = map.getOrDefault("state", "");
+        if (StringUtils.isBlank(state)){
+            log.error("状态为空");
+            return R.ok();
+        }
+        if ("30".equals(state)){
+            userId = Arrays.asList(hiddenDangerTrackDo.getShopfacilitatorid().split(","));
+            title = VERIFICATION_MAIL_TITLE;
+            String format = String.format(VERIFICATION_REMIND_TEMP, hiddenDangerTrackDo.getCode(),
+                    hiddenDangerTrackDo.getHiddendangercontent());
+            context = String.format(VERIFICATION_REMIND_MAIL_CONTENT,format);
+        } else if ("40".equals(state)) {
+            userId = Arrays.asList(hiddenDangerTrackDo.getSafetypromoterid().split(","));
+            title = AFFIRM_MAIL_TITLE;
+            String format = String.format(VERIFICATION_REMIND_TEMP, hiddenDangerTrackDo.getCode(),
+                    hiddenDangerTrackDo.getHiddendangercontent());
+            context = String.format(AFFIRM_REMIND_MAIL_CONTENT,format);
+        }
+        if (userId.size()==0){
+            log.error("无法找到接收人！");
+        }
+        CXCommonUtils.sendNotify(title,
+                context,null,userId,hiddenDangerTrackDo.getId(),DANGERTASKS);
+        return R.ok();
+    }
+
     /**
      * 隐患任务整改提醒
      *

cx-safe-check/cx-save-check-server/src/main/java/com/rongwei/savecheck/controller/HiddenDangerTaskController.java

@@ -122,11 +122,26 @@ public class HiddenDangerTaskController {
      *
      */
 
-    // @Scheduled(cron = "0 0 8 ? * *")
     @PostMapping("/send-back/system")
     public void sendBackSystem(@RequestBody Map<String, String> map){
-        log.info("隐患跟踪任务整改提现定时任务！参数为：{}",map);
+        log.info("隐患跟踪任务退回时提醒！参数为：{}",map);
         hiddenDangerTaskService.sendBackSystem(map);
     }
 
+
+    /**
+     * 提交提醒
+     * @param
+     * @return
+     * @date 2023/12/20 9:55
+     * @author shangmi
+     *
+     */
+
+    @PostMapping("/submit/system")
+    public void submitSystem(@RequestBody Map<String, String> map){
+        log.info("隐患跟踪任务提交时提醒！参数为：{}",map);
+        hiddenDangerTaskService.submitSystem(map);
+    }
+
 }