From c0d47f557b4d202ea95a52434730a235ffb118a0 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期一, 31 三月 2025 15:27:50 +0800
Subject: [PATCH] 压缩空气和蒸汽页面增加调整频率
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleSteamTask.java | 39 ++++++++++++++-----
shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleAirDispatchTask.java | 57 +++++++++++++++++-----------
2 files changed, 64 insertions(+), 32 deletions(-)
diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleAirDispatchTask.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleAirDispatchTask.java
index 0e25f5d..5a027de 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleAirDispatchTask.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunScheduleAirDispatchTask.java
@@ -43,12 +43,12 @@
/**
* 调度建议内容
*/
- private static Map<String, String> gasAdjustMode = new HashMap<>();
+ private static Map<String, String> airAdjustMode = new HashMap<>();
/**
* 调度建议时间
*/
- private static Map<String, Date> gasLastSugTime = new HashMap<>();
+ private static Map<String, Date> airLastSugTime = new HashMap<>();
@Override
public void run(String params) {
@@ -82,27 +82,13 @@
// 保存预警信息
if (mdkScheduleRespDTO.getResult().get("pressureLWarning") != null &&
StringUtils.isNotEmpty(mdkScheduleRespDTO.getResult().get("pressureLWarning").toString())) {
- String pressureLWarning = mdkScheduleRespDTO.getResult().get("pressureLWarning").toString();
- AlarmMessageRespDTO alarm = new AlarmMessageRespDTO();
- alarm.setTitle("压力低于下限预警");
- alarm.setContent(pressureLWarning);
- alarm.setAlarmObj(scheme.getScheduleObj());
- alarm.setAlarmType("低于下限");
- alarm.setAlarmTime(scheduleTime);
- mcsApi.createAlarmMessage(alarm);
+ this.saveAlarmMessage("空压机预警", mdkScheduleRespDTO.getResult().get("pressureLWarning"), scheme.getScheduleObj(), "低于下限",scheduleTime, scheme.getWarningAdjustRate());
}
if (mdkScheduleRespDTO.getResult().get("pressureHWarning") != null &&
StringUtils.isNotEmpty(mdkScheduleRespDTO.getResult().get("pressureHWarning").toString())) {
- String pressureHWarning = mdkScheduleRespDTO.getResult().get("pressureHWarning").toString();
- AlarmMessageRespDTO alarm = new AlarmMessageRespDTO();
- alarm.setTitle("空压机预警");
- alarm.setContent(pressureHWarning);
- alarm.setAlarmObj(scheme.getScheduleObj());
- alarm.setAlarmType("高于上限");
- alarm.setAlarmTime(scheduleTime);
- mcsApi.createAlarmMessage(alarm);
+ this.saveAlarmMessage("空压机预警", mdkScheduleRespDTO.getResult().get("pressureHWarning"), scheme.getScheduleObj(), "高于上限",scheduleTime, scheme.getWarningAdjustRate());
}
// 保存调度建议
@@ -128,13 +114,13 @@
logger.info(title + "调整值为空，不产生建议");
return;
}
- if (gasAdjustMode.containsKey(title) && gasAdjustMode.get(title).equals(contentStr) &&
- gasLastSugTime.containsKey(title) && (scheduleTime.getTime() - gasLastSugTime.get(title).getTime() <= Integer.valueOf(adjustRate).longValue() * 60 * 1000)) {
+ if (airAdjustMode.containsKey(title) && airAdjustMode.get(title).equals(contentStr) &&
+ airLastSugTime.containsKey(title) && (scheduleTime.getTime() - airLastSugTime.get(title).getTime() <= Integer.valueOf(adjustRate).longValue() * 60 * 1000)) {
logger.info("调整建议在有效期内");
return;
}
- gasAdjustMode.put(title, contentStr);
- gasLastSugTime.put(title, scheduleTime);
+ airAdjustMode.put(title, contentStr);
+ airLastSugTime.put(title, scheduleTime);
ScheduleSuggestRespDTO suggest = new ScheduleSuggestRespDTO();
suggest.setTitle(title);
@@ -144,4 +130,31 @@
suggest.setSort(0);
mcsApi.createScheduleSuggest(suggest);
}
+
+ private void saveAlarmMessage(String title, Object content, String scheduleObj,String alarmType, Date scheduleTime, int warningAdjustRate) {
+ if (content == null) {
+ logger.info(title + "预警信息为空，不产生预警");
+ return;
+ }
+ String contentStr = content.toString();
+ if (StringUtils.isBlank(contentStr)) {
+ logger.info(title + "预警信息为空，不产生预警");
+ return;
+ }
+ if (airAdjustMode.containsKey(title) && airAdjustMode.get(title).equals(contentStr) &&
+ airLastSugTime.containsKey(title) && (scheduleTime.getTime() - airLastSugTime.get(title).getTime() <= Integer.valueOf(warningAdjustRate).longValue() * 60 * 1000)) {
+ logger.info("预警信息在有效期内");
+ return;
+ }
+ airAdjustMode.put(title, contentStr);
+ airLastSugTime.put(title, scheduleTime);
+
+ AlarmMessageRespDTO alarm = new AlarmMessageRespDTO();
+ alarm.setTitle(title);
+ alarm.setContent(contentStr);
+ alarm.setAlarmObj(scheduleObj);
+ alarm.setAlarmType(alarmType);
+ alarm.setAlarmTime(scheduleTime);
+ mcsApi.createAlarmMessage(alarm);
+ }
}
\ No newline at end of file
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 1f7a9c3..509b000 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
@@ -58,6 +58,17 @@
*/
private static Map<String, Date> gasLastSugTime = new HashMap<>();
+
+ /**
+ * 预警调整内容
+ */
+ private static Map<String, String> warningAdjustContent = new HashMap<>();
+
+ /**
+ * 预警建议时间
+ */
+ private static Map<String, Date> warningLastSugTime = new HashMap<>();
+
@Override
public void run(String params) {
logger.info("RunScheduleSteamTask，参数为：{}", params);
@@ -96,23 +107,23 @@
}
logger.info("adviceValues=" + JSONArray.toJSONString(adviceValues));
- Object jinfengAdvice = mdkScheduleRespDTO.getResult().get("jinfengAdvice");
- saveScheduleSuggest("锦丰调度建议", jinfengAdvice, scheme.getScheduleObj(), scheduleTime, adviceValues.get(0), scheme.getAdjustRate());
-
Object daxinAdvice = mdkScheduleRespDTO.getResult().get("daxinAdvice");
- saveScheduleSuggest("大新调度建议", daxinAdvice, scheme.getScheduleObj(), scheduleTime, adviceValues.get(1), scheme.getAdjustRate());
+ saveScheduleSuggest("大新调度建议", daxinAdvice, scheme.getScheduleObj(), scheduleTime, adviceValues.get(0), scheme.getAdjustRate());
+
+ Object jinfengAdvice = mdkScheduleRespDTO.getResult().get("jinfengAdvice");
+ saveScheduleSuggest("锦丰调度建议", jinfengAdvice, scheme.getScheduleObj(), scheduleTime, adviceValues.get(1), scheme.getAdjustRate());
Object daxinWarning = mdkScheduleRespDTO.getResult().get("daxinWarning");
- saveAlarmMessage("大新预警", daxinWarning, scheme.getScheduleObj(), scheduleTime);
+ saveAlarmMessage("大新预警", daxinWarning, scheme.getScheduleObj(), scheduleTime, scheme.getWarningAdjustRate());
Object jinfengWarning = mdkScheduleRespDTO.getResult().get("jinfengWarning");
- saveAlarmMessage("锦丰预警", jinfengWarning, scheme.getScheduleObj(), scheduleTime);
+ saveAlarmMessage("锦丰预警", jinfengWarning, scheme.getScheduleObj(), scheduleTime, scheme.getWarningAdjustRate());
Object zhuanlu1Warning = mdkScheduleRespDTO.getResult().get("zhuanlu1Warning");
- saveAlarmMessage("转炉一预警", zhuanlu1Warning, scheme.getScheduleObj(), scheduleTime);
+ saveAlarmMessage("转炉一预警", zhuanlu1Warning, scheme.getScheduleObj(), scheduleTime, scheme.getWarningAdjustRate());
Object zhuanlu2Warning = mdkScheduleRespDTO.getResult().get("zhuanlu2Warning");
- saveAlarmMessage("转炉二预警", zhuanlu2Warning, scheme.getScheduleObj(), scheduleTime);
+ saveAlarmMessage("转炉二预警", zhuanlu2Warning, scheme.getScheduleObj(), scheduleTime, scheme.getWarningAdjustRate());
logger.info(params + "调度方案执行完成");
} catch (Exception ex) {
@@ -150,14 +161,22 @@
mcsApi.createScheduleSuggest(suggest);
}
- private void saveAlarmMessage(String title, Object content, String alarmObj, Date scheduleTime) {
+ private void saveAlarmMessage(String title, Object content, String alarmObj, Date scheduleTime, int warningAdjustRate) {
if (content == null || StringUtils.isBlank(content.toString()) || "0".equals(content.toString())) {
logger.info(title + "content为空");
return;
}
+ String contentStr = content.toString();
+ if (warningAdjustContent.containsKey(title) && warningAdjustContent.get(title).equals(contentStr) &&
+ warningLastSugTime.containsKey(title) && (scheduleTime.getTime() - warningLastSugTime.get(title).getTime() <= Integer.valueOf(warningAdjustRate).longValue() * 60 * 1000)) {
+ logger.info("预警信息在有效期内");
+ return;
+ }
+ warningAdjustContent.put(title, contentStr);
+ warningLastSugTime.put(title, scheduleTime);
AlarmMessageRespDTO alarm = new AlarmMessageRespDTO();
alarm.setTitle(title);
- alarm.setContent(content.toString());
+ alarm.setContent(contentStr);
alarm.setAlarmObj(alarmObj);
alarm.setAlarmType("");
alarm.setAlarmTime(scheduleTime);
--
Gitblit v1.9.3