Browse Source

conConcurrentHashMap value不能为空

lixing 4 years ago
parent
commit
85de816550
1 changed files with 5 additions and 1 deletions
  1. 5 1
      src/main/java/com/persagy/cache/AlarmLastTimeCache.java

+ 5 - 1
src/main/java/com/persagy/cache/AlarmLastTimeCache.java

@@ -58,7 +58,9 @@ public class AlarmLastTimeCache {
         // 初始化defineAlarmMap
         Iterable<ZktAlarmRecordDO> alarmRecords = alarmRecordRepository.findAll();
         // alarmRecords 不会为空
-        alarmRecords.forEach(alarmRecord -> defineAlarmMap.put(alarmRecord.getDefinitionId(), alarmRecord.getAlarmId()));
+        alarmRecords.forEach(
+                alarmRecord -> updateAlarmId(alarmRecord.getDefinitionId(), alarmRecord.getAlarmId())
+        );
         log.info("defineAlarmMap初始化完成");
         log.info("当前defineAlarmMap为:[{}]", defineAlarmMap.toString());
     }
@@ -244,6 +246,8 @@ public class AlarmLastTimeCache {
      * @version: V1.0
      */
     public void updateAlarmId(String defineId, String alarmId) {
+        defineId = defineId == null ? "" : defineId;
+        alarmId = alarmId == null ? "" : alarmId;
         defineAlarmMap.put(defineId, alarmId);
     }