From bea63f67e75ea6c38d946c2ee463260fcf815f87 Mon Sep 17 00:00:00 2001
From: Fang <costa11@qq.com>
Date: 星期一, 07 三月 2022 14:21:29 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepaliveTimeoutListenerForPlatform.java | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepaliveTimeoutListenerForPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepaliveTimeoutListenerForPlatform.java
index d0850a8..3b611b5 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepaliveTimeoutListenerForPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/offline/KeepaliveTimeoutListenerForPlatform.java
@@ -1,16 +1,27 @@
package com.genersoft.iot.vmp.gb28181.event.offline;
+import com.genersoft.iot.vmp.conf.RedisKeyExpirationEventMessageListener;
import com.genersoft.iot.vmp.conf.UserSetup;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.DependsOn;
import org.springframework.data.redis.connection.Message;
+import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
import org.springframework.stereotype.Component;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import org.springframework.util.StringUtils;
+
+import java.util.Properties;
/**
* @description:璁惧蹇冭烦瓒呮椂鐩戝惉,鍊熷姪redis杩囨湡鐗规�э紝杩涜鐩戝惉锛岀洃鍚埌璇存槑璁惧蹇冭烦瓒呮椂锛屽彂閫佺绾夸簨浠�
@@ -18,7 +29,7 @@
* @date: 2020骞�5鏈�6鏃� 涓婂崍11:35:46
*/
@Component
-public class KeepaliveTimeoutListenerForPlatform extends KeyExpirationEventMessageListener {
+public class KeepaliveTimeoutListenerForPlatform extends RedisKeyExpirationEventMessageListener {
private Logger logger = LoggerFactory.getLogger(KeepaliveTimeoutListenerForPlatform.class);
@@ -28,8 +39,14 @@
@Autowired
private UserSetup userSetup;
- public KeepaliveTimeoutListenerForPlatform(RedisMessageListenerContainer listenerContainer) {
- super(listenerContainer);
+ @Autowired
+ private SipSubscribe sipSubscribe;
+
+ @Autowired
+ private IVideoManagerStorager storager;
+
+ public KeepaliveTimeoutListenerForPlatform(RedisMessageListenerContainer listenerContainer, UserSetup userSetup) {
+ super(listenerContainer, userSetup);
}
@@ -47,17 +64,32 @@
String PLATFORM_KEEPLIVEKEY_PREFIX = VideoManagerConstants.PLATFORM_KEEPALIVE_PREFIX + userSetup.getServerId() + "_";
String PLATFORM_REGISTER_PREFIX = VideoManagerConstants.PLATFORM_REGISTER_PREFIX + userSetup.getServerId() + "_";
String KEEPLIVEKEY_PREFIX = VideoManagerConstants.KEEPLIVEKEY_PREFIX + userSetup.getServerId() + "_";
+ String REGISTER_INFO_PREFIX = VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + userSetup.getServerId() + "_";
if (expiredKey.startsWith(PLATFORM_KEEPLIVEKEY_PREFIX)) {
String platformGBId = expiredKey.substring(PLATFORM_KEEPLIVEKEY_PREFIX.length(),expiredKey.length());
-
- publisher.platformKeepaliveExpireEventPublish(platformGBId);
+ ParentPlatform platform = storager.queryParentPlatByServerGBId(platformGBId);
+ if (platform != null) {
+ publisher.platformKeepaliveExpireEventPublish(platformGBId);
+ }
}else if (expiredKey.startsWith(PLATFORM_REGISTER_PREFIX)) {
String platformGBId = expiredKey.substring(PLATFORM_REGISTER_PREFIX.length(),expiredKey.length());
-
- publisher.platformNotRegisterEventPublish(platformGBId);
- }else{
+ ParentPlatform platform = storager.queryParentPlatByServerGBId(platformGBId);
+ if (platform != null) {
+ publisher.platformRegisterCycleEventPublish(platformGBId);
+ }
+ }else if (expiredKey.startsWith(KEEPLIVEKEY_PREFIX)){
String deviceId = expiredKey.substring(KEEPLIVEKEY_PREFIX.length(),expiredKey.length());
- publisher.outlineEventPublish(deviceId, KEEPLIVEKEY_PREFIX);
+ Device device = storager.queryVideoDevice(deviceId);
+ if (device != null) {
+ publisher.outlineEventPublish(deviceId, KEEPLIVEKEY_PREFIX);
+ }
+ }else if (expiredKey.startsWith(REGISTER_INFO_PREFIX)) {
+ String callid = expiredKey.substring(REGISTER_INFO_PREFIX.length());
+ SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult();
+ eventResult.callId = callid;
+ eventResult.msg = "娉ㄥ唽瓒呮椂";
+ eventResult.type = "register timeout";
+ sipSubscribe.getErrorSubscribe(callid).response(eventResult);
}
}
--
Gitblit v1.8.0