From 0dab86f0b8b8ee2d735362a3336eb95f69650d10 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 19 四月 2024 10:22:34 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/genersoft/iot/vmp/service/redisMsg/service/RedisRpcServiceImpl.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/service/RedisRpcServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/service/RedisRpcServiceImpl.java
index f4c429c..9b0a195 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/service/RedisRpcServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/service/RedisRpcServiceImpl.java
@@ -14,13 +14,18 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.hook.HookParam;
import com.genersoft.iot.vmp.service.redisMsg.IRedisRpcService;
+import com.genersoft.iot.vmp.utils.SystemInfoUtils;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
@Service
public class RedisRpcServiceImpl implements IRedisRpcService {
@@ -84,11 +89,13 @@
}
@Override
- public void waitePushStreamOnline(SendRtpItem sendRtpItem, CommonCallback<String> callback) {
+ public long waitePushStreamOnline(SendRtpItem sendRtpItem, CommonCallback<String> callback) {
logger.info("[璇锋眰鎵�鏈塛VP鐩戝惉娴佷笂绾縘 {}/{}", sendRtpItem.getApp(), sendRtpItem.getStream());
// 鐩戝惉娴佷笂绾裤�� 娴佷笂绾跨洿鎺ュ彂閫乻endRtpItem娑堟伅缁欏疄闄呯殑淇′护澶勭悊鑰�
HookSubscribeForStreamChange hook = HookSubscribeFactory.on_stream_changed(
sendRtpItem.getApp(), sendRtpItem.getStream(), true, "rtsp", null);
+ RedisRpcRequest request = buildRequest("waitePushStreamOnline", sendRtpItem);
+ request.setToId(sendRtpItem.getServerId());
hookSubscribe.addSubscribe(hook, (MediaServerItem mediaServerItemInUse, HookParam hookParam) -> {
// 璇诲彇redis涓殑涓婄骇鐐规挱淇℃伅锛岀敓鎴恠endRtpItm鍙戦�佸嚭鍘�
@@ -105,9 +112,9 @@
callback.run(sendRtpItem.getRedisKey());
}
hookSubscribe.removeSubscribe(hook);
+ redisRpcConfig.removeCallback(request.getSn());
});
- RedisRpcRequest request = buildRequest("waitePushStreamOnline", sendRtpItem);
- request.setToId(sendRtpItem.getServerId());
+
redisRpcConfig.request(request, response -> {
if (response.getBody() == null) {
logger.info("[璇锋眰鎵�鏈塛VP鐩戝惉娴佷笂绾縘 娴佷笂绾�,浣嗘槸鏈壘鍒板彂娴佷俊鎭細{}/{}", sendRtpItem.getApp(), sendRtpItem.getStream());
@@ -118,8 +125,9 @@
if (callback != null) {
callback.run(response.getBody().toString());
}
+ hookSubscribe.removeSubscribe(hook);
});
-
+ return request.getSn();
}
@Override
@@ -144,4 +152,9 @@
request.setToId(sendRtpItem.getServerId());
redisRpcConfig.request(request, 10);
}
+
+ @Override
+ public void removeCallback(long key) {
+ redisRpcConfig.removeCallback(key);
+ }
}
--
Gitblit v1.8.0