From 081da9936bf79f5ab34e9e226abe0db56d143f7e Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期六, 08 二月 2025 18:55:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java | 11 +++++------
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java | 1 +
2 files changed, 6 insertions(+), 6 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 f06f22b..c4b608d 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
@@ -93,12 +93,11 @@
mdkApi.scheduleModelOut(mdkScheduleRespDTO);
// 保存调度建议
- String sch_obj_gas = "GAS";
- saveScheduleSuggest("adviceBFG", result.get("adviceBFG"), sch_obj_gas, predictTime);
- saveScheduleSuggest("adviceCOG", result.get("adviceCOG"), sch_obj_gas, predictTime);
- saveScheduleSuggest("adviceLDG13W", result.get("adviceLDG13W"), sch_obj_gas, predictTime);
- saveScheduleSuggest("adviceLDG12W", result.get("adviceLDG12W"), sch_obj_gas, predictTime);
- saveScheduleSuggest("adviceLDG12WT", result.get("adviceLDG12WT"), sch_obj_gas, predictTime);
+ 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);
break;
case CommonConstant.OXYGEN_ONE_CODE:
if (!result.containsKey("faAdvice") || !result.containsKey("yingDiAdvice") || !result.containsKey("yingZhongAdvice")
diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java
index 19ab2ac..bc5631a 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java
@@ -114,6 +114,7 @@
alarmMessage.setAlarmTime(predictTime);
log.info("对比累计值是否超限");
StringBuilder content = new StringBuilder();
+ content.append(configItem.getTitle().replace("预警", ""));
if (configItem.getCulUpper() != null && culValue.compareTo(configItem.getCulUpper()) > 0) {
content.append("即将超出累计值上限");
alarmMessage.setAlarmType(CommonConstant.EXCEEDING_UPPER_LIMIT);
--
Gitblit v1.9.3