新增双重预防危险控制、双重预防时间对应的实体类、mapper、service层，启动类上指定了dao的入口

huangzhen

2022-09-05 e63c146416a18529add34d8e74b3ad84254d4172

新增双重预防危险控制、双重预防时间对应的实体类、mapper、service层，启动类上指定了dao的入口

 src/main/java/com/ruoyi/RuoYiApplication.java

@@ -1,5 +1,6 @@
package com.ruoyi;

import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -14,6 +15,7 @@
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
@EnableCaching
@EnableScheduling
@MapperScan("com.ruoyi.doublePrevention.repository")
public class RuoYiApplication
{
    public static void main(String[] args)

 src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskControlMeasure.java

对比新文件
@@ -0,0 +1,291 @@
package com.ruoyi.doublePrevention.entity;

import com.baomidou.mybatisplus.annotation.TableName;

import java.util.Date;

@TableName("prevent_risk_control_measure")
public class PreventRiskControlMeasure {
    /**
     * 主键
     */
    private Long id;


    private String uuid;
    /**
     * 删除标志：0-有效，1-删除
     */
    private Byte deleteStatus;

    /**
     * 创建时间
     */
    private Date gmtCreate;
    /**
     * 最后修改时间
     */
    private Date gmtModitify;

    /**
     * 管控方式：1-自动化监控，2-隐患排查，3-其他
     */
    private Byte controlType;

    /**
     * 管控措施分类1
     * 1-工程技术，2-维护保养，3-操作行为，4-应急设施
     */
    private Byte classify1;
    /**
     * 管控措施分类2
     * 1工程技术-工艺控制，关键设备/部件，安全附件，安全仪表，其他;
     * 2维护保养-动设备,静设备；3
     * 操作行为-人员资质,操作记录,交接班；
     * 4应急设施-应急设施,个体防护,消防设施,应急预案
     */
    private Byte classify2;

    /**
     * 风险管控措施编号
     */
    private String controlMeasureCode;

    /**
     * 风险管控措施描述
     */
    private String measureDesc;

    /**
     * 企业id
     */
    private Long enterpriseId;

    /**
     * 企业uuid
     */
    private String enterpriseUuid;

    /**
     * 风险事件ID
     */
    private Long riskEventId;

    /**
     * 关联风险事件uuid
     */
    private String riskEventUuid;

    /**
     * 管控措施分类3
     * 自定义
     */
    private String classify3;

    /**
     * 修改人
     */
    private String lastEditUserName;

    /**
     * 创建人
     */
    private String createByUserName;

    /**
     * 同步时间
     */
    private Date reportTime;

    /**
     * 同步数据修改时间
     */
    private Date updateReportDataTime;

    /**
     * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
     */
    private Byte reportStatus;
    /**
     * 上报开关 1-上报；2-不上报
     */
    private Byte reportSwitch;

    private String checkContent;

    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 Byte getDeleteStatus() {
        return deleteStatus;
    }

    public void setDeleteStatus(Byte deleteStatus) {
        this.deleteStatus = deleteStatus;
    }

    public Date getGmtCreate() {
        return gmtCreate;
    }

    public void setGmtCreate(Date gmtCreate) {
        this.gmtCreate = gmtCreate;
    }

    public Date getGmtModitify() {
        return gmtModitify;
    }

    public void setGmtModitify(Date gmtModitify) {
        this.gmtModitify = gmtModitify;
    }

    public Byte getControlType() {
        return controlType;
    }

    public void setControlType(Byte controlType) {
        this.controlType = controlType;
    }

    public Byte getClassify1() {
        return classify1;
    }

    public void setClassify1(Byte classify1) {
        this.classify1 = classify1;
    }

    public Byte getClassify2() {
        return classify2;
    }

    public void setClassify2(Byte classify2) {
        this.classify2 = classify2;
    }

    public String getControlMeasureCode() {
        return controlMeasureCode;
    }

    public void setControlMeasureCode(String controlMeasureCode) {
        this.controlMeasureCode = controlMeasureCode;
    }

    public String getMeasureDesc() {
        return measureDesc;
    }

    public void setMeasureDesc(String measureDesc) {
        this.measureDesc = measureDesc;
    }

    public Long getEnterpriseId() {
        return enterpriseId;
    }

    public void setEnterpriseId(Long enterpriseId) {
        this.enterpriseId = enterpriseId;
    }

    public String getEnterpriseUuid() {
        return enterpriseUuid;
    }

    public void setEnterpriseUuid(String enterpriseUuid) {
        this.enterpriseUuid = enterpriseUuid;
    }

    public Long getRiskEventId() {
        return riskEventId;
    }

    public void setRiskEventId(Long riskEventId) {
        this.riskEventId = riskEventId;
    }

    public String getRiskEventUuid() {
        return riskEventUuid;
    }

    public void setRiskEventUuid(String riskEventUuid) {
        this.riskEventUuid = riskEventUuid;
    }

    public String getClassify3() {
        return classify3;
    }

    public void setClassify3(String classify3) {
        this.classify3 = classify3;
    }

    public String getLastEditUserName() {
        return lastEditUserName;
    }

    public void setLastEditUserName(String lastEditUserName) {
        this.lastEditUserName = lastEditUserName;
    }

    public String getCreateByUserName() {
        return createByUserName;
    }

    public void setCreateByUserName(String createByUserName) {
        this.createByUserName = createByUserName;
    }

    public Date getReportTime() {
        return reportTime;
    }

    public void setReportTime(Date reportTime) {
        this.reportTime = reportTime;
    }

    public Date getUpdateReportDataTime() {
        return updateReportDataTime;
    }

    public void setUpdateReportDataTime(Date updateReportDataTime) {
        this.updateReportDataTime = updateReportDataTime;
    }

    public Byte getReportStatus() {
        return reportStatus;
    }

    public void setReportStatus(Byte reportStatus) {
        this.reportStatus = reportStatus;
    }

    public Byte getReportSwitch() {
        return reportSwitch;
    }

    public void setReportSwitch(Byte reportSwitch) {
        this.reportSwitch = reportSwitch;
    }

    public String getCheckContent() {
        return checkContent;
    }

    public void setCheckContent(String checkContent) {
        this.checkContent = checkContent;
    }
}

 src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskEvent.java

对比新文件
@@ -0,0 +1,219 @@
package com.ruoyi.doublePrevention.entity;

import com.baomidou.mybatisplus.annotation.TableName;

import java.io.Serializable;
import java.util.Date;

/**
 * (PreventRiskEvent)实体类
 *
 * @author makejava
 * @since 2022-06-25 10:40:16
 */
@TableName("prevent_risk_event")
public class PreventRiskEvent implements Serializable {
    /**
     * 主键
     */
    private Long id;

    private String uuid;
    /**
     * 删除标志：0-有效，1-删除
     */
    private Byte deleteStatus;
    /**
     * 创建时间
     */
    private Date gmtCreate;
    /**
     * 最后修改时间
     */
    private Date gmtModitify;
    /**
     * 所属安全风险分析单元id
     */
    private Long riskUnitId;
    /**
     * 企业id
     */
    private Long enterpriseId;
    /**
     * 所属安全风险分析单元uuid
     */
    private String riskUnitUuid;
    /**
     * 企业uuid
     */
    private String enterpriseUuid;
    /**
     * 安全风险事件名称
     */
    private String riskEventName;
    /**
     * 创建人
     */
    private String createByUserName;
    /**
     * 修改人
     */
    private String lastEditUserName;
    /**
     * 同步时间
     */
    private Date reportTime;
    /**
     * 同步数据修改时间
     */
    private Date updateReportDataTime;
    /**
     * 上报状态 1-待上报；2-已上报；3-不上报
     */
    private Byte reportStatus;
    /**
     * 上报开关 1-上报；2-不上报
     */
    private Byte reportSwitch;
    /**
     * 可能照成的后果
     */
    private String eventResult;

    public String getEventResult() {
        return eventResult;
    }

    public void setEventResult(String eventResult) {
        this.eventResult = eventResult;
    }

    public Byte getReportSwitch() {
        return reportSwitch;
    }

    public void setReportSwitch(Byte reportSwitch) {
        this.reportSwitch = reportSwitch;
    }

    public Date getReportTime() {
        return reportTime;
    }

    public void setReportTime(Date reportTime) {
        this.reportTime = reportTime;
    }

    public Date getUpdateReportDataTime() {
        return updateReportDataTime;
    }

    public void setUpdateReportDataTime(Date updateReportDataTime) {
        this.updateReportDataTime = updateReportDataTime;
    }

    public Byte getReportStatus() {
        return reportStatus;
    }

    public void setReportStatus(Byte reportStatus) {
        this.reportStatus = reportStatus;
    }

    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 Byte getDeleteStatus() {
        return deleteStatus;
    }

    public void setDeleteStatus(Byte deleteStatus) {
        this.deleteStatus = deleteStatus;
    }

    public Date getGmtModitify() {
        return gmtModitify;
    }

    public void setGmtModitify(Date gmtModitify) {
        this.gmtModitify = gmtModitify;
    }

    public Long getRiskUnitId() {
        return riskUnitId;
    }

    public void setRiskUnitId(Long riskUnitId) {
        this.riskUnitId = riskUnitId;
    }

    public Long getEnterpriseId() {
        return enterpriseId;
    }

    public void setEnterpriseId(Long enterpriseId) {
        this.enterpriseId = enterpriseId;
    }

    public String getRiskUnitUuid() {
        return riskUnitUuid;
    }

    public void setRiskUnitUuid(String riskUnitUuid) {
        this.riskUnitUuid = riskUnitUuid;
    }

    public String getEnterpriseUuid() {
        return enterpriseUuid;
    }

    public void setEnterpriseUuid(String enterpriseUuid) {
        this.enterpriseUuid = enterpriseUuid;
    }

    public String getRiskEventName() {
        return riskEventName;
    }

    public void setRiskEventName(String riskEventName) {
        this.riskEventName = riskEventName;
    }

    public String getCreateByUserName() {
        return createByUserName;
    }

    public void setCreateByUserName(String createByUserName) {
        this.createByUserName = createByUserName;
    }

    public Date getGmtCreate() {
        return gmtCreate;
    }

    public void setGmtCreate(Date gmtCreate) {
        this.gmtCreate = gmtCreate;
    }

    public String getLastEditUserName() {
        return lastEditUserName;
    }

    public void setLastEditUserName(String lastEditUserName) {
        this.lastEditUserName = lastEditUserName;
    }
}


 src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskControlMeasureRepository.java

对比新文件
@@ -0,0 +1,15 @@
package com.ruoyi.doublePrevention.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventRiskControlMeasureRepository extends BaseMapper<PreventRiskControlMeasure> {

}

 src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskEventRepository.java

对比新文件
@@ -0,0 +1,15 @@
package com.ruoyi.doublePrevention.repository;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.doublePrevention.entity.PreventRiskEvent;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PreventRiskEventRepository extends BaseMapper<PreventRiskEvent> {

}

 src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskControlMeasureService.java

对比新文件
@@ -0,0 +1,13 @@
package com.ruoyi.doublePrevention.service.baseService;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import org.apache.ibatis.annotations.Param;

import java.util.List;

public interface PreventRiskControlMeasureService extends IService<PreventRiskControlMeasure> {

}

 src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskEventService.java

对比新文件
@@ -0,0 +1,12 @@
package com.ruoyi.doublePrevention.service.baseService;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.doublePrevention.entity.PreventRiskEvent;

import java.util.List;

public interface PreventRiskEventService extends IService<PreventRiskEvent> {

}

 src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskControlMeasureServiceImpl.java

对比新文件
@@ -0,0 +1,14 @@
package com.ruoyi.doublePrevention.service.baseService.impl;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import com.ruoyi.doublePrevention.repository.PreventRiskControlMeasureRepository;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskControlMeasureService;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("PreventRiskControlMeasureService")
public class PreventRiskControlMeasureServiceImpl extends ServiceImpl<PreventRiskControlMeasureRepository, PreventRiskControlMeasure> implements PreventRiskControlMeasureService {
}

 src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskEventServiceImpl.java

对比新文件
@@ -0,0 +1,15 @@
package com.ruoyi.doublePrevention.service.baseService.impl;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.doublePrevention.entity.PreventRiskEvent;
import com.ruoyi.doublePrevention.repository.PreventRiskEventRepository;
import com.ruoyi.doublePrevention.service.baseService.PreventRiskEventService;
import org.springframework.stereotype.Service;

import java.util.List;

//@Service("PreventRiskEventService")
public class PreventRiskEventServiceImpl extends ServiceImpl<PreventRiskEventRepository, PreventRiskEvent> implements PreventRiskEventService {

}

 src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerPlanFormulateController.java

@@ -192,6 +192,7 @@
                    //获取公司级区域
                    Region region = new Region();
                    region.setParentId(0L);
                    //todo 通过用户信息获取所属公司信息 然后根据公司获取第一个region的id和name作为隐患地点
                    region.setCompanyId(getSysUser().getCompanyId());
                    List<Region> regionList = regionService.selectRegionList(region);
                    if (regionList.size() > 0) {
@@ -205,6 +206,7 @@
                    dept.setParentId(0L);
                    dept.setCompanyId(getSysUser().getCompanyId());
                    List<Dept> deptList = deptService.selectDeptList(dept);
                    //todo 然后通过公司id获取隐患责任部门信息
                    if (deptList.size() > 0) {
                        Dept d = deptList.get(0);
                        hiddenDangerCheck.setDangerDeptId(d.getDeptId().toString());

 src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml

对比新文件
@@ -0,0 +1,30 @@
<?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.PreventRiskControlMeasureRepository">

    <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure">
        <id property="id" column="id"/>
        <result property="uuid" column="uuid"/>
        <result property="deleteStatus" column="delete_status"/>
        <result property="gmtCreate" column="gmt_create"/>
        <result property="gmtModitify" column="gmt_moditify"/>
        <result property="controlType" column="control_type"/>
        <result property="classify1" column="classify1"/>
        <result property="classify2" column="classify2"/>
        <result property="riskEventId" column="risk_event_id"/>
        <result property="enterpriseId" column="enterprise_id"/>
        <result property="riskEventUuid" column="risk_event_uuid"/>
        <result property="enterpriseUuid" column="enterprise_uuid"/>
        <result property="classify3" column="classify3"/>
        <result property="controlMeasureCode" column="control_measure_code"/>
        <result property="createByUserName" column="create_by_user_name"/>
        <result property="lastEditUserName" column="last_edit_user_name"/>
        <result property="measureDesc" column="measure_desc"/>
        <result column="report_status" property="reportStatus"/>
        <result column="report_time" property="reportTime"/>
        <result column="update_report_data_time" property="updateReportDataTime"/>
        <result column="report_switch" property="reportSwitch"/>
        <result column="check_content" property="checkContent"/>
    </resultMap>

</mapper>

 src/main/resources/mybatis/doublePrevention/PreventRiskEventMapper.xml

对比新文件
@@ -0,0 +1,129 @@
<?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.PreventRiskEventRepository" >

    <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventRiskEvent">
        <id column="id" property="id" jdbcType="BIGINT" />
        <result column="uuid" property="uuid" jdbcType="CHAR"/>
        <result column="delete_status" property="deleteStatus" jdbcType="TINYINT"/>
        <result column="risk_unit_id" property="riskUnitId" jdbcType="BIGINT"/>
        <result column="enterprise_id" property="enterpriseId" jdbcType="BIGINT"/>
        <result column="enterprise_uuid" property="enterpriseUuid" jdbcType="CHAR"/>
        <result column="risk_unit_uuid" property="riskUnitUuid" jdbcType="CHAR"/>
        <result column="gmt_create" property="gmtCreate" jdbcType="TIMESTAMP"/>
        <result column="gmt_moditify" property="gmtModitify" jdbcType="TIMESTAMP"/>
        <result column="create_by_user_name" property="createByUserName" jdbcType="VARCHAR"/>
        <result column="last_edit_user_name" property="lastEditUserName" jdbcType="VARCHAR"/>
        <result column="event_result" property="eventResult"/>
        <result column="risk_event_name" property="riskEventName" jdbcType="VARCHAR"/>
        <result column="report_status" property="reportStatus"/>
        <result column="report_time" property="reportTime"/>
        <result column="update_report_data_time" property="updateReportDataTime"/>
        <result column="report_switch" property="reportSwitch"/>
    </resultMap>

    <!--IPage<PreventRiskEvent> getRiskUnitPage(PreventRiskEventQueryReqDTO riskEventQueryReqDTO);-->
    <select id="getRiskEventPage" resultMap="BaseResultMap">
        select * from prevent_risk_event
        <where>
            delete_status = 0
        <if test="queryParams.riskEventName != null">
            and risk_event_name like '%' #{queryParams.riskEventName} '%'
        </if>
        <if test="queryParams.riskUnitId != null">
            and risk_unit_id = #{queryParams.riskUnitId}
        </if>
        </where>
        order by gmt_create desc
    </select>

    <!--PreventRiskEvent getRiskEventByName(String riskEventName);-->
    <select id="getRiskEventByName" resultType="com.ruoyi.doublePrevention.entity.PreventRiskEvent">
        select
            id,
            uuid,
            risk_event_name
            from prevent_risk_event
        where delete_status = 0 and risk_event_name = #{riskEventName}
    </select>

    <!--PreventRiskEvent getRiskEventNameById(Long id);-->
    <select id="getRiskEventNameById" resultType="com.ruoyi.doublePrevention.entity.PreventRiskEvent">
        select
            id,
            uuid,
            risk_event_name,
            report_switch
            from prevent_risk_event
        where delete_status = 0 and id = #{id}
    </select>
    <!--List<PreventRiskEvent> getRiskEventNameByRiskUnitId(Long riskUnitId);-->
    <select id="getRiskEventNameByRiskUnitId" resultMap="BaseResultMap">
        select
            id,
            risk_event_name
            from prevent_risk_event
        where delete_status = 0 and risk_unit_id = #{riskUnitId}
    </select>

    <!--List<PreventRiskEvent> getListEvents();-->
    <select id="getListEvents" resultMap="BaseResultMap">
        select
        id,
        uuid,
        risk_event_name
        from prevent_risk_event
        where delete_status = 0
    </select>

    <!--int updateRiskEventReport(PreventHandReportConfigReqDTO preventHandReportConfigReqDTO);-->
    <update id="updateRiskEventReport">
        update prevent_risk_ana_unit set
        report_switch = #{reportSwitch}
        where id = #{id}
    </update>

    <!--int updateRiskEvent(PreventRiskEventUpdateParams updateParams);-->
    <update id="updateRiskEvent">
        update prevent_risk_event set
            risk_event_name = #{riskEventName},
            risk_unit_id = #{riskUnitId},
            risk_unit_uuid = #{riskUnitUuid},
            event_result = #{eventResult},
            gmt_moditify = #{gmtModitify},
            last_edit_user_name = #{lastEditUserName},
            update_report_data_time = #{updateReportDataTime},
            report_status = #{reportStatus},
            report_switch = #{reportSwitch}
        where delete_status = 0 and id = #{id}
    </update>

    <!--int deleteRiskEventById(PreventRiskEventDeleteReqDTO riskEventDeleteReqDTO);-->
    <update id="deleteRiskEventById">
        update prevent_risk_event set
            delete_status = 1,
            last_edit_user_name = #{lastEditUserName},
            gmt_moditify = #{gmtModitify},
            update_report_data_time = #{updateReportDataTime}
        where delete_status = 0 and id = #{id}
    </update>

    <!--int updateEventReportStatus(Long id, byte code);-->
    <update id="updateEventReportStatus">
        update prevent_risk_event set
            report_status =  #{reportStatus},
            report_time = #{reportTime}
        where id = #{id}
    </update>




    <!--List<PreventRiskEvent> listReportEvent();-->
    <select id="listReportEvent" resultMap="BaseResultMap">
        select * from prevent_risk_event
        where report_switch = 1 and (update_report_data_time > report_time or report_time is null)
    </select>


</mapper>