From 28f6c716269ce5435b103137dd7ec1f1f9ab19ba Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 26 六月 2023 09:16:56 +0800
Subject: [PATCH] 临时提交-已经与app端对接完成
---
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index 04bab21..722b5a4 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -24,9 +24,12 @@
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.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -37,6 +40,8 @@
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");
@Autowired
private PreventReportConfigService preventReportConfigService;
@@ -98,9 +103,9 @@
private PreventTaskTypeService taskTypeService;//管控措施，任务清单对应关系。基础排查点附属表
@Autowired
- private PreventOverhaulLogService overhaulLogService;//隐患信息附属表
+ private PreventOverhaulLogService overhaulLogService;
@Autowired
- private PreventCJReportOverhaulLogService reportOverhaulLogService;//隐患信息附属表
+ private PreventCJReportOverhaulLogService reportOverhaulLogService;
@Transactional
@@ -394,6 +399,25 @@
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());
+ if (jobById.getTroubleshootTypeCycleType() == 1){
+ Date date = new Date();
+ CJTaskFromWork.setWorkStartTime(new Date(startFormat.format(date)));//todo 这个时间如何确定？
+ CJTaskFromWork.setWorkEndTime(new Date(endFormat.format(date)));
+ }
+ 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));
+ CJTaskFromWork.setTaskNum("1");
+
//封装数据
CJTaskFromWorkLists.add(CJTaskFromWork);
//设置原始数据上报状态
@@ -401,7 +425,6 @@
handlerReportParam.setReportTime(new Date());
handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
preventRiskJobAndMeasureService.updateWorkReportStatus(handlerReportParam);
-
}
}else {
logger.info("【双重预防】当前无任务配置数据需要处理");
@@ -448,7 +471,6 @@
* 1.找到每个点的提交接口，进行数据处理
* 2.写一个定时任务处理（备用）
* */
-
/**
* todo 排查后的任务才上报
* examineUserName，checkTime 任务执行后，不为空 不使用;
@@ -470,7 +492,7 @@
PreventCJReportCheckRecordFromTask CJRecordFromTask = new PreventCJReportCheckRecordFromTask();
CJRecordFromTask.setCheckStatus("0");// 0-正常；1-存在隐患；2-未处理；3-其他
if (Integer.valueOf(hiddenDangerCheckPoint.getWhetherDanger()) == 1){
- CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他
+ CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他
}
User createUser = new User();
createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy());
@@ -517,19 +539,26 @@
CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());
CJRecordFromTask.setCheckTime(hiddenDangerCheckById.getCheckTime());
CJRecordFromTask.setTaskId(task.getCheckId());
+ //第二版标准新增
+ CJRecordFromTask.setMobileCode(task.getMobileCode().toString());
+ List<PreventTaskType> typeByJobIds = taskTypeService.getInfoByJobId(jobAndMeasureByJobId.getJobId());
+ int typeTag = 0;
+ for (PreventTaskType typeByJobId : typeByJobIds) {
+ if (typeByJobId.getType()!= 0) {
+ typeTag = 1;
+ }
+ }
+ CJRecordFromTask.setDefend(String.valueOf(typeTag));
//封装数据
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() )){
@@ -652,7 +681,6 @@
int i = 1;
CJDangerInfo.setHazardCategory(taskTypeInfo.getType().toString());
}
-
CJDangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
CJDangerInfo.setReportTime(null);
CJDangerInfo.setDataSource((byte) 1);
@@ -675,9 +703,7 @@
handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
//修改隐患信息附属表状态
preventRiskDangerInfoService.updateDangerInfoReportStatus(handlerReportParam);
-
}
-
}else {
logger.info("【双重预防】当前无隐患信息需要处理");
}
--
Gitblit v1.9.2