Browse Source

Merge remote-tracking branch 'origin/alarm-engine-cloud' into alarm-engine-cloud

xujiaheng 3 years ago
parent
commit
fb6b5a133a

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

@@ -174,7 +174,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
 							log.error("线程池处理发数信息发生错误", e);
 						}
 					}
-					alarmRedisCache.releaseLock(entry.getKey());
+					alarmRedisCache.releaseLock("alarm_data_lock:"+entry.getKey());
 				});
 			}
 			channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
@@ -383,7 +383,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
 			log.debug("报警恢复持续时间大于设定时间:[{}]>[{}]", alarmSuspendLastTime, uphold);
 			ZktAlarmRecordDO alarmRecordDO = getZktAlarmRecordDOWhenAlarmSuspend(defineId, dataTime, paramMap);
 			String alarmId = alarmRecordDO.getAlarmId();
-			alarmRedisCache.lock(alarmId, alarmId, 10);
+			alarmRedisCache.lock("alarm_record_lock:"+alarmId, alarmId, 10);
 			// 发送报警恢复消息
 			sendAlarmRecoverMessage(defineId, alarmSuspendStartTime, paramMap, alarmId);
 			// 取消过期任务
@@ -703,7 +703,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
 		dmpMessage.setProjectId(projectId);
 		dmpMessage.setGroupCode(groupCode);
 		dmpMessage.setExts(message);
-		alarmRedisCache.lock(alarmId, alarmId, 10);
+		alarmRedisCache.lock("alarm_record_lock:"+alarmId, alarmId, 10);
 		rabbitTemplate.convertAndSend(RabbitConfig.exchangeAlarm, RabbitConfig.alarmMsgRoutingKey,
 				JSON.toJSONString(dmpMessage));
 	}