From c039efe0d95c02dd7adcd24d330c1a0ffb61bd21 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 21 五月 2025 13:55:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 5b01289..d2a0878 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
@@ -11,6 +11,8 @@
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.data.api.point.dto.ApiPointValueDTO;
+import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -81,10 +83,16 @@
String value = "";
switch (ProcessConfDataTypeEnum.getEumByCode(conf.getDataType())) {
case DATAPOINT:
- List<String> points = new ArrayList<>();
- points.add(conf.getPointNo());
- Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
- value = pointsRealValue.get(conf.getPointNo()).toString();
+ ApiPointValueQueryDTO queryDTO = new ApiPointValueQueryDTO();
+ queryDTO.setPointNo(conf.getPointNo());
+ Calendar calendar1 = Calendar.getInstance();
+ queryDTO.setEnd(calendar1.getTime());
+ calendar1.add(Calendar.DAY_OF_YEAR,-1);
+ queryDTO.setStart(calendar1.getTime());
+ List<ApiPointValueDTO> values = dataPointApi.queryPointHistoryValue(queryDTO);
+ if (!CollectionUtils.isEmpty(values)) {
+ value = String.valueOf(values.get(values.size() - 1).getV());
+ }
break;
case IND:
List<ApiIndItemValueDTO> indValues = indItemApi.queryIndItemDefaultValue(conf.getPointNo());
--
Gitblit v1.9.3