Bläddra i källkod

增加和删除设备与报警条件关联关系时,发送的报警消息中增加报警规则id字段

lixing 3 år sedan
förälder
incheckning
3cb5e96eb3

+ 6 - 1
src/main/java/com/persagy/apm/alarmservice/common/jms/JmsSender.java

@@ -168,9 +168,13 @@ public class JmsSender {
         DmpMessage dmpMessage = initDmpMessage();
 
         List<ObjConditionRel> relList = convert2ObjConditionRelList(relationList);
-        if (relList == null) {return;}
+        if (CollectionUtils.isEmpty(relList)) {
+            return;
+        }
         UUIDGenerator uuidGenerator = new UUIDGenerator();
         dmpMessage.setMid(uuidGenerator.next());
+        String projectAlarmRuleId = relationList.get(0).getProjectAlarmRuleId();
+        dmpMessage.setTargetId(projectAlarmRuleId);
         dmpMessage.setStr1(JSONObject.toJSONString(relList));
         dmpMessage.setType(JmsTypeEnum.NEW_OBJ_CONDITION_REL.getType());
 
@@ -272,6 +276,7 @@ public class JmsSender {
         if (relList == null) {return;}
         UUIDGenerator uuidGenerator = new UUIDGenerator();
         dmpMessage.setMid(uuidGenerator.next());
+        dmpMessage.setTargetId(ruleId);
         dmpMessage.setStr1(JSONObject.toJSONString(relList));
         dmpMessage.setType(JmsTypeEnum.DELETE_OBJ_CONDITION_REL.getType());