临时提交-任务记录检索优化；暂存定时任务，处理部分异常数据。

16639036659

2023-07-07 838314ca286334935a3fa63084990ab23b44e612

临时提交-任务记录检索优化；暂存定时任务，处理部分异常数据。

 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java

@@ -86,11 +86,11 @@
    /**

     *当巡检周期是小时的时候为必填

     */

    private Date workStartTime;

    private String workStartTime;

    /**

     *当巡检周期是小时的时候为必填

     */

    private Date workEndTime;

    private String workEndTime;

    /**

     *工作日类型(每天：0；法定工作日(除法定

     * 放假以外的所有)：1 ；非法定工作日(除了放假的时候)：2)


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

@@ -31,4 +31,14 @@
    int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork cjTaskFromWork);



    PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId);







    List<PreventCJReportCheckTaskFromWork> listWork();



    int updateInfo(PreventCJReportCheckTaskFromWork work);



    List<PreventCJReportCheckTaskFromWork> listWork1();



    int updateInfo1(PreventCJReportCheckTaskFromWork work);

}


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

@@ -62,4 +62,5 @@
     */
    List<PreventRiskControlMeasure> listRiskControlMeasure();

    PreventRiskControlMeasure getPreventRiskControlMeasureByUuid(String riskMeasureId);
}

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

@@ -37,4 +37,5 @@
     */

    int updateWorkReportStatus(HandlerReportParam handlerReportParam);



    List<PreventRiskJobAndMeasure> listReportWorkTest();

}


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

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





import com.ruoyi.doublePrevention.entity.CJReport.*;

import com.ruoyi.doublePrevention.entity.*;

import com.ruoyi.doublePrevention.enums.E;

import com.ruoyi.doublePrevention.enums.SyncEnum;

import com.ruoyi.doublePrevention.exception.AusinessException;

import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;

import com.ruoyi.doublePrevention.service.baseService.*;

import com.ruoyi.project.system.dept.domain.Dept;

import com.ruoyi.project.system.dept.service.IDeptService;

import com.ruoyi.project.system.user.domain.User;

import com.ruoyi.project.system.user.service.IUserService;

import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;

import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;

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

import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;

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

import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;

import com.ruoyi.project.tr.riskList.domain.RiskList;

import com.ruoyi.project.tr.riskList.service.IRiskListService;

import org.apache.commons.lang3.ObjectUtils;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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

import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;

import org.springframework.transaction.annotation.Transactional;



import java.text.SimpleDateFormat;

import java.util.*;



@Component

public class DateSchedule {



    private final Logger logger = LoggerFactory.getLogger(this.getClass());



    public static SimpleDateFormat startFormat = new SimpleDateFormat("yyyy-MM-dd 06:30:00");

    public static SimpleDateFormat endFormat = new SimpleDateFormat("yyyy-MM-dd 23:59:59");



    public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");



    @Autowired

    private PreventReportConfigService preventReportConfigService;



    @Autowired

    private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;

    @Autowired

    private PreventCJReportRiskEventService CJEventService;

    @Autowired

    private PreventCJReportRiskControlMeasureService CJMeasureService;

    @Autowired

    private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;

    @Autowired

    private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;

    @Autowired

    private PreventCJReportDangerInfoService CJDangerInfoService;

    @Autowired

    private PreventCJReportPointService CJPointService;





    @Autowired

    private IDeptService trDeptService; //部门服务

    @Autowired

    private IUserService trUserService; //用户服务



    @Autowired

    private IRiskListService trRiskAnaUnitService; //风险设备、分析单元

    @Autowired

    private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表



    @Autowired

    private PreventRiskEventService preventRiskEventService;

    @Autowired

    private PreventRiskControlMeasureService preventRiskControlMeasureService;

    @Autowired

    private PreventRiskControlTemplateService preventRiskControlTemplateService;



    @Autowired

    private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job

    @Autowired

    private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表



    @Autowired

    private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录

    @Autowired

    private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表



    @Autowired

    private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收

    @Autowired

    private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表



    @Autowired

    private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表

    @Autowired

    private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表



    @Autowired

    private PreventTaskTypeService taskTypeService;//管控措施，任务清单对应关系。基础排查点附属表



    @Autowired

    private PreventOverhaulLogService overhaulLogService;

    @Autowired

    private PreventCJReportOverhaulLogService reportOverhaulLogService;





    @Transactional

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

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

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



    public void searchReportDate(){

        String companyCode = "652310082";



//        logger.info("【日巡检】任务数据重置");

//

//        List<PreventCJReportCheckTaskFromWork> workLists = CJTaskFromWorkService.listWork();

//        for (PreventCJReportCheckTaskFromWork work : workLists) {

//            PreventRiskControlMeasure measure = preventRiskControlMeasureService.getPreventRiskControlMeasureByUuid(work.getRiskMeasureId());

//            work.setTroubleshootContent(measure.getCheckContent());

//            work.setWorkStartTime("00:00:00");

//            work.setWorkEndTime("23:59:59");

//            int result = CJTaskFromWorkService.updateInfo(work);

//            if (result < 1){

//                throw new RuntimeException("执行出错");

//            }

//        }















//        logger.info("【包保责任人】任务数据重置");

//

//        List<PreventCJReportCheckTaskFromWork> workLists1 = CJTaskFromWorkService.listWork1();

//        for (PreventCJReportCheckTaskFromWork work : workLists1) {

//            PreventRiskControlMeasure measure = preventRiskControlMeasureService.getPreventRiskControlMeasureByUuid(work.getRiskMeasureId());

//            work.setTroubleshootContent(measure.getCheckContent());

//            HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getWorkId());

//            work.setTaskStartTime(jobById.getStartTime());

//            work.setWorkDayType("2");

//            List<PreventTaskType> infoByJobId = taskTypeService.getInfoByJobId(work.getWorkId());

//            int typeTag = 0;

//            for (PreventTaskType taskType : infoByJobId) {

//                typeTag = taskType.getType();

//            }

//            work.setWorkType(String.valueOf(typeTag));

//            work.setTaskNum("1");

//            int result = CJTaskFromWorkService.updateInfo1(work);

//            if (result < 1){

//                throw new RuntimeException("执行出错");

//            }

//        }











//        logger.info("任务数据重置");

//

//        /**

//         * 4、检索 任务配置 数据 prevent_report_check_record_from_task

//         * */

//        //读取任务配置数据上报主配置信息

//        PreventReportConfig workReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());

//        //如果任务配置主配置开启上报

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

//            //  logger.info("【##】4.检索任务配置...");

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

//            List<PreventRiskJobAndMeasure> works = preventRiskJobAndMeasureService.listReportWorkTest();

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

//            List<PreventCJReportCheckTaskFromWork> CJTaskFromWorkLists = new ArrayList<>();

//            HandlerReportParam handlerReportParam = new HandlerReportParam();

//

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

//                //遍历，封装数据

//                for (PreventRiskJobAndMeasure work : works) {

//                    //通过work中的信息，查询主表数据

//                    HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getJobId());

//                    //获取数据对象

//                    PreventCJReportCheckTaskFromWork CJTaskFromWork = new PreventCJReportCheckTaskFromWork();

//                    //转换时间周期单位 (1小时,2日,3周,4月,5年)

//                    if (jobById.getTroubleshootTypeCycleType() == 1){

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

//                        CJTaskFromWork.setCheckCycleUnit("小时");

//                        CJTaskFromWork.setWorkStartTime("00:00:00");

//                        CJTaskFromWork.setWorkEndTime("23:59:59");

//                    }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() == 4){

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

//                        CJTaskFromWork.setCheckCycleUnit("月");

//                    }else if (jobById.getTroubleshootTypeCycleType() == 5){

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

//                        CJTaskFromWork.setCheckCycleUnit("年");

//                    }

//                    //获取用户信息

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

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

//

//                    //封装上报昌吉州任务配置数据

//                    CJTaskFromWork.setId(work.getJobUuid());

//                    CJTaskFromWork.setCompanyCode(companyCode);

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

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

//                    }else {

//                        CJTaskFromWork.setDeleted("0");

//                    }

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

//                    CJTaskFromWork.setCreateDate(jobById.getCreateTime());

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

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

//                        CJTaskFromWork.setUpdateDate(jobById.getCreateTime());

//                    }else {

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

//                        CJTaskFromWork.setUpdateDate(jobById.getCreateTime());

//                    }

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

//                    CJTaskFromWork.setReportTime(null);

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

//                    CJTaskFromWork.setRiskMeasureId(work.getMeasureUuid());

//                    CJTaskFromWork.setWorkId(jobById.getJobId());

//

//                    //第二版标准新增

//                    PreventRiskControlMeasure measureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(work.getMeasureId());

//                    CJTaskFromWork.setTroubleshootContent(measureById.getCheckContent());

//                    CJTaskFromWork.setTaskStartTime(jobById.getStartTime());

//

//                    CJTaskFromWork.setWorkDayType("0");

//                    List<PreventTaskType> typeByJobId = taskTypeService.getInfoByJobId(work.getJobId());

//                    int typeTag = 0;

//                    for (PreventTaskType taskType : typeByJobId) {

//                        typeTag = taskType.getType();

//                    }

//                    CJTaskFromWork.setWorkType(String.valueOf(typeTag));

//                    if (typeTag !=0){

//                        CJTaskFromWork.setTaskNum("1");

//                    }

//                    //封装数据

//                    CJTaskFromWorkLists.add(CJTaskFromWork);

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

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

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

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

//                    preventRiskJobAndMeasureService.updateWorkReportStatus(handlerReportParam);

//                }

//            }else {

//                logger.info("【双重预防】当前无任务配置数据需要处理");

//            }

//            //写入上报昌吉州数据转换表

//            for (PreventCJReportCheckTaskFromWork CJTaskFromWorks : CJTaskFromWorkLists) {

//                CJTaskFromWorkService.insertTaskFromWorkList(CJTaskFromWorks);

//                logger.info("【双重预防】任务配置CJ：数据处理...");

//            }

//        }else {

//            logger.info("任务配置数据上报已关闭");

//        }





    }

}


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

@@ -91,8 +91,8 @@


    @Transactional

//    @Scheduled(cron = "0 0 23 * * ?")    //每天晚上23点执行一次0 0 22,23 * * ?

    @Scheduled(cron = "0 0 22,23 * * ?")    //每天晚上22、23点执行一次

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

//    @Scheduled(cron = "0 0 22,23 * * ?")    //每天晚上22、23点执行一次

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

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

    public void execReportDateSchedule() throws UnsupportedEncodingException {

        logger.info("【####】上报数据开始...");


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

@@ -108,9 +108,9 @@




    @Transactional

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

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

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

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

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



    public void searchReportDate(){




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

@@ -31,4 +31,12 @@
    void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);



    PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String uuid, Long jobId);



    List<PreventCJReportCheckTaskFromWork>  listWork();



    int updateInfo(PreventCJReportCheckTaskFromWork work);



    List<PreventCJReportCheckTaskFromWork> listWork1();



    int updateInfo1(PreventCJReportCheckTaskFromWork work);

}


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

@@ -58,4 +58,5 @@
     */
    List<PreventRiskControlMeasure> listRiskControlMeasure();

    PreventRiskControlMeasure getPreventRiskControlMeasureByUuid(String riskMeasureId);
}

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

@@ -34,4 +34,5 @@
     */

    int updateWorkReportStatus(HandlerReportParam handlerReportParam);



    List<PreventRiskJobAndMeasure> listReportWorkTest();

}


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

@@ -73,4 +73,27 @@
    public PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId) {

        return preventCJReportCheckTaskFromWorkRepository.geByMeasureUUidAndJobId(measureUuid, jobId);

    }



    @Override

    public List<PreventCJReportCheckTaskFromWork> listWork() {

        return preventCJReportCheckTaskFromWorkRepository.listWork();

    }



    @Override

    public List<PreventCJReportCheckTaskFromWork> listWork1() {

        return preventCJReportCheckTaskFromWorkRepository.listWork1();

    }







    @Override

    public int updateInfo1(PreventCJReportCheckTaskFromWork work) {

        return preventCJReportCheckTaskFromWorkRepository.updateInfo1(work);

    }



    @Override

    public int updateInfo(PreventCJReportCheckTaskFromWork work) {

        return preventCJReportCheckTaskFromWorkRepository.updateInfo(work);

    }



}


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

@@ -76,6 +76,10 @@
        return preventRiskControlMeasureRepository.listRiskControlMeasure();
    }

    @Override
    public PreventRiskControlMeasure getPreventRiskControlMeasureByUuid(String riskMeasureId) {
        return preventRiskControlMeasureRepository.getPreventRiskControlMeasureByUuid(riskMeasureId);
    }


    /**

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

@@ -68,5 +68,10 @@
        return result;

    }



    @Override

    public List<PreventRiskJobAndMeasure> listReportWorkTest() {

        return preventRiskJobAndMeasureRepository.listReportWorkTest();

    }





}


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

@@ -41,6 +41,18 @@
        limit 200

    </select>



    <select id="listWork" resultMap="BaseResultMap">

        select * from prevent_cj_report_check_task_from_work

        where work_id >= 82 and  94 >= work_id and troubleshoot_content is null

        limit 50

    </select>



    <select id="listWork1" resultMap="BaseResultMap">

        select * from prevent_cj_report_check_task_from_work

        where index_id > 800 and 1205 >= index_id and (82 > work_id  or work_id > 94) and troubleshoot_content is null

        limit 100

    </select>



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

    <update id="updateWorkReportStatus">

        update prevent_cj_report_check_task_from_work set

@@ -57,6 +69,27 @@
        where id = #{id}

    </update>



<!--    int updateInfo(PreventCJReportCheckTaskFromWork work);-->

    <update id="updateInfo">

        update prevent_cj_report_check_task_from_work set

        work_start_time =  #{workStartTime},

        work_end_time =  #{workEndTime},

        troubleshoot_content = #{troubleshootContent}

        where index_id = #{indexId}

    </update>

<!--    int updateInfo1(PreventCJReportCheckTaskFromWork work);-->

    <update id="updateInfo1">

        update prevent_cj_report_check_task_from_work set

        troubleshoot_content = #{troubleshootContent},

        task_start_time =  #{taskStartTime},

        work_day_type =  #{workDayType},

        work_type =  #{workType},

        task_num =  #{taskNum}



        where index_id = #{indexId}



    </update>



<!--    int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork cjTaskFromWork);-->

    <insert id="insertTaskFromWorkList">

        insert into prevent_cj_report_check_task_from_work


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

@@ -178,12 +178,16 @@
        </where>
    </select>

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

    <select id="getPreventRiskControlMeasureByUuid" resultMap="BaseResultMap">
        select * from prevent_risk_control_measure
        where delete_status = 0 and uuid = #{riskMeasureId}
    </select>



<!--    List<PreventRiskControlMeasure> listReportMeasure();-->

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

@@ -35,7 +35,7 @@
<!--    List<PreventRiskDangerCheckLog> listReportTask();-->
    <select id="listReportTask" resultMap="BaseResultMap">
        select * from prevent_risk_danger_check_log
        where report_switch = 0 and (update_report_data_time > report_time or report_time is null)
        where report_switch = 0 and (update_report_data_time > report_time or report_time is null) and mobile_code is not null
    </select>

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

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

@@ -54,8 +54,11 @@
            report_time = #{reportTime}
        where id = #{id}
    </update>
<!--    PreventRiskJobAndMeasure geByMeasureUUidAndJobId(String measureUuid, Long jobId);-->

    <!--    List<PreventRiskJobAndMeasure> listReportWork();-->
    <select id="listReportWorkTest" resultMap="BaseResultMap">
        select * from prevent_risk_job_and_measure
        where job_id = 84
    </select>
</mapper>