|
@@ -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);
|
|
|
}
|
|
|
|