shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/ModelAlarmConsumer.java

@@ -1,6 +1,5 @@
package com.iailab.module.shasteel.mq.consumer;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.module.model.api.mcs.McsApi;
@@ -42,6 +41,9 @@

    private static String lastRunGasSchedule = "";

    // 最早调度时间
    private static Date earliestScheduleTime = null;

    /**
     * 监听报警信息，执行调度
     *
@@ -63,6 +65,17 @@
            return;
        }

        // 判断predictTime 是否大于outTime，否则不执行调度
        if (earliestScheduleTime != null && predictTime.compareTo(earliestScheduleTime) < 0) {
            return;
        }

        List<AlarmMessageRespDTO> alarmList = JSONObject.parseArray(messageJson.get("alarmList").toString(),AlarmMessageRespDTO.class);
        // 取出最小outTime
        Date minOutTime = alarmList.stream().filter(e -> e.getOutTime() != null).map(AlarmMessageRespDTO::getOutTime).min(Date::compareTo).get();
        earliestScheduleTime = minOutTime;


        // 查找需要执行的调度方案
        List<StScheduleSchemeDTO> scheduleSchemeList = mcsApi.listScheduleScheme(ScheduleTriggerMethodEnum.EVENT.getCode(), routingKey);
        if (CollectionUtils.isEmpty(scheduleSchemeList)) {
@@ -79,7 +92,7 @@
            lastRunGasSchedule = runKey;
            MdkScheduleReqDTO mdkScheduleReqDTO = new MdkScheduleReqDTO();
            mdkScheduleReqDTO.setScheduleCode(stScheduleSchemeDTO.getCode());
            mdkScheduleReqDTO.setScheduleTime(stScheduleSchemeDTO.getScheduleTime());
            mdkScheduleReqDTO.setScheduleTime(predictTime);
            //执行调度方案
            MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(mdkScheduleReqDTO);
            if (mdkScheduleRespDTO == null) {
@@ -93,12 +106,11 @@
                    mdkApi.scheduleModelOut(mdkScheduleRespDTO);

                    // 保存调度建议
                    String sch_obj_gas = "GAS";
                    saveScheduleSuggest("adviceBFG", result.get("adviceBFG"), sch_obj_gas, predictTime);
                    saveScheduleSuggest("adviceCOG", result.get("adviceCOG"), sch_obj_gas, predictTime);
                    saveScheduleSuggest("adviceLDG13W", result.get("adviceLDG13W"), sch_obj_gas, predictTime);
                    saveScheduleSuggest("adviceLDG12W", result.get("adviceLDG12W"), sch_obj_gas, predictTime);
                    saveScheduleSuggest("adviceLDG12WT", result.get("adviceLDG12WT"), sch_obj_gas, predictTime);
                    saveScheduleSuggest("高炉煤气", result.get("adviceBFG"), "BFG", predictTime);
                    saveScheduleSuggest("焦炉煤气", result.get("adviceCOG"), "COG", predictTime);
                    saveScheduleSuggest("转炉5W+8W煤气柜", result.get("adviceLDG13W"), "LDG1", predictTime);
                    saveScheduleSuggest("宏发12W煤气柜", result.get("adviceLDG12W"), "LDG2", predictTime);
                    saveScheduleSuggest("转炉特钢煤气柜", result.get("adviceLDG12WT"), "LDGt", predictTime);
                    break;
                case CommonConstant.OXYGEN_ONE_CODE:
                    if (!result.containsKey("faAdvice") || !result.containsKey("yingDiAdvice") || !result.containsKey("yingZhongAdvice")