From 0b62b61eaba22186417e8171c86ecf6e20d1def1 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 21 四月 2025 17:49:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java | 44 ++++++++++++++++++--------------------------
1 files changed, 18 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 38e55b2..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,33 +1,26 @@
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.CokingProcessConfEntity;
+import com.iailab.module.ansteel.coking.entity.CokingProdDayEntity;
+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;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
/**
* 生成焦化日前生产信息
@@ -49,6 +42,9 @@
private CokingProdDayService cokingProdDayService;
@Resource
+ private CokingTraceIndService cokingTraceIndService;
+
+ @Resource
private DataPointApi dataPointApi;
@Resource
@@ -58,10 +54,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 +62,11 @@
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);
logger.info("清理旧数据");
cokingProdDayService.deleteByClock(clock);
for (CokingProcessConfEntity conf : list) {
@@ -104,7 +96,7 @@
break;
}
- this.saveProdDay(conf, value, clock);
+ saveProdDay(conf, value, clock);
}
} catch (Exception ex) {
logger.error("RunCokingProdDayTask运行异常");
--
Gitblit v1.9.3