feature 代码提交

js-security/security-common/pom.xml

@@ -37,6 +37,12 @@
             <version>4.4.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.rongwei</groupId>
+            <artifactId>training-common</artifactId>
+            <version>1.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/dao/ApsSpecialInspectionTaskDao.java

@@ -1,7 +1,7 @@
-package com.rongwei.trainingcommon.sys.dao;
+package com.rongwei.sfcommon.sys.dao;
 
-import com.rongwei.training.domain.ApsSpecialInspectionTaskDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwe.scentity.domian.ApsSpecialInspectionTaskDo;
 
 /**
  * @Entity generator.domain.ApsSpecialInspectionTask

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/dao/ApsSpecialInspectionTaskZibiaoDao.java

@@ -1,7 +1,7 @@
-package com.rongwei.trainingcommon.sys.dao;
+package com.rongwei.sfcommon.sys.dao;
 
-import com.rongwei.training.domain.ApsSpecialInspectionTaskZibiaoDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwe.scentity.domian.ApsSpecialInspectionTaskZibiaoDo;
 
 /**
  * @Entity generator.domain.ApsSpecialInspectionTaskZibiao

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/ApsSpecialInspectionTaskService.java

@@ -1,7 +1,7 @@
-package com.rongwei.trainingcommon.sys.service;
+package com.rongwei.sfcommon.sys.service;
 
-import com.rongwei.training.domain.ApsSpecialInspectionTaskDo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwe.scentity.domian.ApsSpecialInspectionTaskDo;
 
 /**
  *

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/ApsSpecialInspectionTaskZibiaoService.java

@@ -1,7 +1,7 @@
-package com.rongwei.trainingcommon.sys.service;
+package com.rongwei.sfcommon.sys.service;
 
-import com.rongwei.training.domain.ApsSpecialInspectionTaskZibiaoDo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwe.scentity.domian.ApsSpecialInspectionTaskZibiaoDo;
 
 /**
  *

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/ApsSpecialInspectionTaskServiceImpl.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.ApsSpecialInspectionTaskDo;
+import com.rongwei.sfcommon.sys.dao.ApsSpecialInspectionTaskDao;
+import com.rongwei.sfcommon.sys.service.ApsSpecialInspectionTaskService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsSpecialInspectionTaskServiceImpl extends ServiceImpl<ApsSpecialInspectionTaskDao, ApsSpecialInspectionTaskDo>
+        implements ApsSpecialInspectionTaskService {
+
+}
+
+
+
+

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/ApsSpecialInspectionTaskZibiaoServiceImpl.java

@@ -1,11 +1,14 @@
-package com.rongwei.trainingcommon.sys.service.impl;
+package com.rongwei.sfcommon.sys.service.impl;
+
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.training.domain.ApsSpecialInspectionTaskZibiaoDo;
-import com.rongwei.trainingcommon.sys.dao.ApsSpecialInspectionTaskZibiaoDao;
-import com.rongwei.trainingcommon.sys.service.ApsSpecialInspectionTaskZibiaoService;
+
+import com.rongwe.scentity.domian.ApsSpecialInspectionTaskZibiaoDo;
+import com.rongwei.sfcommon.sys.dao.ApsSpecialInspectionTaskZibiaoDao;
+import com.rongwei.sfcommon.sys.service.ApsSpecialInspectionTaskZibiaoService;
 import org.springframework.stereotype.Service;
 
+
 /**
  *
  */

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

@@ -1,11 +1,22 @@
 package com.rongwei.sfcommon.sys.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.rongwe.scentity.domian.AspCheckDiscoveryItemDo;
+import com.rongwe.scentity.domian.HiddenDangerTrackDo;
+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.safecommon.utils.JSCommonUtils;
 import com.rongwei.sfcommon.sys.service.SpecialInspectionService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * SpecialInspectionServiceImpl class
  *
@@ -16,6 +27,15 @@ import org.springframework.stereotype.Service;
 public class SpecialInspectionServiceImpl implements SpecialInspectionService {
     private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
 
+    @Autowired
+    private ApsSpecialInspectionTaskZibiaoServiceImpl apsSpecialInspectionTaskZibiaoService;
+    @Autowired
+    private ApsSpecialInspectionTaskServiceImpl apsSpecialInspectionTaskService;
+    @Autowired
+    private AspCheckDiscoveryItemServiceImpl aspCheckDiscoveryItemService;
+    @Autowired
+    private HiddenDangerTrackServiceImpl hiddenDangerTrackService;
+
     /**
      * 专项检查生成隐患任务
      * @param id
@@ -24,7 +44,36 @@ public class SpecialInspectionServiceImpl implements SpecialInspectionService {
     @Override
     public R createHiddenDangerTrack(String id) {
         log.info("开始根据专项检查任务：{}生成隐患任务",id);
+        ApsSpecialInspectionTaskDo specialInspectionTaskDo = apsSpecialInspectionTaskService.getById(id);
+        JSCommonUtils.parameterCheck(()->specialInspectionTaskDo==null,"无法找到对应的专项检查任务",
+                "根据id:{}无法找到对应的专项检查任务",id);
+        // 获取改专项检查任务对应的隐患任务
+        List<AspCheckDiscoveryItemDo> checkDiscoveryItemDos = aspCheckDiscoveryItemService.list(new LambdaQueryWrapper<AspCheckDiscoveryItemDo>().eq(BaseDo::getDeleted, "0")
+                .eq(AspCheckDiscoveryItemDo::getThemecheckitemid, id));
+        JSCommonUtils.parameterCheck(checkDiscoveryItemDos::isEmpty,"暂无隐患任务需要生成",
+                "");
 
-        return null;
+        List<HiddenDangerTrackDo> saveList=new ArrayList<>();
+        HiddenDangerTrackDo hiddenDangerTrackDo;
+        SysUserVo currentUser = JSCommonUtils.getCurrentUser();
+        for (AspCheckDiscoveryItemDo checkDiscoveryItemDo : checkDiscoveryItemDos) {
+            hiddenDangerTrackDo =new HiddenDangerTrackDo();
+            hiddenDangerTrackDo.setId(SecurityUtil.getUUID());
+            JSCommonUtils.setBaseDetail(hiddenDangerTrackDo,currentUser);
+            hiddenDangerTrackDo.setRiskanalysisobjectcode(checkDiscoveryItemDo.getRiskunitcode());
+            hiddenDangerTrackDo.setHazardlevel(checkDiscoveryItemDo.getGrade());
+            hiddenDangerTrackDo.setDangersource("10");
+            hiddenDangerTrackDo.setGovernancetype(checkDiscoveryItemDo.getGovernancetype());
+            hiddenDangerTrackDo.setHiddendangertype(checkDiscoveryItemDo.getType());
+            hiddenDangerTrackDo.setHazardstate("0");
+            hiddenDangerTrackDo.setHazardname(checkDiscoveryItemDo.getName());
+            hiddenDangerTrackDo.setHazarddescription(checkDiscoveryItemDo.getHazarddescription());
+            hiddenDangerTrackDo.setHazardphoto(checkDiscoveryItemDo.getFileinfo());
+            hiddenDangerTrackDo.setResponsiblepersonforrectification(checkDiscoveryItemDo.getTrackuser());
+            hiddenDangerTrackDo.setTrackuserid(checkDiscoveryItemDo.getTrackuserid());
+            saveList.add(hiddenDangerTrackDo);
+        }
+        JSCommonUtils.batchChunk(saveList,hiddenDangerTrackService::saveBatch,100);
+        return R.ok();
     }
 }

js-training/training-entity/src/main/java/com/rongwei/training/domain/ApsSpecialInspectionTaskDo.java

@@ -1,14 +1,14 @@
-package com.rongwei.training.domain;
+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;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 专项检查任务
  * @TableName aps_special_inspection_task

js-training/training-entity/src/main/java/com/rongwei/training/domain/ApsSpecialInspectionTaskZibiaoDo.java

@@ -1,14 +1,13 @@
-package com.rongwei.training.domain;
+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;
 
+import java.io.Serializable;
+
 /**
  * 专项检查任务
  * @TableName aps_special_inspection_task_zibiao

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

@@ -111,45 +111,6 @@ public class AspCheckDiscoveryItemDo extends BaseDo implements Serializable {
      */
     private String roption;
 
-    /**
-     * 是否删除(Y/N)
-     */
-    private String deleted;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 创建时间
-     */
-    private Date createdate;
-
-    /**
-     * 创建用户ID
-     */
-    private String createuserid;
-
-    /**
-     * 修改日期
-     */
-    private Date modifydate;
-
-    /**
-     * 修改用户ID
-     */
-    private String modifyuserid;
-
-    /**
-     * 创建人名称
-     */
-    private String createusername;
-
-    /**
-     * 修改人名称
-     */
-    private String modifyusername;
 
     /**
      * 是否已生成任务

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

@@ -340,242 +340,4 @@ public class HiddenDangerTrackDo extends BaseDo implements Serializable {
      * 隐患治理期限
      */
     private Date deadlineforhazardcontrol;
-
-
-//    /**
-//     * 总编号
-//     */
-//    private String code;
-//
-//    /**
-//     * 发现时间
-//     */
-//    private Date findtime;
-//
-//    /**
-//     * 发现人
-//     */
-//    private String findusername;
-//
-//    /**
-//     * 发现人ID
-//     */
-//    private String finduser;
-//
-//    /**
-//     * 隐患来源
-//     */
-//    private String dangersource;
-//
-//    /**
-//     * 隐患工段
-//     */
-//    private String dangerworkpark;
-//
-//    /**
-//     * 隐患工段名称
-//     */
-//    private String dangerworkparkname;
-//
-//    /**
-//     * 指派跟踪人
-//     */
-//    private String trackusername;
-//
-//    /**
-//     * 指派跟踪人ID
-//     */
-//    private String trackuserid;
-//
-//    /**
-//     * 最初指派跟踪人ID
-//     */
-//    private String firsttrackuserid;
-//
-//    /**
-//     * 最初指派跟踪人名称
-//     */
-//    private String firsttrackusername;
-//
-//    /**
-//     * 隐患类型
-//     */
-//    private String hiddendangertype;
-//
-//    /**
-//     * 隐患分类
-//     */
-//    private String hiddendangerclassify;
-//
-//    /**
-//     * 隐患内容
-//     */
-//    private String hiddendangercontent;
-//
-//    /**
-//     * 限整改日期
-//     */
-//    private Date rectificationdate;
-//
-//    /**
-//     * 完成日期
-//     */
-//    private Date finishdate;
-//
-//    /**
-//     * 措施完成进度
-//     */
-//    private String completionschedule;
-//
-//    /**
-//     * 预警状态
-//     */
-//    private String warnstatus;
-//
-//    /**
-//     * 状态
-//     */
-//    private String status;
-//
-//    /**
-//     * 检查照片
-//     */
-//    private String checkphoto;
-//
-//    /**
-//     * 处理说明
-//     */
-//    private String processexplain;
-//
-//    /**
-//     * 关联主键ID
-//     */
-//    private String relationid;
-//
-//    /**
-//     * 租户ID
-//     */
-//    private String tenantid;
-//
-//    /**
-//     * 扩展json格式配置
-//     */
-//    private String roption;
-//
-//    /**
-//     * 是否删除(Y/N)
-//     */
-//    private String deleted;
-//
-//    /**
-//     * 备注
-//     */
-//    private String remark;
-//
-//    /**
-//     * 创建时间
-//     */
-//    private Date createdate;
-//
-//    /**
-//     * 创建用户ID
-//     */
-//    private String createuserid;
-//
-//    /**
-//     * 修改日期
-//     */
-//    private Date modifydate;
-//
-//    /**
-//     * 修改用户ID
-//     */
-//    private String modifyuserid;
-//
-//    /**
-//     * 创建人名称
-//     */
-//    private String createusername;
-//
-//    /**
-//     * 修改人名称
-//     */
-//    private String modifyusername;
-//
-//    /**
-//     * 完成照片
-//     */
-//    private String finishedphoto;
-//
-//    /**
-//     * 安全促进员
-//     */
-//    private String safetypromoter;
-//
-//    /**
-//     * 安全促进员ID
-//     */
-//    private String safetypromoterid;
-//
-//    /**
-//     * 发现项ID
-//     */
-//    private String discoveryitemid;
-//
-//    /**
-//     * 主题检查ID
-//     */
-//    private String themecheckid;
-//
-//    /**
-//     * 主题检查名称
-//     */
-//    private String themecheckname;
-//
-//    /**
-//     * 实际检查日期
-//     */
-//    private Date actualchecktime;
-//
-//    /**
-//     * 车间
-//     */
-//    private String workshop;
-//
-//    /**
-//     * 车间ID
-//     */
-//    private String workshopid;
-//
-//    /**
-//     * 整改资金
-//     */
-//    private BigDecimal rectificationfund;
-//
-//    /**
-//     * 整改措施
-//     */
-//    private String measure;
-//
-//    /**
-//     * 车间促进员
-//     */
-//    private String shopfacilitator;
-//
-//    /**
-//     * 车间促进员ID
-//     */
-//    private String shopfacilitatorid;
-//
-//    /**
-//     * 数据来源(0-安全生产 1-设备管理)
-//     */
-//    private String source;
-//
-//    /**
-//     * 退回次数
-//     */
-//    private Integer returnsnum;
-
-
 }

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/ApsSpecialInspectionTaskServiceImpl.java

@@ -1,21 +0,0 @@
-package com.rongwei.trainingcommon.sys.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.training.domain.ApsSpecialInspectionTaskDo;
-import com.rongwei.trainingcommon.sys.dao.ApsSpecialInspectionTaskDao;
-
-import com.rongwei.trainingcommon.sys.service.ApsSpecialInspectionTaskService;
-import org.springframework.stereotype.Service;
-
-/**
- *
- */
-@Service
-public class ApsSpecialInspectionTaskServiceImpl extends ServiceImpl<ApsSpecialInspectionTaskDao, ApsSpecialInspectionTaskDo>
-implements ApsSpecialInspectionTaskService {
-
-}
-
-
-
-