双重预防项目-国泰新华二开定制版
16639036659
2022-09-15 36ab7c36a3a8d40568dfaced7531744b8d63e03e
管控措施嵌入基础清单
已修改6个文件
已添加6个文件
250 ■■■■■ 文件已修改
src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskCheckUnit.java 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskUnitUuid.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskCheckUnitRepository.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/doublePrevention/repository/param/PreventPointAndMeasureParams.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/doublePrevention/service/RiskService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskCheckUnitService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskCheckUnitServiceImpl.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tr/baseCheckPoint/domain/BaseCheckPoint.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mybatis/doublePrevention/PreventRiskCheckUnitMapper.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mybatis/tr/BaseCheckPointMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskCheckUnit.java
对比新文件
@@ -0,0 +1,71 @@
package com.ruoyi.doublePrevention.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@TableName("prevent_risk_check_unit")
public class PreventRiskCheckUnit {
    /**
     * 主键
     * */
    @TableId(value = "id" , type = IdType.AUTO)
    private Long id;
    /**
     * uuid
     * */
    private String uuid;
    /**
     * 原-检查点id
     * */
    private Long baseCheckPointId;
    /**
     * 管控措施id
     * */
    private Long controlMeasureId;
    /**
     * 风险点-单元-基础清单 id
     * */
    private Long riskId;
    public Long getId() {
        return id;
    }
    public void setId(Long id) {
        this.id = id;
    }
    public String getUuid() {
        return uuid;
    }
    public void setUuid(String uuid) {
        this.uuid = uuid;
    }
    public Long getBaseCheckPointId() {
        return baseCheckPointId;
    }
    public void setBaseCheckPointId(Long baseCheckPointId) {
        this.baseCheckPointId = baseCheckPointId;
    }
    public Long getControlMeasureId() {
        return controlMeasureId;
    }
    public void setControlMeasureId(Long controlMeasureId) {
        this.controlMeasureId = controlMeasureId;
    }
    public Long getRiskId() {
        return riskId;
    }
    public void setRiskId(Long riskId) {
        this.riskId = riskId;
    }
}
src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskUnitUuid.java
@@ -10,7 +10,7 @@
    /**
     * 主键
     * */
    @TableId(type = IdType.AUTO)
    @TableId(value = "id" , type = IdType.AUTO)
    private Long id;
    /**
     * 风险分析单元(设施区域)id
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskCheckUnitRepository.java
对比新文件
@@ -0,0 +1,13 @@
package com.ruoyi.doublePrevention.repository;
import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
import org.springframework.stereotype.Repository;
@Repository
public interface PreventRiskCheckUnitRepository {
    /**
     * 保存原检查点与管控措施的对应关系
     */
    int insertPointAndMeasure(PreventRiskCheckUnit checkUnit);
}
src/main/java/com/ruoyi/doublePrevention/repository/param/PreventPointAndMeasureParams.java
对比新文件
@@ -0,0 +1,42 @@
package com.ruoyi.doublePrevention.repository.param;
import java.util.List;
public class PreventPointAndMeasureParams {
    /**
     * 原-检查点id
     * */
    private Long baseCheckPointId;
    /**
     * 管控措施id
     * */
    private Long controlMeasureId;
    /**
     * 风险点-单元-基础清单 id
     * */
    private Long riskId;
    public Long getBaseCheckPointId() {
        return baseCheckPointId;
    }
    public void setBaseCheckPointId(Long baseCheckPointId) {
        this.baseCheckPointId = baseCheckPointId;
    }
    public Long getControlMeasureId() {
        return controlMeasureId;
    }
    public void setControlMeasureId(Long controlMeasureId) {
        this.controlMeasureId = controlMeasureId;
    }
    public Long getRiskId() {
        return riskId;
    }
    public void setRiskId(Long riskId) {
        this.riskId = riskId;
    }
}
src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
@@ -6,6 +6,7 @@
import com.ruoyi.doublePrevention.entity.PreventRiskEvent;
import com.ruoyi.doublePrevention.entity.dto.req.*;
import com.ruoyi.doublePrevention.entity.dto.resp.*;
import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.project.tr.riskList.domain.RiskList;
@@ -76,4 +77,9 @@
     * 管控措施-分页查询
     */
    ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> getRiskControlMeasurePage(PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO);
    /**
     * 保存原检查点与管控措施的对应关系
     */
    int insertPointAndMeasure(PreventPointAndMeasureParams pointAndMeasureParams);
}
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskCheckUnitService.java
对比新文件
@@ -0,0 +1,13 @@
package com.ruoyi.doublePrevention.service.baseService;
import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
import org.springframework.stereotype.Repository;
@Repository
public interface PreventRiskCheckUnitService {
    /**
     * 保存原检查点与管控措施的对应关系
     */
    int insertPointAndMeasure(PreventRiskCheckUnit checkUnit);
}
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskCheckUnitServiceImpl.java
对比新文件
@@ -0,0 +1,21 @@
package com.ruoyi.doublePrevention.service.baseService.impl;
import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
import com.ruoyi.doublePrevention.repository.PreventRiskCheckUnitRepository;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskCheckUnitService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service("PreventRiskCheckUnitService")
public class PreventRiskCheckUnitServiceImpl implements PreventRiskCheckUnitService {
    @Autowired
    private PreventRiskCheckUnitRepository preventRiskCheckUnitRepository;
    /**
     * 保存原检查点与管控措施的对应关系
     */
    @Override
    public int insertPointAndMeasure(PreventRiskCheckUnit checkUnit) {
        return preventRiskCheckUnitRepository.insertPointAndMeasure(checkUnit);
    }
}
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -11,6 +11,7 @@
import com.ruoyi.doublePrevention.enums.ResultCodes;
import com.ruoyi.doublePrevention.enums.StatusEnum;
import com.ruoyi.doublePrevention.enums.SyncEnum;
import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.doublePrevention.service.baseService.*;
import com.ruoyi.doublePrevention.vo.ResultVO;
@@ -19,6 +20,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
@@ -48,6 +50,9 @@
    @Autowired
    private PreventRiskControlMeasureService riskControlMeasureService;
    @Autowired
    private PreventRiskCheckUnitService preventRiskCheckUnitService;
    /**
     * 为设施设备清单附属表添加uuid
@@ -640,7 +645,29 @@
        ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
        resultVO.setCount(count);
        return resultVO;
    }
    /**
     * 保存原检查点与管控措施的对应关系
     */
    @Transactional
    @Override
    public int insertPointAndMeasure(PreventPointAndMeasureParams pointAndMeasureParams) {
        String uuid = UUID.randomUUID().toString();
        PreventRiskCheckUnit checkUnit = new PreventRiskCheckUnit();
        //封装数据 todo
        checkUnit.setUuid(uuid);
        checkUnit.setRiskId(pointAndMeasureParams.getRiskId());
        checkUnit.setBaseCheckPointId(pointAndMeasureParams.getBaseCheckPointId());
        checkUnit.setControlMeasureId(pointAndMeasureParams.getControlMeasureId());
        //执行插入
        int result = preventRiskCheckUnitService.insertPointAndMeasure(checkUnit);
        if (result < 1){
            throw new  RuntimeException("保存原检查点与管控措施的对应关系失败");
        }
        return result;
    }
}
src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java
@@ -8,6 +8,8 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.project.enumerate.TrEvaluationMethodDetailsEnum;
import com.ruoyi.project.enumerate.TrEvaluationMethodTypeEnum;
import com.ruoyi.project.system.dept.domain.Dept;
@@ -58,6 +60,9 @@
    @Autowired
    private IUserService userService;
    @Autowired
    private RiskService riskService;
    @GetMapping("{riskId}")
    public String baseCheckPoint(@PathVariable("riskId")Long riskId,ModelMap modelMap)
@@ -153,7 +158,19 @@
    @ResponseBody
    public AjaxResult addSave(BaseCheckPoint baseCheckPoint)
    {
        return toAjax(baseCheckPointService.insertBaseCheckPoint(baseCheckPoint));
      //老代码改造
        int result = baseCheckPointService.insertBaseCheckPoint(baseCheckPoint);
        //todo ,此处改造,嵌入管控措施
        baseCheckPoint.getCheckPointId();
        PreventPointAndMeasureParams pointAndMeasureParams = new PreventPointAndMeasureParams();
        //封装参数
        pointAndMeasureParams.setBaseCheckPointId(baseCheckPoint.getCheckPointId());
        pointAndMeasureParams.setControlMeasureId(baseCheckPoint.getControlMeasureId());//todo,该参数页面尚未封装进去
        pointAndMeasureParams.setRiskId(baseCheckPoint.getRiskId());
        riskService.insertPointAndMeasure(pointAndMeasureParams);
        return toAjax(result);
    }
    /**
src/main/java/com/ruoyi/project/tr/baseCheckPoint/domain/BaseCheckPoint.java
@@ -5,6 +5,8 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
import java.util.List;
/**
 * 基础清单检查点对象 tr_base_check_point
 * 
@@ -36,6 +38,17 @@
    @Excel(name = "检查类别")
    private String checkType;
    /**措施id */
    @Excel(name = "措施id")
    private Long controlMeasureId;
    public Long getControlMeasureId() {
        return controlMeasureId;
    }
    public void setControlMeasureId(Long controlMeasureId) {
        this.controlMeasureId = controlMeasureId;
    }
    public String getCheckType() {
        return checkType;
@@ -94,6 +107,7 @@
            .append("checkContent", getCheckContent())
            .append("checkResult", getCheckResult())
            .append("riskId", getRiskId())
            .append("controlMeasureId", getControlMeasureId())
            .toString();
    }
}
src/main/resources/mybatis/doublePrevention/PreventRiskCheckUnitMapper.xml
对比新文件
@@ -0,0 +1,18 @@
<?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.ruoyi.doublePrevention.repository.PreventRiskCheckUnitRepository" >
    <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit">
        <id column="id" property="id"/>
        <result column="uuid" property="uuid"/>
        <result column="base_check_point_id" property="baseCheckPointId" />
        <result column="control_measure_id" property="controlMeasureId" />
        <result column="risk_id" property="riskId" />
    </resultMap>
<!--    int insertPointAndMeasure(PreventRiskCheckUnit checkUnit);-->
    <insert id="insertPointAndMeasure">
        insert into prevent_risk_check_unit values(null, #{uuid}, #{baseCheckPointId}, #{controlMeasureId}, #{riskId})
    </insert>
</mapper>
src/main/resources/mybatis/tr/BaseCheckPointMapper.xml
@@ -39,7 +39,7 @@
        where check_point_id = #{checkPointId}
    </select>
        
    <insert id="insertBaseCheckPoint" parameterType="BaseCheckPoint">
    <insert id="insertBaseCheckPoint" parameterType="BaseCheckPoint" useGeneratedKeys="true" keyProperty="checkPointId">
        insert into tr_base_check_point
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="checkPointId != null ">check_point_id,</if>