From 6a713bf32263bbda52cb1fb3b5274c92e56647ae Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期六, 18 一月 2025 13:33:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunPredictModuleTask.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunPredictModuleTask.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunPredictModuleTask.java
index 5609080..a99a554 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunPredictModuleTask.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/job/task/RunPredictModuleTask.java
@@ -1,7 +1,9 @@
package com.iailab.module.shasteel.job.task;
+import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.module.model.api.mdk.MdkApi;
import com.iailab.module.model.api.mdk.dto.MdkPredictReqDTO;
+import com.iailab.module.shasteel.mq.common.constant.CommonConstant;
import com.iailab.module.shasteel.mq.common.constant.RoutingConstant;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -14,6 +16,12 @@
/**
* 执行模块预测定时任务
+ * 1、高炉
+ * 2、焦炉
+ * 3、转炉
+ * 3.1、氧气
+ * 3.2、蒸汽
+ * 4、氮气
*/
@Component("runPredictModuleTask")
public class RunPredictModuleTask implements ITask {
@@ -46,8 +54,12 @@
logger.info(type + "模块预测完成。");
Map<String, Object> msg = new HashMap<>();
msg.put("moduleType", type);
- msg.put("predictTime", predictTime);
+ msg.put("predictTime", DateUtils.format(predictTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
rabbitTemplate.convertAndSend(RoutingConstant.EXCHANGE, RoutingConstant.Iailab_Model_PredictFinish, msg);
+ if (type.equals(CommonConstant.TRIGGER_CONDITION_ELEC)) {
+ //电力管网预测完成发送单独消息，执行电力调度
+ rabbitTemplate.convertAndSend(RoutingConstant.EXCHANGE, RoutingConstant.Iailab_Model_PredictFinish_Elec, msg);
+ }
});
} catch (Exception ex) {
logger.error("runPredictModuleTask运行异常");
--
Gitblit v1.9.3