src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -740,6 +740,9 @@ } //找排查点，然后查措施 if (hiddenDanger.getCheckPointId() == null){ CJDangerInfo.setRiskMeasureId( null); }else { PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId()); if (null != unit){ //查管控措施 @@ -754,7 +757,7 @@ }else { CJDangerInfo.setRiskMeasureId(null); } } }else { CJDangerInfo.setCheckRecordId(null); CJDangerInfo.setRiskMeasureId(null); src/main/java/com/ruoyi/project/tr/specialCheck/scheduleLogTask/DealDataTask.java
@@ -1,5 +1,8 @@ package com.ruoyi.project.tr.specialCheck.scheduleLogTask; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem; import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemLog; import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog; import com.ruoyi.project.tr.specialCheck.mapper.TbBaseCheckItemMapper; import com.ruoyi.project.tr.specialCheck.mapper.TbSpecialCheckItemLogMapper; @@ -18,7 +21,7 @@ * 每年拉取完检查项需要生成对应的专项任务数据 */ public static final String TASK_ID = "a8de03f0-4c3e-43fe-a139-0e4ed34edd35"; public static final String TASK_ID = "47da41f5-c747-4bd3-b4ab-d4d496e31e93"; @Autowired @@ -40,8 +43,9 @@ tbSpecialCheckTaskLog.setIndexId(null); tbSpecialCheckTaskLog.setId(UUID.randomUUID().toString()); tbSpecialCheckTaskLog.setReportStatus((byte) 1); tbSpecialCheckTaskLog.setZhunReportStatus((byte) 1); //1为企业自查 2是市级及以下 tbSpecialCheckTaskLog.setCheckType("2"); tbSpecialCheckTaskLog.setCheckType(tbSpecialCheckTaskLog.getCheckType()); tbSpecialCheckTaskLog.setCreateDate(LocalDateTime.now()); tbSpecialCheckTaskLog.setUpdateDate(LocalDateTime.now()); taskSpecialLogMapper.save(tbSpecialCheckTaskLog); @@ -50,28 +54,30 @@ } // //任务item // // List<TbBaseCheckItem> tbBaseCheckItems = baseCheckItemMapper.listBaseCheckItemBytaskId(TASK_ID); // if (ObjectUtils.isNotEmpty(tbBaseCheckItems)){ // for (TbBaseCheckItem tbBaseCheckItem : tbBaseCheckItems) { // TbSpecialCheckItemLog tbSpecialCheckItemLog = new TbSpecialCheckItemLog(); // tbSpecialCheckItemLog.setId(UUID.randomUUID().toString()); // tbSpecialCheckItemLog.setCompanyCode("652310082"); // tbSpecialCheckItemLog.setTaskId(TASK_ID); // tbSpecialCheckItemLog.setCheckItemId(tbBaseCheckItem.getId()); // tbSpecialCheckItemLog.setCheckName(tbBaseCheckItem.getCheckName()); // tbSpecialCheckItemLog.setCheckContent(tbBaseCheckItem.getCheckContent()); // tbSpecialCheckItemLog.setCheckWay(tbBaseCheckItem.getCheckWay()); // tbSpecialCheckItemLog.setCheckBasis(tbBaseCheckItem.getCheckBasis()); // tbSpecialCheckItemLog.setApplicablePlace(tbBaseCheckItem.getApplicablePlace()); // tbSpecialCheckItemLog.setCreateBy("李康"); // tbSpecialCheckItemLog.setCreateDate(tbBaseCheckItem.getCreateDate()); // tbSpecialCheckItemLog.setUpdateBy("李康"); // tbSpecialCheckItemLog.setUpdateDate(tbBaseCheckItem.getUpdateDate()); // itemLogMapper.save(tbSpecialCheckItemLog); // } // } //任务item List<TbBaseCheckItem> tbBaseCheckItems = baseCheckItemMapper.listBaseCheckItemBytaskId(TASK_ID); if (ObjectUtils.isNotEmpty(tbBaseCheckItems)){ for (TbBaseCheckItem tbBaseCheckItem : tbBaseCheckItems) { TbSpecialCheckItemLog tbSpecialCheckItemLog = new TbSpecialCheckItemLog(); tbSpecialCheckItemLog.setId(UUID.randomUUID().toString()); tbSpecialCheckItemLog.setCompanyCode("652310082"); tbSpecialCheckItemLog.setTaskId(TASK_ID); tbSpecialCheckItemLog.setCheckItemId(tbBaseCheckItem.getId()); tbSpecialCheckItemLog.setCheckName(tbBaseCheckItem.getCheckName()); tbSpecialCheckItemLog.setCheckContent(tbBaseCheckItem.getCheckContent()); tbSpecialCheckItemLog.setCheckWay(tbBaseCheckItem.getCheckWay()); tbSpecialCheckItemLog.setCheckBasis(tbBaseCheckItem.getCheckBasis()); tbSpecialCheckItemLog.setApplicablePlace(tbBaseCheckItem.getApplicablePlace()); tbSpecialCheckItemLog.setCreateBy("李康"); tbSpecialCheckItemLog.setCreateDate(tbBaseCheckItem.getCreateDate()); tbSpecialCheckItemLog.setUpdateBy("李康"); tbSpecialCheckItemLog.setDeleted((byte) 0); tbSpecialCheckItemLog.setReportStatus((byte)1); tbSpecialCheckItemLog.setUpdateDate(tbBaseCheckItem.getUpdateDate()); itemLogMapper.save(tbSpecialCheckItemLog); } }
@@ -31,6 +31,8 @@ import java.time.format.DateTimeFormatter; import java.util.*; import static com.ruoyi.common.utils.Threads.sleep; @Component public class SpecialCheckTaskDownload { @@ -78,6 +80,7 @@ } return sr; } public static String decrypt(String encryptedText, byte[] key, byte[] iv) { String sr; try { @@ -96,7 +99,7 @@ } @Transactional // @Transactional // @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次0 0 22,23 * * ? // @Scheduled(cron = "0 0 22,23 * * ?") //每天晚上22、23点执行一次 // @Scheduled(cron = "0 0/1 * * * ? ") // 分钟 @@ -128,11 +131,14 @@ //String taskId = "84766708-9b18-4133-8acf-08aba67792c7"; String taskId = "a8de03f0-4c3e-43fe-a139-0e4ed34edd35"; String taskId = "47da41f5-c747-4bd3-b4ab-d4d496e31e93"; int count = 0; /** * 1 * */ // logger.info("【####】拉取专项任务数据开始..."); logger.info("【####】拉取专项任务数据开始..."); TbCheckConfig specialCheckConfig = configMapper.getSpecialCheckConfig(); if (specialCheckConfig.getStatus() == 2){ @@ -292,7 +298,7 @@ item.setId(item.getCheckItemId()); int insert = itemTbRepository.insertBatch(item); } count = tbBaseCheckItems.size(); } } @@ -309,11 +315,20 @@ * */ logger.info("【####】拉取评分细则开始..."); if (specialCheckConfig.getStatus() == 2){ if (count <= 0) { logger.info("【拉取评分细则开始】-无检查项数据"); return; } for (int i = 0; i < count + 20; i++) { StringBuffer specialCheckBuffer = null; ScoreDownloadRespDTO scoreDownloadRespDTO = new ScoreDownloadRespDTO(); TbBaseCheckItem baseItemByStatus = itemTbRepository.getBaseItemByStatus(date); ScoreDownloadRespDTO scoreDownloadRespDTO = new ScoreDownloadRespDTO(); Page page = new Page(); page.setCurrent(String.valueOf(1)); page.setSize(String.valueOf(1000)); @@ -387,12 +402,16 @@ } } } itemTbRepository.updateStatusById(baseItemByStatus.getId()); logger.info("【评分细则】-读取结果：" + scoreDownloadRespBO.getCode()); System.out.println("【评分细则】-读取完成"); sleep(6000); } }else { System.out.println("【评分细则】- 不读取"); } src/main/resources/mybatis/tr/TbSpecialCheckTaskLogMapper.xml
@@ -163,7 +163,7 @@ <select id="listTestReportTaskTest" resultMap="BaseResultMap"> select * from tb_special_check_task_log where deleted = 0 and create_date >= '2024-01-01 00:00:00' and create_date <= '2024-06-16 23:59:59' where deleted = 0 and create_date >= '2025-01-01 00:00:00' and create_date <= '2025-08-16 23:59:59' </select>
@@ -1,9 +1,10 @@ import com.ruoyi.doublePrevention.scheduls.ExecCJReportDateSchedule; import com.ruoyi.RuoYiApplication; import com.ruoyi.project.tr.specialCheck.scheduleLogTask.DealDataTask; import com.ruoyi.project.tr.specialCheck.scheduleLogTask.SpecialCheckTaskDownload; 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; @@ -11,16 +12,30 @@ import java.io.UnsupportedEncodingException; @RunWith(SpringRunner.class) @SpringBootTest(classes = SpringBootApplication.class) //@ActiveProfiles("dev") @SpringBootTest(classes = RuoYiApplication.class) @ActiveProfiles("dev") @Slf4j public class ReportTest { @Autowired ExecCJReportDateSchedule execCJReportDateSchedule; SpecialCheckTaskDownload specialCheckTaskDownload; @Autowired private DealDataTask dealDataTask; //第一步每年拉取数据处理 @Test public void testPush() throws UnsupportedEncodingException { execCJReportDateSchedule.execReportDateSchedule(); specialCheckTaskDownload.execReportDateSchedule(); } //第二部处理拉取数据 @Test public void testPushV2() throws UnsupportedEncodingException { dealDataTask.dealData(); } }
