From 720f98e15ae809092f9686b710d038cbe503b3ca Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 25 三月 2025 13:16:11 +0800
Subject: [PATCH] 蒸汽调度

---
 shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleOnaOptTask.java |   15 ++++++++++++---
 shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleSteamTask.java  |   14 ++++++++++----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleOnaOptTask.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleOnaOptTask.java
index 5f6a054..4e94f46 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleOnaOptTask.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleOnaOptTask.java
@@ -1,5 +1,6 @@
 package com.iailab.module.shasteel.job.task;
 
+import com.alibaba.fastjson.JSONArray;
 import com.iailab.module.model.api.mcs.McsApi;
 import com.iailab.module.model.api.mcs.dto.ScheduleSuggestRespDTO;
 import com.iailab.module.model.api.mcs.dto.StScheduleSchemeDTO;
@@ -136,11 +137,19 @@
                         saveScheduleSuggest("润忠调整建议", runAdvice, scheduleObj, scheduleTime);
                     }*/
 
-                    double[][] adviceValues = (double[][])entry.getValue().getResult().get("adviceValues");
-                    logger.info("adviceValues=" + Arrays.toString(adviceValues));
+                    logger.info("adviceValues=" + entry.getValue().getResult().get("adviceValues"));
+                    List<BigDecimal> adviceValues = new ArrayList<>();
+                    JSONArray ja0 = JSONArray.parseArray(entry.getValue().getResult().get("adviceValues").toString());
+                    JSONArray ja1 = ja0.getJSONArray(0);
+                    for(int i = 0; i < ja1.size(); i++) {
+                        adviceValues.add(new BigDecimal(ja1.get(i).toString()));
+                    }
+                    logger.info("adviceValues=" + JSONArray.toJSONString(adviceValues));
+
+
                     String advice = entry.getValue().getResult().get("advice").toString();
                     if(!advice.contains("压力正常")){
-                        saveScheduleSuggest("各制氧机组建议", advice, scheduleObj, scheduleTime, new BigDecimal(adviceValues[0][0]), scheduleScheme.getAdjustRate());
+                        saveScheduleSuggest("各制氧机组建议", advice, scheduleObj, scheduleTime, adviceValues.get(0), scheduleScheme.getAdjustRate());
                     }
 
                 } else if (entry.getKey().equals(CODE01)) {
diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleSteamTask.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleSteamTask.java
index b6c35c4..1f7a9c3 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleSteamTask.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleSteamTask.java
@@ -87,14 +87,20 @@
                 return;
             }
             // 用户调整量
-            double[][] adviceValues = (double[][])mdkScheduleRespDTO.getResult().get("user_adjust");
-            logger.info("adviceValues=" + Arrays.toString(adviceValues));
+            logger.info("user_adjust=" + mdkScheduleRespDTO.getResult().get("user_adjust"));
+            List<BigDecimal> adviceValues = new ArrayList<>();
+            JSONArray ja0 = JSONArray.parseArray(mdkScheduleRespDTO.getResult().get("user_adjust").toString());
+            JSONArray ja1 = ja0.getJSONArray(0);
+            for(int i = 0; i < ja1.size(); i++) {
+                adviceValues.add(new BigDecimal(ja1.get(i).toString()));
+            }
+            logger.info("adviceValues=" + JSONArray.toJSONString(adviceValues));
 
             Object jinfengAdvice = mdkScheduleRespDTO.getResult().get("jinfengAdvice");
-            saveScheduleSuggest("锦丰调度建议", jinfengAdvice, scheme.getScheduleObj(), scheduleTime, new BigDecimal(adviceValues[0][0]), scheme.getAdjustRate());
+            saveScheduleSuggest("锦丰调度建议", jinfengAdvice, scheme.getScheduleObj(), scheduleTime, adviceValues.get(0), scheme.getAdjustRate());
 
             Object daxinAdvice = mdkScheduleRespDTO.getResult().get("daxinAdvice");
-            saveScheduleSuggest("大新调度建议", daxinAdvice, scheme.getScheduleObj(), scheduleTime, new BigDecimal(adviceValues[0][1]), scheme.getAdjustRate());
+            saveScheduleSuggest("大新调度建议", daxinAdvice, scheme.getScheduleObj(), scheduleTime, adviceValues.get(1), scheme.getAdjustRate());
 
             Object daxinWarning = mdkScheduleRespDTO.getResult().get("daxinWarning");
             saveAlarmMessage("大新预警", daxinWarning, scheme.getScheduleObj(), scheduleTime);

--
Gitblit v1.9.3