xujiaheng преди 3 години
родител
ревизия
c8d0405887
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      src/main/java/com/persagy/apm/alarmservice/project/alarmrule/service/impl/ProjectAlarmRuleServiceImpl.java

+ 2 - 2
src/main/java/com/persagy/apm/alarmservice/project/alarmrule/service/impl/ProjectAlarmRuleServiceImpl.java

@@ -139,7 +139,7 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
                 String replacement = equipId + "_" + infoCode;
                 backend = backend.replaceAll(infoCode, replacement);
             }
-            equipCondition.setEnd("!" + backend);
+            equipCondition.setEnd("!(" + backend+ ")");
             equipCondition.setEndUphold(0);
             equipCondition.setTrigger(backend);
             equipCondition.setTriggerUphold(alarmConditionDTO.getTriggerUphold() * 60);
@@ -271,7 +271,7 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
                 String replacement = equipId + "_" + infoCode;
                 backend = backend.replaceAll(infoCode, replacement);
             }
-            equipCondition.setEnd("!" + backend);
+            equipCondition.setEnd("!(" + backend+ ")");
             equipCondition.setEndUphold(0);
             equipCondition.setTrigger(backend);
             equipCondition.setTriggerUphold(alarmCondition.getTriggerUphold() * 60);