From a6d6489c0477a9dfb8cd10cfea9004ebe4bdb66e Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 21 四月 2025 17:43:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java | 30 ++++--------------------------
1 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java
index f7e499b..5be926e 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java
@@ -1,10 +1,8 @@
package com.iailab.module.ansteel.job.task;
import com.iailab.framework.common.util.date.DateUtils;
-import com.iailab.module.ansteel.coking.entity.CokingAnalyIndEntity;
import com.iailab.module.ansteel.coking.entity.CokingProcessConfEntity;
import com.iailab.module.ansteel.coking.entity.CokingProdDayEntity;
-import com.iailab.module.ansteel.coking.entity.CokingTraceIndEntity;
import com.iailab.module.ansteel.coking.service.CokingProcessConfService;
import com.iailab.module.ansteel.coking.service.CokingProdDayService;
import com.iailab.module.ansteel.coking.service.CokingTraceIndService;
@@ -19,7 +17,10 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
/**
* 生成焦化日前生产信息
@@ -66,15 +67,6 @@
calendar.set(Calendar.SECOND, 0);
calendar.add(Calendar.DAY_OF_YEAR, -1);
String clock = DateUtils.format(calendar.getTime(), DateUtils.FORMAT_YEAR_MONTH_DAY);
- String clock2 = "";
- int hour = calendar.get(Calendar.HOUR_OF_DAY);
- if (hour == 0) {
- clock2 = clock.concat("-").concat("A");
- } else if (hour == 8) {
- clock2 = clock.concat("-").concat("B");
- } else if (hour == 16) {
- clock2 = clock.concat("-").concat("C");
- }
logger.info("清理旧数据");
cokingProdDayService.deleteByClock(clock);
for (CokingProcessConfEntity conf : list) {
@@ -100,15 +92,11 @@
value = indValues.get(indValues.size() - 1).getDataValue().toString();
}
break;
- case MODEL:
- value = "100";
- break;
default:
break;
}
saveProdDay(conf, value, clock);
- saveTraceInd(conf, value, clock2);
}
} catch (Exception ex) {
logger.error("RunCokingProdDayTask运行异常");
@@ -116,16 +104,6 @@
}
logger.info("RunCokingProdDayTask运行完成");
- }
-
- private void saveTraceInd(CokingProcessConfEntity conf, String value, String clock) {
- CokingTraceIndEntity cokingTraceIndEntity = new CokingTraceIndEntity();
- cokingTraceIndEntity.setTitle(conf.getIndType());
- cokingTraceIndEntity.setClock(clock);
- cokingTraceIndEntity.setIndName(conf.getIndName());
- cokingTraceIndEntity.setIndValue(value);
- cokingTraceIndEntity.setIndUnit(conf.getIndUnit());
- cokingTraceIndService.save(cokingTraceIndEntity);
}
private void saveProdDay(CokingProcessConfEntity conf, String value, String clock) {
--
Gitblit v1.9.3