From 234d5e479fa1938566c80ff00f0cc63514871090 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 22 五月 2023 14:38:28 +0800
Subject: [PATCH] 上报部分数据修改，每天晚上23时上报数据
---
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckAndMeasureRepository.java | 4 ++
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 29 +++++++++-----
src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckAndMeasureMapper.xml | 5 ++
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java | 1
src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java | 2
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java | 2 +
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java | 1
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckAndMeasureServiceImpl.java | 7 +++
src/main/resources/mybatis/doublePrevention/PreventRiskJobAndMeasureMapper.xml | 3 +
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckTaskFromWorkService.java | 2 +
src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml | 7 ++-
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckAndMeasureService.java | 4 ++
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java | 2 +
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckTaskFromWorkServiceImpl.java | 5 ++
14 files changed, 61 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java
index 80d512f..704e156 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java
@@ -37,4 +37,6 @@
* 插入数据
* */
int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork cjTaskFromWork);
+
+ PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckAndMeasureRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckAndMeasureRepository.java
index 9e9e384..49a60a5 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckAndMeasureRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckAndMeasureRepository.java
@@ -3,6 +3,8 @@
import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
@Repository
public interface PreventRiskDangerCheckAndMeasureRepository {
@@ -10,4 +12,6 @@
* 写入核查任务检查点与管控措施信息
* */
int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure);
+
+ List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java
index 23902a8..590a739 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java
@@ -36,4 +36,5 @@
* 修改上报状态
*/
int updateWorkReportStatus(HandlerReportParam handlerReportParam);
+
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
index d1dda69..9c3a37c 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
@@ -87,7 +87,7 @@
@Transactional
-// @Scheduled(cron = "0 0/1 * * * ?")
+ @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次
//@Scheduled(cron = "0/30 * * * * ?")
public void execReportDateSchedule() throws UnsupportedEncodingException {
logger.info("【####】上报数据开始...");
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index c6aaeff..cf8cd8b 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -92,7 +92,8 @@
@Autowired
private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表
-
+ @Autowired
+ private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表
@Transactional
@@ -342,7 +343,7 @@
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("小时");
@@ -432,11 +433,7 @@
HiddenDangerCheck hiddenDangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(task.getCheckId());
//获取任务附属表信息
PreventRiskJobAndMeasure jobAndMeasureByJobId = preventRiskJobAndMeasureService.getJobAndMeasureByJobId(task.getJobId());
- //获取上报数据对象
- PreventCJReportCheckRecordFromTask CJRecordFromTask = new PreventCJReportCheckRecordFromTask();
//转换检查结果
-
-
/**
* examineUserName，checkTime 任务执行后，不为空 不使用;
* tr_hidden_danger_check 的 scheduleCheckStatus 0 未排查， 1已排查
@@ -462,7 +459,8 @@
logger.info("【双重预防】排查任务记录CJ：异常，无检查点...");
}else {
for (HiddenDangerCheckPoint hiddenDangerCheckPoint : hiddenDangerCheckPointList) {
-
+ //获取上报数据对象
+ PreventCJReportCheckRecordFromTask CJRecordFromTask = new PreventCJReportCheckRecordFromTask();
CJRecordFromTask.setCheckStatus("0");// 0-正常；1-存在隐患；2-未处理；3-其他
if (Integer.valueOf(hiddenDangerCheckPoint.getWhetherDanger()) == 1){
CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他
@@ -471,8 +469,9 @@
User createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy());
User updateUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getUpdateBy());
- //封装上报昌吉州的任务数据
- CJRecordFromTask.setId(task.getUuid());
+ //封装上报昌吉州的任务数据 todo taskUUid
+// String taskUuid = UUID.randomUUID().toString();
+ CJRecordFromTask.setId(UUID.randomUUID().toString());
CJRecordFromTask.setCompanyCode(companyCode);
CJRecordFromTask.setCreateBy(createUser.getUserName());
CJRecordFromTask.setCreateDate(hiddenDangerCheckById.getCreateTime());
@@ -495,7 +494,17 @@
CJRecordFromTask.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
CJRecordFromTask.setReportTime(null);
CJRecordFromTask.setDataSource((byte) 1);
- CJRecordFromTask.setCheckTaskId(jobAndMeasureByJobId.getJobUuid());
+ List<PreventRiskDangerCheckAndMeasure> baseCheckPointAndMeasure = riskDangerCheckAndMeasureService.getByBaseCheckPointId(hiddenDangerCheckPoint.getCheckPointId());
+ //获取该条记录对应的管控措施id，
+ Long controlMeasureId = 1L;
+ for (PreventRiskDangerCheckAndMeasure checkAndMeasure : baseCheckPointAndMeasure) {
+ controlMeasureId = checkAndMeasure.getControlMeasureId();
+ }
+ //获取该条记录对应的管控措施uuid
+ PreventRiskControlMeasure preventRiskControlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(controlMeasureId);
+ //通过管控措施uuid ，jobId(workId)，在任务上报表中，找到任务对应的uuid
+ PreventCJReportCheckTaskFromWork preventCJReportCheckTaskFromWork = CJTaskFromWorkService.geByMeasureUUidAndJobId(preventRiskControlMeasureById.getUuid(), task.getJobId());
+ CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());
CJRecordFromTask.setCheckTime(hiddenDangerCheckById.getCheckTime());
CJRecordFromTask.setTaskId(task.getCheckId());
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckTaskFromWorkService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckTaskFromWorkService.java
index e0d912a..09b7dcc 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckTaskFromWorkService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckTaskFromWorkService.java
@@ -29,4 +29,6 @@
* 任务配置 -待上报状态变更 -通过id
* */
void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+
+ PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String uuid, Long jobId);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckAndMeasureService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckAndMeasureService.java
index a28451a..f14221b 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckAndMeasureService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckAndMeasureService.java
@@ -2,10 +2,14 @@
import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure;
+import java.util.List;
+
public interface PreventRiskDangerCheckAndMeasureService {
/**
* 写入核查任务检查点与管控措施信息
* */
int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure);
+
+ List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId);
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java
index 4061cbe..76b4c10 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java
@@ -33,4 +33,5 @@
* 修改上报状态
*/
int updateWorkReportStatus(HandlerReportParam handlerReportParam);
+
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckTaskFromWorkServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckTaskFromWorkServiceImpl.java
index efdb397..b4aa284 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckTaskFromWorkServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckTaskFromWorkServiceImpl.java
@@ -68,4 +68,9 @@
throw new AusinessException(E.ADD_FAIL.getCode(), "任务-配置 状态变更失败");
}
}
+
+ @Override
+ public PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId) {
+ return preventCJReportCheckTaskFromWorkRepository.geByMeasureUUidAndJobId(measureUuid, jobId);
+ }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckAndMeasureServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckAndMeasureServiceImpl.java
index d4c27b3..e24c0bf 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckAndMeasureServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckAndMeasureServiceImpl.java
@@ -6,6 +6,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Service("PreventRiskDangerCheckAndMeasureService")
public class PreventRiskDangerCheckAndMeasureServiceImpl implements PreventRiskDangerCheckAndMeasureService {
@@ -19,4 +21,9 @@
public int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure) {
return preventRiskDangerCheckAndMeasureRepository.insertCheckAndMeasure(checkAndMeasure);
}
+
+ @Override
+ public List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId) {
+ return preventRiskDangerCheckAndMeasureRepository.getByBaseCheckPointId(checkPointId);
+ }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
index 8466f3f..2e8a1af 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
@@ -67,4 +67,6 @@
}
return result;
}
+
+
}
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
index b781f56..a6abcb8 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
@@ -57,8 +57,11 @@
, #{reportStatus}, #{reportTime}, #{dataSource}, #{workId})
</insert>
-
-
+<!-- PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId);-->
+ <select id="geByMeasureUUidAndJobId" resultMap="BaseResultMap">
+ select * from prevent_cj_report_check_task_from_work
+ where work_id = #{jobId} and risk_measure_id = #{measureUuid}
+ </select>
<!-- int insertList(taskFromWorkLists);-->
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckAndMeasureMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckAndMeasureMapper.xml
index 3d5ef95..a3a513f 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckAndMeasureMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckAndMeasureMapper.xml
@@ -18,4 +18,9 @@
(null, #{checkId}, #{dangerCheckPointId}, #{baseCheckPointId}, #{controlMeasureId}, #{checkContent}, #{checkResult})
</insert>
+<!-- List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId);-->
+ <select id="getByBaseCheckPointId" resultMap="BaseResultMap">
+ select * from prevent_risk_danger_check_and_measure
+ where base_check_point_id = #{checkPointId}
+ </select>
</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskJobAndMeasureMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskJobAndMeasureMapper.xml
index 644229e..4a80302 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskJobAndMeasureMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskJobAndMeasureMapper.xml
@@ -54,5 +54,8 @@
report_time = #{reportTime}
where id = #{id}
</update>
+<!-- PreventRiskJobAndMeasure geByMeasureUUidAndJobId(String measureUuid, Long jobId);-->
+
</mapper>
+
--
Gitblit v1.9.2