隐患上报，已经测过

16639036659

2022-10-11 7e8d51b6a2d2892c8eca2c8cefd91f7d1b6f8f40

隐患上报，已经测过

 src/main/java/com/ruoyi/doublePrevention/enums/StatusEnum.java

@@ -9,6 +9,12 @@


    EXEC_FAIL((byte) 0, "操作失败"),

    EXEC_SUCCESS((byte) 1, "操作成功"),



    RECTIFY_ING((byte) 0, "整改中"),

    RECTIFY_WAIT_ACCEPT((byte) 1, "待验收"),

    RECTIFY_TIMEOUT((byte) 2, "延期整改"),

    RECTIFY_TIMEOUT_AND_FAIL((byte) 3, "超期未整改"),

    ACCEPT_SUCCESS((byte) 9, "已验收"),

    ;

    byte code;

    @JsonValue


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

@@ -22,6 +22,10 @@
    int updateDangerInfo(PreventRiskDangerInfo dangerInfo);



    int deleteDangerInfo(Long id);

    /**

     * 修改隐患整改状态

     */

    int updateDangerInfoState(PreventRiskDangerInfo dangerInfo);



    /**

     * @description 统计时间段内所有、死亡、重伤、轻伤的隐患数量


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

@@ -100,7 +100,7 @@
    /**

     * 保存job管控措施的附属表

     */

    int insertJobAndMeasure(Long jobId);

    int insertJobAndMeasure(Long jobId, HiddenDangerCheckJob hiddenDangerCheckJob);

    /**

     * 修改job管控措施的附属表

     */

@@ -142,9 +142,21 @@
    int deleteDangerInfo(Long id);



    /**

     * 隐患判定，如果是隐患，修改为整改中

     */

    int updateDangerInfoJudge(HiddenDangerCheckPoint hiddenDangerCheckPoint);

    /**

     * 隐患整改信息 - 修改

     */

    int updateDangerInfoRectify(HiddenDangerCheckPoint hiddenDangerCheckPoint);

    /**

     * 隐患验收 - 保存验收信息

     */

    int updateDangerInfoAccept(HiddenDangerCheckPoint hiddenDangerCheckPoint);

//    /**

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

//     * */

//    int insertAllDangerInfo(Long id, HiddenDangerCheckPoint hdcp);



    /**

     * @description 获取所有的风险分析单元的编码和姓名


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

@@ -21,6 +21,10 @@
     * 删除隐患上报

     */

    int deleteDangerInfo(Long id);

    /**

     * 修改隐患整改状态

     */

    int updateDangerInfoState(PreventRiskDangerInfo dangerInfo);



    /**

     * @description 统计时间段内所有、死亡、重伤、轻伤的隐患数量


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

@@ -41,6 +41,14 @@
        return preventRiskDangerInfoRepository.deleteDangerInfo(id);

    }



    /**

     * 修改隐患整改状态

     */

    @Override

    public int updateDangerInfoState(PreventRiskDangerInfo dangerInfo) {

        return preventRiskDangerInfoRepository.updateDangerInfoState(dangerInfo);

    }





    /**

     * @description 统计时间段内所有、死亡、重伤、轻伤的隐患数量


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

@@ -2,6 +2,7 @@


import com.github.pagehelper.Page;

import com.github.pagehelper.PageHelper;

import com.ruoyi.common.constant.TrHiddenDangerCheckConstants;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.common.utils.text.Convert;

import com.ruoyi.doublePrevention.entity.*;

@@ -20,6 +21,7 @@
import com.ruoyi.project.tr.HiddenDangerCheckJob.mapper.HiddenDangerCheckJobMapper;

import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;

import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;

import org.apache.commons.lang3.ObjectUtils;

import org.springframework.beans.BeanUtils;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

@@ -588,6 +590,7 @@
        resultVO.setCode(ResultCodes.OK.getCode());

        resultVO.setMsg(ResultCodes.OK.getDesc());

        resultVO.setData(dto);



        return resultVO;

    }



@@ -749,6 +752,19 @@
    @Override

    public int insertPointAndMeasure(PreventPointAndMeasureParams pointAndMeasureParams) {



        //参数校验-管控措施id

        if (pointAndMeasureParams.getControlMeasureId() == null){

            throw new RuntimeException("管控措施不能为空");

        }

        PreventRiskControlMeasure preventRiskControlMeasureById

                = riskControlMeasureService.getPreventRiskControlMeasureById(pointAndMeasureParams.getControlMeasureId());

        if (preventRiskControlMeasureById == null){

            throw new RuntimeException("管控措施不存在");

        }

        if (pointAndMeasureParams.getBaseCheckPointId() == null){

            throw new RuntimeException("检查点添加失败");

        }



        String uuid = UUID.randomUUID().toString();

        PreventRiskCheckUnit checkUnit = new PreventRiskCheckUnit();

        //封装数据

@@ -785,14 +801,14 @@
     * 保存job管控措施的附属表

     */

    @Override

    public int insertJobAndMeasure(Long jobId) {

    public int insertJobAndMeasure(Long jobId, HiddenDangerCheckJob hiddenDangerCheckJob) {



        String jobUuid = UUID.randomUUID().toString();

        PreventRiskJobAndMeasure jobAndMeasure = new PreventRiskJobAndMeasure();

        //根据jobId查询对应的基础排查清单

        HiddenDangerCheckJob jobById = hiddenDangerCheckJobMapper.getJobById(jobId);



        //根据RiskId查询对应的管控措施

        List<PreventRiskCheckUnit> unitByRiskId = preventRiskCheckUnitService.getUnitByRiskId(jobById.getRiskId());

        List<PreventRiskCheckUnit> unitByRiskId = preventRiskCheckUnitService.getUnitByRiskId(hiddenDangerCheckJob.getRiskId());



        //遍历管控措施集合

        for (PreventRiskCheckUnit checkUnit : unitByRiskId) {

            PreventRiskControlMeasure preventRiskControlMeasureById = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());

@@ -985,6 +1001,9 @@
        preventRiskDangerCheckAndMeasureService.insertCheckAndMeasure(checkAndMeasure);



    }

    /**

     * todo-2022 填报时的操作

     */



    /**

     * 删除定时核查任务

@@ -1020,11 +1039,24 @@
        dangerInfo.setDangerCheckPointId(id);

        dangerInfo.setHazardCode(hdcp.getHazardCode());

        dangerInfo.setDangerSrc(hdcp.getDangerSrc());

        dangerInfo.setDangerDesc(hdcp.getDangerDesc());

        dangerInfo.setDangerDesc(hdcp.getDangerDescription());

        dangerInfo.setDangerReason(hdcp.getDangerReason());

        dangerInfo.setDangerResult(hdcp.getDangerResult());

        dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());

        dangerInfo.setDangerState(hdcp.getDangerState());

        //隐患状态  0未验收 1验收通过 2验收未通过 ，新建时为空

        if (hdcp.getAcceptStatus() == null){

            //设置为 空

            dangerInfo.setDangerState(null);

        } else if (hdcp.getAcceptStatus().equals(0)){

            //设置为整改中

            dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());

        } else if (hdcp.getAcceptStatus().equals(1)) {

            //设置为已验收

            dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());

        }else if (hdcp.getAcceptStatus().equals(2)){

            //设置为超期未整改

            dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode());

        }

        dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空

        //获取上报主配置信息

        PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());

@@ -1062,11 +1094,24 @@
        dangerInfo.setDangerCheckPointId(hdcp.getId());

        dangerInfo.setHazardCode(hdcp.getHazardCode());

        dangerInfo.setDangerSrc(hdcp.getDangerSrc());

        dangerInfo.setDangerDesc(hdcp.getDangerDesc());

        dangerInfo.setDangerDesc(hdcp.getDangerDescription());

        dangerInfo.setDangerReason(hdcp.getDangerReason());

        dangerInfo.setDangerResult(hdcp.getDangerResult());

        dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());

        dangerInfo.setDangerState(hdcp.getDangerState());

        //隐患状态  0未验收 1验收通过 2验收未通过 ，新建时为空

        if (hdcp.getAcceptStatus() == null){

            //设置为 空

            dangerInfo.setDangerState(null);

        } else if (hdcp.getAcceptStatus().equals(0)){

            //设置为整改中

            dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());

        } else if (hdcp.getAcceptStatus().equals(1)) {

            //设置为已验收

            dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());

        }else if (hdcp.getAcceptStatus().equals(2)){

            //设置为超期未整改

            dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode());

        }

        dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空

        //获取上报主配置信息

        PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());

@@ -1100,20 +1145,19 @@
    }



    /**

     * 隐患整改信息 - 修改

     * 隐患判定，如果是隐患，修改为整改中

     */

    @Override

    public int updateDangerInfoRectify(HiddenDangerCheckPoint hdcp) {

    public int updateDangerInfoJudge(HiddenDangerCheckPoint hdcp) {



        //封装修改数据

        PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();



        dangerInfo.setDangerCheckPointId(hdcp.getId());

        //需要根据条件，判断附属表隐患状态。

        // 目前想法：认定后的隐患-0整改中；整改后的隐患-1待验收；整改后的隐患-9已验收。2,3状态暂时未使用



        dangerInfo.setDangerState(hdcp.getDangerState());

        dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空

        //目前想法：认定后的隐患-0整改中；整改后的隐患-1待验收；验收后的隐患-9已验收。2,3状态暂时未使用

        //设置为整改中

        dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());

        //获取上报主配置信息

        PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());

        //设置本条数据上报更新时间

@@ -1133,7 +1177,83 @@
            dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());

        }



        return 0;

        return preventRiskDangerInfoService.updateDangerInfoState(dangerInfo);

    }



    /**

     * 隐患整改信息 - 修改

     */

    @Override

    public int updateDangerInfoRectify(HiddenDangerCheckPoint hdcp) {



        //封装修改数据

        PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();



        dangerInfo.setDangerCheckPointId(hdcp.getId());

        //需要根据条件，判断附属表隐患状态。

        //目前想法：认定后的隐患-0整改中；整改后的隐患-1待验收；验收后的隐患-9已验收。2,3状态暂时未使用

        //待验收验收

        dangerInfo.setDangerState(StatusEnum.RECTIFY_WAIT_ACCEPT.getCode());



        //获取上报主配置信息

        PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());

        //设置本条数据上报更新时间

        dangerInfo.setUpdateReportDataTime(new Date());

        //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置

        if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()

                && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){

            //设置上报状态为-等待上报

            dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());

            //设置本条数据上报开关为-开启

            dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());

            //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作

        }else {

            //设置上报状态为-不上报

            dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());

            //设置本条数据上报开关为-关闭

            dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());

        }



        return  preventRiskDangerInfoService.updateDangerInfoState(dangerInfo);

    }



    /**

     * 隐患验收 - 保存验收信息

     */

    @Override

    public int updateDangerInfoAccept(HiddenDangerCheckPoint hdcp) {



        //封装修改数据

        PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();



        dangerInfo.setDangerCheckPointId(hdcp.getId());



        //如果验收通过，设置为验收成功；验收失败，打回上一级进行整改，设置为整改中

        if (hdcp.getAcceptStatus().equals(0)){

            dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());

        }else if (hdcp.getAcceptStatus().equals(1)){

            dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());

        }



        //获取上报主配置信息

        PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());

        //设置本条数据上报更新时间

        dangerInfo.setUpdateReportDataTime(new Date());

        //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置

        if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()

                && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){

            //设置上报状态为-等待上报

            dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());

            //设置本条数据上报开关为-开启

            dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());

            //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作

        }else {

            //设置上报状态为-不上报

            dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());

            //设置本条数据上报开关为-关闭

            dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());

        }

        return preventRiskDangerInfoService.updateDangerInfoState(dangerInfo);

    }



    /**

@@ -1149,4 +1269,48 @@
        }).collect(Collectors.toList());

        return listQueryRespDTOs;

    }



//    /**

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

//     * */

//    @Override

//    public int insertAllDangerInfo(Long id, HiddenDangerCheckPoint hdcp) {

//

//        String dangerInfoUuid = UUID.randomUUID().toString();

//        PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();

//

//        dangerInfo.setUuid(dangerInfoUuid);

//        dangerInfo.setDangerCheckPointId(id);

//        dangerInfo.setHazardCode(hdcp.getHazardCode());

//        dangerInfo.setDangerSrc(hdcp.getDangerSrc());

//        dangerInfo.setDangerDesc(hdcp.getDangerDesc());

//        dangerInfo.setDangerReason(hdcp.getDangerReason());

//        dangerInfo.setDangerResult(hdcp.getDangerResult());

//        dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());

//        dangerInfo.setDangerState(hdcp.getDangerState());

//        dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空

//

//        //获取上报主配置信息

//        PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());

//        //设置上报时间为空

//        dangerInfo.setReportTime(null);

//        //设置本条数据上报更新时间

//        dangerInfo.setUpdateReportDataTime(new Date());

//        //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置

//        if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()

//                && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){

//            //设置上报状态为-等待上报

//            dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());

//            //设置本条数据上报开关为-开启

//            dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());

//            //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作

//        }else {

//            //设置上报状态为-不上报

//            dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());

//            //设置本条数据上报开关为-关闭

//            dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());

//        }

//

//        return preventRiskDangerInfoService.insertDangerInfo(dangerInfo);

//    }

}

 src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java

@@ -7,6 +7,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.mobile.domain.ApiRequestHeader;
import com.ruoyi.project.mobile.domain.ApiResult;
@@ -20,6 +21,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.HashMap;
@@ -40,6 +42,9 @@

    @Autowired
    IUserService userService;//用户Service

    @Autowired
    private RiskService riskService;

    /**
     * 获取定时任务隐患列表
@@ -176,7 +181,9 @@

    /**
     * 定时隐患排查---隐患登记
     * todo-2022 手机端-暂时未改动
     */
    @Transactional
    public ApiResult editPointScheduleDangerRegisterSave(String str, ApiRequestHeader header) {
        //验证userId,loginName,token,deviceType,deviceId,appType 是否一致
        ApiRequestHeader requestHeader = getHeader(header);
@@ -212,10 +219,25 @@

                hdcp.setCompanyId(user.getCompanyId());
                i = hdcpService.insertHiddenDangerCheckPoint(hdcp);

                // todo-2022 此处插入附属表
                //获取Id返回值
                hdcp.getId();
                int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
                if (result< 1){
                    throw new RuntimeException("添加隐患附属信息失败");
                }

            }else{
                hdcp.setUpdateBy(user.getLoginName());
                hdcp.setUpdateTime(DateUtils.getNowDate());
                i = hdcpService.updateHiddenDangerCheckPoint(hdcp);

                // todo-2022 此处修改附属表
                int result = riskService.updateDangerInfo(hdcp);
                if (result < 1){
                    throw new RuntimeException("修改失败");
                }
            }
            hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送


 src/main/java/com/ruoyi/project/tr/HiddenDangerCheckJob/controller/HiddenDangerCheckJobController.java

@@ -28,7 +28,9 @@
import com.ruoyi.project.tr.troubleshootType.service.ITroubleshootTypeService;
import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -89,11 +91,15 @@
    @Log(title = "定时任务", businessType = BusinessType.DELETE)
    @PostMapping("/remove")
    @ResponseBody
    @Transactional
    public AjaxResult remove(String ids) throws SchedulerException {
        hiddenDangerCheckJobService.deleteJobByIds(ids);

        //todo-2022 删除job与措施的关联关系
        riskService.deleteJobAndMeasure(ids);
        int result = riskService.deleteJobAndMeasure(ids);
        if (result < 1){
            throw new RuntimeException("删除调度与管控措施的关联失败");
        }

        return success();
    }
@@ -167,6 +173,7 @@
    @Log(title = "定时任务", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @ResponseBody
    @Transactional
    public AjaxResult addSave(@Validated HiddenDangerCheckJob hiddenDangerCheckJob) throws SchedulerException, TaskException {
        if (!StringUtils.isEmpty(hiddenDangerCheckJob.getExecuteUserIdString())) {
            String[] executeUserIdArray = hiddenDangerCheckJob.getExecuteUserIdString().split(",");
@@ -226,7 +233,7 @@

                            //todo- 2022 保存job与管控措施的对应关系
                            hiddenDangerCheckJob.getJobId();
                            int result = riskService.insertJobAndMeasure(hiddenDangerCheckJob.getJobId());{
                            int result = riskService.insertJobAndMeasure(hiddenDangerCheckJob.getJobId(),hiddenDangerCheckJob);{
                                if (result < 0 ){
                                    throw new RuntimeException("保存job与管控措施的对应关系失败");
                                }
@@ -329,6 +336,7 @@
    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @ResponseBody
    @Transactional
    public AjaxResult editSave(@Validated HiddenDangerCheckJob hiddenDangerCheckJob) throws
            SchedulerException, TaskException {
        HiddenDangerCheckJob tempJob = hiddenDangerCheckJobService.selectJobById(hiddenDangerCheckJob.getJobId());
@@ -372,7 +380,9 @@

        //todo- 2022 保存job与管控措施的对应关系
        //1、先查询基础清单是否有变更
        Long jobIds = hiddenDangerCheckJob.getJobId();
        HiddenDangerCheckJob jobById = hiddenDangerCheckJobService.getJobById(hiddenDangerCheckJob.getJobId());

        if (!jobById.getRiskId().equals(hiddenDangerCheckJob.getRiskId())){
            // 2、若有变更，再次添加关联关系
            riskService.updateJobAndMeasure(hiddenDangerCheckJob);

 src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java

@@ -165,12 +165,18 @@

        //todo-2022 ，此处改造，嵌入管控措施
        baseCheckPoint.getCheckPointId();

        //使用baseCheckPointId进行查询
//        BaseCheckPoint baseCheckPointById = baseCheckPointService.getBaseCheckPointById(baseCheckPoint.getCheckPointId());

        PreventPointAndMeasureParams pointAndMeasureParams = new PreventPointAndMeasureParams();
        //封装参数
        pointAndMeasureParams.setBaseCheckPointId(baseCheckPoint.getCheckPointId());
        pointAndMeasureParams.setControlMeasureId(baseCheckPoint.getControlMeasureId());// todo，该参数页面尚未封装进去
        pointAndMeasureParams.setRiskId(baseCheckPoint.getRiskId());

        int result1 = riskService.insertPointAndMeasure(pointAndMeasureParams);

        if (result1 < 1){
            throw new RuntimeException("新增异常，保存管控措施关系失败");
        }

 src/main/java/com/ruoyi/project/tr/baseCheckPoint/domain/BaseCheckPoint.java

@@ -111,7 +111,7 @@
            .append("checkContent", getCheckContent())
            .append("checkResult", getCheckResult())
            .append("riskId", getRiskId())
            .append("controlMeasureId", getControlMeasureId())
//            .append("controlMeasureId", getControlMeasureId())
            .toString();
    }
}

 src/main/java/com/ruoyi/project/tr/baseCheckPoint/mapper/BaseCheckPointMapper.java

@@ -58,4 +58,10 @@
     * @return 结果
     */
    int deleteBaseCheckPointByIds(String[] checkPointIds);


    /**
     *使用baseCheckPointId进行查询
     */
    BaseCheckPoint getBaseCheckPointById(Long checkPointId);
}

 src/main/java/com/ruoyi/project/tr/baseCheckPoint/service/IBaseCheckPointService.java

@@ -58,5 +58,8 @@
     * @return 结果
     */
    int deleteBaseCheckPointById(Long checkPointId);

    /**
     *使用baseCheckPointId进行查询
     */
    BaseCheckPoint getBaseCheckPointById(Long checkPointId);
}

 src/main/java/com/ruoyi/project/tr/baseCheckPoint/service/impl/BaseCheckPointServiceImpl.java

@@ -94,4 +94,12 @@
    {
        return baseCheckPointMapper.deleteBaseCheckPointById(checkPointId);
    }

    /**
     *使用baseCheckPointId进行查询
     */
    @Override
    public BaseCheckPoint getBaseCheckPointById(Long checkPointId) {
        return baseCheckPointMapper.getBaseCheckPointById(checkPointId);
    }
}

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

@@ -4,6 +4,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -14,6 +15,7 @@
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;

@@ -32,6 +34,9 @@

    @Autowired
    private IHiddenDangerCheckPointService hiddenDangerCheckPointService;

    @Autowired
    private RiskService riskService;

    @GetMapping()
    public String hiddenDangerCheckPoint() {
@@ -70,6 +75,7 @@
    @Log(title = "隐患验收--保存", businessType = BusinessType.UPDATE)
    @PostMapping("/editDangerAcceptSave")
    @ResponseBody
    @Transactional
    public AjaxResult editDangerAcceptSave(HiddenDangerCheckPoint hiddenDangerCheckPoint) {
        //获取当前更新用户信息
        User sysUser = getSysUser();
@@ -85,9 +91,17 @@
            } else if ("1".equals(hiddenDangerCheckPoint.getAcceptResult())) {
                hiddenDangerCheckPoint.setAcceptCreateTime(DateUtils.getNowDate());//设置验收时间
                hiddenDangerCheckPoint.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_ALREADY_ACCEPT_PASS);//验收状态(验收通过)

            }
        }
        int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint);

        // todo-2022  验收通过
        int result = riskService.updateDangerInfoAccept(hiddenDangerCheckPoint);
        if (result < 1){
            throw new RuntimeException("隐患验收信息保存失败");
        }

        hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送
        return toAjax(i);
    }

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

@@ -6,6 +6,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.security.ShiroUtils;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -24,6 +25,7 @@
import com.ruoyi.project.tr.riskEvaluationPlan.service.IRiskEvaluationPlanService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;

@@ -54,6 +56,9 @@

    @Autowired
    private IRiskCheckPointService riskCheckPointService;

    @Autowired
    private RiskService riskService;


    @Autowired
@@ -396,10 +401,12 @@

    /**
     * 检查点隐患登记--保存
     * todo-2022 手机端-暂时未改动
     */
    @Log(title = "检查点隐患登记--保存", businessType = BusinessType.UPDATE)
    @PostMapping("/editPointDangerRegisterSave")
    @ResponseBody
    @Transactional
    public AjaxResult editPointDangerRegisterSave(HiddenDangerCheckPoint hiddenDangerCheckPoint) {
        hiddenDangerCheckPoint.setRegisterCreateTime(DateUtils.getNowDate());//设置隐患登记上报创建时间
        hiddenDangerCheckPoint.setRegisterUserId(getSysUser().getUserId());//设置隐患登记上报创建人ID
@@ -427,10 +434,25 @@
            hiddenDangerCheckPoint.setCreateTime(DateUtils.getNowDate());
            hiddenDangerCheckPoint.setCompanyId(getSysUser().getCompanyId());
            i = hiddenDangerCheckPointService.insertHiddenDangerCheckPoint(hiddenDangerCheckPoint);

            // todo-2022 此处插入附属表
            //获取Id返回值
            hiddenDangerCheckPoint.getId();
            int result = riskService.insertDangerInfo(hiddenDangerCheckPoint.getId(), hiddenDangerCheckPoint);
            if (result< 1){
                throw new RuntimeException("添加隐患附属信息失败");
            }

        } else {
            hiddenDangerCheckPoint.setUpdateBy(getSysUser().getLoginName());
            hiddenDangerCheckPoint.setUpdateTime(DateUtils.getNowDate());
            i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint);

            // todo-2022 此处修改附属表
            int result = riskService.updateDangerInfo(hiddenDangerCheckPoint);
            if (result < 1){
                throw new RuntimeException("修改失败");
            }
        }
        hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送
        return toAjax(i);

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

@@ -104,6 +104,9 @@

        // todo-2022 隐患信息保存
        int result = riskService.updateDangerInfoRectify(hiddenDangerCheckPoint);
        if (result < 1){
            throw new RuntimeException("整改信息保存失败");
        }

        hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送


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

@@ -135,7 +135,7 @@

    /**
     * 新增保存隐患上报
     * todo-2022 隐患上报   需要检查对分别对两张表做了什么，然后添加附属表（tr_hidden_danger_check_point）
     * todo-2022 隐患上报   tr_hidden_danger_check_point
     */
    @Log(title = "隐患上报", businessType = BusinessType.INSERT)
    @PostMapping("/addDangerReportSave")
@@ -164,7 +164,6 @@
        if (i< 1){
            throw new RuntimeException("添加隐患信息失败");
        }


        // todo-2022 此处插入附属表
        //获取Id返回值
@@ -209,6 +208,7 @@
    @Log(title = "隐患上报全流程", businessType = BusinessType.INSERT)
    @PostMapping("/addDangerReportWholeProcessSave")
    @ResponseBody
    @Transactional
    public AjaxResult addDangerReportWholeProcessSave(HiddenDangerCheckPoint hdcp) {
        //新增隐患上报
        HiddenDangerCheck hiddenDangerCheck  = new HiddenDangerCheck();
@@ -223,6 +223,9 @@
        hiddenDangerCheck.setDangerPlaceId(hdcp.getDangerPlaceId());
        hiddenDangerCheck.setDangerPlaceName(hdcp.getDangerPlaceName());
        hiddenDangerCheckService.insertHiddenDangerCheck(hiddenDangerCheck);//构造隐患排查对象保存，主要保存隐患责任部门，隐患地点

        // todo-2022 1.全流程隐患上报信息封装


        hdcp.setCheckId(hiddenDangerCheck.getCheckId());
        hdcp.setCreateBy(ShiroUtils.getLoginName());//创建者
@@ -243,6 +246,7 @@
//        hdcp.setRegisterSubmitTime(DateUtils.getNowDate());//设置隐患上报提交时间



        //隐患上报判定
//        hdcp.setJudgeCreateTime(DateUtils.getNowDate());//设置隐患上报判定时间
        if (!StringUtils.isEmpty(hdcp.getReportStatus())) {
@@ -256,6 +260,7 @@
                hdcp.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查)
            }
        }
        // todo-2022 2.全流程隐患提交信息封装-未操作

        //隐患核查

@@ -271,11 +276,17 @@
            }
        }

        // todo-2022 3.全流程隐患核查信息封装-未操作


        //隐患整改
//        hdcp.setRectifyCreateTime(DateUtils.getNowDate());//设置整改时间
        hdcp.setRectifyStatus(TrHiddenDangerCheckConstants.RECTIFY_STATUS_ALREADY_RECTIFY);//整改状态(已整改)
        hdcp.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_NOT_ACCEPT);//验收状态(未验收)
        hdcp.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_ACCEPT);//隐患验收阶段(数据进入到隐患验收阶段)


        // todo-2022 4.全流程隐患整改信息封装-未操作

        //隐患验收
        if (!StringUtils.isEmpty(hdcp.getAcceptResult())) {
@@ -286,8 +297,11 @@
                hdcp.setRectifyStatus(TrHiddenDangerCheckConstants.RECTIFY_STATUS_NOT_RECTIFY);//整改状态(未整改)
                hdcp.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_ALREADY_ACCEPT_NOT_PASS);//验收状态(验收未通过)
            } else if ("1".equals(hdcp.getAcceptResult())) {
//                hdcp.setAcceptCreateTime(DateUtils.getNowDate());//设置验收时间
//              hdcp.setAcceptCreateTime(DateUtils.getNowDate());//设置验收时间
                hdcp.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_ALREADY_ACCEPT_PASS);//验收状态(验收通过)

                // todo-2022 5.全流程隐患验收信息封装-未操作

            }
        }
        hdcp.setCompanyId(getSysUser().getCompanyId());
@@ -296,6 +310,14 @@
        hdcp.setUpdateTime(hdcp.getAcceptCreateTime());

        int i = hiddenDangerCheckPointService.insertHiddenDangerCheckPoint(hdcp);

        // todo-2022 全流程隐患附属信息插入
        //获取返回值id
        hdcp.getId();
        int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
        if (result < 1){
            throw new RuntimeException("全流程隐患信息保存失败");
        }

        return toAjax(i);
    }
@@ -396,11 +418,12 @@

    /**
     * 修改判定隐患上报保存
     * todo-2022 隐患核查（判定隐患） 以判定的隐患，才需要上报； 此处暂时不改动
     * todo-2022 隐患核查（判定隐患） 以判定的隐患，才需要上报
     */
    @Log(title = "修改判定隐患上报保存", businessType = BusinessType.UPDATE)
    @PostMapping("/editJudgeDangerReportSave")
    @ResponseBody
    @Transactional
    public AjaxResult editJudgeDangerReportSave(HiddenDangerCheckPoint hiddenDangerCheckPoint) {
        hiddenDangerCheckPoint.setJudgeCreateTime(DateUtils.getNowDate());//设置隐患上报判定时间
        if (!StringUtils.isEmpty(hiddenDangerCheckPoint.getReportStatus())) {
@@ -413,10 +436,19 @@
                hiddenDangerCheckPoint.setDangerLevel("0");//默认设置为一般隐患
                hiddenDangerCheckPoint.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_EXAMINE);//隐患核查阶段(数据进入到隐患核查阶段)
                hiddenDangerCheckPoint.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查)

                // todo-2022 隐患信息判定
                int result = riskService.updateDangerInfoJudge(hiddenDangerCheckPoint);
                if (result < 1){
                    throw new RuntimeException("整改信息保存失败");
                }

            }
        }
        int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint);

        hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送

        return toAjax(i);
    }


 src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java

@@ -7,6 +7,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
import com.ruoyi.project.system.company.domain.Company;
import kotlin.jvm.Transient;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

@@ -442,40 +443,46 @@
    /**
     * hazard_code 风先分析对象编码（风险分析单元编码）
     * */
    @Transient
    private String hazardCode;
    /**
     *  隐患来源
     * 1-日常排查；2-综合性排查；3-专业性排查;4-季节性排查；5-重点时段及节假日前排查
     * 6-事故类比排查；7-复产复工前排查;8-外聘专家诊断式排查；9-管控措施实效;10-其他；11-政府执法检查
     * */
    @Transient
    private Byte dangerSrc;
    /**
     * 隐患描述
     * */
    private String dangerDesc;
//    /**
//     * 隐患描述
//     * */
//    private String dangerDesc;
    /**
     * 隐患产生的原因
     * */
    @Transient
    private String dangerReason;
    /**
     * 隐患类型
     *  1-安全；2-工艺；3-电气；4-仪表
     *  5-消防；6-总图；7-设备；8其他
     * */
    @Transient
    private Byte hazardDangerType;
    /**
     * 隐患状态
     *  0-整改中
     *  1-待验收
     *  2-延期整改
     *  3-超期未整改
     *  9-已验收
     */
    private Byte dangerState;
//    /**
//     * 隐患状态
//     *  0-整改中
//     *  1-待验收
//     *  2-延期整改
//     *  3-超期未整改
//     *  9-已验收
//     */
//    private Byte dangerState;
    /**
     * 隐患造成的结果：1-无；2-轻伤；3-重伤；4-死亡
     */
    @Transient
    private Byte dangerResult;


    public Byte getDangerResult() {
        return dangerResult;
@@ -501,14 +508,6 @@
        this.dangerSrc = dangerSrc;
    }

    public String getDangerDesc() {
        return dangerDesc;
    }

    public void setDangerDesc(String dangerDesc) {
        this.dangerDesc = dangerDesc;
    }

    public String getDangerReason() {
        return dangerReason;
    }
@@ -523,14 +522,6 @@

    public void setHazardDangerType(Byte hazardDangerType) {
        this.hazardDangerType = hazardDangerType;
    }

    public Byte getDangerState() {
        return dangerState;
    }

    public void setDangerState(Byte dangerState) {
        this.dangerState = dangerState;
    }

    public List<Long> getCompanyIdList() {

 src/main/resources/application-druid.yml

@@ -6,12 +6,20 @@
        druid:
            # 主库数据源
            master:
                url: jdbc:mysql://sinanoaq.com:23306/trouble_and_risk.guotai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#                username: riskctrl_gk
#                password: Sjk@Jbhs98n
                username: riskctrl_gk
                password: Csa8@g89cajnDFd7

#                url: jdbc:mysql://localhost:3306/trouble_and_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#                username: root
#                password: root

#                url: jdbc:mysql://localhost:17716/trouble_and_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#                username: trouble_and_risk
#                password: Bw44sxzyiE8SdWzJ
                url: jdbc:mysql://sinanoaq.com:23306/trouble_and_risk.guotai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
                username: riskctrl_gk
                password: Csa8@g89cajnDFd7

#                url: jdbc:mysql://192.168.10.201:3306/trouble_and_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#                username: trouble_and_risk
#                password: LYGstJAYc85jkF7H

 src/main/resources/application.yml

@@ -10,8 +10,7 @@
  demoEnabled: false
  # 文件路径 示例（ Windows配置D:/TroubleAndRisk/uploadPath，Linux配置 /home/TroubleAndRisk/uploadPath）
#  profile: /www/TroubleAndRisk/uploadPath
#  profile: D:/ProjFile/TroubleAndRisk
  profile: /home/troubleAndRisk/upload
  profile: D:/ProjFile/TroubleAndRisk
  # 获取ip地址开关
  addressEnabled: true
  #  获取服务器域名
@@ -19,7 +18,7 @@
# 开发环境配置
server:
  # 服务器的HTTPS端口，为443
  port: 1443
  port: 443
#  ssl:
#    key-store: /root/ssl/syf.com.pfx
#    key-store: H:/wm/ssl/syf.com.pfx
@@ -37,7 +36,7 @@

http:
  # HTTP端口，39559
  additionalPorts: 6801
  additionalPorts: 80

# 日志配置
logging:

 src/main/resources/logback.xml

@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
    <!-- 日志存放路径 -->
<!--    <property name="log.path" value="/www/javaProject/TroubleAndRisk/logs" />-->
    <property name="log.path" value="/home/gkhy/troubleAndRisk/logs" />
    <property name="log.path" value="/www/javaProject/TroubleAndRisk/logs" />
    <!-- 日志输出格式 -->
    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />


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

@@ -77,5 +77,16 @@
        </if>
    </select>

<!--    int updateDangerInfoState(PreventRiskDangerInfo dangerInfo);-->
    <update id="updateDangerInfoState">
        update prevent_risk_danger_info set
            danger_state = #{dangerState},
            update_report_data_time = #{updateReportDataTime},
            report_status = #{reportStatus},
            report_switch = #{reportSwitch}
        where danger_check_point_id = #{dangerCheckPointId}
    </update>

</mapper>



 src/main/resources/mybatis/tr/BaseCheckPointMapper.xml

@@ -93,5 +93,10 @@
            #{checkPointId}
        </foreach>
    </delete>
    


<!--    BaseCheckPoint getBaseCheckPointById(Long checkPointId);-->
    <select id="getBaseCheckPointById" resultType="com.ruoyi.project.tr.baseCheckPoint.domain.BaseCheckPoint">
        select * from tr_base_check_point where check_point_id = #{checkPointId}
    </select>
</mapper>

 src/main/resources/mybatis/tr/HiddenDangerCheckJobMapper.xml

@@ -226,8 +226,8 @@


    <!--HiddenDangerCheckJob getJobById(Long jobId);-->
    <select id="getJobById" resultType="com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob">
    <select id="getJobById" resultMap="JobResult">
        select * from tr_hidden_danger_check_job
        where id = #{jobId}
        where job_id = #{jobId}
    </select>
</mapper>