feature 代码提交

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/ApsDetailsHazardInvestigationTasksServiceImpl.java

@@ -4,7 +4,9 @@ package com.rongwei.sfcommon.sys.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwe.scentity.domian.*;
+import com.rongwe.scentity.domian.ApsDetailsHazardInvestigationTasksDo;
+import com.rongwe.scentity.domian.AspCheckDiscoveryItemDo;
+import com.rongwe.scentity.domian.HiddenDangerTrackDo;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
@@ -12,7 +14,6 @@ import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.safecommon.utils.JSCommonUtils;
 import com.rongwei.sfcommon.sys.dao.ApsDetailsHazardInvestigationTasksDao;
 import com.rongwei.sfcommon.sys.service.ApsDetailsHazardInvestigationTasksService;
-
 import com.rongwei.sfcommon.utils.MlConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,11 +27,11 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
-*
-*/
+ *
+ */
 @Service
 public class ApsDetailsHazardInvestigationTasksServiceImpl extends ServiceImpl<ApsDetailsHazardInvestigationTasksDao, ApsDetailsHazardInvestigationTasksDo>
-implements ApsDetailsHazardInvestigationTasksService {
+        implements ApsDetailsHazardInvestigationTasksService {
 
     private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
     @Autowired
@@ -51,7 +52,7 @@ implements ApsDetailsHazardInvestigationTasksService {
             return R.ok();
         }
         // 获取隐患排查任务主表
-        ApsDetailsHazardInvestigationTasksDo apsDetailsHazardInvestigationTasksDo  = apsDetailsHazardInvestigationTasksService.getById(id);
+        ApsDetailsHazardInvestigationTasksDo apsDetailsHazardInvestigationTasksDo = apsDetailsHazardInvestigationTasksService.getById(id);
         if (null == apsDetailsHazardInvestigationTasksDo) {
             log.error("通过id:{}无法获取到隐患排查任务", id);
             return R.ok();
@@ -60,7 +61,7 @@ implements ApsDetailsHazardInvestigationTasksService {
         // 获取所有的隐患排查任务内容
         List<AspCheckDiscoveryItemDo> aspCheckDiscoveryItemDos = aspCheckDiscoveryItemService.list(new LambdaQueryWrapper<AspCheckDiscoveryItemDo>()
                 .eq(AspCheckDiscoveryItemDo::getThemecheckitemid, id)
-                        .eq(AspCheckDiscoveryItemDo::getCreatetask,"0")
+                .eq(AspCheckDiscoveryItemDo::getCreatetask, "0")
                 .eq(BaseDo::getDeleted, "0"));
         if (aspCheckDiscoveryItemDos.isEmpty()) {
             log.error("无法通过ID：{}获取到检查项信息", id);
@@ -86,7 +87,7 @@ implements ApsDetailsHazardInvestigationTasksService {
      *
      * @return
      */
-    public List<HiddenDangerTrackDo> generateHiddenDangerTrack(ApsDetailsHazardInvestigationTasksDo apsDetailsHazardInvestigationTasksDo,List<AspCheckDiscoveryItemDo> aspCheckDiscoveryItemDos) {
+    public List<HiddenDangerTrackDo> generateHiddenDangerTrack(ApsDetailsHazardInvestigationTasksDo apsDetailsHazardInvestigationTasksDo, List<AspCheckDiscoveryItemDo> aspCheckDiscoveryItemDos) {
 
         List<HiddenDangerTrackDo> addList = new ArrayList<>();
         aspCheckDiscoveryItemDos.forEach(info -> {
@@ -97,14 +98,14 @@ implements ApsDetailsHazardInvestigationTasksService {
             hiddenDangerTrack.setRiskanalysisobjectcode(apsDetailsHazardInvestigationTasksDo.getRiskanalysisobjectcode());
             //隐患等级hazardlevel
             hiddenDangerTrack.setHazardlevel(info.getGrade());
-            //隐患来源
-            hiddenDangerTrack.setDangersource(MlConstants.DANGER_SOURCE_THEMECHECK);
             //治理类型
             hiddenDangerTrack.setGovernancetype(info.getGovernancetype());
             //隐患类别
             hiddenDangerTrack.setHiddendangerleibie(info.getClassification());
             //隐患类型
             hiddenDangerTrack.setHiddendangertype(info.getType());
+            //隐患来源
+            hiddenDangerTrack.setDangersource("1");
             //隐患状态 默认待评级
             hiddenDangerTrack.setHazardstate("3");
             //隐患名称
@@ -122,7 +123,7 @@ implements ApsDetailsHazardInvestigationTasksService {
             hiddenDangerTrack.setTrackuserid(info.getTrackuserid());
             //检查任务id
             hiddenDangerTrack.setCheckid(info.getId());
-            JSCommonUtils.setBaseDetail(hiddenDangerTrack,null);
+            JSCommonUtils.setBaseDetail(hiddenDangerTrack, null);
             //隐患图片
             hiddenDangerTrack.setHazardphoto(info.getFileinfo());
             addList.add(hiddenDangerTrack);