From 1213d828c89493cd95e61ec77ea789f23364de6d Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 21 三月 2025 10:21:25 +0800
Subject: [PATCH] 煤气调度建议逻辑修改

---
 shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java |  109 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 93 insertions(+), 16 deletions(-)

diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java
index 9424085..28fe13d 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java
@@ -22,6 +22,7 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -43,10 +44,16 @@
 
     private static String lastRunGasSchedule = "";
 
-    // 最早调度时间
-    private static Date earliestScheduleTime = null;
+    /**
+     * 煤气调度调整方向
+     * 1:调整值为正数;-1:调整值为负数
+     */
+    private static Map<String, Integer> gasAdjustMode = new HashMap<>();
 
-    private static Date lastScheduleTime = null;
+    /**
+     * 煤气调度建议时间
+     */
+    private static Map<String, Date> gasLastSugTime = new HashMap<>();
 
     /**
      * 监听报警信息,执行煤气调度
@@ -94,11 +101,6 @@
             return;
         }
         for (StScheduleSchemeDTO stScheduleSchemeDTO : scheduleSchemeList) {
-            if (lastScheduleTime != null && stScheduleSchemeDTO.getAdjustRate() != null && stScheduleSchemeDTO.getAdjustRate() > 0 &&
-                    (predictTime.getTime() - lastScheduleTime.getTime() > 1000 * 60 * stScheduleSchemeDTO.getAdjustRate().longValue()) ) {
-                log.info("调整速率有效期内,跳过执行");
-                continue;
-            }
             String runKey = "GasSchedule_" + stScheduleSchemeDTO.getCode() + "_" + predictTime.getTime();
             log.info("runKey:" + runKey);
             log.info("lastRunGasSchedule:" + lastRunGasSchedule);
@@ -130,11 +132,11 @@
                     mdkApi.scheduleModelOut(mdkScheduleRespDTO);
 
                     // 保存调度建议
-                    saveScheduleSuggest("高炉煤气", result.get("adviceBFG"), "BFG", predictTime);
-                    saveScheduleSuggest("焦炉煤气", result.get("adviceCOG"), "COG", predictTime);
-                    saveScheduleSuggest("转炉5W+8W煤气柜", result.get("adviceLDG13W"), "LDG1", predictTime);
-                    saveScheduleSuggest("宏发12W煤气柜", result.get("adviceLDG12W"), "LDG2", predictTime);
-                    saveScheduleSuggest("转炉特钢煤气柜", result.get("adviceLDG12WT"), "LDGt", predictTime);
+                    saveScheduleSuggest("高炉煤气", result.get("adviceBFG"), "BFG", predictTime, result.get("adjustValueBFG"), stScheduleSchemeDTO.getAdjustRate());
+                    saveScheduleSuggest("焦炉煤气", result.get("adviceCOG"), "COG", predictTime, result.get("adjustValueCOG"), stScheduleSchemeDTO.getAdjustRate());
+                    saveScheduleSuggest("转炉5W+8W煤气柜", result.get("adviceLDG13W"), "LDG1", predictTime, result.get("adjustValueLDG13W"), stScheduleSchemeDTO.getAdjustRate());
+                    saveScheduleSuggest("宏发12W煤气柜", result.get("adviceLDG12W"), "LDG2", predictTime, result.get("adjustValueLDG12W"), stScheduleSchemeDTO.getAdjustRate());
+                    saveScheduleSuggest("转炉特钢煤气柜", result.get("adviceLDG12WT"), "LDGt", predictTime, result.get("adjustValueLDG12WT"), stScheduleSchemeDTO.getAdjustRate());
 
                     // 模拟调整
                     MdkPredictSimAdjustReqDTO simAdjustReqDTO = new MdkPredictSimAdjustReqDTO();
@@ -234,18 +236,93 @@
                     break;
             }
         }
-
-        lastScheduleTime = predictTime;
     }
 
-    private void saveScheduleSuggest(String title, Object content, String scheduleObj, Date scheduleTime) {
+    /**
+     * 建议保持逻辑
+     * <p>
+     * <p>
+     * BFG建议:
+     * 若触发第一条:
+     * 当前BFG建议 = adviceBFG
+     * 若后续BFG建议出现时间与当前BFG建议相差15分钟之内:
+     * 所后续BFG建议方向与当前BFG建议方向相反:
+     * 当前建议 = 后续BFG建议
+     * 若不是:
+     * 当前建议保持不变
+     * 若不是则:
+     * 当前建议 = 后续BFG建议
+     * <p>
+     * COG建议:
+     * 若触发第一条:
+     * 当前COG建议 = adviceCOG
+     * 若后续COG建议出现时间与当前COG建议相差15分钟之内:
+     * 所后续COG建议方向与当前COG建议方向相反:
+     * 当前建议 = 后续COG建议
+     * 若不是:
+     * 当前建议保持不变
+     * 若不是则:
+     * 当前建议 = 后续COG建议
+     * <p>
+     * LDG13W建议:
+     * 若触发第一条:
+     * 当前LDG13W建议 = adviceLDG13W
+     * 若后续LDG13W建议出现时间与当前LDG13W建议相差15分钟之内:
+     * 所后续LDG13W建议方向与当前LDG13W建议方向相反:
+     * 当前建议 = 后续LDG13W建议
+     * 若不是:
+     * 当前建议保持不变
+     * 若不是则:
+     * 当前建议 = 后续LDG13W建议
+     * <p>
+     * LDG12W建议:
+     * 若触发第一条:
+     * 当前LDG12W建议 = adviceLDG12W
+     * 若后续LDG12W建议出现时间与当前LDG12W建议相差15分钟之内:
+     * 所后续LDG12W建议方向与当前LDG12W建议方向相反:
+     * 当前建议 = 后续LDG12W建议
+     * 若不是:
+     * 当前建议保持不变
+     * 若不是则:
+     * 当前建议 = 后续LDG12W建议
+     * <p>
+     * LDG12WT建议:
+     * 若触发第一条:
+     * 当前LDG12WT建议 = adviceLDG12WT
+     * 若后续LDG12WT建议出现时间与当前LDG12WT建议相差15分钟之内:
+     * 所后续LDG12WT建议方向与当前LDG12WT建议方向相反:
+     * 当前建议 = 后续LDG12WT建议
+     * 若不是:
+     * 当前建议保持不变
+     * 若不是则:
+     * 当前建议 = 后续LDG12WT建议
+     *
+     * @param title
+     * @param content
+     * @param scheduleObj
+     * @param scheduleTime
+     */
+    private void saveScheduleSuggest(String title, Object content, String scheduleObj, Date scheduleTime, Object adjustObj, int adjustRate) {
         if (content == null || StringUtils.isBlank(content.toString()) || "0".equals(content.toString())) {
             log.info(title + "content为空");
             return;
         }
+        if (adjustObj == null || StringUtils.isBlank(adjustObj.toString()) || "0".equals(adjustObj.toString())) {
+            log.info(title + "调整值为空,不产生建议");
+            return;
+        }
+        BigDecimal adjustValue = new BigDecimal(adjustObj.toString());
+        if (gasAdjustMode.containsKey(scheduleObj) && gasAdjustMode.get(scheduleObj).equals(adjustValue.compareTo(BigDecimal.ZERO)) &&
+                gasLastSugTime.containsKey(scheduleObj) && (scheduleTime.getTime() - gasLastSugTime.get(scheduleObj).getTime() <= adjustRate)) {
+            log.info("调整建议在有效期内");
+            return;
+        }
+        gasAdjustMode.put(scheduleObj, adjustValue.compareTo(BigDecimal.ZERO));
+        gasLastSugTime.put(scheduleObj, scheduleTime);
         ScheduleSuggestRespDTO suggest = new ScheduleSuggestRespDTO();
         suggest.setTitle(title);
         suggest.setContent(content.toString());
+        suggest.setAdjustValue(adjustValue);
         suggest.setScheduleObj(scheduleObj);
         suggest.setScheduleTime(scheduleTime);
         suggest.setSort(0);

--
Gitblit v1.9.3