648540858
2022-06-23 0da452293f15be019bf23923148691ca133e43b0
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -11,7 +11,6 @@
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
import com.genersoft.iot.vmp.media.zlm.dto.*;
import com.genersoft.iot.vmp.service.*;
@@ -92,10 +91,9 @@
   public ResponseEntity<String> onServerKeepalive(@RequestBody JSONObject json){
      if (logger.isDebugEnabled()) {
         logger.debug("[ ZLM HOOK ]on_server_keepalive API调用,参数:" + json.toString());
         logger.debug("[ 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);
      if (subscribes != null  && subscribes.size() > 0) {
         for (ZLMHttpHookSubscribe.Event subscribe : subscribes) {
@@ -165,7 +163,6 @@
         if (mediaInfo != null) {
            subscribe.response(mediaInfo, json);
         }
      }
      JSONObject ret = new JSONObject();
      ret.put("code", 0);
@@ -400,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记录获取