Explorar o código

重构发送报警持续消息功能

lixing %!s(int64=4) %!d(string=hai) anos
pai
achega
504549244d

+ 4 - 4
src/main/java/com/persagy/cache/AlarmLastTimeCache.java

@@ -133,7 +133,7 @@ public class AlarmLastTimeCache {
             log.info("更新alarmLastTime状态为:[{}-{}]", alarmId, alarmLastTimeHasSentEnum);
             log.info("当前alarmLastTimeMap缓存为:[{}]", alarmLastTimeMapToString(alarmLastTimeMap));
         } else {
-            log.info("未找到相应的alarmLastTime, 报警id: [{}]", alarmId);
+            log.info("更新报警持续时间为已发送,未找到相应的alarmLastTime, 报警id: [{}]", alarmId);
         }
     }
 
@@ -159,7 +159,7 @@ public class AlarmLastTimeCache {
             log.info("更新alarmLastTime状态为可删除,报警id:[{}]", alarmId);
             log.info("当前alarmLastTimeMap缓存为:[{}]", alarmLastTimeMapToString(alarmLastTimeMap));
         } else {
-            log.info("未找到相应的alarmLastTime, 报警id: [{}]", alarmId);
+            log.info("更新报警持续消息为可删除,未找到相应的alarmLastTime, 报警id: [{}]", alarmId);
         }
     }
 
@@ -185,7 +185,7 @@ public class AlarmLastTimeCache {
             log.info("更新alarmLastTime中报警状态为已创建,报警id:[{}]", alarmId);
             log.info("当前alarmLastTimeMap缓存为:[{}]", alarmLastTimeMapToString(alarmLastTimeMap));
         } else {
-            log.info("未找到相应的alarmLastTime, 报警id: [{}]", alarmId);
+            log.info("报警持续消息中报警已创建,但未找到相应的alarmLastTime无法完成更新, 报警id: [{}]", alarmId);
         }
 
     }
@@ -312,7 +312,7 @@ public class AlarmLastTimeCache {
             alarmLastTimeMap.put(alarmId, alarmLastTime);
             // 持久化到数据库
             alarmLastTimeRepository.save(alarmLastTime);
-            log.info("完成报警持续消息的初始化,报警id:[{}]", alarmId);
+            log.info("完成报警持续消息的创建,报警id:[{}]", alarmId);
         }
 
     }

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

@@ -524,7 +524,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
                 String alarmId = alarmRecordRepository.findById(defineId).orElse(new ZktAlarmRecordDO()).getAlarmId();
                 if (StringUtils.isNotBlank(alarmId)) {
                     alarmLastTimeCache.put(alarmId, Integer.valueOf(String.valueOf(lastTime)));
-                    log.info("初始化报警持续消息");
+                    log.info("开始拼装报警持续消息");
                     initAlarmContinueMsg(alarmId, lastTime, paramMap, alarmDefine.getProjectId());
                 }
             }