Merge branch 'wvp-28181-2.0'

648540858

2022-08-15 cb16cabb64e99d7f505822a49665725ff5b61ff6

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

@@ -98,16 +98,15 @@
   @PostMapping(value = "/on_server_keepalive", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onServerKeepalive(@RequestBody JSONObject json){



      if (logger.isDebugEnabled()) {

         logger.debug("[ ZLM HOOK ] on_server_keepalive API调用，参数：" + json.toString());

      }

      logger.info("[ ZLM HOOK ] on_server_keepalive API调用，参数：" + json.toString());

      String mediaServerId = json.getString("mediaServerId");

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

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

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

         for (ZLMHttpHookSubscribe.Event subscribe : subscribes) {

            subscribe.response(null, json);

         }

      }

      mediaServerService.updateMediaServerKeepalive(mediaServerId, json.getJSONObject("data"));



      JSONObject ret = new JSONObject();

      ret.put("code", 0);

@@ -167,7 +166,7 @@
         logger.debug("[ ZLM HOOK ]on_play API调用，参数：" + JSON.toJSONString(param));

      }

      String mediaServerId = param.getMediaServerId();

      ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_play, json);

      ZLMHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_play, json);

      if (subscribe != null ) {

         MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);

         if (mediaInfo != null) {

@@ -237,9 +236,11 @@
         // 鉴权通过

         redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);

         // 通知assist新的callId

         if (mediaInfo != null) {

         if (mediaInfo != null && mediaInfo.getRecordAssistPort() > 0) {

            assistRESTfulUtils.addStreamCallInfo(mediaInfo, param.getApp(), param.getStream(), callId, null);

         }

      }else {

         zlmMediaListManager.sendStreamEvent(param.getApp(),param.getStream(), param.getMediaServerId());

      }



      ret.put("code", 0);

@@ -250,7 +251,7 @@
      }





      ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, json);

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

      if (subscribe != null) {

         if (mediaInfo != null) {

            subscribe.response(mediaInfo, json);

@@ -374,7 +375,7 @@
         logger.debug("[ ZLM HOOK ]on_shell_login API调用，参数：" + json.toString());

      }

      String mediaServerId = json.getString("mediaServerId");

      ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_shell_login, json);

      ZLMHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_shell_login, json);

      if (subscribe != null ) {

         MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);

         if (mediaInfo != null) {

@@ -400,7 +401,7 @@
      logger.info("[ ZLM HOOK ]on_stream_changed API调用，参数：" + JSONObject.toJSONString(item));

      String mediaServerId = item.getMediaServerId();

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

      ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, json);

      ZLMHttpHookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_stream_changed, json);

      if (subscribe != null ) {

         MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);

         if (mediaInfo != null) {

@@ -442,13 +443,15 @@
            if (streamInfo!=null){

               redisCatchStorage.stopPlay(streamInfo);

               storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());

               // 如果正在给上级推送，则发送bye



            }else{

               streamInfo = redisCatchStorage.queryPlayback(null, null, stream, null);

               if (streamInfo != null) {

                  redisCatchStorage.stopPlayback(streamInfo.getDeviceID(), streamInfo.getChannelId(),

                        streamInfo.getStream(), null);

               }



               // 如果正在给上级推送，则发送bye

            }

         }else {

            if (!"rtp".equals(app)){

@@ -461,7 +464,6 @@
                     StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaServerItem,

                           app, stream, tracks, streamAuthorityInfo.getCallId());

                     item.setStreamInfo(streamInfoByAppAndStream);

                     item.setSeverId(userSetting.getServerId());

                     redisCatchStorage.addStream(mediaServerItem, type, app, stream, item);

                     if (item.getOriginType() == OriginType.RTSP_PUSH.ordinal()

                           || item.getOriginType() == OriginType.RTMP_PUSH.ordinal()

@@ -469,20 +471,6 @@
                        item.setSeverId(userSetting.getServerId());

                        zlmMediaListManager.addPush(item);

                     }



//                     List<GbStream> gbStreams = new ArrayList<>();

//                     if (streamPushItem == null || streamPushItem.getGbId() == null) {

//                        GbStream gbStream = storager.getGbStream(app, streamId);

//                        gbStreams.add(gbStream);

//                     }else {

//                        if (streamPushItem.getGbId() != null) {

//                           gbStreams.add(streamPushItem);

//                        }

//                     }

//                     if (gbStreams.size() > 0) {

//                        eventPublisher.catalogEventPublishForStream(null, gbStreams, CatalogEvent.ON);

//                     }



                  }else {

                     // 兼容流注销时类型从redis记录获取

                     MediaItem mediaItem = redisCatchStorage.getStreamInfo(app, stream, mediaServerId);

@@ -626,16 +614,21 @@
      }

      String remoteAddr = request.getRemoteAddr();

      jsonObject.put("ip", remoteAddr);

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

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

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

         for (ZLMHttpHookSubscribe.Event subscribe : subscribes) {

            subscribe.response(null, jsonObject);

         }

      }



      ZLMServerConfig zlmServerConfig = JSONObject.toJavaObject(jsonObject, ZLMServerConfig.class);

      if (zlmServerConfig !=null ) {

         mediaServerService.zlmServerOnline(zlmServerConfig);

      }

      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      ret.put("msg", "success");

      return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);

      return new ResponseEntity<>(ret.toString(),HttpStatus.OK);

   }



   private Map<String, String> urlParamToMap(String params) {