|
@@ -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);
|