优化部分hook订阅

648540858

2022-07-27 f84eebdb75a6af1894b057b0255b01992bdd4f03

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

@@ -108,6 +108,7 @@
            subscribe.response(null, json);

         }

      }

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



      JSONObject ret = new JSONObject();

      ret.put("code", 0);

@@ -240,6 +241,8 @@
         if (mediaInfo != null) {

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

         }

      }else {

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

      }



      ret.put("code", 0);

@@ -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);

@@ -632,10 +620,15 @@
            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) {