From 5c92309910361bb197208ffdd95fd84e531b624a Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 22 四月 2025 16:59:06 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/ansteel
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingChildDayTask.java | 51 ++++++++++++++++++++++++---------------------------
1 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingChildDayTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingChildDayTask.java
index 606930d..e558a04 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingChildDayTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingChildDayTask.java
@@ -1,10 +1,11 @@
package com.iailab.module.ansteel.job.task;
-import com.iailab.module.ansteel.api.entity.CokingProcessConfEntity;
-import com.iailab.module.ansteel.api.entity.CokingProcessChildEntity;
-import com.iailab.module.ansteel.api.service.CokingProcessChildService;
-import com.iailab.module.ansteel.api.service.CokingProcessConfService;
-import com.iailab.module.ansteel.api.service.CokingProcessMainService;
+import com.iailab.framework.common.util.date.DateUtils;
+import com.iailab.module.ansteel.coking.entity.CokingProcessConfEntity;
+import com.iailab.module.ansteel.coking.entity.CokingProcessChildEntity;
+import com.iailab.module.ansteel.coking.service.CokingProcessChildService;
+import com.iailab.module.ansteel.coking.service.CokingProcessConfService;
+import com.iailab.module.ansteel.common.enums.ProcessIndDataTypeEnum;
import com.iailab.module.data.api.point.DataPointApi;
import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger;
@@ -12,8 +13,6 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
@@ -44,6 +43,8 @@
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);
CokingProcessConfEntity queryParams = new CokingProcessConfEntity();
queryParams.setIndType("child");
List<CokingProcessConfEntity> list = cokingProcessConfService.list(queryParams);
@@ -69,40 +70,36 @@
(a, b) -> a,
LinkedHashMap::new))));
- // 获取当前日期时间
- LocalDateTime now = LocalDateTime.now();
- // 减去一天得到昨天同一时间
- LocalDateTime yesterday = now.minusDays(1);
- // 格式化输出
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- String formattedDateTime = yesterday.format(formatter);
+ logger.info("清理旧数据");
+ cokingProcessChildService.deleteByClock(clock);
+
AtomicReference<Integer> counter = new AtomicReference<>(1);
groupMap.forEach((group, confList) -> {
CokingProcessChildEntity cokingProcessChildEntity = new CokingProcessChildEntity();
cokingProcessChildEntity.setInfoType("0");
cokingProcessChildEntity.setSort(counter.getAndSet(counter.get() + 1));
cokingProcessChildEntity.setCategory("day");
- cokingProcessChildEntity.setIndName(group);
- cokingProcessChildEntity.setClock(formattedDateTime);
- CokingProcessConfEntity conf = confList.get(0);
- cokingProcessChildEntity.setIndType(conf.getExt2());
- cokingProcessChildEntity.setIndMain(conf.getExt1().replace(conf.getExt2(), ""));
- confList.forEach(cokingProcessConfEntity -> {
+ cokingProcessChildEntity.setClock(clock);
+ CokingProcessConfEntity childConf = confList.get(0);
+ cokingProcessChildEntity.setIndType(childConf.getExt3());
+ cokingProcessChildEntity.setIndMain(childConf.getExt4());
+ cokingProcessChildEntity.setIndName(childConf.getExt5());
+ confList.forEach(conf -> {
List<String> points = new ArrayList<>();
- points.add(cokingProcessConfEntity.getPointNo());
+ points.add(conf.getPointNo());
Map<String, Object> stringObjectMap = dataPointApi.queryPointsRealValue(points);
//保存数据
- Object value = stringObjectMap.get(cokingProcessConfEntity.getPointNo());
+ Object value = stringObjectMap.get(conf.getPointNo());
if(ObjectUtils.isNotEmpty(value)) {
- if(cokingProcessConfEntity.getIndCode().endsWith("LSPJ")) {
+ if(conf.getExt2().equals(ProcessIndDataTypeEnum.LSPJ.getCode())) {
cokingProcessChildEntity.setAvgValue(value.toString());
- } else if(cokingProcessConfEntity.getIndCode().endsWith("LLZ")) {
+ } else if(conf.getExt2().equals(ProcessIndDataTypeEnum.LLZ.getCode())) {
cokingProcessChildEntity.setTheoryValue(value.toString());
- } else if(cokingProcessConfEntity.getIndCode().endsWith("SJZ")) {
+ } else if(conf.getExt2().equals(ProcessIndDataTypeEnum.SJZ.getCode())) {
cokingProcessChildEntity.setActualValue(value.toString());
- } else if(cokingProcessConfEntity.getIndCode().endsWith("JZZ")) {
+ } else if(conf.getExt2().equals(ProcessIndDataTypeEnum.JZZ.getCode())) {
cokingProcessChildEntity.setStandValue(value.toString());
- } else if(cokingProcessConfEntity.getIndCode().endsWith("SSSJ")) {
+ } else if(conf.getExt2().equals(ProcessIndDataTypeEnum.SSSJ.getCode())) {
cokingProcessChildEntity.setRealValue(value.toString());
}
}
--
Gitblit v1.9.3