From bd0f24fb70621ea26dc6fd4c41b391620ab583dd Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 24 四月 2025 15:02:27 +0800
Subject: [PATCH] 焦化溯源时间修改
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
index 5231e90..8eddebf 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
@@ -18,7 +18,6 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.*;
@@ -100,30 +99,40 @@
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.MILLISECOND, 0);
calendar.set(Calendar.SECOND, 0);
- calendar.set(Calendar.MINUTE,0);
- calendar.add(Calendar.DAY_OF_YEAR, -1);
- String yesterday = DateUtils.format(calendar.getTime(), DateUtils.FORMAT_YEAR_MONTH_DAY);
+ calendar.set(Calendar.MINUTE, 0);
int hour = calendar.get(Calendar.HOUR_OF_DAY);
Date startDate = calendar.getTime();
- calendar.add(Calendar.HOUR, 8);
Date endDate = calendar.getTime();
String clock = "";
String analyClass = "";
- if (hour == 0) {
- clock = yesterday.concat("-").concat("A");
+ if (hour >= 8 && hour < 16) {
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ startDate = calendar.getTime();
+ calendar.add(Calendar.HOUR_OF_DAY, 8);
+ endDate = calendar.getTime();
+ clock = DateUtils.format(startDate).concat("-").concat("A");
analyClass = "甲班";
- } else if (hour == 8) {
- clock = yesterday.concat("-").concat("B");
+ } else if (hour >= 16 && hour < 24) {
+ calendar.set(Calendar.HOUR_OF_DAY, 8);
+ startDate = calendar.getTime();
+ calendar.add(Calendar.HOUR_OF_DAY, 8);
+ endDate = calendar.getTime();
+ clock = DateUtils.format(startDate).concat("-").concat("B");
analyClass = "乙班";
- } else if (hour == 16) {
- clock = yesterday.concat("-").concat("C");
+ } else if (hour >= 0 && hour < 8) {
+ calendar.add(Calendar.DAY_OF_YEAR, -1);
+ calendar.set(Calendar.HOUR_OF_DAY, 16);
+ startDate = calendar.getTime();
+ calendar.add(Calendar.HOUR_OF_DAY, 8);
+ endDate = calendar.getTime();
+ clock = DateUtils.format(startDate).concat("-").concat("B");
analyClass = "丙班";
}
Map<String, Object> tMap = new HashMap<>();
tMap.put("relId", UUID.randomUUID().toString());
tMap.put("process", "化产工序");
tMap.put("reportName", "化产工序");
- tMap.put("analyDate", yesterday);
+ tMap.put("analyDate", DateUtils.format(startDate));
tMap.put("analyClass", analyClass);
tMap.put("clock", clock);
tMap.put("analyContent", "化产蒸汽消耗量异常");
--
Gitblit v1.9.3