648540858
2022-06-23 0da452293f15be019bf23923148691ca133e43b0
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -245,6 +245,23 @@
      ret.put("msg", "success");
      return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
   }
   /**
    * 录制hls完成后通知事件;此事件对回复不敏感。
    *
    */
   @ResponseBody
   @PostMapping(value = "/on_record_ts", produces = "application/json;charset=UTF-8")
   public ResponseEntity<String> onRecordTs(@RequestBody JSONObject json){
      if (logger.isDebugEnabled()) {
         logger.debug("[ ZLM HOOK ]on_record_ts API调用,参数:" + json.toString());
      }
      String mediaServerId = json.getString("mediaServerId");
      JSONObject ret = new JSONObject();
      ret.put("code", 0);
      ret.put("msg", "success");
      return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
   }
   
   /**
    * rtsp专用的鉴权事件,先触发on_rtsp_realm事件然后才会触发on_rtsp_auth事件。
@@ -380,21 +397,22 @@
                     if (item.getOriginType() == OriginType.RTSP_PUSH.ordinal()
                           || item.getOriginType() == OriginType.RTMP_PUSH.ordinal()
                           || item.getOriginType() == OriginType.RTC_PUSH.ordinal() ) {
                        streamPushItem = zlmMediaListManager.addPush(item);
                        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) {
//                     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记录获取