From e99b85b724b9013db0bd12a7de9521e8a3fc8520 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 06 五月 2025 13:32:46 +0800
Subject: [PATCH] 峰谷平占比计算
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java | 11 ++++++++---
1 files changed, 8 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 870e040..ad3fa59 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
@@ -156,7 +156,7 @@
// 筛选info_type = 1
List<CokingProcessConfEntity> indList = list.stream().filter(e -> e.getInfoType().equals("1")).collect(Collectors.toList());
if (CollectionUtils.isEmpty(indList)) {
- return;
+ continue;
}
List<CokingOverviewIndEntity> overviewIndEntities = new ArrayList<>(indList.size());
for (CokingProcessConfEntity conf : indList) {
@@ -198,12 +198,14 @@
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:
@@ -212,6 +214,9 @@
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