|
@@ -52,8 +52,8 @@ public class AlarmLastTimeCache {
|
|
|
Iterable<AlarmLastTime> alarmLastTimes = alarmLastTimeRepository.findAll();
|
|
|
// alarmLastTimes 不会为空
|
|
|
alarmLastTimes.forEach(alarmLastTime -> alarmLastTimeMap.put(alarmLastTime.getId(), alarmLastTime));
|
|
|
- log.info("alarmLastTimeMap初始化完成");
|
|
|
- log.info("当前alarmLastTimeMap为:[{}]", alarmLastTimeMapToString(alarmLastTimeMap));
|
|
|
+ log.debug("alarmLastTimeMap初始化完成");
|
|
|
+ log.debug("当前alarmLastTimeMap为:[{}]", alarmLastTimeMapToString(alarmLastTimeMap));
|
|
|
|
|
|
// 初始化defineAlarmMap
|
|
|
Iterable<ZktAlarmRecordDO> alarmRecords = alarmRecordRepository.findAll();
|
|
@@ -61,8 +61,8 @@ public class AlarmLastTimeCache {
|
|
|
alarmRecords.forEach(
|
|
|
alarmRecord -> updateAlarmId(alarmRecord.getDefinitionId(), alarmRecord.getAlarmId())
|
|
|
);
|
|
|
- log.info("defineAlarmMap初始化完成");
|
|
|
- log.info("当前defineAlarmMap为:[{}]", defineAlarmMap.toString());
|
|
|
+ log.debug("defineAlarmMap初始化完成");
|
|
|
+ log.debug("当前defineAlarmMap为:[{}]", defineAlarmMap.toString());
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -99,10 +99,10 @@ public class AlarmLastTimeCache {
|
|
|
alarmLastTimeMap.put(alarmId, alarmLastTime);
|
|
|
// 持久化到数据库
|
|
|
alarmLastTimeRepository.save(alarmLastTime);
|
|
|
- log.info("[{}-{}]放入alarmLastTimeMap", alarmId, lastTime);
|
|
|
- log.info("当前alarmLastTimeMap缓存为:[{}]", alarmLastTimeMapToString(alarmLastTimeMap));
|
|
|
+ log.debug("[{}-{}]放入alarmLastTimeMap", alarmId, lastTime);
|
|
|
+ log.debug("当前alarmLastTimeMap缓存为:[{}]", alarmLastTimeMapToString(alarmLastTimeMap));
|
|
|
} else {
|
|
|
- log.info("经判断无需更新alarmLastTimeCache, 报警id - 报警持续时间:[{}-{}]", alarmId, lastTime);
|
|
|
+ log.debug("经判断无需更新alarmLastTimeCache, 报警id - 报警持续时间:[{}-{}]", alarmId, lastTime);
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -126,10 +126,10 @@ public class AlarmLastTimeCache {
|
|
|
alarmLastTimeMap.put(alarmId, alarmLastTime);
|
|
|
// 持久化到数据库
|
|
|
alarmLastTimeRepository.save(alarmLastTime);
|
|
|
- log.info("更新alarmLastTime已发送状态为:[{}-{}]", alarmId, alarmLastTimeHasSentEnum);
|
|
|
- log.info("当前alarmLastTimeMap缓存为:[{}]", alarmLastTimeMapToString(alarmLastTimeMap));
|
|
|
+ log.debug("更新alarmLastTime已发送状态为:[{}-{}]", alarmId, alarmLastTimeHasSentEnum);
|
|
|
+ log.debug("当前alarmLastTimeMap缓存为:[{}]", alarmLastTimeMapToString(alarmLastTimeMap));
|
|
|
} else {
|
|
|
- log.info("更新报警持续时间为已发送,未找到相应的alarmLastTime, 报警id: [{}]", alarmId);
|
|
|
+ log.debug("更新报警持续时间为已发送,未找到相应的alarmLastTime, 报警id: [{}]", alarmId);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -147,7 +147,7 @@ public class AlarmLastTimeCache {
|
|
|
public void setDeleteAvailable(String defineId) {
|
|
|
String alarmId = defineAlarmMap.get(defineId);
|
|
|
if (StringUtils.isBlank(alarmId)) {
|
|
|
- log.info("更新报警持续消息为可删除失败,根据报警定义id[{}]未找到报警id", defineId);
|
|
|
+ log.debug("更新报警持续消息为可删除失败,根据报警定义id[{}]未找到报警id", defineId);
|
|
|
return;
|
|
|
}
|
|
|
AlarmLastTime alarmLastTime = alarmLastTimeMap.get(alarmId);
|
|
@@ -157,10 +157,10 @@ public class AlarmLastTimeCache {
|
|
|
alarmLastTimeMap.put(alarmId, alarmLastTime);
|
|
|
// 持久化到数据库
|
|
|
alarmLastTimeRepository.save(alarmLastTime);
|
|
|
- log.info("更新alarmLastTime状态为可删除,报警id:[{}]", alarmId);
|
|
|
- log.info("当前alarmLastTimeMap缓存为:[{}]", alarmLastTimeMapToString(alarmLastTimeMap));
|
|
|
+ log.debug("更新alarmLastTime状态为可删除,报警id:[{}]", alarmId);
|
|
|
+ log.debug("当前alarmLastTimeMap缓存为:[{}]", alarmLastTimeMapToString(alarmLastTimeMap));
|
|
|
} else {
|
|
|
- log.info("更新报警持续消息为可删除失败,未找到相应的alarmLastTime, 报警id: [{}]", alarmId);
|
|
|
+ log.debug("更新报警持续消息为可删除失败,未找到相应的alarmLastTime, 报警id: [{}]", alarmId);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -183,10 +183,10 @@ public class AlarmLastTimeCache {
|
|
|
alarmLastTimeMap.put(alarmId, alarmLastTime);
|
|
|
// 持久化到数据库
|
|
|
alarmLastTimeRepository.save(alarmLastTime);
|
|
|
- log.info("更新alarmLastTime中报警状态为已创建,报警id:[{}]", alarmId);
|
|
|
- log.info("当前alarmLastTimeMap缓存为:[{}]", alarmLastTimeMapToString(alarmLastTimeMap));
|
|
|
+ log.debug("更新alarmLastTime中报警状态为已创建,报警id:[{}]", alarmId);
|
|
|
+ log.debug("当前alarmLastTimeMap缓存为:[{}]", alarmLastTimeMapToString(alarmLastTimeMap));
|
|
|
} else {
|
|
|
- log.info("报警持续消息中报警已创建,但未找到相应的alarmLastTime无法完成更新, 报警id: [{}]", alarmId);
|
|
|
+ log.debug("报警持续消息中报警已创建,但未找到相应的alarmLastTime无法完成更新, 报警id: [{}]", alarmId);
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -209,8 +209,8 @@ public class AlarmLastTimeCache {
|
|
|
alarmLastTimeMap.remove(alarmId);
|
|
|
// 从数据库中移除
|
|
|
alarmLastTimeRepository.deleteById(alarmId);
|
|
|
- log.info("报警id[{}]从alarmLastTimeMap移除", alarmId);
|
|
|
- log.info("当前alarmLastTimeMap缓存为:[{}]", alarmLastTimeMapToString(alarmLastTimeMap));
|
|
|
+ log.debug("报警id[{}]从alarmLastTimeMap移除", alarmId);
|
|
|
+ log.debug("当前alarmLastTimeMap缓存为:[{}]", alarmLastTimeMapToString(alarmLastTimeMap));
|
|
|
}
|
|
|
|
|
|
public AlarmLastTime get(String alarmId) {
|
|
@@ -311,7 +311,7 @@ public class AlarmLastTimeCache {
|
|
|
alarmLastTimeMap.put(alarmId, alarmLastTime);
|
|
|
// 持久化到数据库
|
|
|
alarmLastTimeRepository.save(alarmLastTime);
|
|
|
- log.info("完成报警持续消息的创建,报警id:[{}]", alarmId);
|
|
|
+ log.debug("完成报警持续消息的创建,报警id:[{}]", alarmId);
|
|
|
}
|
|
|
|
|
|
}
|