From 7241e0d2d21e408877cf2e1c62a19f17a82a9ac9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 28 十二月 2021 09:33:25 +0800
Subject: [PATCH] 修复兼容接口查询通道列表查询
---
src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMKeepliveTimeoutListener.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMKeepliveTimeoutListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMKeepliveTimeoutListener.java
index 33a251c..3fc6a3c 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMKeepliveTimeoutListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMKeepliveTimeoutListener.java
@@ -1,8 +1,12 @@
package com.genersoft.iot.vmp.media.zlm.event;
+import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.UserSetup;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
+import com.genersoft.iot.vmp.service.IMediaServerService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +29,22 @@
private EventPublisher publisher;
@Autowired
+ private ZLMRESTfulUtils zlmresTfulUtils;
+
+ @Autowired
private UserSetup userSetup;
+
+ @Autowired
+ private IMediaServerService mediaServerService;
+
+ @Override
+ public void init() {
+ if (!userSetup.getRedisConfig()) {
+ // 閰嶇疆springboot榛樿Config涓虹┖锛屽嵆涓嶈搴旂敤鍘讳慨鏀箁edis鐨勯粯璁ら厤缃紝鍥犱负Redis鏈嶅姟鍑轰簬瀹夊叏浼氱鐢–ONFIG鍛戒护缁欒繙绋嬬敤鎴蜂娇鐢�
+ setKeyspaceNotificationsConfigParameter("");
+ }
+ super.init();
+ }
public ZLMKeepliveTimeoutListener(RedisMessageListenerContainer listenerContainer) {
super(listenerContainer);
@@ -46,7 +65,17 @@
}
String mediaServerId = expiredKey.substring(KEEPLIVEKEY_PREFIX.length(),expiredKey.length());
+ logger.info("[zlm蹇冭烦鍒版湡]锛�" + mediaServerId);
+ // 鍙戣捣http璇锋眰楠岃瘉zlm鏄惁纭疄鏃犳硶杩炴帴锛屽鏋滅‘瀹炴棤娉曡繛鎺ュ垯鍙戦�佺绾夸簨浠讹紝鍚﹀垯涓嶄綔澶勭悊
+ MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
+ JSONObject mediaServerConfig = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
+ if (mediaServerConfig == null) {
+ publisher.zlmOfflineEventPublish(mediaServerId);
+ }else {
+ logger.info("[zlm蹇冭烦鍒版湡]锛歿}楠岃瘉鍚巣lm浠嶅湪绾匡紝鍥炲蹇冭烦淇℃伅", mediaServerId);
+ // 娣诲姞zlm淇℃伅
+ mediaServerService.updateMediaServerKeepalive(mediaServerId, mediaServerConfig);
+ }
- publisher.zlmOfflineEventPublish(mediaServerId);
}
}
--
Gitblit v1.8.0