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 | 87 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 71 insertions(+), 16 deletions(-) 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 aca64a9..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 @@ -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.AlarmMessageRespDTO; import com.iailab.module.model.api.mcs.dto.ScheduleSuggestRespDTO; @@ -16,12 +17,13 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.math.BigDecimal; +import java.util.*; /** * 蒸汽调度 + * 定时触发 + * 30 0/2 * * * ? * * 参考点压力信号 pressure_flag * 锦丰调度建议 jinfengAdvice @@ -44,6 +46,28 @@ @Autowired private MdkApi mdkApi; + + /** + * 调度调整方向 + * 1:调整值为正数;-1:调整值为负数 + */ + private static Map<String, Integer> gasAdjustMode = new HashMap<>(); + + /** + * 调度建议时间 + */ + 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) { @@ -73,24 +97,33 @@ logger.info("调度结果异常,STATUS=" + mdkScheduleRespDTO.getStatusCode()); return; } - - Object jinfengAdvice = mdkScheduleRespDTO.getResult().get("jinfengAdvice"); - saveScheduleSuggest("锦丰调度建议", jinfengAdvice, scheme.getScheduleObj(), scheduleTime); + // 用户调整量 + 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 daxinAdvice = mdkScheduleRespDTO.getResult().get("daxinAdvice"); - saveScheduleSuggest("大新调度建议", daxinAdvice, scheme.getScheduleObj(), scheduleTime); + 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) { @@ -100,11 +133,25 @@ logger.info("RunScheduleSteamTask运行完成"); } - private void saveScheduleSuggest(String title, Object content, String scheduleObj, Date scheduleTime) { - if (content == null || StringUtils.isBlank(content.toString()) || "0".equals(content.toString())) { - logger.info(title + "content为空"); + private void saveScheduleSuggest(String title, Object content, String scheduleObj, Date scheduleTime, BigDecimal adjustValue, int adjustRate) { + if (content == null) { return; } + if (StringUtils.isBlank(content.toString())) { + return; + } + if (adjustValue == null || adjustValue.doubleValue() == 0) { + logger.info(title + "调整值为空,不产生建议"); + return; + } + if (gasAdjustMode.containsKey(title) && gasAdjustMode.get(title).equals(adjustValue.compareTo(BigDecimal.ZERO)) && + gasLastSugTime.containsKey(title) && (scheduleTime.getTime() - gasLastSugTime.get(title).getTime() <= Integer.valueOf(adjustRate).longValue() * 60 * 1000)) { + logger.info("调整建议在有效期内"); + return; + } + gasAdjustMode.put(title, adjustValue.compareTo(BigDecimal.ZERO)); + gasLastSugTime.put(title, scheduleTime); + ScheduleSuggestRespDTO suggest = new ScheduleSuggestRespDTO(); suggest.setTitle(title); suggest.setContent(content.toString()); @@ -114,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