Browse Source

修复 气象站告警多指标只开启两个要素后没有触发预警的问题

zhaiyifei 1 year ago
parent
commit
8645958698

+ 3 - 3
src/main/java/com/yunfeiyun/agmp/iots/warn/service/WarnService.java

@@ -219,10 +219,10 @@ public class WarnService {
         String ruleName = warnRuleOp.getName();
         String ruleName = warnRuleOp.getName();
 
 
         boolean status = "0".equals(wcStatus) && "0".equals(wiStatus);
         boolean status = "0".equals(wcStatus) && "0".equals(wiStatus);
-        boolean tempSuccess = false;
-        if(status){
-            tempSuccess = CompareUtil.comp(currentValue, expression, targetValue);
+        if(!status){
+            return null;
         }
         }
+        boolean tempSuccess = CompareUtil.comp(currentValue, expression, targetValue);
 
 
         String warnMessage = WarnMessageBuilderUtil.buildQxzWarningMessage(
         String warnMessage = WarnMessageBuilderUtil.buildQxzWarningMessage(
                 "气象站设备", devCode, wiName, currentValue, wiUnit, ruleName, targetValue);
                 "气象站设备", devCode, wiName, currentValue, wiUnit, ruleName, targetValue);