update gitignore

kongzy

2024-08-14 135a322f44708b1187d37ea4b6859b5d82113e89

update gitignore

 .gitignore

@@ -13,3 +13,4 @@

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
logs/

 TR.iml

对比新文件
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
  <component name="AdditionalModuleElements">
    <content url="file://$MODULE_DIR$" dumb="true">
      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
    </content>
  </component>
</module>

 pom.xml

@@ -67,6 +67,7 @@
            <scope>test</scope>
        </dependency>


        <!-- SpringBoot 拦截器 -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -96,6 +97,7 @@
        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
<!--            <version>5.1.40</version>-->
        </dependency>

        <!-- SpringBoot集成mybatis框架 -->

 src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java

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

 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/CJReportResultData.java

 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/Data.java

 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/ErrorMsgDetails.java

 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckRecordFromTaskDTO.java

 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java

 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java

 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportOverhaulLogDTO.java

 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportPointDTO.java

 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskAnaUnitDTO.java

 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskControlMeasureDTO.java

 src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskEventDTO.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataForPieChartRespDTO.java

 src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataReqBO.java

 src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataRespDTO.java

 src/main/java/com/ruoyi/doublePrevention/entity/SPI/TroubleData.java

 src/main/java/com/ruoyi/doublePrevention/entity/SPI/TroubleLevel.java

 src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogInsertReqBO.java

 src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogReqBO.java

 src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogUpdateReqBO.java

 src/main/java/com/ruoyi/doublePrevention/entity/dto/req/RiskAndPeopleInfoReqBO.java

 src/main/java/com/ruoyi/doublePrevention/entity/dto/req/RiskOldInfoQueryReqDTO.java

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

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

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

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

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

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

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

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

 src/main/java/com/ruoyi/doublePrevention/exception/AusinessException.java

 src/main/java/com/ruoyi/doublePrevention/exception/BusinessException.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerCJReportParam.java

 src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerReportParam.java

 src/main/java/com/ruoyi/doublePrevention/repository/param/PreventPointAndMeasureParams.java

 src/main/java/com/ruoyi/doublePrevention/repository/param/PreventReportConfigUpdateParams.java

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

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

@@ -3,13 +3,12 @@
import com.alibaba.fastjson.JSON;

import com.alibaba.fastjson.JSONArray;

import com.alibaba.fastjson.JSONObject;



import com.ruoyi.common.utils.BeanCopyUtils;

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

import com.ruoyi.doublePrevention.entity.CJReport.CJdto.CJReportResultData;

import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;

import com.ruoyi.doublePrevention.entity.CJReport.CJdto.ErrorMsgDetails;

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

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

import com.ruoyi.doublePrevention.enums.CJReportEnum;

import com.ruoyi.doublePrevention.enums.SyncEnum;

@@ -29,7 +28,6 @@
import org.springframework.transaction.annotation.Transactional;



import java.io.*;

import java.lang.reflect.Array;

import java.net.HttpURLConnection;

import java.net.URL;

import java.nio.charset.StandardCharsets;

@@ -95,8 +93,9 @@
    @Transactional

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

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

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

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

    // @Scheduled(cron = "0 0/5 * * * ? ")    // 分钟
   // @Scheduled(cron = "0 0/5 * * * ? ")
    @Scheduled(cron = "0 0/1 * * * ? ")
    public void execReportDateSchedule() throws UnsupportedEncodingException {

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



@@ -589,16 +588,22 @@
            //数据加密

            String AESReportRecordFromTask = encrypt(JSONObject.toJSONString(reportRecordFromTaskList), key.getBytes(), iv.getBytes());

            logger.info("【test】数据加密完成,开始上报数据");


            StringBuffer recordFromTaskResultBuffer = null;

            //上报数据

            try {

                URL url = new URL("http://120.71.182.198:9999/v1/data/receive/measuresTaskRecordMsg");

               // URL url = new URL("http://120.71.182.198:9999/v1/data/receive/measuresTaskRecordMsg");
                URL url = new URL("https://cjzjg.gtaq.com.cn:7004/v1/data/receive/measuresTaskRecordMsg");  //备用地址
                //得到连接对象

                con = (HttpURLConnection) url.openConnection();

                //设置请求类型

                con.setRequestMethod("POST");

                //设置Content-Type，此处根据实际情况确定

                con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");

            //    con.setRequestProperty(HTTP.CONN_DIRECTIVE,HTTP.CONN_CLOSE);
                con.setConnectTimeout(600000);
                con.setReadTimeout(600000);

                //允许写出

                con.setDoOutput(true);

                //允许读入

@@ -606,7 +611,7 @@
                //不使用缓存

                con.setUseCaches(false);

                //设置请求头

                con.setRequestProperty("X-Access-Token",token+formatDate.toString());

                con.setRequestProperty("X-Access-Token",token+tokenDate.format(new Date()).toString());
                OutputStream os = con.getOutputStream();

                Map paraMap = new HashMap();

                paraMap.put("data", AESReportRecordFromTask);/**封装数据*/


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

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

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

@@ -107,9 +107,9 @@




    @Transactional

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

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

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

 //   @Scheduled(cron = "0 0/25 * * * ? ")    // 分钟
    public void searchReportDate(){



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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 src/main/java/com/ruoyi/doublePrevention/utilsCJ/AesGcm256Util.java

 src/main/java/com/ruoyi/project/system/user/test.java

 src/main/java/com/ruoyi/project/tr/HiddenDangerCheckJob/util/AbstractQuartzJob.java

@@ -133,7 +133,7 @@
     * */
    //生成定时隐患排查数据
    @Transactional
    protected void createData(JobExecutionContext context, HiddenDangerCheckJob job) {
    public void createData(JobExecutionContext context, HiddenDangerCheckJob job) {
        Date startTime = threadLocal.get();

        //比较当前时间与执行开始时间

 src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java

 src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/impl/HiddenDangerCheckServiceImpl.java

@@ -1,25 +1,16 @@
package com.ruoyi.project.tr.hiddenDangerCheck.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.text.Convert;
import com.ruoyi.framework.web.service.JpushService;
import com.ruoyi.project.mobile.domain.ApiResult;
import com.ruoyi.project.system.user.domain.User;
import com.ruoyi.project.system.user.service.IUserService;
import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
import com.ruoyi.project.tr.hiddenDangerCheck.mapper.HiddenDangerCheckMapper;
import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.report.mapper.ReportMapper;
import com.ruoyi.project.tr.report.service.ReportService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * 隐患排查Service业务层处理
@@ -39,8 +30,6 @@
    @Autowired
    private ReportMapper reportMapper;

    @Autowired
    JpushService jpushService;


    @Autowired

 src/main/java/com/ruoyi/project/tr/specialCheck/Test/ItemDangerReportScheduleTest.java

 src/main/java/com/ruoyi/project/tr/specialCheck/Test/SpecialCheckTaskDownload.java

 src/main/java/com/ruoyi/project/tr/specialCheck/Test/TaskReportScheduleTest.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/HandlerSpecialCheckReportParam.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckItemBO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckScoreBO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckTaskBO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogBO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogUpdateBO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemLogEditBO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogEditBO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogQueryBO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogBO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogEditBO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogUpdateBO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/SpecialCheckItemDangerLogReportDTO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/SpecialCheckTaskLogReportDTO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckItemDTO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckScoreDTO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckTaskDTO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemDangerLogDTO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemLogDTO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemLogQueryDTO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogDTO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogQueryDTO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogRespDTO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDTO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDateDTO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckItemData.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckScoreData.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckTaskData.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ItemDownloadRespBO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ItemDownloadRespDTO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/Page.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ScoreDownloadRespBO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ScoreDownloadRespDTO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/TbBaseCheckTaskDownloadBO.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckCompany.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckItem.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckScore.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckTask.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbCheckConfig.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemDangerLog.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemLog.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckScoreAndDangerLog.java

 src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckTaskLog.java

 src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckCompanyMapper.java

 src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java

 src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java

 src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java

 src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbCheckConfigMapper.java

 src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemDangerLogMapper.java

 src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemLogMapper.java

 src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckScoreAndDangerLogMapper.java

 src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckTaskLogMapper.java

 src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckItemDangerLogService.java

 src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckScoreAndDangerDangerLogService.java

 src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckTaskService.java

 src/main/java/com/ruoyi/project/tr/specialCheck/service/TbBaseCheckService.java

 src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java

 src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckScoreAndDangerLogServiceImpl.java

 src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckTaskServiceImpl.java

 src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/TbBaseCheckServiceImpl.java

 src/main/resources/application-dev.yml

文件名从 src/main/resources/application-louge.yml 修改
@@ -6,25 +6,13 @@
spring:
    datasource:
        type: com.alibaba.druid.pool.DruidDataSource
        driverClassName: com.mysql.cj.jdbc.Driver
        driverClassName: com.mysql.jdbc.Driver
        druid:
            # 主库数据源
            master:
                url: jdbc:mysql://124.221.179.102:3306/testqhs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
                username: testqhs
                password: raD2AEaccLRsaFrB

#                url: jdbc:mysql://localhost:3306/trouble_and_risk.guotai?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://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
                url: jdbc:mysql://192.168.2.16:39231/gt_double_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
                username: gt_double_risk
                password: B6CrYp7ZhTNdJF4Y

            # 从库数据源
            slave:
@@ -75,9 +63,9 @@

    # redis
    redis:
        host: 192.168.0.52
        host: 127.0.0.1
        port: 6379
        password: SEF98uvs98dUAUEF90Udssa      # Redis 服务器密码，默认为空。生产中，一定要设置 Redis 密码！
        password:       # Redis 服务器密码，默认为空。生产中，一定要设置 Redis 密码！
        database: 0           # Redis 数据库号，默认为 0
        timeout: 15000        # Redis 连接超时时间，单位：毫秒。
        lettuce:
@@ -112,3 +100,16 @@
    #  profile: /home/troubleAndRisk/upload
    # 获取ip地址开关
    addressEnabled: true


# 日志配置
logging:
    level:
        com.ruoyi: debug
        org.springframework: warn

#极光推送内容
jpush:
    appKey: dac5323e315005928daa4330_1
    masterSecret: d115672ccd8d69d0b75c4926
    liveTime: 172800

 src/main/resources/application-guotai-prod.yml

@@ -129,3 +129,10 @@
    profile: /home/java/TroubleAndRisk/upload
    # 获取ip地址开关
    addressEnabled: true


# 日志配置
logging:
    level:
        com.ruoyi: info
        org.springframework: info

 src/main/resources/application.yml

@@ -38,6 +38,8 @@

# Spring配置
spring:
  application:
    name: trouble_risk
  # 模板引擎
  thymeleaf:
    mode: HTML
@@ -52,13 +54,9 @@
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss
  profiles:
    #active: guotai-uat
    #active: dev
    active: guotai-prod
#    active: druid
#    druid使用的数据库是5.7.28，过高的版本，可能有部分函数不支持
#    active: uat
#    active: uat8
#    active: local

  # 文件上传
  servlet:
    multipart:
@@ -76,34 +74,13 @@
    jcache:
      config: classpath:ehcache.xml

# 日志配置
logging:
  level:
    com.ruoyi: debug
    org.springframework: warn


# 用户配置
user:
  password:
    # 密码错误{maxRetryCount}次锁定10分钟
    maxRetryCount: 5
#  # redis
#  redis:
#    host: 192.168.0.52
#    port: 6379
#    password: SEF98uvs98dUAUEF90Udssa      # Redis 服务器密码，默认为空。生产中，一定要设置 Redis 密码！
#    database: 0           # Redis 数据库号，默认为 0
#    timeout: 15000        # Redis 连接超时时间，单位：毫秒。
#    lettuce:
#      pool:
#        max-active: 4
#    # 对应 RedisProperties.Jedis 内部类
#    jedis:
#      pool:
#        max-active: 4     # 连接池最大连接数，默认为 8 。使用负数表示没有限制    同一时间最大只能执行8条sql语句，每执行一条语句就会建立一个连接
#        max-idle: 4       # 默认连接数最大空闲的连接数，默认为 8 。使用负数表示没有限制。
#        min-idle: 0       # 默认连接池最小空闲的连接数，默认为 0 。允许设置 0 和 正数。
#        max-wait: -1

# MyBatis
mybatis:

 src/main/resources/logback.xml

@@ -1,14 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
    <!--应用名称-->
    <springProperty scope="context" name="APP_NAME" source="spring.application.name" defaultValue="springBoot"/>
    <!-- 日志存放路径 -->
    <property name="log.path" value="/www/javaProject/TroubleAndRisk/logs" />
    <property name="log.path" value="logs" />
    <!--日志文件保存路径-->
    <property name="LOG_FILE_PATH" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/logs}"/>
    <!-- 日志输出格式 -->
    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%C,%M,%L] - %msg%n" />

    <!-- 控制台输出 -->
    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
        <encoder>
        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
            <pattern>${log.pattern}</pattern>
            <charset>utf8</charset>
        </encoder>
    </appender>
    
@@ -16,14 +21,18 @@
    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${log.path}/sys-info.log</file>
        <!-- 循环政策：基于时间创建日志文件 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
            <!-- 日志文件名格式 -->
            <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
            <!-- 日志最大的历史 60天 -->
            <maxHistory>60</maxHistory>
            <fileNamePattern>${log.path}/${APP_NAME}-info-%d{yyyy-MM-dd}-%i.log</fileNamePattern>
            <totalSizeCap>30GB</totalSizeCap>
            <!--设置日志文件大小，超过就重新生成文件，默认50M-->
            <maxFileSize>100MB</maxFileSize>
            <!-- 日志最大的历史 30天 -->
            <maxHistory>30</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${log.pattern}</pattern>
            <charset>UTF-8</charset>
        </encoder>
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <!-- 过滤的级别 -->
@@ -38,14 +47,18 @@
    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${log.path}/sys-error.log</file>
        <!-- 循环政策：基于时间创建日志文件 -->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
            <!-- 日志文件名格式 -->
            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
            <!-- 日志最大的历史 60天 -->
            <maxHistory>60</maxHistory>
            <fileNamePattern>${log.path}/${APP_NAME}-error-%d{yyyy-MM-dd}-%i.log</fileNamePattern>
            <totalSizeCap>10GB</totalSizeCap>
            <!--设置日志文件大小，超过就重新生成文件，默认50M-->
            <maxFileSize>100MB</maxFileSize>
            <!-- 日志最大的历史 30天 -->
            <maxHistory>30</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${log.pattern}</pattern>
            <charset>UTF-8</charset>
        </encoder>
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <!-- 过滤的级别 -->
@@ -57,26 +70,14 @@
        </filter>
    </appender>
    
    <!-- 用户访问日志输出  -->
    <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${log.path}/sys-user.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!-- 按天回滚 daily -->
            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
            <!-- 日志最大的历史 60天 -->
            <maxHistory>60</maxHistory>
        </rollingPolicy>
        <encoder>
            <pattern>${log.pattern}</pattern>
        </encoder>
    </appender>
    
    <!-- 系统模块日志级别控制  -->
    <logger name="org.slf4j" level="INFO"/>
    <logger name="com.ruoyi" level="info" />
    <!-- Spring日志级别控制  -->
    <logger name="org.springframework" level="warn" />

    <root level="info">
    <root level="DEBUG">
        <appender-ref ref="console" />
    </root>
    
@@ -86,8 +87,5 @@
        <appender-ref ref="file_error" />
    </root>
    
    <!--系统用户操作日志-->
    <logger name="sys-user" level="info">
        <appender-ref ref="sys-user"/>
    </logger>

</configuration> 

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

@@ -35,7 +35,7 @@
    <select id="listReportTaskRecordDate" resultMap="BaseResultMap">

        select * from prevent_cj_report_check_record_from_task

        where report_status = 1

        limit 200

        limit 60
    </select>



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


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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -38,7 +38,7 @@
        where report_switch = 0 and (update_report_data_time > report_time or report_time is null) and mobile_code is not null
<!--        where report_switch = 0 and (update_report_data_time > report_time or report_time is null) and mobile_code is not null and job_id = 47-->
        order by update_report_data_time
        limit 10
        limit 3
    </select>



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

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

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

 src/test/ReportTest.java

对比新文件
@@ -0,0 +1,26 @@
import com.ruoyi.doublePrevention.scheduls.ExecCJReportDateSchedule;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;

import java.io.UnsupportedEncodingException;

@RunWith(SpringRunner.class)
@SpringBootTest(classes = SpringBootApplication.class)
//@ActiveProfiles("dev")
@Slf4j
public class ReportTest {
    @Autowired
    ExecCJReportDateSchedule execCJReportDateSchedule;

    @Test
    public void testPush() throws UnsupportedEncodingException {
        execCJReportDateSchedule.execReportDateSchedule();
    }

}