|
@@ -365,7 +365,8 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
|
|
|
AlarmDefine alarmDefine, String dataTime,
|
|
|
Boolean endResult, HashMap<String, Object> paramMap) throws InterruptedException {
|
|
|
String defineId = AlarmInfoCache.getAlarmDefineId(alarmDefine);
|
|
|
- AlarmConditionState alarmConditionState = getAlarmDefineStateFromCacheOrDb(defineId);
|
|
|
+// AlarmConditionState alarmConditionState = getAlarmDefineStateFromCacheOrDb(defineId);
|
|
|
+ AlarmConditionState alarmConditionState = alarmRedisCache.getAlarmDefineState(defineId);
|
|
|
|
|
|
Condition condition = alarmDefine.getCondition();
|
|
|
//当前数据正常,报警状态为正常:清空之前的报警计时,重置回默认状态
|