新增管控措施不分页

huangzhen

2022-10-28 886a387463f4e0e0ad6f7c2a04d2cfab2e3aace8

新增管控措施不分页

 src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskControlMeasureController.java

@@ -3,10 +3,7 @@

import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
import com.ruoyi.doublePrevention.entity.dto.req.*;
import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskControlMeasurePageQueryRespDTO;
import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskControlMeasureRespDTO;
import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskEventRespDTO;
import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskMeasureTemplatesListQueryRespDTO;
import com.ruoyi.doublePrevention.entity.dto.resp.*;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.doublePrevention.vo.ResultVO;
import org.apache.tomcat.util.net.openssl.ciphers.Authentication;
@@ -72,4 +69,13 @@
        return riskService.listMeasureTemplates();
    }


    /**
     * 管控措施-不分页查询
     */
    @PostMapping("/select/listRiskControlMeasure")
    public ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> listRiskControlMeasure() {
        return riskService.listRiskControlMeasure();
    }

}

 src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskControlMeasureListQueryRespDTO.java

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

import com.fasterxml.jackson.annotation.JsonFormat;

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

public class PreventRiskControlMeasureListQueryRespDTO implements Serializable {
    /**
     * 主键
     */
    private Long id;

    private String uuid;

    /**
     * 创建时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date gmtCreate;
    /**
     * 最后修改时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    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;

    /**
     * 同步时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date reportTime;

    /**
     * 同步数据修改时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    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 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/repository/PreventRiskControlMeasureRepository.java

@@ -41,5 +41,11 @@
    /**
     * @description 分页获取风险管控措施
     */
    List<PreventRiskControlMeasure> listRiskEvenByCondition(@Param("controlType") Byte controlType,@Param("riskEventId") Long riskEventId);
    List<PreventRiskControlMeasure> listRiskControlMeasureByCondition(@Param("controlType") Byte controlType,@Param("riskEventId") Long riskEventId);

    /**
     * 管控措施-不分页查询
     */
    List<PreventRiskControlMeasure> listRiskControlMeasure();

}

 src/main/java/com/ruoyi/doublePrevention/service/RiskService.java

@@ -163,4 +163,8 @@
     */

    List<PreventRiskUnitCodeAndNameListQueryRespDTO> listRiskUnitCodeAndName();



    /**

     * 管控措施-不分页查询

     */

    ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> listRiskControlMeasure();

}


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

@@ -39,5 +39,11 @@
    /**
     * @description 分页获取风险管控措施
     */
    List<PreventRiskControlMeasure> listRiskEvenByCondition(Byte controlType, Long riskEventId);
    List<PreventRiskControlMeasure> listRiskControlMeasureByCondition(Byte controlType, Long riskEventId);

    /**
     * 管控措施-不分页查询
     */
    List<PreventRiskControlMeasure> listRiskControlMeasure();

}

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

@@ -63,7 +63,15 @@
     * @description 分页获取风险管控措施
     */
    @Override
    public List<PreventRiskControlMeasure> listRiskEvenByCondition(Byte controlType, Long riskEventId) {
        return preventRiskControlMeasureRepository.listRiskEvenByCondition(controlType,riskEventId);
    public List<PreventRiskControlMeasure> listRiskControlMeasureByCondition(Byte controlType, Long riskEventId) {
        return preventRiskControlMeasureRepository.listRiskControlMeasureByCondition(controlType,riskEventId);
    }

    /**
     * 管控措施-不分页查询
     */
    @Override
    public List<PreventRiskControlMeasure> listRiskControlMeasure() {
        return preventRiskControlMeasureRepository.listRiskControlMeasure();
    }
}

 src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java

@@ -164,11 +164,11 @@
            resultVO.setMsg("安全风险分析单元名称不能为空");

            return resultVO;

        }

        PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);

        if (riskUnit == null){

            resultVO.setMsg("安全风险分析单元名称不存在");

            return resultVO;

        }

//        PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);

//        if (riskUnit == null){

//            resultVO.setMsg("安全风险分析单元名称不存在");

//            return resultVO;

//        }

        if (StringUtils.isEmpty(riskEventName)){

            resultVO.setMsg("安全风险事件名称不能为空");

            return resultVO;

@@ -190,7 +190,7 @@
        riskEvent.setEventResult(eventResult);

        riskEvent.setRiskEventName(riskEventName);

        riskEvent.setRiskUnitId(riskUnitId);

        riskEvent.setRiskUnitUuid(riskUnit.getRiskUnitUuid());

//        riskEvent.setRiskUnitUuid(riskUnit.getRiskUnitUuid());

        riskEvent.setDeleteStatus(StatusEnum.DELETE_STATUS_USE.getCode());

        riskEvent.setGmtCreate(date);

        riskEvent.setGmtModitify(date);

@@ -701,7 +701,7 @@
        Long riskEventId = measureQueryReqDTO.getRiskEventId();



        Page<PreventRiskControlMeasure> page = PageHelper.startPage(pageIndex, pageSize);

        riskControlMeasureService.listRiskEvenByCondition(controlType,riskEventId);

        riskControlMeasureService.listRiskControlMeasureByCondition(controlType,riskEventId);



        List<PreventRiskControlMeasure> result = page.getResult();

        Long total = page.getTotal();

@@ -1276,6 +1276,27 @@
        return listQueryRespDTOs;

    }





    /**

     * 管控措施-不分页查询

     */

    @Override

    public ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> listRiskControlMeasure() {



        List<PreventRiskControlMeasure> controlMeasures = riskControlMeasureService.listRiskControlMeasure();

        List<PreventRiskControlMeasureListQueryRespDTO> pageResult = null;

        if (controlMeasures != null) {

            pageResult = controlMeasures.stream().map((preventRiskControlMeasure) -> {

                PreventRiskControlMeasureListQueryRespDTO dto = new PreventRiskControlMeasureListQueryRespDTO();

                BeanUtils.copyProperties(preventRiskControlMeasure, dto);

                return dto;

            }).collect(Collectors.toList());

        }



        ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);

        return resultVO;

    }



//    /**

//     * 全流程隐患上报-附属表信息插入

//     * */


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

@@ -163,7 +163,7 @@
    </select>


    <select id="listRiskEvenByCondition" resultMap="BaseResultMap">
    <select id="listRiskControlMeasureByCondition" resultMap="BaseResultMap">
        select * from prevent_risk_control_measure
        <where>
            delete_status = 0
@@ -177,4 +177,9 @@
        </where>
    </select>

    <select id="listRiskControlMeasure"
            resultMap="BaseResultMap">
        select * from prevent_risk_control_measure where delete_status = 0
    </select>

</mapper>

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

@@ -16,7 +16,7 @@
<!--    PreventRiskUnitUuid getRiskUnitUuidById(Long id);-->
    <select id="getRiskUnitUuidById" resultMap="BaseResultMap">
        select * from prevent_risk_unit_uuid
        where delete_status = 0 and risk_unit_id = #{id}
        where  risk_unit_id = #{id}
    </select>

    <!--    int insertUuid(PreventRiskUnitUuid riskUnitUuid);-->