From 9e928fe5bc2c006d2c4a295a301dc1e0f89d6dfe Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期一, 05 五月 2025 18:01:31 +0800
Subject: [PATCH] /** * 峰时占比 */ private BigDecimal fsRatio;
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingMainTask.java | 2 +-
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/dto/CokingOverviewDTO.java | 14 ++++++++++++--
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingOverviewEntity.java | 14 ++++++++++++--
3 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/dto/CokingOverviewDTO.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/dto/CokingOverviewDTO.java
index 3e1dd51..9ce1932 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/dto/CokingOverviewDTO.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/dto/CokingOverviewDTO.java
@@ -113,7 +113,17 @@
private BigDecimal gxls;
/**
- * 峰谷占比
+ * 峰时占比
*/
- private BigDecimal fgRatio;
+ private BigDecimal fsRatio;
+
+ /**
+ * 谷时占比
+ */
+ private BigDecimal gsRatio;
+
+ /**
+ * 平时占比
+ */
+ private BigDecimal psRatio;
}
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingOverviewEntity.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingOverviewEntity.java
index f0eca64..89acfb9 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingOverviewEntity.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingOverviewEntity.java
@@ -107,7 +107,17 @@
private BigDecimal gxls;
/**
- * 峰谷占比
+ * 峰时占比
*/
- private BigDecimal fgRatio;
+ private BigDecimal fsRatio;
+
+ /**
+ * 谷时占比
+ */
+ private BigDecimal gsRatio;
+
+ /**
+ * 平时占比
+ */
+ private BigDecimal psRatio;
}
\ No newline at end of file
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 06a98bb..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);
--
Gitblit v1.9.3