From db9d7e4ce7f5fea229bb512244c9d94cf31b6786 Mon Sep 17 00:00:00 2001
From: 换个名字嗨起来 <577530412@qq.com>
Date: Wed, 31 Jul 2024 13:21:45 +0800
Subject: [PATCH] 修改检索内容
---
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index 7266c9b..8525d71 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -108,7 +108,7 @@
@Transactional
// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
-// @Scheduled(cron = "0/30 * * * * ?") // 30秒
+// @Scheduled(cron = "0/10 * * * * ?") // 30秒
@Scheduled(cron = "0 0/25 * * * ? ") // 分钟
public void searchReportDate(){
@@ -373,8 +373,17 @@
CJTaskFromWork.setCheckCycleUnit("年");
}
//获取用户信息
- User createUser = trUserService.getUserByLoginName(jobById.getCreateBy());
- User updateUser = trUserService.getUserByLoginName(jobById.getUpdateBy());
+ User createUser = new User();
+ User updateUser = new User();
+ createUser = trUserService.getUserByLoginName(jobById.getCreateBy());
+ if(ObjectUtils.isEmpty(createUser)){
+ createUser = trUserService.getUserByName(jobById.getCreateBy());
+ }
+
+ updateUser = trUserService.getUserByLoginName(jobById.getUpdateBy());
+ if(ObjectUtils.isEmpty(updateUser)){
+ updateUser = trUserService.getUserByName(jobById.getUpdateBy());
+ }
//封装上报昌吉州任务配置数据
CJTaskFromWork.setId(work.getJobUuid());
@@ -453,6 +462,7 @@
List<Long> taskIds = new ArrayList<>();
//获取上报数据对象
List<PreventCJReportCheckRecordFromTask> CJRecordFromTaskLists = new ArrayList<>();
+ int tag = 0;
// HandlerReportParam handlerReportParam = new HandlerReportParam();
// List<HandlerReportParam> handlerReportParamList = new ArrayList<>();
if (ObjectUtils.isNotEmpty(tasks)){
@@ -593,6 +603,7 @@
// preventRiskDangerCheckLogService.updateTaskReportStatus(handlerReportParam);
int i = 1;
taskIds.add(task.getId());
+ tag ++;
}
System.out.println("【##】5.数据封装完成...");
@@ -605,7 +616,7 @@
logger.info("【双重预防】排查任务记录CJ：数据处理...");
//设置原始数据状态
int taskUpdateResult = preventRiskDangerCheckLogService.updateTaskReportStatusByList(taskIds);
- if (taskUpdateResult < tasks.size()){
+ if (taskUpdateResult < taskIds.size()){
throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录原始数据更新失败, 取消操作");
}
int result = CJTaskRecordService.insertRecordList(CJRecordFromTaskLists);
@@ -708,6 +719,7 @@
CJDangerInfo.setUpdateBy(updateUser.getUserName());
CJDangerInfo.setUpdateDate(hiddenDanger.getUpdateTime());
}
+ // todo 2024-07-01 需要检查
CJDangerInfo.setHazardCategory("0");
if (dangerManage.getId() <= 383){
PreventTaskType taskTypeInfo = taskTypeService.getInfoByTaskId(dangerManage.getId());
--
Gitblit v1.9.2