feature 代码提交

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

@@ -3,6 +3,7 @@ package com.rongwei.sfcommon.sys.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.thread.ExecutorBuilder;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.rongwe.scentity.domian.AspCheckDiscoveryItemDo;
 import com.rongwe.scentity.domian.HiddenDangerTrackDo;
 import com.rongwe.scentity.domian.ThemeCheckDo;
@@ -94,23 +95,29 @@ public class SaveCheckItemServiceImpl implements SaveCheckItemService {
         // 获取所有的检查项
         List<AspCheckDiscoveryItemDo> aspCheckDiscoveryItemDos = aspCheckDiscoveryItemService.list(new LambdaQueryWrapper<AspCheckDiscoveryItemDo>()
                 .eq(AspCheckDiscoveryItemDo::getThemecheckitemid, id)
+                .eq(AspCheckDiscoveryItemDo::getCreatetask, 0)
                 .eq(BaseDo::getDeleted, "0"));
         if (aspCheckDiscoveryItemDos.isEmpty()) {
             log.error("无法通过ID：{}获取到检查项信息", id);
         }
         // 任务生成
         generateHiddenDangerTrack(checkItemDo, themeCheck, aspCheckDiscoveryItemDos);
+        // 更新任务状态
+        List<String> discoverIds = aspCheckDiscoveryItemDos.stream().map(AspCheckDiscoveryItemDo::getId).collect(Collectors.toList());
+        aspCheckDiscoveryItemService.update(new LambdaUpdateWrapper<AspCheckDiscoveryItemDo>()
+                .set(AspCheckDiscoveryItemDo::getCreatetask,1)
+                .eq(AspCheckDiscoveryItemDo::getId,discoverIds));
 
-        ThreadPoolExecutor threadPool = ExecutorBuilder.create()
-                .setCorePoolSize(1)
-                .setMaxPoolSize(3)
-                .setKeepAliveTime(0)
-                .build();
-        threadPool.submit(() -> {
-            log.info("异步邮件发送");
-            this.sendDiscoveryMail(checkItemDo, themeCheck, aspCheckDiscoveryItemDos);
-        });
-        threadPool.shutdown();
+//        ThreadPoolExecutor threadPool = ExecutorBuilder.create()
+//                .setCorePoolSize(1)
+//                .setMaxPoolSize(3)
+//                .setKeepAliveTime(0)
+//                .build();
+//        threadPool.submit(() -> {
+//            log.info("异步邮件发送");
+//            this.sendDiscoveryMail(checkItemDo, themeCheck, aspCheckDiscoveryItemDos);
+//        });
+//        threadPool.shutdown();
         return R.ok();
     }
 

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

@@ -28,6 +28,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.rongwei.sfcommon.utils.MlConstants.THEME_CHECK_STATUS_WAIT;
+
 @Service("themeCheckService")
 public class ThemeCheckServiceImpl extends ServiceImpl<ThemeCheckDao, ThemeCheckDo> implements ThemeCheckService {
 
@@ -120,7 +122,7 @@ public class ThemeCheckServiceImpl extends ServiceImpl<ThemeCheckDao, ThemeCheck
                 themeCheckItemDo.setGroupleadername(v.getGroupleadername());
                 themeCheckItemDo.setGroupusernames(v.getGroupusernames());
                 // 初始化待检查
-                themeCheckItemDo.setCheckstatus(MlConstants.THEME_CHECK_STATUS_WAIT);
+                themeCheckItemDo.setCheckstatus(THEME_CHECK_STATUS_WAIT);
                 themeCheckItemService.save(themeCheckItemDo);
 
                 if(checkTemplateItemss != null && checkTemplateItemss.size()>0){
@@ -155,7 +157,11 @@ public class ThemeCheckServiceImpl extends ServiceImpl<ThemeCheckDao, ThemeCheck
             return;
         }
         ThemeCheckDo themeCheckDo = this.getById(themeCheckId);
-        if (themeCheckDo.getCreatetask() == 1) {
+        if (themeCheckDo == null) {
+            logger.debug("无法通过ID 获取到检查计划");
+            return;
+        }
+        if (1 == themeCheckDo.getCreatetask()) {
             logger.debug("此检查计划已生成检查任务");
             return;
         }
@@ -265,6 +271,7 @@ public class ThemeCheckServiceImpl extends ServiceImpl<ThemeCheckDao, ThemeCheck
         themeCheckItemDo.setGroupleadername(themeCheckWorkPark.getGroupleadername());
         themeCheckItemDo.setGroupusers(themeCheckWorkPark.getGroupusernames());
         themeCheckItemDo.setGroupusernames(themeCheckWorkPark.getGroupleadername());
+        themeCheckItemDo.setCheckstatus(THEME_CHECK_STATUS_WAIT);
         return themeCheckItemDo;
     }
 

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/AspCheckDiscoveryItemDo.java

@@ -114,5 +114,6 @@ public class AspCheckDiscoveryItemDo extends BaseDo implements Serializable {
      */
     private String measure;
 
+    private Integer createtask;
     private static final long serialVersionUID = 1L;
 }

safe-check/save-check-entity/src/main/java/com/rongwe/scentity/domian/ThemeCheckDo.java

@@ -85,5 +85,5 @@ public class ThemeCheckDo extends BaseDo implements Serializable {
 	/**
 	 * 是否生成任务
 	 */
-	private int createtask;
+	private Integer createtask;
 }