From eb23bc41da0a27d1aada95744e0262e8cb4f0385 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 06 五月 2025 16:44:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingMainTask.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 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 59da296..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
@@ -17,6 +17,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -112,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);
@@ -122,6 +123,41 @@
processMainEntities.add(processMainEntity);
}
+ // 计算吨焦产煤气，吨焦产蒸汽，吨焦耗煤气
+ Map<String, CokingProcessMainEntity> resultCodeMap = processMainEntities.stream().collect(Collectors.toMap(CokingProcessMainEntity::getIndCode, Function.identity(), (e1, e2) -> e1));
+ // 有焦炭产量
+ if (resultCodeMap.containsKey("main_jcmq")) {
+ // 焦炭产量
+ BigDecimal jtcl = resultCodeMap.get("main_jcmq").getRealValue();
+ if (jtcl != null && !jtcl.equals(BigDecimal.ZERO)) {
+ processMainEntities.forEach(e -> {
+ // 吨焦产煤气
+ if (e.getIndCode().equals("main_jcmq") && resultCodeMap.containsKey("main_jlmqfs")) {
+ // 焦炉煤气发生
+ BigDecimal mainJlmqfs = resultCodeMap.get("main_jlmqfs").getRealValue();
+ e.setRealValue(mainJlmqfs.divide(jtcl,2,BigDecimal.ROUND_HALF_UP));
+ }
+ // 吨焦产蒸汽
+ if (e.getIndCode().equals("main_djczq") && resultCodeMap.containsKey("main_gxjzqcs")) {
+ // 干熄焦蒸汽产生
+ 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")) {
+ // 高炉煤气消耗
+ BigDecimal mainGlmqxh = resultCodeMap.get("main_glmqxh").getRealValue();
+ // 焦炉煤气消耗
+ BigDecimal mainJlmqxh = resultCodeMap.get("main_jlmqxh").getRealValue();
+ e.setRealValue(mainGlmqxh.add(mainJlmqxh).divide(jtcl,2,BigDecimal.ROUND_HALF_UP));
+ }
+ });
+ }
+ }
cokingProcessMainService.save(processMainEntities);
}
} catch (Exception ex) {
--
Gitblit v1.9.3