|
@@ -385,6 +385,7 @@ public class MonitorIndicatorRecordServiceImpl implements IMonitorIndicatorRecor
|
|
|
String alarmItemCode = objIdAndAlarmItemCode.substring(indexOf + 1);
|
|
|
String lockKey = AlarmConstants.alarmDataLockPrefix + objId + "-" + alarmItemCode;
|
|
|
Object isLock = redisUtil.get(lockKey);
|
|
|
+ log.error("是否获取到锁:" + isLock);
|
|
|
if (null != isLock) {
|
|
|
continue;
|
|
|
}
|
|
@@ -395,11 +396,12 @@ public class MonitorIndicatorRecordServiceImpl implements IMonitorIndicatorRecor
|
|
|
|
|
|
//通过redis查询对象该报警类型下的发数截止时间
|
|
|
ConfigItemDataSendTimeDTO configItemSendTimeDTO = getConfigItemSendTimeDTO(projectDTO, objIdAndAlarmItemCode);
|
|
|
-
|
|
|
+ log.error("发数截止时间:" + objIdAndAlarmItemCode + "," + configItemSendTimeDTO);
|
|
|
Date lastSendTime = configItemSendTimeDTO.getLastSendTime();
|
|
|
Date endTime = getSendEndTime(lastSendTime);
|
|
|
|
|
|
Map<String, List<MonitorIndicatorRecord>> timeKeyAndRecordList = getTimekeyAndRecordListGteLt(projectDTO, objId, infCodeList, lastSendTime, endTime);
|
|
|
+ log.error("本次需要发的数:" + timeKeyAndRecordList);
|
|
|
if (timeKeyAndRecordList == null) {
|
|
|
continue;
|
|
|
}
|