From af2d5942652584c65579894c4a4a680bc37dad20 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期六, 08 二月 2025 15:29:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelPredictFinish2Consumer.java | 10 ++--------
1 files changed, 2 insertions(+), 8 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 60df985..10aa293 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;
@@ -59,10 +56,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());
--
Gitblit v1.9.3