Parcourir la source

更改报警条件查询方式

gaoyu il y a 3 ans
Parent
commit
b93c8bf3ac

+ 2 - 1
src/main/java/com/persagy/service/impl/AlarmHandleServiceImpl.java

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