浏览代码

完善处理报警消息的逻辑

lixing 3 年之前
父节点
当前提交
7360293fc6

+ 1 - 1
AlarmEngineStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmengine/jms/AlarmEngineMsgHandler.java

@@ -27,7 +27,7 @@ public class AlarmEngineMsgHandler {
     public String getAlarmCategory(DmpMessage dmpMessage) {
         JSONObject data = dmpMessage.getExts();
         String itemCode = data.getString("itemCode");
-        return alarmRecordMsgHandler.getAlarmCategory(alarmRecordMsgHandler.getAlarmUrlParam(data), itemCode);
+        return alarmRecordMsgHandler.getAlarmCategory(alarmRecordMsgHandler.getAlarmUrlParam(dmpMessage), itemCode);
     }
 
     /**

+ 3 - 3
AlarmEngineStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmengine/jms/JmsAlarmRecordEnum.java

@@ -15,9 +15,9 @@ public enum JmsAlarmRecordEnum {
     /**
      * 字典类型
      */
-    NEW_ALARM_RECORD("new_alarmRecord", "新增报警记录"),
-    UPDATE_ALARM_RECORD("update_alarmRecord", "更新报警记录"),
-    CONDITION_ALARM("continue_alarm", "报警持续处理");
+    NEW_ALARM_RECORD("new_alarm_record", "新增报警记录"),
+    UPDATE_ALARM_RECORD("update_alarm_record", "更新报警记录"),
+    CONTINUE_ALARM("continue_alarm", "报警持续处理");
 
     @Setter
     @Getter

+ 1 - 1
AlarmEngineStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmengine/jms/JmsConfig.java

@@ -162,7 +162,7 @@ public class JmsConfig {
             if (JmsAlarmRecordEnum.UPDATE_ALARM_RECORD.getType().equals(msg.getType())) {
                 msgHandler.updateAlarmRecord(msg);
             }
-            if (JmsAlarmRecordEnum.CONDITION_ALARM.getType().equals(msg.getType())) {
+            if (JmsAlarmRecordEnum.CONTINUE_ALARM.getType().equals(msg.getType())) {
                 msgHandler.alarmContinue(msg);
             }
             //解锁

+ 21 - 0
AlarmEngineStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmengine/service/BaseService.java

@@ -2,6 +2,7 @@ package com.persagy.apm.energyalarmstarter.alarmengine.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.AlarmUrlParam;
+import com.persagy.apm.energyalarmstarter.alarmdata.mq.model.DmpMessage;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.CollectionUtils;
 
@@ -70,6 +71,26 @@ public class BaseService {
     }
 
     /**
+     * 从数据中台消息中获取AlarmUrlParam
+     *
+     * @param msg 数据中台消息
+     * @return AlarmUrlParam
+     * @author lixing
+     * @version V1.0 2021/11/19 10:15 下午
+     */
+    public AlarmUrlParam getAlarmUrlParam(DmpMessage msg) throws Exception {
+        String projectId = StringUtils.isBlank(msg.getProjectId())? "0": msg.getProjectId();
+
+
+        return new AlarmUrlParam(
+                msg.getUserId(),
+                msg.getGroupCode(),
+                projectId,
+                msg.getAppId()
+        );
+    }
+
+    /**
      * @description: 获取request中的body
      * @param: obj
      * @return: com.alibaba.fastjson.JSONObject