From 77a5ab85c55cdd84b311b1d67d35ba4663be8b93 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期五, 06 十二月 2024 12:00:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/PredictFinishConsumer.java | 74 ++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/PredictFinishConsumer.java b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/PredictFinishConsumer.java
index 0937244..d8f1918 100644
--- a/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/PredictFinishConsumer.java
+++ b/shasteel-biz/src/main/java/com/iailab/module/shasteel/mq/consumer/PredictFinishConsumer.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;
@@ -9,14 +8,15 @@
import com.iailab.module.model.api.mcs.dto.PreDataJsonReqVO;
import org.springframework.amqp.rabbit.annotation.RabbitHandler;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @author lirm
@@ -31,13 +31,12 @@
private McsApi mcsApi;
@Resource
- private RabbitTemplate rabbitTemplate;
+ private AlarmConsumer alarmConsumer;
@RabbitHandler
- public void process(PredictFinishMessage finishMessage) throws InterruptedException {
+ public void process(JSONObject json) throws InterruptedException {
System.out.println("测试消费模型预测完成RabbitMQ消息----------------------");
Thread.sleep(5000);
-
List<AlarmConfigRespDTO> configList = mcsApi.listAlarmConfig(new HashMap<String, Object>());
if (!CollectionUtils.isEmpty(configList)) {
List<String> OutputIdList = new ArrayList<>();
@@ -45,37 +44,44 @@
OutputIdList.add(item.getOutId());
});
configList.forEach(item -> {
- PreDataJsonReqVO preDataJsonReqVO = new PreDataJsonReqVO();
- preDataJsonReqVO.setPredictTime(finishMessage.getPredictTime());
- preDataJsonReqVO.setOutputIdList(OutputIdList);
- Map<String, List<Object[]>> preData = mcsApi.getPreDataCur(preDataJsonReqVO);
+ PreDataJsonReqVO reqVO = new PreDataJsonReqVO();
+ reqVO.setPredictTime(DateUtils.parse(json.get("predictTime").toString(),DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
+ reqVO.setOutputIdList(OutputIdList);
+ Map<String, List<Object[]>> preData = mcsApi.getPreDataCur(reqVO);
if (!CollectionUtils.isEmpty(preData)) {
List<Object[]> result = preData.get(item.getOutId());
int toIndex = result.size();
- int fromIndex = result.size() - item.getCompLength();
- List<Object[]> predictList = result.subList(fromIndex, toIndex);
- for(Object[] data : predictList){
- BigDecimal dataValue = new BigDecimal(Double.parseDouble(data[1].toString())).setScale(2, BigDecimal.ROUND_HALF_UP);
- if (!(dataValue.compareTo(item.getLowerLimit()) >= 0 && dataValue.compareTo(item.getUpperLimit()) <= 0)) {
- AlarmMessage alarmMessage = new AlarmMessage();
- AlarmMessageRespDTO alarmMessageRespDTO = new AlarmMessageRespDTO();
- alarmMessageRespDTO.setConfigId(item.getId());
- if (dataValue.compareTo(item.getLowerLimit()) < 0) {
- alarmMessageRespDTO.setAlarmType("1");//超下限
- }else if (dataValue.compareTo(item.getUpperLimit()) > 0) {
- alarmMessageRespDTO.setAlarmType("2");//超上限
+ if(toIndex > 0){
+ int fromIndex = result.size() - item.getCompLength();
+ List<Object[]> predictList = result.subList(fromIndex, toIndex);
+ for(Object[] data : predictList){
+ BigDecimal dataValue = new BigDecimal(Double.parseDouble(data[1].toString())).setScale(2, BigDecimal.ROUND_HALF_UP);
+ if (!(dataValue.compareTo(item.getLowerLimit()) >= 0 && dataValue.compareTo(item.getUpperLimit()) <= 0)) {
+ AlarmMessage alarmMessage = new AlarmMessage();
+ AlarmMessageRespDTO alarmMessageRespDTO = new AlarmMessageRespDTO();
+ alarmMessageRespDTO.setConfigId(item.getId());
+ if (dataValue.compareTo(item.getLowerLimit()) < 0) {
+ alarmMessageRespDTO.setAlarmType("1");//超下限
+ }else if (dataValue.compareTo(item.getUpperLimit()) > 0) {
+ alarmMessageRespDTO.setAlarmType("2");//超上限
+ }
+ alarmMessageRespDTO.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", alarmMessageRespDTO.getAlarmType());
+ content.put("unit", item.getUnit());
+ content.put("overLimitTime", data[0]);
+ content.put("overLimitValue", dataValue);
+ alarmMessageRespDTO.setContent(JSONObject.toJSONString(content));
+ System.out.println("预警消息=" + alarmMessageRespDTO);
+ alarmMessage.setAlarmMessageRespDTO(alarmMessageRespDTO);
+ try {
+ alarmConsumer.process(alarmMessage);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ break;
}
- alarmMessageRespDTO.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", alarmMessageRespDTO.getAlarmType());
- content.put("unit", item.getUnit());
- content.put("overLimitTime", data[0]);
- content.put("overLimitValue", dataValue);
- alarmMessageRespDTO.setContent(JSONObject.toJSONString(content));
- alarmMessage.setAlarmMessageRespDTO(alarmMessageRespDTO);
- rabbitTemplate.convertAndSend(AlarmMessage.EXCHANGE, AlarmMessage.ALARM_ROUTING_KEY, alarmMessage);
- break;
}
}
}
--
Gitblit v1.9.3