From 13bb12a0445532ead99f4e5755a586a9f99c4d57 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 29 四月 2025 14:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
index 07e4cb6..58f6eb8 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelHCTask.java
@@ -80,13 +80,13 @@
             "\"chemProdSteam\":[[33836,33925]],  \n" +
             "\"chemProdIndex\":[[352,355],[68,66.3],[82.5,87.6],[50.7,56.5],[73.5,73.1]],\n" +
             "\"chemProdTotal\":\"蒸汽消耗量异常,当前值1342,经模型计算,指标1异常,当前值1342,建议调整指标1至区间[90,110],指标2异常,当前值1342,建议调整指标2至区间[50,80]\",\n" +
-            "\"chemProdRow0\":[[0,42]],\n" + "      " +
+            "\"chemProdRow0\":[[0,42],[5,345],[2,41]],\n" + "      " +
             "\"chemProdRow1\":[[5,1342],[7,1342],[9,1342]],\n" +
-            "\"chemProdRow2\":[[5,10,1342],[5,16,1342],[7,18,1342]],\n" +
+            "\"chemProdRow2\":[[5,1342],[5,1342],[7,1342]],\n" +
             "\"chemProdHomePage\":[[9,1342],[9,1342]],\n" +
             "\"chemProdHomeIndex\":[[90.4,90.2],[80.3,78],[103,100],[280,270]],\n" +
-            "\"chemProdHomeIndexInfo\":\"2月18日甲班:化产蒸汽消耗量异常\",\n" +
-            "\"chemProdHomeErr\":\"2月18日化产蒸汽消耗量数据异常(无数据)\"\n" +  " }" + "}";
+            "\"chemProdHomeIndexInfo\":\"4月25日甲班:化产蒸汽消耗量异常\",\n" +
+            "\"chemProdHomeErr\":\"4月25日化产蒸汽消耗量数据异常(无数据)\"\n" +  " }" + "}";
 
     @Override
     public void run(String params) {
@@ -179,12 +179,12 @@
 
     @Transactional
     public void saveTraceDeviation(String relId, String process, String clock, JSONObject result) {
-        List<ChartParamDTO> list = mcsApi.getChartParamList(CommonConstant.COAL_INDEX_CHARTCODE);
+        List<ChartParamDTO> list = mcsApi.getChartParamList(CommonConstant.CHEMPROD_INDEX_CHARTCODE);
         Map<String, String> steamIndexMaps = list.stream().collect(Collectors.toMap(ChartParamDTO::getParamCode, e -> e.getParamName()));
 
         List<String> coalRowKeys = new ArrayList<>();
         result.forEach((key, value) -> {
-            if (StringUtils.isBlank(key) && key.contains(chemProdRow)) {
+            if (StringUtils.isNotBlank(key) && key.contains(chemProdRow)) {
                 coalRowKeys.add(key);
             }
 
@@ -258,6 +258,8 @@
             analyIndEntity.setSort(i + 1);
             entityList.add(analyIndEntity);
         }
+        // 清理旧数据
+        cokingAnalyIndService.delete(process, analyDate, analyClass);
         cokingAnalyIndService.save(entityList);
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3