From 39568777cbacd2bd23014daf57fc6a4a6b9a1240 Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Sat, 8 Nov 2025 07:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/conf/redis/RedisRpcConfig.java    | 10 ++++++++--
 .../control/RedisRpcStreamPushController.java | 20 ++++++++++++-------
 .../web/custom/CameraChannelController.java   |  1 -
 3 files changed, 21 insertions(+), 10 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 b56818049..e413d7240 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
@@ -18,7 +18,6 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
@@ -143,6 +142,10 @@ public class RedisRpcConfig implements MessageListener {
                 }
             }else {
                 if (method == null) {
+                    // 回复404结果
+                    RedisRpcResponse response = request.getResponse();
+                    response.setStatusCode(ErrorCode.ERROR404.getCode());
+                    sendResponse(response);
                     return;
                 }
                 RedisRpcResponse response = (RedisRpcResponse)method.invoke(controller, request);
@@ -150,8 +153,11 @@ public class RedisRpcConfig implements MessageListener {
                     sendResponse(response);
                 }
             }
-        }catch (InvocationTargetException | IllegalAccessException e) {
+        }catch (Exception e) {
             log.error("[redis-rpc ] 处理请求失败 ", e);
+            RedisRpcResponse response = request.getResponse();
+            response.setStatusCode(ErrorCode.ERROR100.getCode());
+            sendResponse(response);
         }
     }
 
diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcStreamPushController.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcStreamPushController.java
index 53212b178..babaa0f45 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcStreamPushController.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcStreamPushController.java
@@ -189,13 +189,19 @@ public class RedisRpcStreamPushController extends RpcController {
             response.setBody("param error");
             return response;
         }
-        streamPushPlayService.start(id, (code, msg, data) -> {
-            if (code == ErrorCode.SUCCESS.getCode()) {
-                response.setStatusCode(ErrorCode.SUCCESS.getCode());
-                response.setBody(JSONObject.toJSONString(data));
-                sendResponse(response);
-            }
-        }, null, null);
+        try {
+            streamPushPlayService.start(id, (code, msg, data) -> {
+                if (code == ErrorCode.SUCCESS.getCode()) {
+                    response.setStatusCode(ErrorCode.SUCCESS.getCode());
+                    response.setBody(JSONObject.toJSONString(data));
+                    sendResponse(response);
+                }
+            }, null, null);
+        }catch (IllegalArgumentException e) {
+            response.setStatusCode(ErrorCode.ERROR100.getCode());
+            response.setBody(e.getMessage());
+            sendResponse(response);
+        }
         return null;
     }
 
diff --git a/src/main/java/com/genersoft/iot/vmp/web/custom/CameraChannelController.java b/src/main/java/com/genersoft/iot/vmp/web/custom/CameraChannelController.java
index acde7e67e..e6ffffd1d 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/custom/CameraChannelController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/custom/CameraChannelController.java
@@ -14,7 +14,6 @@ import com.genersoft.iot.vmp.service.bean.CloudRecordItem;
 import com.genersoft.iot.vmp.service.bean.ErrorCallback;
 import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.streamProxy.service.IStreamProxyService;
 import com.genersoft.iot.vmp.streamPush.bean.StreamPush;
 import com.genersoft.iot.vmp.streamPush.service.IStreamPushPlayService;
 import com.genersoft.iot.vmp.streamPush.service.IStreamPushService;