优化RPC调用

2024-12-12 12:42:57 +08:00
parent 9d96658696
commit 0a06ae9475
10 changed files with 96 additions and 79 deletions
--- 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,35 +1,28 @@
 package com.genersoft.iot.vmp.service.redisMsg.control;

-import com.alibaba.fastjson2.JSONObject;
-import com.genersoft.iot.vmp.common.StreamInfo;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.redis.RedisRpcConfig;
 import com.genersoft.iot.vmp.conf.redis.bean.RedisRpcMessage;
 import com.genersoft.iot.vmp.conf.redis.bean.RedisRpcRequest;
 import com.genersoft.iot.vmp.conf.redis.bean.RedisRpcResponse;
 import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel;
-import com.genersoft.iot.vmp.gb28181.bean.SendRtpInfo;
 import com.genersoft.iot.vmp.gb28181.service.IGbChannelPlayService;
 import com.genersoft.iot.vmp.gb28181.service.IGbChannelService;
-import com.genersoft.iot.vmp.gb28181.session.SSRCFactory;
-import com.genersoft.iot.vmp.media.bean.MediaServer;
-import com.genersoft.iot.vmp.media.event.hook.Hook;
-import com.genersoft.iot.vmp.media.event.hook.HookSubscribe;
-import com.genersoft.iot.vmp.media.event.hook.HookType;
-import com.genersoft.iot.vmp.media.service.IMediaServerService;
-import com.genersoft.iot.vmp.service.ISendRtpServerService;
 import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
 import com.genersoft.iot.vmp.service.redisMsg.dto.RedisRpcController;
 import com.genersoft.iot.vmp.service.redisMsg.dto.RedisRpcMapping;
+import com.genersoft.iot.vmp.service.redisMsg.dto.RpcController;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;

 import javax.sip.message.Response;

+@Component
@Slf4j
@RedisRpcController("channel")
-public class RedisRpcChannelPlayController {
+public class RedisRpcChannelPlayController extends RpcController {

    @Autowired
    private UserSetting userSetting;
--- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcSendRtpController.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/control/RedisRpcSendRtpController.java
@@ -5,27 +5,26 @@ import com.genersoft.iot.vmp.conf.exception.ControllerException;
 import com.genersoft.iot.vmp.conf.redis.bean.RedisRpcRequest;
 import com.genersoft.iot.vmp.conf.redis.bean.RedisRpcResponse;
 import com.genersoft.iot.vmp.gb28181.bean.SendRtpInfo;
-import com.genersoft.iot.vmp.gb28181.service.IGbChannelPlayService;
-import com.genersoft.iot.vmp.gb28181.service.IGbChannelService;
 import com.genersoft.iot.vmp.gb28181.session.SSRCFactory;
 import com.genersoft.iot.vmp.media.bean.MediaInfo;
 import com.genersoft.iot.vmp.media.bean.MediaServer;
-import com.genersoft.iot.vmp.media.event.hook.HookSubscribe;
 import com.genersoft.iot.vmp.media.service.IMediaServerService;
 import com.genersoft.iot.vmp.service.ISendRtpServerService;
 import com.genersoft.iot.vmp.service.redisMsg.dto.RedisRpcController;
 import com.genersoft.iot.vmp.service.redisMsg.dto.RedisRpcMapping;
+import com.genersoft.iot.vmp.service.redisMsg.dto.RpcController;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
 import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;

 import javax.sip.message.Response;

+@Component
@Slf4j
@RedisRpcController("sendRtp")
-public class RedisRpcSendRtpController {
+public class RedisRpcSendRtpController extends RpcController {

    @Autowired
    private SSRCFactory ssrcFactory;
@@ -39,17 +38,6 @@ public class RedisRpcSendRtpController {
    @Autowired
    private UserSetting userSetting;

-    @Autowired
-    private HookSubscribe hookSubscribe;
-
-    @Autowired
-    private RedisTemplate<Object, Object> redisTemplate;
-
-    @Autowired
-    private IGbChannelService channelService;
-
-    @Autowired
-    private IGbChannelPlayService channelPlayService;

    /**
     * 获取发流的信息
--- 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
@@ -8,8 +8,6 @@ import com.genersoft.iot.vmp.conf.redis.bean.RedisRpcMessage;
 import com.genersoft.iot.vmp.conf.redis.bean.RedisRpcRequest;
 import com.genersoft.iot.vmp.conf.redis.bean.RedisRpcResponse;
 import com.genersoft.iot.vmp.gb28181.bean.SendRtpInfo;
-import com.genersoft.iot.vmp.gb28181.service.IGbChannelPlayService;
-import com.genersoft.iot.vmp.gb28181.service.IGbChannelService;
 import com.genersoft.iot.vmp.gb28181.session.SSRCFactory;
 import com.genersoft.iot.vmp.media.bean.MediaServer;
 import com.genersoft.iot.vmp.media.event.hook.Hook;
@@ -19,13 +17,16 @@ import com.genersoft.iot.vmp.media.service.IMediaServerService;
 import com.genersoft.iot.vmp.service.ISendRtpServerService;
 import com.genersoft.iot.vmp.service.redisMsg.dto.RedisRpcController;
 import com.genersoft.iot.vmp.service.redisMsg.dto.RedisRpcMapping;
+import com.genersoft.iot.vmp.service.redisMsg.dto.RpcController;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;

+@Component
@Slf4j
@RedisRpcController("streamPush")
-public class RedisRpcStreamPushController {
+public class RedisRpcStreamPushController extends RpcController {

    @Autowired
    private SSRCFactory ssrcFactory;
@@ -45,11 +46,6 @@ public class RedisRpcStreamPushController {
    @Autowired
    private RedisTemplate<Object, Object> redisTemplate;

-    @Autowired
-    private IGbChannelService channelService;
-
-    @Autowired
-    private IGbChannelPlayService channelPlayService;

    private void sendResponse(RedisRpcResponse response){
        log.info("[redis-rpc] >> {}", response);
--- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/dto/RedisRpcController.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/dto/RedisRpcController.java
@@ -1,13 +1,10 @@
 package com.genersoft.iot.vmp.service.redisMsg.dto;

-import org.springframework.stereotype.Component;
-
 import java.lang.annotation.*;

@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
-@Component
 public @interface RedisRpcController {
    /**
     * 请求路径
--- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/dto/RpcController.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/dto/RpcController.java
@@ -0,0 +1,33 @@
+package com.genersoft.iot.vmp.service.redisMsg.dto;
+
+
+import com.genersoft.iot.vmp.conf.redis.RedisRpcConfig;
+import com.genersoft.iot.vmp.conf.redis.bean.RedisRpcClassHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.annotation.PostConstruct;
+import java.lang.reflect.Method;
+
+public class RpcController {
+
+    @Autowired
+    private RedisRpcConfig redisRpcConfig;
+
+
+    @PostConstruct
+    public void init() {
+        String controllerPath = this.getClass().getAnnotation(RedisRpcController.class).value();
+        // 扫描其下的方法
+        Method[] methods = this.getClass().getDeclaredMethods();
+        for (Method method : methods) {
+            RedisRpcMapping annotation = method.getAnnotation(RedisRpcMapping.class);
+            if (annotation != null) {
+                String methodPath =  annotation.value();
+                if (methodPath != null) {
+                    redisRpcConfig.addHandler(controllerPath + "/" + methodPath, new RedisRpcClassHandler(this, method));
+                }
+            }
+
+        }
+    }
+}