使用冒号分隔redis的key

648540858

2024-03-28 1de344674afd6bb35b51b165bbad76dbe6299b7e

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

@@ -73,9 +73,6 @@
    private AudioBroadcastManager audioBroadcastManager;



    @Autowired

    private ZLMServerFactory zlmServerFactory;



    @Autowired

    private IPlayService playService;



    @Autowired

@@ -124,9 +121,6 @@
    private VideoStreamSessionManager sessionManager;



    @Autowired

    private AssistRESTfulUtils assistRESTfulUtils;



    @Autowired

    private SSRCFactory ssrcFactory;



    @Qualifier("taskExecutor")

@@ -147,7 +141,7 @@


        taskExecutor.execute(() -> {

            List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_keepalive);

            if (subscribes != null && subscribes.size() > 0) {

            if (subscribes != null && !subscribes.isEmpty()) {

                for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {

                    subscribe.response(null, param);

                }

@@ -166,7 +160,7 @@
    @PostMapping(value = "/on_play", produces = "application/json;charset=UTF-8")

    public HookResult onPlay(@RequestBody OnPlayHookParam param) {

        if (logger.isDebugEnabled()) {

            logger.debug("[ZLM HOOK] 播放鉴权：{}->{}" + param.getMediaServerId(), param);

            logger.debug("[ZLM HOOK] 播放鉴权：{}->{}", param.getMediaServerId(), param);

        }

        String mediaServerId = param.getMediaServerId();



@@ -252,11 +246,7 @@
        taskExecutor.execute(() -> {

            ZlmHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_publish, json);

            if (subscribe != null) {

                if (mediaInfo != null) {

                    subscribe.response(mediaInfo, param);

                } else {

                    new HookResultForOnPublish(1, "zlm not register");

                }

                subscribe.response(mediaInfo, param);

            }

        });



@@ -380,7 +370,6 @@
                    redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);

                }

            }



            if ("rtsp".equals(param.getSchema())) {

                logger.info("流变化：注册->{}, app->{}, stream->{}", param.isRegist(), param.getApp(), param.getStream());

                if (param.isRegist()) {

@@ -580,9 +569,9 @@
                }

                // 收到无人观看说明流也没有在往上级推送

                if (redisCatchStorage.isChannelSendingRTP(inviteInfo.getChannelId())) {

                    List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByChnnelId(

                    List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByChannelId(

                            inviteInfo.getChannelId());

                    if (sendRtpItems.size() > 0) {

                    if (!sendRtpItems.isEmpty()) {

                        for (SendRtpItem sendRtpItem : sendRtpItems) {

                            ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(sendRtpItem.getPlatformId());

                            try {

@@ -799,7 +788,7 @@
        logger.info("[ZLM HOOK] zlm 启动 " + zlmServerConfig.getGeneralMediaServerId());

        taskExecutor.execute(() -> {

            List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_server_started);

            if (subscribes != null && subscribes.size() > 0) {

            if (subscribes != null && !subscribes.isEmpty()) {

                for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {

                    subscribe.response(null, zlmServerConfig);

                }

@@ -848,12 +837,11 @@
     */

    @ResponseBody

    @PostMapping(value = "/on_rtp_server_timeout", produces = "application/json;charset=UTF-8")

    public HookResult onRtpServerTimeout(HttpServletRequest request, @RequestBody OnRtpServerTimeoutHookParam

    public HookResult onRtpServerTimeout(@RequestBody OnRtpServerTimeoutHookParam

            param) {

        logger.info("[ZLM HOOK] rtpServer收流超时：{}->{}({})", param.getMediaServerId(), param.getStream_id(), param.getSsrc());



        taskExecutor.execute(() -> {

            JSONObject json = (JSONObject) JSON.toJSON(param);

            List<ZlmHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_rtp_server_timeout);

            if (subscribes != null && !subscribes.isEmpty()) {

                for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {