Merge branch 'master' of http://dlindusit.com:53929/r/shasteel

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

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

import com.iailab.module.model.api.mcs.McsApi;
import com.iailab.module.model.api.mcs.dto.StScheduleSchemeDTO;
import com.iailab.module.model.api.mdk.MdkApi;
import com.iailab.module.model.api.mdk.dto.MdkScheduleReqDTO;
import com.iailab.module.shasteel.mq.common.RoutingConstant;
import com.iailab.module.shasteel.mq.config.QueueModelAlarmConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.Message;
@@ -8,6 +12,9 @@
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * 监听报警信息
@@ -23,6 +30,9 @@
    @Resource
    private McsApi mcsApi;

    @Resource
    private MdkApi mdkApi;

    /**
     * 事件标识
     */
@@ -35,10 +45,27 @@
     */
    @RabbitListener(queues = QueueModelAlarmConfig.QUEUE_NAME)
    public void listen(Message message) {
        String routingKey = message.getMessageProperties().getReceivedRoutingKey();
        log.info("routingKey:" + routingKey);
        String messageBody = new String(message.getBody());
        log.info("messageBody:" + messageBody);
        // 查找需要执行的调度方案


        // 开始执行调度方案
        Map<String, Object> params = new HashMap<>();
        params.put("trigger_condition", routingKey);
        List<StScheduleSchemeDTO> scheduleSchemeList = mcsApi.listScheduleScheme(params);//根据触发条件获取调度方案列表
        for(StScheduleSchemeDTO stScheduleSchemeDTO : scheduleSchemeList){
            MdkScheduleReqDTO mdkScheduleReqDTO = new MdkScheduleReqDTO();
            mdkScheduleReqDTO.setScheduleCode(stScheduleSchemeDTO.getCode());
            mdkScheduleReqDTO.setScheduleTime(stScheduleSchemeDTO.getScheduleTime());
//            MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(mdkScheduleReqDTO);//执行调度方案
//            String result = mdkScheduleRespDTO.getResult().toString();
//            System.out.println(result);
//            AlarmMessageRespDTO alarmMessageRespDTO = new AlarmMessageRespDTO();
//            mcsApi.createAlarmMessage(alarmMessageRespDTO);
        }
//        AlarmMessageRespDTO alarmMessageRespDTO = alarmMessage.getAlarmMessageRespDTO();
//        JSONObject contentJson = JSONObject.parseObject(alarmMessageRespDTO.getContent());
//        String overLimitTime = contentJson.get("overLimitTime").toString();

        // 根据模型返回结果，保存调度建议


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

@@ -46,11 +46,15 @@
     */
    @RabbitListener(queues = QueuePredictFinishConfig.QUEUE_NAME)
    public void listen(Message message) {
        try {
        String routingKey = message.getMessageProperties().getReceivedRoutingKey();
        log.info("routingKey:" + routingKey);
        String messageBody = new String(message.getBody());
        log.info("messageBody:" + messageBody);
        JSONObject messageJson = JSONObject.parseObject(messageBody);
            if (CollectionUtils.isEmpty(messageJson)) {
                return;
            }
        List<AlarmConfigRespDTO> configList = mcsApi.listAlarmConfig(new HashMap<String, Object>());
        if (CollectionUtils.isEmpty(configList)) {
            return;
@@ -85,13 +89,18 @@
                        alarmMessage.setAlarmType("2");//超上限
                    }
                    alarmMessage.setAlarmTime(DateUtils.parse(data[0].toString(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
                    JSONObject content = new JSONObject();
                    content.put("alarmObj", item.getAlarmObj());
                    content.put("alarmType", alarmMessage.getAlarmType());
                    content.put("unit", item.getUnit());
                    content.put("overLimitTime", data[0]);
                    content.put("overLimitValue", dataValue);
                    alarmMessage.setContent(JSONObject.toJSONString(content));
                        StringBuffer sb = new StringBuffer();
                        sb.append(data[0]);
                        sb.append(" ");
                        sb.append(item.getAlarmObj());
                        if ("1".equals(alarmMessage.getAlarmType())) {
                            sb.append("超下限");
                        } else if ("2".equals(alarmMessage.getAlarmType())) {
                            sb.append("超上限");
                        }
                        sb.append(dataValue);
                        sb.append(item.getUnit());
                        alarmMessage.setContent(sb.toString());
                    System.out.println("预警消息=" + alarmMessage);
                    rabbitTemplate.convertAndSend(RoutingConstant.EXCHANGE, RoutingConstant.Iailab_Model_Alarm, alarmMessage);
                    break;
@@ -99,5 +108,9 @@
            }
            System.out.println(preData);
        });
        } catch (Exception e) {
            return;
        }

    }
}