|
|
@@ -219,10 +219,10 @@ public class WarnService {
|
|
|
String ruleName = warnRuleOp.getName();
|
|
|
|
|
|
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(
|
|
|
"气象站设备", devCode, wiName, currentValue, wiUnit, ruleName, targetValue);
|