feature 代码提交

js-common/src/main/java/com/rongwei/safecommon/utils/JSCommonUtils.java

@@ -10,6 +10,7 @@ import com.rongwei.commonservice.service.RedisService;
 import com.rongwei.rwadmincommon.system.domain.SysOrganizationDo;
 import com.rongwei.rwadmincommon.system.vo.SysOrganizationVo;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+import com.rongwei.rwcommon.base.BaseDo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
@@ -347,7 +348,15 @@ public class JSCommonUtils {
             }
         }
     }
-
+    public static <T extends BaseDo> void setBaseDetail(T t, SysUserVo userVo) {
+        t.setCreatedate(new Date());
+        t.setCreateuserid(userVo.getId());
+        t.setCreateusername(userVo.getName());
+        t.setModifydate(new Date());
+        t.setModifyuserid(userVo.getId());
+        t.setModifyusername(userVo.getName());
+        t.setDeleted("0");
+    }
     @PostConstruct
     public void info() {
         redisService = autoRedisService;

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspRiskUnitDao.java

@@ -0,0 +1,16 @@
+package com.rongwei.sfcommon.sys.dao;
+
+import com.rongwe.scentity.domian.AspRiskUnitDo;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Entity generator.domain.AspRiskUnit
+ */
+public interface AspRiskUnitDao extends BaseMapper<AspRiskUnitDo> {
+
+}
+
+
+
+

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

@@ -0,0 +1,11 @@
+package com.rongwei.sfcommon.sys.service;
+
+import com.rongwe.scentity.domian.AspRiskUnitDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ */
+public interface AspRiskUnitService extends IService<AspRiskUnitDo> {
+
+}

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

@@ -0,0 +1,21 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwe.scentity.domian.AspRiskUnitDo;
+import com.rongwei.sfcommon.sys.dao.AspRiskUnitDao;
+
+import com.rongwei.sfcommon.sys.service.AspRiskUnitService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class AspRiskUnitServiceImpl extends ServiceImpl<AspRiskUnitDao, AspRiskUnitDo>
+implements AspRiskUnitService {
+
+}
+
+
+
+

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

@@ -1,9 +1,7 @@
 package com.rongwei.sfcommon.sys.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.rongwe.scentity.domian.ApsDetailsHazardInvestigationTasksDo;
-import com.rongwe.scentity.domian.ApsHazardInvestigationTemplateDo;
-import com.rongwe.scentity.domian.ApsHazardInvestigationTemplateZibiaoDo;
+import com.rongwe.scentity.domian.*;
 import com.rongwei.commonservice.serial.service.SysSerialNumberService;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.BaseDo;
@@ -13,16 +11,14 @@ import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommonentity.commonservers.vo.SysSerialVo;
 import com.rongwei.safecommon.utils.JSCommonUtils;
+import com.rongwei.sfcommon.sys.dao.ApsHazardInvestigationTemplateZibiaoDao;
 import com.rongwei.sfcommon.sys.service.HazardInvestigationService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * HazardInvestigationServiceImpl class
@@ -40,6 +36,12 @@ public class HazardInvestigationServiceImpl implements HazardInvestigationServic
     private ApsHazardInvestigationTemplateZibiaoServiceImpl apsHazardInvestigationTemplateZibiaoService;
     @Autowired
     private SysSerialNumberService autoSysSerialNumberService;
+    @Autowired
+    private AspRiskUnitServiceImpl aspRiskUnitService;
+    @Autowired
+    private ApsDetailsHazardInvestigationTasksServiceImpl apsDetailsHazardInvestigationTasksServiceImpl;
+    @Autowired
+    private ApsDetailsHazardInvestigationTasksJcxzibiaoServiceImpl apsDetailsHazardInvestigationTasksJcxzibiaoService;
 
     @Override
     public R createTask(String id) {
@@ -63,25 +65,41 @@ public class HazardInvestigationServiceImpl implements HazardInvestigationServic
         return null;
     }
 
+    /**
+     * 生成隐患任务信息
+     * @param tempData
+     */
     public void assembleTask(ApsHazardInvestigationTemplateDo tempData) {
-        ApsDetailsHazardInvestigationTasksDo apsDetailsHazardInvestigationTasksDo;
+
         SysUserVo currentUser = JSCommonUtils.getCurrentUser();
         if (StringUtils.isBlank(tempData.getHiddendangerid())) {
             log.error("风险点为空");
             throw new RuntimeException("模板对应需检查的风险点为空");
         }
+        // 获取模板对应的检查项
+        List<ApsHazardInvestigationTemplateZibiaoDo> checkItemList = apsHazardInvestigationTemplateZibiaoService.list(new LambdaQueryWrapper<ApsHazardInvestigationTemplateZibiaoDo>()
+                .eq(BaseDo::getDeleted, "0")
+                .eq(ApsHazardInvestigationTemplateZibiaoDo::getMubanid, tempData.getId()));
+        if(checkItemList.isEmpty()){
+            log.error("当前模板:{}不存在检查项",tempData.getTemplatename());
+            throw new CustomException("当前模板不存在检查项");
+        }
         // 风险点
         List<String> riskPointIds = Arrays.asList(tempData.getHiddendangerid().split(","));
+        List<AspRiskUnitDo> aspRiskUnitDos = (List<AspRiskUnitDo>) aspRiskUnitService.listByIds(riskPointIds);
+        if(aspRiskUnitDos.isEmpty()){
+            log.error("无法根据id:{}找到对应的风险点",riskPointIds);
+            throw new CustomException("无法获取对应的风险点");
+        }
+        List<ApsDetailsHazardInvestigationTasksDo> saveList= new ArrayList<>();
+        List<ApsDetailsHazardInvestigationTasksJcxzibiaoDo> subSaveList = new ArrayList<>();
         // 按照风险点 分开生成隐患排查任务
-        for (String s : riskPointIds) {
+        ApsDetailsHazardInvestigationTasksDo apsDetailsHazardInvestigationTasksDo;
+        ApsDetailsHazardInvestigationTasksJcxzibiaoDo apsHazardInvestigationTemplateZibiaoDo;
+        for (AspRiskUnitDo s : aspRiskUnitDos) {
             apsDetailsHazardInvestigationTasksDo = new ApsDetailsHazardInvestigationTasksDo();
+            JSCommonUtils.setBaseDetail(apsDetailsHazardInvestigationTasksDo,currentUser);
             apsDetailsHazardInvestigationTasksDo.setId(SecurityUtil.getUUID());
-            apsDetailsHazardInvestigationTasksDo.setCreatedate(new Date());
-            apsDetailsHazardInvestigationTasksDo.setModifydate(new Date());
-            apsDetailsHazardInvestigationTasksDo.setCreateuserid(currentUser.getId());
-            apsDetailsHazardInvestigationTasksDo.setCreateusername(currentUser.getName());
-            apsDetailsHazardInvestigationTasksDo.setModifyuserid(currentUser.getId());
-            apsDetailsHazardInvestigationTasksDo.setModifyusername(currentUser.getName());
             apsDetailsHazardInvestigationTasksDo.setRiskunit(tempData.getHiddendangerid());
             apsDetailsHazardInvestigationTasksDo.setRiskanalysisobjectcode(tempData.getHiddendanger());
             SysSerialVo sysSerialVo = new SysSerialVo();
@@ -89,8 +107,8 @@ public class HazardInvestigationServiceImpl implements HazardInvestigationServic
             sysSerialVo.setRuleTemplateStr("BIANHAO@{serialNumber:#000000}");
             sysSerialVo.setIfautomaticreset("n");
             apsDetailsHazardInvestigationTasksDo.setNumber(autoSysSerialNumberService.getCodeByTemplate(sysSerialVo));
-            apsDetailsHazardInvestigationTasksDo.setIdentifyperple();
-            apsDetailsHazardInvestigationTasksDo.setIdentifyperpleid();
+            apsDetailsHazardInvestigationTasksDo.setIdentifyperple(s.getDutyofficername());
+            apsDetailsHazardInvestigationTasksDo.setIdentifyperpleid(s.getDutyofficerid());
 
             // 获取当前时间的0点0分0秒
             Calendar startOfDay = Calendar.getInstance();
@@ -105,11 +123,32 @@ public class HazardInvestigationServiceImpl implements HazardInvestigationServic
             startOfDay.set(Calendar.SECOND, 59);
             startOfDay.set(Calendar.MILLISECOND, 999);
             apsDetailsHazardInvestigationTasksDo.setPlannedendtime(startOfDay.getTime());
+            saveList.add(apsDetailsHazardInvestigationTasksDo);
 
         }
-
+        apsDetailsHazardInvestigationTasksServiceImpl.saveBatch(saveList);
 
     }
 
+    /**
+     * 生成隐患任务详情
+     */
+    public void assembleTaskDetails(SysUserVo currentUser,
+                                    ApsDetailsHazardInvestigationTasksDo apsDetailsHazardInvestigationTasksDo,
+                                    List<ApsHazardInvestigationTemplateZibiaoDo> checkItemList ){
+        ApsDetailsHazardInvestigationTasksJcxzibiaoDo apsHazardInvestigationTemplateZibiaoDo;
+        for (ApsHazardInvestigationTemplateZibiaoDo s : checkItemList) {
+            apsHazardInvestigationTemplateZibiaoDo = new ApsDetailsHazardInvestigationTasksJcxzibiaoDo();
+            apsHazardInvestigationTemplateZibiaoDo.setId(SecurityUtil.getUUID());
+            apsHazardInvestigationTemplateZibiaoDo.setTaskid(apsDetailsHazardInvestigationTasksDo.getId());
+            JSCommonUtils.setBaseDetail(apsHazardInvestigationTemplateZibiaoDo,currentUser);
+            apsHazardInvestigationTemplateZibiaoDo.setControlmeasurenumber(s.getControlmeasurenumber());
+            apsHazardInvestigationTemplateZibiaoDo.setInspectioncycle(s.getInspectioncycle());
+            apsHazardInvestigationTemplateZibiaoDo.setInspectioncycleunit(s.getInspectioncycleunit());
+            apsHazardInvestigationTemplateZibiaoDo.setTasktype(s.getTasktype());
+
+        }
+
+    }
 
 }

js-security/security-common/src/main/resources/mybatis/AspRiskUnitMapper.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rongwei.sfcommon.sys.dao.AspRiskUnitDao">
+
+    <resultMap id="BaseResultMap" type="com.rongwe.scentity.domian.AspRiskUnitDo">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="tenantid" column="TENANTID" jdbcType="VARCHAR"/>
+            <result property="roption" column="ROPTION" jdbcType="VARCHAR"/>
+            <result property="deleted" column="DELETED" jdbcType="CHAR"/>
+            <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
+            <result property="createdate" column="CREATEDATE" jdbcType="TIMESTAMP"/>
+            <result property="createuserid" column="CREATEUSERID" jdbcType="VARCHAR"/>
+            <result property="modifydate" column="MODIFYDATE" jdbcType="TIMESTAMP"/>
+            <result property="modifyuserid" column="MODIFYUSERID" jdbcType="VARCHAR"/>
+            <result property="createusername" column="CREATEUSERNAME" jdbcType="VARCHAR"/>
+            <result property="modifyusername" column="MODIFYUSERNAME" jdbcType="VARCHAR"/>
+            <result property="riskobjectcode" column="RISKOBJECTCODE" jdbcType="VARCHAR"/>
+            <result property="responsibledept" column="RESPONSIBLEDEPT" jdbcType="VARCHAR"/>
+            <result property="responsibledeptid" column="RESPONSIBLEDEPTID" jdbcType="VARCHAR"/>
+            <result property="riskunitname" column="RISKUNITNAME" jdbcType="VARCHAR"/>
+            <result property="risklevel" column="RISKLEVEL" jdbcType="VARCHAR"/>
+            <result property="synctime" column="SYNCTIME" jdbcType="TIMESTAMP"/>
+            <result property="dutyofficerid" column="DUTYOFFICERID" jdbcType="VARCHAR"/>
+            <result property="dutyofficername" column="DUTYOFFICERNAME" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,TENANTID,ROPTION,
+        DELETED,REMARK,CREATEDATE,
+        CREATEUSERID,MODIFYDATE,MODIFYUSERID,
+        CREATEUSERNAME,MODIFYUSERNAME,RISKOBJECTCODE,
+        RESPONSIBLEDEPT,RESPONSIBLEDEPTID,RISKUNITNAME,
+        RISKLEVEL,SYNCTIME,DUTYOFFICERID,
+        DUTYOFFICERNAME
+    </sql>
+</mapper>

js-security/security-entity/src/main/java/com/rongwe/scentity/domian/ApsDetailsHazardInvestigationTasksDo.java

@@ -46,11 +46,13 @@ public class ApsDetailsHazardInvestigationTasksDo extends BaseDo implements Seri
     /**
      * 任务类型
      */
+    @Deprecated
     private String tasktype;
 
     /**
      * 包保任务对应项
      */
+    @Deprecated
     private String correspondingitemsforwarrantytasks;
 
     /**

js-security/security-entity/src/main/java/com/rongwe/scentity/domian/ApsDetailsHazardInvestigationTasksJcxzibiaoDo.java

@@ -60,11 +60,13 @@ public class ApsDetailsHazardInvestigationTasksJcxzibiaoDo extends BaseDo implem
     /**
      * 工作开始时间
      */
+    @Deprecated
     private Date startingtimeofwork;
 
     /**
      * 工作结束时间
      */
+    @Deprecated
     private Date endtimeofwork;
 
     /**

js-security/security-entity/src/main/java/com/rongwe/scentity/domian/ApsHazardInvestigationTemplateZibiaoDo.java

@@ -60,11 +60,13 @@ public class ApsHazardInvestigationTemplateZibiaoDo extends BaseDo implements Se
     /**
      * 工作开始时间
      */
+    @Deprecated
     private Date startingtimeofwork;
 
     /**
      * 工作结束时间
      */
+    @Deprecated
     private Date endtimeofwork;
 
     /**

js-security/security-entity/src/main/java/com/rongwe/scentity/domian/AspRiskUnitDo.java

@@ -0,0 +1,77 @@
+package com.rongwe.scentity.domian;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 安全风险分析单元
+ * @TableName asp_risk_unit
+ */
+@TableName(value ="asp_risk_unit")
+@Data
+public class AspRiskUnitDo extends BaseDo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 风险对象编码
+     */
+    private String riskobjectcode;
+
+    /**
+     * 责任部门
+     */
+    private String responsibledept;
+
+    /**
+     * 责任部门id
+     */
+    private String responsibledeptid;
+
+    /**
+     * 安全风险分析单元
+     */
+    private String riskunitname;
+
+    /**
+     * 风险等级
+     */
+    private String risklevel;
+
+    /**
+     * 上次同步时间
+     */
+    private Date synctime;
+
+    /**
+     * 责任人ID
+     */
+    private String dutyofficerid;
+
+    /**
+     * 责任人
+     */
+    private String dutyofficername;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}