feature 代码提交

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspEvaluationRecordDao.java

@@ -0,0 +1,15 @@
+package com.rongwei.sfcommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwe.scentity.domian.AspEvaluationRecordDo;
+
+/**
+ * @Entity com.rongwei.training.domain.AspEvaluationRecord
+ */
+public interface AspEvaluationRecordDao extends BaseMapper<AspEvaluationRecordDo> {
+
+}
+
+
+
+

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspEvaluationRecordHistoryDao.java

@@ -0,0 +1,18 @@
+package com.rongwei.sfcommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwe.scentity.domian.AspEvaluationRecordHistoryDo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @Entity com.rongwei.training.domain.AspEvaluationRecordHistory
+ */
+public interface AspEvaluationRecordHistoryDao extends BaseMapper<AspEvaluationRecordHistoryDo> {
+    @Delete("DELETE from asp_evaluation_record_history where MASTERID = #{masterId}")
+    void removeByMasterId(@Param("masterId") String masterId);
+}
+
+
+
+

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspRiskSourceHistoryDao.java

@@ -0,0 +1,19 @@
+package com.rongwei.sfcommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwe.scentity.domian.AspRiskSourceHistoryDo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @Entity com.rongwei.training.domain.AspRiskSourceHistory
+ */
+public interface AspRiskSourceHistoryDao extends BaseMapper<AspRiskSourceHistoryDo> {
+
+    @Delete("DELETE from asp_risk_source_history where ID = #{id}")
+    void removeById(@Param("id") String id);
+}
+
+
+
+

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@ package com.rongwei.sfcommon.sys.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwe.scentity.domian.AspRiskSourceDo;
-
+import com.rongwei.rwcommon.base.R;
 
 
 public interface AspRiskSourceService extends IService<AspRiskSourceDo> {
@@ -10,5 +10,7 @@ public interface AspRiskSourceService extends IService<AspRiskSourceDo> {
     void test(Boolean haveJob,String filePath,String category);
 
     void resetInfo();
+
+    R updateHistory(String id);
 }
 

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspEvaluationRecordHistoryServiceImpl.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.AspEvaluationRecordHistoryDo;
+import com.rongwei.sfcommon.sys.dao.AspEvaluationRecordHistoryDao;
+
+import com.rongwei.sfcommon.sys.service.AspEvaluationRecordHistoryService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class AspEvaluationRecordHistoryServiceImpl extends ServiceImpl<AspEvaluationRecordHistoryDao, AspEvaluationRecordHistoryDo>
+implements AspEvaluationRecordHistoryService {
+
+}
+
+
+
+

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspEvaluationRecordServiceImpl.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.AspEvaluationRecordDo;
+import com.rongwei.sfcommon.sys.dao.AspEvaluationRecordDao;
+
+import com.rongwei.sfcommon.sys.service.AspEvaluationRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class AspEvaluationRecordServiceImpl extends ServiceImpl<AspEvaluationRecordDao, AspEvaluationRecordDo>
+implements AspEvaluationRecordService {
+
+}
+
+
+
+

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

@@ -0,0 +1,20 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwe.scentity.domian.AspRiskSourceHistoryDo;
+import com.rongwei.sfcommon.sys.dao.AspRiskSourceHistoryDao;
+import com.rongwei.sfcommon.sys.service.AspRiskSourceHistoryService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class AspRiskSourceHistoryServiceImpl extends ServiceImpl<AspRiskSourceHistoryDao, AspRiskSourceHistoryDo>
+implements AspRiskSourceHistoryService {
+
+}
+
+
+
+

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

@@ -5,41 +5,52 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwe.scentity.domian.AspEvaluationRecordDo;
+import com.rongwe.scentity.domian.AspEvaluationRecordHistoryDo;
 import com.rongwe.scentity.domian.AspRiskSourceDo;
+import com.rongwe.scentity.domian.AspRiskSourceHistoryDo;
 import com.rongwei.rwadmincommon.system.domain.SysOrganizationDo;
 import com.rongwei.rwadmincommon.system.domain.SysUserDo;
 import com.rongwei.rwadmincommon.system.service.SysOrganizationService;
 import com.rongwei.rwadmincommon.system.service.SysUserService;
 import com.rongwei.rwcommon.base.BaseDo;
+import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.sfcommon.sys.dao.AspRiskSourceDao;
+import com.rongwei.sfcommon.sys.service.AspEvaluationRecordService;
 import com.rongwei.sfcommon.sys.service.AspRiskSourceService;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
 public class AspRiskSourceServiceImpl extends ServiceImpl<AspRiskSourceDao, AspRiskSourceDo> implements AspRiskSourceService {
-
+    private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
     @Autowired
     private SysUserService sysUserService;
     @Autowired
     private SysOrganizationService sysOrganizationService;
+    @Autowired
+    private AspEvaluationRecordService aspEvaluationRecordService;
 
+    @Autowired
+    private AspRiskSourceHistoryServiceImpl aspRiskSourceHistoryService;
+    @Autowired
+    private AspEvaluationRecordHistoryServiceImpl aspEvaluationRecordHistoryService;
     @Override
     public void test(Boolean haveJob,String filePath,String category) {
 //        //获取文件目录
@@ -180,21 +191,78 @@ public class AspRiskSourceServiceImpl extends ServiceImpl<AspRiskSourceDao, AspR
         this.saveBatch(resList);
     }
 
+    /**
+     * 将以评估的非历史记录 变为历史记录并生成新的数据
+     */
     @Override
+    @Transactional
     public void resetInfo() {
-        List<AspRiskSourceDo> list = this.list(new LambdaQueryWrapper<AspRiskSourceDo>().eq(BaseDo::getDeleted, "0"));
+        // 获取所有以评估的数据
+        List<AspRiskSourceDo> list = this.list(new LambdaQueryWrapper<AspRiskSourceDo>()
+                .eq(BaseDo::getDeleted, "0")
+                .eq(AspRiskSourceDo::getAssessstatus,"ypg"));
         if(list.isEmpty()){
             log.debug("暂无需要重置信息的风险源信息");
             return;
         }
-        List<String> ids = list.stream().map(AspRiskSourceDo::getId).collect(Collectors.toList());
-        this.update(new LambdaUpdateWrapper<AspRiskSourceDo>()
-                .in(AspRiskSourceDo::getId,ids)
-                .set(AspRiskSourceDo::getAssessstatus,"dpg")
-                .set(AspRiskSourceDo::getAvgsalary,null)
-                .set(AspRiskSourceDo::getRating,null)
-                .set(AspRiskSourceDo::getRiskranking,null)
-        );
+        // 将原来的数据变为 历史记录
+        List<String> oldIds = list.stream().map(AspRiskSourceDo::getId).collect(Collectors.toList());
+        // 更新历史记录信息
+        oldIds.forEach(id->{
+            updateHistory(id);
+        });
+
+        // 删除子表数据
+        aspEvaluationRecordService.remove(new LambdaQueryWrapper<AspEvaluationRecordDo>().in(AspEvaluationRecordDo::getMasterid,oldIds));
+        // 删除主表信息
+        this.removeByIds(oldIds);
 
+        // 重新生成新的数据
+        list.forEach(info->{
+            info.setAssessstatus("dpg");
+            info.setAvgsalary(null);
+            info.setRating(null);
+            info.setRiskranking(null);
+            info.setSerialnumber(null);
+            info.setId(SecurityUtil.getUUID());
+        });
+        this.saveBatch(list);
+    }
+
+    /**
+     * 更新风险源的历史评估记录
+     * @param id
+     */
+    @Override
+    public R updateHistory(String id) {
+        log.info("开始更新风险源的历史评估记录");
+        AspRiskSourceDo aspRiskSourceDo = this.getById(id);
+        if(aspRiskSourceDo==null){
+            log.error("无法通过ID:{}获取到风险源评估信息",id);
+            return  R.error("无法获取到风险评估信息");
+        }
+        // 主表
+        AspRiskSourceHistoryDo saveData = new AspRiskSourceHistoryDo();
+        BeanUtils.copyProperties(aspRiskSourceDo,saveData);
+
+        // 子表
+        List<AspEvaluationRecordDo> recordHistoryDos = aspEvaluationRecordService.list(new LambdaQueryWrapper<AspEvaluationRecordDo>()
+                .eq(AspEvaluationRecordDo::getMasterid, id)
+                .eq(BaseDo::getDeleted, "0"));
+        List<AspEvaluationRecordHistoryDo> historySaveList = new ArrayList<>();
+        recordHistoryDos.forEach(data->{
+            AspEvaluationRecordHistoryDo aspEvaluationRecordHistoryDo = new AspEvaluationRecordHistoryDo();
+            BeanUtils.copyProperties(data,aspEvaluationRecordHistoryDo);
+            historySaveList.add(aspEvaluationRecordHistoryDo);
+        });
+        // 删除历史表的记录
+        aspRiskSourceHistoryService.getBaseMapper().removeById(id);
+        aspEvaluationRecordHistoryService.getBaseMapper().removeByMasterId(id);
+        // 保存;
+        aspRiskSourceHistoryService.save(saveData);
+        if(!historySaveList.isEmpty()){
+            aspEvaluationRecordHistoryService.saveBatch(historySaveList);
+        }
+        return R.ok();
     }
 }

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

@@ -0,0 +1,85 @@
+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.math.BigDecimal;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 创新安全——评估记录
+ * @TableName asp_evaluation_record
+ */
+@TableName(value ="asp_evaluation_record")
+@Data
+public class AspEvaluationRecordDo extends BaseDo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 主表ID(asp_risk_source)
+     */
+    private String masterid;
+
+    /**
+     * L
+     */
+    private String eventprobability;
+
+    /**
+     * E
+     */
+    private String exposurefrequency;
+
+    /**
+     * C
+     */
+    private String consequence;
+
+    /**
+     * D
+     */
+    private BigDecimal riskrankingscore;
+
+    /**
+     * 风险等级(数据字典：1、稍有危险；2、一般危险；3、显著危险；4、高度危险；5、极其危险)
+     */
+    private String riskranking;
+
+    /**
+     * 评估人ID
+
+     */
+    private String appraiserid;
+
+    /**
+     * 评估人
+
+     */
+    private String appraisername;
+
+    /**
+     * 评估年份
+     */
+    private String evaluationyear;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,84 @@
+package com.rongwe.scentity.domian;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 创新安全——评估记录
+ * @TableName asp_evaluation_record_history
+ */
+@TableName(value ="asp_evaluation_record_history")
+@Data
+public class AspEvaluationRecordHistoryDo extends BaseDo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 主表ID(asp_risk_source)
+     */
+    private String masterid;
+
+    /**
+     * L
+     */
+    private String eventprobability;
+
+    /**
+     * E
+     */
+    private String exposurefrequency;
+
+    /**
+     * C
+     */
+    private String consequence;
+
+    /**
+     * D
+     */
+    private BigDecimal riskrankingscore;
+
+    /**
+     * 风险等级(数据字典：1、稍有危险；2、一般危险；3、显著危险；4、高度危险；5、极其危险)
+     */
+    private String riskranking;
+
+    /**
+     * 评估人ID
+
+     */
+    private String appraiserid;
+
+    /**
+     * 评估人
+
+     */
+    private String appraisername;
+
+    /**
+     * 评估年份
+     */
+    private String evaluationyear;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,161 @@
+package com.rongwe.scentity.domian;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 创新安全——风险源管理
+ * @TableName asp_risk_source_history
+ */
+@TableName(value ="asp_risk_source_history")
+@Data
+public class AspRiskSourceHistoryDo extends BaseDo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 序号
+     */
+    private String serialnumber;
+
+    /**
+     * 类别(数据字典：1、设备设施；2、作业活动)
+     */
+    private String category;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 车间ID
+     */
+    private String workshopid;
+
+    /**
+     * 车间
+     */
+    private String workshopname;
+
+    /**
+     * 工序ID
+     */
+    private String processid;
+
+    /**
+     * 工序
+     */
+    private String process;
+
+    /**
+     * 检查项目
+     */
+    private String inspectionitem;
+
+    /**
+     * 作业活动
+     */
+    private String jobactivity;
+
+    /**
+     * 检查标准
+     */
+    private String inspectionstandard;
+
+    /**
+     * 可能发生的事故类型及后果
+     */
+    private String eventuality;
+
+    /**
+     * 工程技术措施
+     */
+    private String engineeringmeasure;
+
+    /**
+     * 管理措施
+     */
+    private String controlmeasure;
+
+    /**
+     * 教育培训
+     */
+    private String educationaltraining;
+
+    /**
+     * 个体防护措施
+     */
+    private String safeguardprocedures;
+
+    /**
+     * 应急处置措施
+     */
+    private String imprintingmeasures;
+
+    /**
+     * 评定级别
+     */
+    private String rating;
+
+    /**
+     * 平均分
+     */
+    private String avgsalary;
+
+    /**
+     * 风险分级
+     */
+    private String riskranking;
+
+    /**
+     * 管控层(数据字典：1、班组级；2、车间级；3、工厂级)
+     */
+    private String managementlevel;
+
+    /**
+     * 责任单位
+     */
+    private String accountabilityunnitname;
+
+    /**
+     * 责任单位ID
+     */
+    private String accountabilityunnitid;
+
+    /**
+     * 责任人ID
+     */
+    private String dutyofficerid;
+
+    /**
+     * 责任人
+     */
+    private String dutyofficername;
+
+    /**
+     * 评估状态
+     */
+    private String assessstatus;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

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

@@ -40,7 +40,7 @@ public class AspRiskSourceController {
      *
      * @return
      */
-    @Scheduled(cron = "1 1 1 1 1 ?")
+    @Scheduled(cron = "1 0 0 1 1 ?")
     @PostMapping("/reset")
     public R resetInfo() {
         log.info("重置风险源相关信息");
@@ -48,4 +48,10 @@ public class AspRiskSourceController {
         return R.ok();
     }
 
+    @PostMapping("/history/{id}")
+    public R updateHistory(@PathVariable("id") String id) {
+        log.info("更新风险源历史记录信息");
+        return aspRiskSourceService.updateHistory(id);
+    }
+
 }