From 831901d5e82cd503ca16c22a0613785828bbd9f6 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 13 五月 2025 18:07:50 +0800
Subject: [PATCH] 默认值-2

---
 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingMainTask.java     |    8 ++++----
 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java |    8 +++-----
 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java  |    3 +++
 3 files changed, 10 insertions(+), 9 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 985b8a4..324f216 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
@@ -94,13 +94,13 @@
                     processMainEntity.setSort(conf.getSort());
                     // 日实际值
                     Double value = getConfValue(conf.getDataType(),conf.getPointNo());
-                    processMainEntity.setRealValue(value == null ? BigDecimal.ZERO : BigDecimal.valueOf(value));
+                    processMainEntity.setRealValue(value == null ? BigDecimal.valueOf(-2) : BigDecimal.valueOf(value));
 
                     // 基准值、理论值 来源模型下发结果
                     Double standValue = getConfValue("DATAPOINT",conf.getExt1());
-                    processMainEntity.setStandValue(standValue == null ? BigDecimal.ZERO : BigDecimal.valueOf(standValue));
+                    processMainEntity.setStandValue(standValue == null ? BigDecimal.valueOf(-2) : BigDecimal.valueOf(standValue));
                     Double theoryValue = getConfValue("DATAPOINT",conf.getExt2());
-                    processMainEntity.setTheoryValue(theoryValue == null ? BigDecimal.ZERO : BigDecimal.valueOf(theoryValue));
+                    processMainEntity.setTheoryValue(theoryValue == null ? BigDecimal.valueOf(-2) : BigDecimal.valueOf(theoryValue));
                     // 历史最优计算方向
                     if (conf.getExt3() != null) {
                         directionMap.put(conf.getIndCode(),Double.valueOf(conf.getExt3()));
@@ -113,7 +113,7 @@
                 if (resultCodeMap.containsKey("main_jcmq")) {
                     // 焦炭产量
                     BigDecimal jtcl = resultCodeMap.get("main_jcmq").getRealValue();
-                    if (jtcl != null && !jtcl.equals(BigDecimal.ZERO)) {
+                    if (jtcl != null && !jtcl.equals(BigDecimal.valueOf(-2))) {
                         processMainEntities.forEach(e -> {
                             // 吨焦产煤气
                             if (e.getIndCode().equals("main_jcmq") && resultCodeMap.containsKey("main_jlmqfs")) {
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 18c9efb..c3e5351 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
@@ -119,7 +119,7 @@
 
                         // 异常数据处理
                         String content = null;
-                        if (value != null) {
+                        if (value != null && !value.equals(-2.0)) {
                             if (value.equals(0.0)) {
                                 content = clock + " " + conf.getIndName() + "数据异常(数据为0)";
                             }else if (value.compareTo(Double.valueOf(conf.getExt3())) > 0) {
@@ -181,9 +181,7 @@
                     entity.setIndCode(conf.getIndCode());
                     entity.setIndName(conf.getIndName());
                     entity.setIndUnit(conf.getIndUnit());
-                    if (value != null) {
-                        entity.setIndValue(BigDecimal.valueOf(value));
-                    }
+                    entity.setIndValue(BigDecimal.valueOf(value));
                     entity.setCreateDate(new Date());
                     overviewIndEntities.add(entity);
                 }
@@ -225,6 +223,6 @@
         if (value != null && StringUtils.isNotBlank(conf.getExt5())) {
             value = value * Double.valueOf(conf.getExt5());
         }
-        return value;
+        return value == null ? -2.0 : value;
     }
 }
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java
index 7315d11..5b01289 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingProdDayTask.java
@@ -102,6 +102,9 @@
                         break;
 
                 }
+                if (StringUtils.isBlank(value)) {
+                    value = "-2";
+                }
                 saveProdDay(conf, value, clock, conf.getIndCode());
             }
         } catch (Exception ex) {

--
Gitblit v1.9.3