|
@@ -2,29 +2,14 @@ package com.persagy.apm.energyalarmstarter.alarmengine.jms;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.google.common.collect.Lists;
|
|
|
import com.persagy.apm.energyalarmstarter.alarmengine.feign.AlarmCondition;
|
|
|
-import com.persagy.apm.energyalarmstarter.alarmengine.feign.ObjConditionRel;
|
|
|
-import com.persagy.apm.energyalarmstarter.alarmengine.feign.ProjectVO;
|
|
|
-import com.persagy.apm.energyalarmstarter.alarmengine.feign.service.AlarmServiceImpl;
|
|
|
import com.persagy.apm.energyalarmstarter.alarmengine.jms.model.DmpMessage;
|
|
|
import com.persagy.apm.energyalarmstarter.alarmengine.service.AlarmRecordMsgHandler;
|
|
|
-import com.persagy.apm.energyalarmstarter.alarmengine.util.StringUtil;
|
|
|
-import io.netty.channel.Channel;
|
|
|
import io.netty.channel.ChannelHandler;
|
|
|
-import io.netty.channel.ChannelHandlerContext;
|
|
|
import io.netty.channel.ChannelInboundHandlerAdapter;
|
|
|
-import io.netty.channel.group.ChannelGroup;
|
|
|
-import io.netty.channel.group.DefaultChannelGroup;
|
|
|
-import io.netty.util.concurrent.GlobalEventExecutor;
|
|
|
+import lombok.SneakyThrows;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.util.CollectionUtils;
|
|
|
-
|
|
|
-import java.net.SocketAddress;
|
|
|
-import java.util.*;
|
|
|
-import java.util.concurrent.ConcurrentHashMap;
|
|
|
|
|
|
/**
|
|
|
* @description: Netty报警息处理中心
|
|
@@ -39,6 +24,13 @@ public class AlarmEngineMsgHandler extends ChannelInboundHandlerAdapter {
|
|
|
@Autowired
|
|
|
private AlarmRecordMsgHandler alarmRecordMsgHandler;
|
|
|
|
|
|
+ @SneakyThrows
|
|
|
+ public String getAlarmCategory(DmpMessage dmpMessage) {
|
|
|
+ JSONObject data = dmpMessage.getExts();
|
|
|
+ String itemCode = data.getString("itemCode");
|
|
|
+ return alarmRecordMsgHandler.getAlarmCategory(alarmRecordMsgHandler.getAlarmUrlParam(data), itemCode);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* @description: 创建报警记录,并发送报警记录id至边缘端
|
|
|
* @param: nettyMessage
|
|
@@ -49,7 +41,8 @@ public class AlarmEngineMsgHandler extends ChannelInboundHandlerAdapter {
|
|
|
* @since: 2020/11/30 3:33 下午
|
|
|
* @version: V1.0
|
|
|
*/
|
|
|
- public void createAlarmRecordAndSendRecordId(DmpMessage dmpMessage) throws Exception {
|
|
|
+ @SneakyThrows
|
|
|
+ public void createAlarmRecordAndSendRecordId(DmpMessage dmpMessage) {
|
|
|
JSONObject data = dmpMessage.getExts();
|
|
|
data.put("userId", "system");
|
|
|
alarmRecordMsgHandler.createAlarm(data);
|
|
@@ -65,7 +58,8 @@ public class AlarmEngineMsgHandler extends ChannelInboundHandlerAdapter {
|
|
|
* @since: 2020/11/30 4:13 下午
|
|
|
* @version: V1.0
|
|
|
*/
|
|
|
- public void updateAlarmRecord(DmpMessage dmpMessage) throws Exception {
|
|
|
+ @SneakyThrows
|
|
|
+ public void updateAlarmRecord(DmpMessage dmpMessage) {
|
|
|
JSONObject data = dmpMessage.getExts();
|
|
|
data.put("userId", "system");
|
|
|
alarmRecordMsgHandler.updateAlarmRecord(data);
|