From 3769e700946d79d93cc748897d456caa5714d58d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Fri, 13 Dec 2024 15:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=94=99=E8=AF=AF=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/conf/redis/RedisRpcConfig.java    |  4 ++++
 .../impl/GbChannelPlayServiceImpl.java        |  2 --
 .../RedisRpcChannelPlayController.java        |  2 --
 .../service/RedisRpcPlayServiceImpl.java      | 19 -------------------
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisRpcConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisRpcConfig.java
index 29e090ad..49c1fb95 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisRpcConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisRpcConfig.java
@@ -123,6 +123,10 @@ public class RedisRpcConfig implements MessageListener {
             }
             log.info("[redis-rpc] << {}", request);
             RedisRpcClassHandler redisRpcClassHandler = protocolHash.get(request.getUri());
+            if (redisRpcClassHandler == null) {
+                log.error("[redis-rpc] 路径: {}不存在", request.getUri());
+                return;
+            }
             RpcController controller = redisRpcClassHandler.getController();
             Method method = redisRpcClassHandler.getMethod();
             // 没有携带目标ID的可以理解为哪个wvp有结果就哪个回复，携带目标ID，但是如果是不存在的uri则直接回复404
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
index cd3bf212..d01409a2 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
@@ -150,8 +150,6 @@ public class GbChannelPlayServiceImpl implements IGbChannelPlayService {
         }
     }
 
-
-
     @Override
     public void playProxy(CommonGBChannel channel, ErrorCallback<StreamInfo> callback){
         // 拉流代理通道
diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcChannelPlayController.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcChannelPlayController.java
index 3eb9c1e3..653e2453 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcChannelPlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcChannelPlayController.java
@@ -1,7 +1,6 @@
 package com.genersoft.iot.vmp.service.redisMsg.control;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.genersoft.iot.vmp.common.InviteInfo;
 import com.genersoft.iot.vmp.common.InviteSessionType;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.exception.ControllerException;
@@ -19,7 +18,6 @@ import com.genersoft.iot.vmp.service.redisMsg.dto.RedisRpcMapping;
 import com.genersoft.iot.vmp.service.redisMsg.dto.RpcController;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/service/RedisRpcPlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/service/RedisRpcPlayServiceImpl.java
index d293721d..e82b5323 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/service/RedisRpcPlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/service/RedisRpcPlayServiceImpl.java
@@ -18,7 +18,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.sip.message.Response;
 import java.util.concurrent.TimeUnit;
 
 @Slf4j
@@ -141,23 +140,5 @@ public class RedisRpcPlayServiceImpl implements IRedisRpcPlayService {
             }
         }
     }
-
-    @Override
-    public void stop(String serverId, InviteSessionType type, int channelId, String stream) {
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("channelId", channelId);
-        jsonObject.put("stream", stream);
-        jsonObject.put("inviteSessionType", type);
-        RedisRpcRequest request = buildRequest("channel/stop", jsonObject.toJSONString());
-        request.setToId(serverId);
-        RedisRpcResponse response = redisRpcConfig.request(request, 50);
-        if (response == null) {
-            throw new ControllerException(ErrorCode.ERROR100.getCode(), ErrorCode.ERROR100.getMsg());
-        }else {
-            if (response.getStatusCode() != Response.OK) {
-                throw new ControllerException(ErrorCode.ERROR100.getCode(), ErrorCode.ERROR100.getMsg());
-            }
-        }
-    }
 }