From a3bb1815c3eb6b0f0cfe9d9d2ba5ee48279e26ed Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期五, 28 三月 2025 11:30:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java
index e3626c7..7d4439b 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java
@@ -1,6 +1,5 @@
package com.iailab.module.shasteel.mq.consumer;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.module.model.api.mcs.McsApi;
@@ -10,9 +9,8 @@
import com.iailab.module.model.api.mdk.MdkApi;
import com.iailab.module.model.api.mdk.dto.MdkScheduleReqDTO;
import com.iailab.module.model.api.mdk.dto.MdkScheduleRespDTO;
+import com.iailab.module.model.enums.ScheduleTriggerMethodEnum;
import com.iailab.module.shasteel.mq.common.constant.CommonConstant;
-import com.iailab.module.shasteel.mq.common.enums.TriggerConditionEnum;
-import com.iailab.module.shasteel.mq.config.QueueModelAlarmConfig;
import com.iailab.module.shasteel.mq.config.QueuePredictFinishConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.Message;
@@ -21,7 +19,6 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -37,6 +34,7 @@
@Component
public class ModelPredictFinish2Consumer {
+
@Resource
private McsApi mcsApi;
@@ -48,7 +46,7 @@
*
* @param message
*/
- @RabbitListener(queues = QueuePredictFinishConfig.QUEUE_NAME)
+ @RabbitListener(queues = QueuePredictFinishConfig.QUEUE_NAME2)
public void listen(Message message) {
String routingKey = message.getMessageProperties().getReceivedRoutingKey();
log.info("routingKey:" + routingKey);
@@ -59,10 +57,7 @@
return;
}
// 查找需要执行的调度方案
- Map<String, Object> params = new HashMap<>();
- params.put("trigger_method", TriggerConditionEnum.EVENT);
- params.put("trigger_condition", routingKey);
- List<StScheduleSchemeDTO> scheduleSchemeList = mcsApi.listScheduleScheme(params);//根据触发条件获取调度方案列表
+ List<StScheduleSchemeDTO> scheduleSchemeList = mcsApi.listScheduleScheme(ScheduleTriggerMethodEnum.EVENT.getCode(), routingKey);
for(StScheduleSchemeDTO stScheduleSchemeDTO : scheduleSchemeList){
MdkScheduleReqDTO mdkScheduleReqDTO = new MdkScheduleReqDTO();
mdkScheduleReqDTO.setScheduleCode(stScheduleSchemeDTO.getCode());
@@ -87,12 +82,14 @@
}else if("dispatchStart".equals(key) && !"".equals(result.get("dispatchStart").toString())){
ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
suggestRespDTO.setContent(result.get("dispatchStart").toString());//空压机启动调度建议
suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
mcsApi.createScheduleSuggest(suggestRespDTO);
}else if("dispatchEnd".equals(key) && !"".equals(result.get("dispatchEnd").toString())){
ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
suggestRespDTO.setContent(result.get("dispatchClose").toString());//空压机关停调度建议
suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
mcsApi.createScheduleSuggest(suggestRespDTO);
@@ -132,12 +129,14 @@
}else if ("jinfengAdvice".equals(key) && !"".equals(result.get("jinfengAdvice").toString())) {
ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
suggestRespDTO.setContent(result.get("jinfengAdvice").toString());//锦丰调度建议
suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
mcsApi.createScheduleSuggest(suggestRespDTO);
}else if ("daxinAdvice".equals(key) && !"".equals(result.get("daxinAdvice").toString())) {
ScheduleSuggestRespDTO suggestRespDTO = new ScheduleSuggestRespDTO();
suggestRespDTO.setId(UUID.randomUUID().toString());
+ suggestRespDTO.setScheduleObj(stScheduleSchemeDTO.getScheduleObj());
suggestRespDTO.setContent(result.get("daxinAdvice").toString());//大新调度建议
suggestRespDTO.setSchemeId(stScheduleSchemeDTO.getId());
mcsApi.createScheduleSuggest(suggestRespDTO);
--
Gitblit v1.9.3