|
@@ -127,11 +127,11 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
|
|
|
log.info("有一条满足报警条件{},-----{}----{}", defineId, paramMap, alarmDefine.getCondition());
|
|
|
if (alarmDefine.getOpen() == 0) {
|
|
|
log.info("报警定义ID为[{}]已经屏蔽", defineId);
|
|
|
- return;
|
|
|
+ continue;
|
|
|
}
|
|
|
if (AlarmInfoCache.isolationSystemList.contains(alarmDefine.getSystemCode())) {
|
|
|
log.info("报警定义ID为[{}]的系统[{}]已经隔离,不产生报警", defineId, alarmDefine.getSystemCode());
|
|
|
- return;
|
|
|
+ continue;
|
|
|
}
|
|
|
//报警的时候不考虑报警恢复,因为同时报警和报警恢复是不应该出现的
|
|
|
handlerNowDataAlarm(alarmDefine, alarmState, dateTime, condition, defineId, paramMap, meterId, funcId, value);
|