From 52a562adab33da97f7f7f4f6123fa61689255229 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 21 四月 2025 09:40:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java | 64 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 25 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 38e55b2..f7e499b 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,33 +1,25 @@
package com.iailab.module.ansteel.job.task;
import com.iailab.framework.common.util.date.DateUtils;
-import com.iailab.module.ansteel.api.entity.CokingProcessConfEntity;
-import com.iailab.module.ansteel.api.entity.CokingProdDayEntity;
-import com.iailab.module.ansteel.api.service.CokingProcessConfService;
-import com.iailab.module.ansteel.api.service.CokingProdDayService;
+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;
import com.iailab.module.ansteel.common.enums.ProcessConfDataTypeEnum;
import com.iailab.module.data.api.ind.IndItemApi;
import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
import com.iailab.module.data.api.point.DataPointApi;
-import com.iailab.module.model.api.mcs.McsApi;
-import com.iailab.module.model.api.mcs.dto.StScheduleSchemeDTO;
-import com.iailab.module.model.api.mdk.MdkApi;
-import com.iailab.module.model.api.mdk.dto.MdkScheduleReqDTO;
-import com.iailab.module.model.api.mdk.dto.MdkScheduleRespDTO;
-import com.iailab.module.model.enums.ScheduleTriggerMethodEnum;
-import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.*;
-import java.util.stream.Collectors;
/**
* 生成焦化日前生产信息
@@ -49,6 +41,9 @@
private CokingProdDayService cokingProdDayService;
@Resource
+ private CokingTraceIndService cokingTraceIndService;
+
+ @Resource
private DataPointApi dataPointApi;
@Resource
@@ -58,10 +53,6 @@
public void run(String params) {
logger.info("RunCokingProdDayTask，参数为：{}", params);
try {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
-
CokingProcessConfEntity queryParams = new CokingProcessConfEntity();
queryParams.setIndType("prod_day");
List<CokingProcessConfEntity> list = cokingProcessConfService.list(queryParams);
@@ -70,11 +61,20 @@
return;
}
- Calendar calendar1 = Calendar.getInstance();
- calendar1.set(Calendar.MILLISECOND, 0);
- calendar1.set(Calendar.SECOND, 0);
- calendar1.add(Calendar.DAY_OF_YEAR, -1);
- String clock = DateUtils.format(calendar1.getTime(), DateUtils.FORMAT_YEAR_MONTH_DAY);
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.MILLISECOND, 0);
+ 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,11 +100,15 @@
value = indValues.get(indValues.size() - 1).getDataValue().toString();
}
break;
+ case MODEL:
+ value = "100";
+ break;
default:
break;
}
- this.saveProdDay(conf, value, clock);
+ saveProdDay(conf, value, clock);
+ saveTraceInd(conf, value, clock2);
}
} catch (Exception ex) {
logger.error("RunCokingProdDayTask运行异常");
@@ -114,6 +118,16 @@
}
+ 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) {
CokingProdDayEntity cokingProdDayEntity = new CokingProdDayEntity();
cokingProdDayEntity.setInfoType(conf.getInfoType());
--
Gitblit v1.9.3