From 0d7505f8301d2721edfa031d5f4ebf82b2d02a17 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 09 五月 2025 10:27:00 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/ansteel
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java
index f64418a..18c9efb 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java
@@ -6,6 +6,8 @@
import com.iailab.module.ansteel.coking.service.*;
import com.iailab.module.ansteel.common.enums.ProcessConfDataTypeEnum;
import com.iailab.module.ansteel.common.enums.ProcessTypeEnum;
+import com.iailab.module.data.api.arc.ArcDataApi;
+import com.iailab.module.data.api.arc.dto.ApiArcDataDTO;
import com.iailab.module.data.api.ind.IndItemApi;
import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
@@ -46,6 +48,8 @@
private DataPointApi dataPointApi;
@Resource
private IndItemApi indItemApi;
+ @Resource
+ private ArcDataApi arcDataApi;
@Resource
private CokingTraceReportService cokingTraceReportService;
@Resource
@@ -198,20 +202,29 @@
List<String> points = new ArrayList<>();
points.add(conf.getPointNo());
Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points);
- value = Double.valueOf(pointsRealValue.get(conf.getPointNo()).toString());
+ if (pointsRealValue.containsKey(conf.getPointNo())) {
+ value = Double.valueOf(pointsRealValue.get(conf.getPointNo()).toString());
+ }
break;
case IND:
List<ApiIndItemValueDTO> indValues = indItemApi.queryIndItemDefaultValue(conf.getPointNo());
if (!CollectionUtils.isEmpty(indValues)) {
- value = Double.valueOf(indValues.get(indValues.size() - 1).getDataValue().toString());
+ value = Double.valueOf(indValues.get(0).getDataValue().toString());
}
break;
- case MODEL:
+ case ARC:
+ ApiArcDataDTO apiArcDataDTO = arcDataApi.queryArcLastValue(conf.getPointNo());
+ if (apiArcDataDTO != null) {
+ value = apiArcDataDTO.getArcValue().doubleValue();
+ }
break;
default:
break;
}
+ if (value != null && StringUtils.isNotBlank(conf.getExt5())) {
+ value = value * Double.valueOf(conf.getExt5());
+ }
return value;
}
}
\ No newline at end of file
--
Gitblit v1.9.3