娄哥的库

16639036659

2023-05-16 5f1ab44b47d1e28121ecf6983fada2bc628a69fb

娄哥的库

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

@@ -37,4 +37,6 @@
     * 修改已经被检索读取完成数据的状态

     */

    int updateReportStatus(HandlerReportParam handlerReportParam);



    PreventRiskUnitUuid getRiskUnitUuidByUnitId(Long riskUnitId);

}


 src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java

@@ -94,8 +94,12 @@
    private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表







    @Transactional

//    @Scheduled(cron = "0 0/1 * * * ?")

//    @Scheduled(cron = "0 0/1 * * * ? ")    // 分钟

//    @Scheduled(cron = "0/30 * * * * ?")  // 30秒

    @Scheduled(cron = "0 0 0/2 * * ?")  // 小时



    public void searchReportDate(){



        logger.info("【双重预防】定时检索需要上报数据...");

@@ -215,7 +219,8 @@
                    CJReportRiskEvent.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());

                    CJReportRiskEvent.setReportTime(null);

                    CJReportRiskEvent.setDataSource((byte) 1);

                    CJReportRiskEvent.setRiskUnitId(riskEvent.getRiskUnitUuid());

                    PreventRiskUnitUuid riskUnitUuidByUnitId = preventRiskUnitUuidService.getRiskUnitUuidByUnitId(riskEvent.getRiskUnitId());

                    CJReportRiskEvent.setRiskUnitId(riskUnitUuidByUnitId.getRiskUnitUuid());

                    CJReportRiskEvent.setRiskEventName(riskEvent.getRiskEventName());

                    CJReportRiskEvent.setRiskEventId(riskEvent.getId());

                    //封装数据

@@ -342,12 +347,12 @@
                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));

                        CJTaskFromWork.setCheckCycleUnit("小时");

                    }else if (jobById.getTroubleshootTypeCycleType() == 2){

                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));

                        CJTaskFromWork.setCheckCycleUnit("天");

                    }else if (jobById.getTroubleshootTypeCycleType() == 3){

                        Long num = jobById.getTroubleshootTypeCycleNum() * 7;

                        CJTaskFromWork.setCheckCycle(Math.toIntExact(num));

                        CJTaskFromWork.setCheckCycleUnit("日");

                    }else if (jobById.getTroubleshootTypeCycleType() == 3){

                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));

                        CJTaskFromWork.setCheckCycleUnit("日");

                        CJTaskFromWork.setCheckCycleUnit("天");

                    }else if (jobById.getTroubleshootTypeCycleType() == 4){

                        CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));

                        CJTaskFromWork.setCheckCycleUnit("月");

@@ -430,20 +435,38 @@
                    //获取上报数据对象

                    PreventCJReportCheckRecordFromTask CJRecordFromTask = new PreventCJReportCheckRecordFromTask();

                    //转换检查结果





                    /**

                     * todo 结果暂时不写入，需要后续处理

                     *  examineUserName，checkTime  任务执行后，不为空  不使用;

                     * tr_hidden_danger_check 的 scheduleCheckStatus 0 未排查， 1已排查

                     *  结果暂时不写入，需要后续处理   ---检查源任务相关的检查点结果

                     *  1.找到每个点的提交接口，进行数据处理

                     *  2.写一个定时任务处理（备用）

                     * */



                    /**

                     *   todo  排查后的任务才上报

                     *  examineUserName，checkTime  任务执行后，不为空  不使用;

                     * tr_hidden_danger_check 的 scheduleCheckStatus 0 未排查， 1已排查

                     * todo  先找到所有已经排查的任务，然后查询 tr_hidden_danger_check_point ，whether_danger 是否为隐患（0为正常  1为隐患） ,未处理的任务，该值为空

                     *  部分查询结果为空，需要对tr_hidden_danger_check_point结果做判空

                     * */

                    //如果已经执行过，进入方法

                    if (Integer.valueOf(hiddenDangerCheckById.getScheduleCheckStatus()) == 1){



                        List<HiddenDangerCheckPoint> hiddenDangerCheckPointList = trHiddenDangerCheckPointService.getHiddenDangerCheckPointByCheckId(task.getCheckId());



                        //避免个别任务无检查点的情况

                        if (ObjectUtils.isEmpty(hiddenDangerCheckPointList)) {

                            logger.info("【双重预防】排查任务记录CJ：异常，无检查点...");

                        }else {

                            for (HiddenDangerCheckPoint hiddenDangerCheckPoint : hiddenDangerCheckPointList) {



                    CJRecordFromTask.setCheckStatus("0");// 0-正常；1-存在隐患；2-未处理；3-其他

//                    String checkStatus = null;

//                    if (ObjectUtils.isEmpty(task.getResult() )){

//                        checkStatus = "2";

//                    }else if (task.getResult() == 2){

//                        checkStatus = "1";

//                    }else if (task.getResult() == 1){

//                        checkStatus = "0";

//                    }

                                if (Integer.valueOf(hiddenDangerCheckPoint.getWhetherDanger()) == 1){

                                        CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他

                                }



                    User createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy());

                    User updateUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getUpdateBy());

@@ -478,11 +501,25 @@


                    //封装数据

                    CJRecordFromTaskLists.add(CJRecordFromTask);

                            }

                        }





                    //设置原始数据上报状态

                    handlerReportParam.setId(task.getId());

                    handlerReportParam.setReportTime(new Date());

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

                    preventRiskDangerCheckLogService.updateTaskReportStatus(handlerReportParam);



                    }

//                    String checkStatus = null;

//                    if (ObjectUtils.isEmpty(task.getResult() )){

//                        checkStatus = "2";

//                    }else if (task.getResult() == 2){

//                        checkStatus = "1";

//                    }else if (task.getResult() == 1){

//                        checkStatus = "0";

//                    }

                }

            }else {

                logger.info("【双重预防】当前无排查任务记录需要处理");

@@ -497,134 +534,136 @@
                logger.info("【双重预防】排查任务记录CJ：数据处理...");

            }

            step = 6;



        }else {

            step = 6;

            logger.info("排查任务记录数据上报已关闭");

        }



        /**

         * 6、隐患信息数据

         * */

        //读取安全风险管控措施数据上报主配置信息

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

        //如果安全风险管控措施主配置开启上报

        if (dangerReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){



            //logger.info("【##】4.检索隐患信息数据...");



            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）

            List<PreventRiskDangerInfo> dangerManages = preventRiskDangerInfoService.listReportDanger();

            //获取上报数据list

            List<PreventCJReportDangerInfo> CJDangerInfoLists = new ArrayList<>();



            if (ObjectUtils.isNotEmpty(dangerManages)){

                HandlerReportParam handlerReportParam = new HandlerReportParam();

                //遍历，封装数据

                for (PreventRiskDangerInfo dangerManage : dangerManages) {



                    //获取隐患信息主表信息

                    HiddenDangerCheckPoint hiddenDanger = trHiddenDangerCheckPointService.getHiddenDangerCheckPointById(dangerManage.getDangerCheckPointId());

                    //获取上报数据对象

                    PreventCJReportDangerInfo CJDangerInfo = new PreventCJReportDangerInfo();



                    //通过用户名，获取涉及到的各位用户的真实姓名

                    User createUser = trUserService.getUserByLoginName(hiddenDanger.getCreateBy());

                    User updateUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy());

                    if (ObjectUtils.isNotEmpty(hiddenDanger.getRegisterUserName())){

                        User registerUser = trUserService.getUserByLoginName(hiddenDanger.getRegisterUserName());

                        //登记人信息

                        CJDangerInfo.setRegistrant(registerUser.getUserName());//登记人

                        CJDangerInfo.setRegistTime(hiddenDanger.getRegisterCreateTime());//登记时间

                    }



                    if (ObjectUtils.isNotEmpty(hiddenDanger.getRectifyUserName())){

                        User rectifyUser = trUserService.getUserByLoginName(hiddenDanger.getRectifyUserName());

                        //整改人信息

                        CJDangerInfo.setLiablePerson(rectifyUser.getUserName());//整改责任人

                    }



                    if (ObjectUtils.isNotEmpty(hiddenDanger.getAcceptUserName())){

                        User acceptUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy());

                        //验收人信息

                        CJDangerInfo.setCheckAcceptPerson(acceptUser.getUserName());//验收人

                        CJDangerInfo.setCheckAcceptComment(hiddenDanger.getAcceptOpinion());//验收情况

                        CJDangerInfo.setCheckAcceptTime(hiddenDanger.getAcceptCreateTime());//验收时间

                    }

                    //如果排查任务正常存在，封装任务相关数据

                    HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId());

                    if (ObjectUtils.isNotEmpty(dangerCheckById)){



                        PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId());

                        CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid

                        //找排查点，然后查措施

                        PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());

                        //查管控措施

                        PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());

                        CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid

                        CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施

                    }else {

                        CJDangerInfo.setCheckRecordId(null);//隐患排查任务记录uuid

                        CJDangerInfo.setRiskMeasureId(null);//管控措施uuid

                    }



                    if (dangerManage.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){

                        CJDangerInfo.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10

                    }else {

                        CJDangerInfo.setDeleted("0");

                    }

                    CJDangerInfo.setId(dangerManage.getUuid());

                    CJDangerInfo.setCompanyCode(companyCode);

                    CJDangerInfo.setHazardCode(dangerManage.getHazardCode());//风险分析对象编码

                    CJDangerInfo.setCreateBy(createUser.getUserName());

                    CJDangerInfo.setCreateDate(hiddenDanger.getCreateTime());



                    if (ObjectUtils.isEmpty(updateUser)){

                        CJDangerInfo.setUpdateBy(createUser.getUserName());

                        CJDangerInfo.setUpdateDate(hiddenDanger.getCreateTime());

                    }else {

                        CJDangerInfo.setUpdateBy(updateUser.getUserName());

                        CJDangerInfo.setUpdateDate(hiddenDanger.getUpdateTime());

                    }



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

                    CJDangerInfo.setReportTime(null);

                    CJDangerInfo.setDataSource((byte) 1);

                    CJDangerInfo.setDangerName(hiddenDanger.getDangerName());

                    CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());//隐患等级

                    CJDangerInfo.setDangerSrc(dangerManage.getDangerSrc().toString());//隐患来源

                    CJDangerInfo.setDangerManageType(hiddenDanger.getRectifyType());//隐患治理类型

                    CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());//隐患描述

                    CJDangerInfo.setDangerReason(dangerManage.getDangerReason());//隐患产生原因

                    CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金

                    CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());//治理期限

                    CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());//隐患状态

                    CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());//隐患类型

                    CJDangerInfo.setDangerManagerId(dangerManage.getId());

                    //封装数据

                    CJDangerInfoLists.add(CJDangerInfo);

                    //设置原始数据上报状态

                    handlerReportParam.setId(dangerManage.getId());

                    handlerReportParam.setReportTime(new Date());

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

                    //修改隐患信息附属表状态

                    preventRiskDangerInfoService.updateDangerInfoReportStatus(handlerReportParam);

                }

            }else {

                logger.info("【双重预防】当前无隐患信息需要处理");

            }



            //插入上报昌吉州转换表

            for (PreventCJReportDangerInfo CJDanger : CJDangerInfoLists) {

                logger.info("【双重预防】隐患信息插入...");

                int result = CJDangerInfoService.insert(CJDanger);

                if (result < 0){

                    throw new AusinessException(E.ADD_FAIL.getCode(), "隐患信息插入失败");

                }

                logger.info("【双重预防】隐患信息：数据处理...");

            }

        }else {

            logger.info("隐患信息数据上报已关闭");

        }

//        /**

//         * 6、隐患信息数据

//         * */

//        //读取安全风险管控措施数据上报主配置信息

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

//        //如果安全风险管控措施主配置开启上报

//        if (dangerReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){

//

//            //logger.info("【##】4.检索隐患信息数据...");

//

//            //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）

//            List<PreventRiskDangerInfo> dangerManages = preventRiskDangerInfoService.listReportDanger();

//            //获取上报数据list

//            List<PreventCJReportDangerInfo> CJDangerInfoLists = new ArrayList<>();

//

//            if (ObjectUtils.isNotEmpty(dangerManages)){

//                HandlerReportParam handlerReportParam = new HandlerReportParam();

//                //遍历，封装数据

//                for (PreventRiskDangerInfo dangerManage : dangerManages) {

//

//                    //获取隐患信息主表信息

//                    HiddenDangerCheckPoint hiddenDanger = trHiddenDangerCheckPointService.getHiddenDangerCheckPointById(dangerManage.getDangerCheckPointId());

//                    //获取上报数据对象

//                    PreventCJReportDangerInfo CJDangerInfo = new PreventCJReportDangerInfo();

//

//                    //通过用户名，获取涉及到的各位用户的真实姓名

//                    User createUser = trUserService.getUserByLoginName(hiddenDanger.getCreateBy());

//                    User updateUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy());

//                    if (ObjectUtils.isNotEmpty(hiddenDanger.getRegisterUserName())){

//                        User registerUser = trUserService.getUserByLoginName(hiddenDanger.getRegisterUserName());

//                        //登记人信息

//                        CJDangerInfo.setRegistrant(registerUser.getUserName());//登记人

//                        CJDangerInfo.setRegistTime(hiddenDanger.getRegisterCreateTime());//登记时间

//                    }

//

//                    if (ObjectUtils.isNotEmpty(hiddenDanger.getRectifyUserName())){

//                        User rectifyUser = trUserService.getUserByLoginName(hiddenDanger.getRectifyUserName());

//                        //整改人信息

//                        CJDangerInfo.setLiablePerson(rectifyUser.getUserName());//整改责任人

//                    }

//

//                    if (ObjectUtils.isNotEmpty(hiddenDanger.getAcceptUserName())){

//                        User acceptUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy());

//                        //验收人信息

//                        CJDangerInfo.setCheckAcceptPerson(acceptUser.getUserName());//验收人

//                        CJDangerInfo.setCheckAcceptComment(hiddenDanger.getAcceptOpinion());//验收情况

//                        CJDangerInfo.setCheckAcceptTime(hiddenDanger.getAcceptCreateTime());//验收时间

//                    }

//                    //如果排查任务正常存在，封装任务相关数据

//                    HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId());

//                    if (ObjectUtils.isNotEmpty(dangerCheckById)){

//

//                        PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId());

//                        CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid

//                        //找排查点，然后查措施

//                        PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());

//                        //查管控措施

//                        PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());

//                        CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid

//                        CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施

//                    }else {

//                        CJDangerInfo.setCheckRecordId(null);//隐患排查任务记录uuid

//                        CJDangerInfo.setRiskMeasureId(null);//管控措施uuid

//                    }

//

//                    if (dangerManage.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){

//                        CJDangerInfo.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10

//                    }else {

//                        CJDangerInfo.setDeleted("0");

//                    }

//                    CJDangerInfo.setId(dangerManage.getUuid());

//                    CJDangerInfo.setCompanyCode(companyCode);

//                    CJDangerInfo.setHazardCode(dangerManage.getHazardCode());//风险分析对象编码

//                    CJDangerInfo.setCreateBy(createUser.getUserName());

//                    CJDangerInfo.setCreateDate(hiddenDanger.getCreateTime());

//

//                    if (ObjectUtils.isEmpty(updateUser)){

//                        CJDangerInfo.setUpdateBy(createUser.getUserName());

//                        CJDangerInfo.setUpdateDate(hiddenDanger.getCreateTime());

//                    }else {

//                        CJDangerInfo.setUpdateBy(updateUser.getUserName());

//                        CJDangerInfo.setUpdateDate(hiddenDanger.getUpdateTime());

//                    }

//

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

//                    CJDangerInfo.setReportTime(null);

//                    CJDangerInfo.setDataSource((byte) 1);

//                    CJDangerInfo.setDangerName(hiddenDanger.getDangerName());

//                    CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());//隐患等级

//                    CJDangerInfo.setDangerSrc(dangerManage.getDangerSrc().toString());//隐患来源

//                    CJDangerInfo.setDangerManageType(hiddenDanger.getRectifyType());//隐患治理类型

//                    CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());//隐患描述

//                    CJDangerInfo.setDangerReason(dangerManage.getDangerReason());//隐患产生原因

//                    CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金

//                    CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());//治理期限

//                    CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());//隐患状态

//                    CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());//隐患类型

//                    CJDangerInfo.setDangerManagerId(dangerManage.getId());

//                    //封装数据

//                    CJDangerInfoLists.add(CJDangerInfo);

//                    //设置原始数据上报状态

//                    handlerReportParam.setId(dangerManage.getId());

//                    handlerReportParam.setReportTime(new Date());

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

//                    //修改隐患信息附属表状态

//                    preventRiskDangerInfoService.updateDangerInfoReportStatus(handlerReportParam);

//                }

//            }else {

//                logger.info("【双重预防】当前无隐患信息需要处理");

//            }

//

//            //插入上报昌吉州转换表

//            for (PreventCJReportDangerInfo CJDanger : CJDangerInfoLists) {

//                logger.info("【双重预防】隐患信息插入...");

//                int result = CJDangerInfoService.insert(CJDanger);

//                if (result < 0){

//                    throw new AusinessException(E.ADD_FAIL.getCode(), "隐患信息插入失败");

//                }

//                logger.info("【双重预防】隐患信息：数据处理...");

//            }

//        }else {

//            logger.info("隐患信息数据上报已关闭");

//        }








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

@@ -33,4 +33,6 @@
     * 修改已经被检索读取完成数据的状态

     */

    int updateReportStatus(HandlerReportParam handlerReportParam);



    PreventRiskUnitUuid getRiskUnitUuidByUnitId(Long riskUnitId);

}


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

@@ -65,4 +65,11 @@
        }

        return result;

    }



    @Override

    public PreventRiskUnitUuid getRiskUnitUuidByUnitId(Long riskUnitId) {

        return preventRiskUnitUuidRepository.getRiskUnitUuidByUnitId(riskUnitId);

    }





}


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

@@ -944,7 +944,7 @@
        PreventRiskDangerCheckLog dangerCheck = new PreventRiskDangerCheckLog();



        dangerCheck.setUuid(dangerCheckUuid);

        dangerCheck.setCheckStatus(null);//

        dangerCheck.setCheckStatus((byte) 2);//

        dangerCheck.setCheckId(checkId);

        dangerCheck.setJobId(hdc.getJobId());

        //获取上报主配置信息


 src/main/java/com/ruoyi/framework/config/ScheduleConfig.java

@@ -40,6 +40,7 @@
        // sqlserver 启用
        //prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?");
        prop.put("org.quartz.jobStore.misfireThreshold", "12000");
//        prop.put("org.quartz.jobStore.tablePrefix", "qrtz_");
        prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
        factory.setQuartzProperties(prop);


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

@@ -97,7 +97,7 @@


    /**
     * 定时隐患排查保存
     * 定时隐患排查保存  -- todo
     */
    public ApiResult editDangerScheduleSave(String str, ApiRequestHeader header) {
        //验证userId,loginName,token,deviceType,deviceId,appType 是否一致

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

@@ -102,7 +102,7 @@
            resultList.add(checkPoint);
        }

        return getDataTable(resultList);
        return getDataTable(list);
    }

    /**

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

@@ -126,7 +126,7 @@


    /**
     * 根据隐患排查checkId获取基础清单下的检查点，并合并检查内容相同的行
     * 根据隐患排查checkId获取基础清单下的检查点，并合并检查内容相同的行  todo
     */
    @PostMapping("/selectBaseCheckPointListByCheckIdAndMergeSamePoint")
    @ResponseBody

 src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/mapper/HiddenDangerCheckPointMapper.java

@@ -81,4 +81,6 @@
     * 查询by Id
     */
    HiddenDangerCheckPoint getHiddenDangerCheckPointById(Long dangerCheckPointId);

    List<HiddenDangerCheckPoint> getHiddenDangerCheckPointByCheckId(Long checkId);
}

 src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/IHiddenDangerCheckPointService.java

@@ -89,4 +89,8 @@
     * 查询by Id
     */
    HiddenDangerCheckPoint getHiddenDangerCheckPointById(Long dangerCheckPointId);
    /**
     * 查询by CheckId
     */
    List<HiddenDangerCheckPoint> getHiddenDangerCheckPointByCheckId(Long checkId);
}

 src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/service/impl/HiddenDangerCheckPointServiceImpl.java

@@ -190,4 +190,15 @@
    public HiddenDangerCheckPoint getHiddenDangerCheckPointById(Long dangerCheckPointId) {
        return hiddenDangerCheckPointMapper.getHiddenDangerCheckPointById(dangerCheckPointId);
    }

    /**
     * 查询by CheckId
     */

    @Override
    public List<HiddenDangerCheckPoint> getHiddenDangerCheckPointByCheckId(Long checkId) {
        return hiddenDangerCheckPointMapper.getHiddenDangerCheckPointByCheckId(checkId);
    }


}

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

@@ -189,7 +189,7 @@
<!--    List<PreventRiskControlMeasure> listReportMeasure();-->
    <select id="listReportMeasure" resultMap="BaseResultMap">
        select * from prevent_risk_control_measure
        where report_switch = 0 and (update_report_data_time > report_time or report_time is null)
        where report_switch = 0 and delete_status  = 0  and  (update_report_data_time > report_time or report_time is null)
    </select>

<!--    int updateMeasureReportStatus(HandlerReportParam handlerReportParam);-->

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

@@ -130,7 +130,7 @@
<!--    List<PreventRiskEvent> listReportEvent();-->
    <select id="listReportEvent" resultMap="BaseResultMap">
        select * from prevent_risk_event
        where report_switch = 0 and (update_report_data_time > report_time or report_time is null)
        where report_switch = 0 and delete_status  = 0 and (update_report_data_time > report_time or report_time is null)
    </select>
<!--    int updateEventReportStatus(HandlerReportParam handlerReportParam);-->
    <update id="updateEventReportStatus">

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

@@ -56,4 +56,10 @@
            report_time = #{reportTime}
        where id = #{id}
    </update>

<!--    PreventRiskUnitUuid getRiskUnitUuidByUnitId(Long riskUnitId);-->
    <select id="getRiskUnitUuidByUnitId" resultMap="BaseResultMap">
        select * from prevent_risk_unit_uuid
        where risk_unit_id = #{riskUnitId}
    </select>
</mapper>

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

@@ -677,4 +677,10 @@
        where id = #{dangerCheckPointId}
    </select>


<!--    List<HiddenDangerCheckPoint> getHiddenDangerCheckPointByCheckId(Long checkId);-->
    <select id="getHiddenDangerCheckPointByCheckId" parameterType="HiddenDangerCheckPoint" resultMap="HiddenDangerCheckPointResult">
        select * from tr_hidden_danger_check_point
        where check_id = #{checkId}
    </select>
</mapper>

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

@@ -324,6 +324,6 @@

<!--    RiskList getInfoByRiskListId(Long riskUnitId);-->
    <select id="getInfoByRiskListId" parameterType="RiskList" resultMap="RiskListResult">
        select * from tr_risk_list where risk_list_id = #{riskUnitId}
        select * from tr_risk_list where risk_list_id = #{riskUnitId} and user_id is not null
    </select>
</mapper>