From e7eb903a9ca509e4fe5ed10922a0772ce1460912 Mon Sep 17 00:00:00 2001 From: Jay <csj123456> Date: 星期一, 21 四月 2025 15:29:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinishConsumer.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) 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 0d57f0b..9c487f4 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 @@ -213,12 +213,15 @@ finishAlarmMap.add(predictTime.getTime()); } - log.info("发送预警消息"); + log.info("预警完成,直接返回"); + + // 预测不再触发煤气模型调度,煤气调度改成定时触发 2025-04-21 + /*log.info("发送预警消息"); Map<String, Object> msg = new HashMap<>(2); msg.put("predictTime", DateUtils.format(predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)); msg.put("alarmList", alarmList); msg.put("moduleType", moduleType); - rabbitTemplate.convertAndSend(RoutingConstant.EXCHANGE, RoutingConstant.Iailab_Model_Alarm, msg); + rabbitTemplate.convertAndSend(RoutingConstant.EXCHANGE, RoutingConstant.Iailab_Model_Alarm, msg);*/ } } catch (Exception e) { e.printStackTrace(); -- Gitblit v1.9.3