From 2f5864f98743fcc1b32d1eb94015adf70c1a9bf5 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 05 五月 2025 20:11:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingMainTask.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingMainTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingMainTask.java
index d1a930e..33170eb 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingMainTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingMainTask.java
@@ -113,7 +113,7 @@
processMainEntity.setAvgValue(BigDecimal.valueOf(avgValue));
// 历史最优
double baseValue = 0.0;
- if (Double.valueOf(conf.getExt3()) > 0.0) {
+ if (conf.getExt3() == null || Double.valueOf(conf.getExt3()) > 0.0) {
baseValue = historyList_90.stream().mapToDouble(e -> e.getRealValue().doubleValue()).max().orElse(0.0);
}else {
baseValue = historyList_90.stream().mapToDouble(e -> e.getRealValue().doubleValue()).min().orElse(0.0);
@@ -142,6 +142,10 @@
// 干熄焦蒸汽产生
BigDecimal mainGxjzqcs = resultCodeMap.get("main_gxjzqcs").getRealValue();
e.setRealValue(mainGxjzqcs.divide(jtcl,2,BigDecimal.ROUND_HALF_UP));
+
+
+ e.setRealValue(e.getAvgValue());
+ e.setAvgValue(e.getAvgValue().divide(jtcl,2,BigDecimal.ROUND_HALF_UP));
}
// 吨焦耗煤气
if (e.getIndCode().equals("main_djhmq") && resultCodeMap.containsKey("main_glmqxh") && resultCodeMap.containsKey("main_jlmqxh")) {
--
Gitblit v1.9.3