修复导入通道时无平台关联时的bug

648540858

2022-03-07 41616f726dafafe7c015bf4f3e02a7aa9488a3a2

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

@@ -1,24 +1,22 @@
package com.genersoft.iot.vmp.media.zlm;



import java.util.ArrayList;

import java.util.List;

import java.util.UUID;



import com.alibaba.fastjson.JSON;

import com.alibaba.fastjson.JSONArray;

import com.genersoft.iot.vmp.common.StreamInfo;

import com.genersoft.iot.vmp.conf.MediaConfig;

import com.genersoft.iot.vmp.conf.UserSetup;

import com.genersoft.iot.vmp.gb28181.bean.Device;

import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;

import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;

import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;

import com.genersoft.iot.vmp.service.IMediaServerService;

import com.genersoft.iot.vmp.service.IMediaService;

import com.genersoft.iot.vmp.service.IStreamProxyService;

import com.genersoft.iot.vmp.gb28181.bean.GbStream;

import com.genersoft.iot.vmp.gb28181.event.EventPublisher;

import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;

import com.genersoft.iot.vmp.media.zlm.dto.*;

import com.genersoft.iot.vmp.service.*;

import com.genersoft.iot.vmp.service.bean.SSRCInfo;

import com.genersoft.iot.vmp.storager.IRedisCatchStorage;

import com.genersoft.iot.vmp.storager.IVideoManagerStorager;

import com.genersoft.iot.vmp.service.IPlayService;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

@@ -65,10 +63,13 @@
   private IStreamProxyService streamProxyService;



   @Autowired

   private IStreamPushService streamPushService;



   @Autowired

   private IMediaService mediaService;



   @Autowired

   private ZLMRESTfulUtils zlmresTfulUtils;

   private EventPublisher eventPublisher;



    @Autowired

    private ZLMMediaListManager zlmMediaListManager;

@@ -83,6 +84,32 @@
   private MediaConfig mediaConfig;



   /**

    * 服务器定时上报时间，上报间隔可配置，默认10s上报一次

    *

    */

   @ResponseBody

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

      }

      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) {

            subscribe.response(null, json);

         }

      }



      JSONObject ret = new JSONObject();

      ret.put("code", 0);

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

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

   }



   /**

    * 流量统计事件，播放器或推流器断开时并且耗用流量超过特定阈值时会触发此事件，阈值通过配置文件general.flowThreshold配置；此事件对回复不敏感。

    *  

    */

@@ -91,7 +118,7 @@
   public ResponseEntity<String> onFlowReport(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

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

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

      }

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

      JSONObject ret = new JSONObject();

@@ -109,7 +136,7 @@
   public ResponseEntity<String> onHttpAccess(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

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

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

      }

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

      JSONObject ret = new JSONObject();

@@ -129,7 +156,7 @@
   public ResponseEntity<String> onPlay(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

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

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

      }

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

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

@@ -154,22 +181,38 @@
   @PostMapping(value = "/on_publish", produces = "application/json;charset=UTF-8")

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



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



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

      JSONObject ret = new JSONObject();

      ret.put("code", 0);

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

      ret.put("enableHls", true);

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

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

      if (subscribe != null) {

         MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);

         if (mediaInfo != null) {

            subscribe.response(mediaInfo, json);

         }else {

            ret.put("code", 1);

            ret.put("msg", "zlm not register");

         }

      }

      JSONObject ret = new JSONObject();

      ret.put("code", 0);

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

      ret.put("enableHls", true);

      ret.put("enableMP4", userSetup.isRecordPushLive());

      ret.put("enableRtxp", true);

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

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

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

         ret.put("enableMP4", userSetup.getRecordSip());

      }else {

         ret.put("enableMP4", userSetup.isRecordPushLive());

      }

      StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(stream);



      // 录像回放时不进行录像下载

      if (streamInfo != null) {

         ret.put("enableMP4", false);

      }else {

         ret.put("enableMP4", userSetup.isRecordPushLive());

      }



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

   }

   

@@ -182,7 +225,7 @@
   public ResponseEntity<String> onRecordMp4(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

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

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

      }

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

      JSONObject ret = new JSONObject();

@@ -200,7 +243,7 @@
   public ResponseEntity<String> onRtspRealm(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

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

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

      }

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

      JSONObject ret = new JSONObject();

@@ -219,7 +262,7 @@
   public ResponseEntity<String> onRtspAuth(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

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

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

      }

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

      JSONObject ret = new JSONObject();

@@ -238,7 +281,7 @@
   public ResponseEntity<String> onShellLogin(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

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

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

      }

      // TODO 如果是带有rtpstream则开启按需拉流

      // String app = json.getString("app");

@@ -266,9 +309,9 @@
   @ResponseBody

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

   public ResponseEntity<String> onStreamChanged(@RequestBody MediaItem item){

		


      if (logger.isDebugEnabled()) {

         logger.debug("ZLM HOOK on_stream_changed API调用，参数：" + JSONObject.toJSONString(item));

         logger.debug("[ ZLM HOOK ]on_stream_changed API调用，参数：" + JSONObject.toJSONString(item));

      }

      String mediaServerId = item.getMediaServerId();

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

@@ -286,14 +329,17 @@
      String schema = item.getSchema();

      List<MediaItem.MediaTrack> tracks = item.getTracks();

      boolean regist = item.isRegist();

      if (tracks != null) {

         logger.info("[stream: " + streamId + "] on_stream_changed->>" + schema);

      }

      if ("rtmp".equals(schema)){

         logger.info("on_stream_changed：注册->{}, app->{}, stream->{}", regist, app, streamId);

         if (regist) {

            mediaServerService.addCount(mediaServerId);

         }else {

            mediaServerService.removeCount(mediaServerId);

         }

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

               || item.getOriginType() == OriginType.FFMPEG_PULL.ordinal()) {

            // 设置拉流代理上线/离线

            streamProxyService.updateStatus(regist, app, streamId);

         }

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

            StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);

@@ -306,33 +352,58 @@
            }

         }else {

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



               boolean pushChange = false;



               String type = OriginType.values()[item.getOriginType()].getType();

               MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);

               if (regist) {

                  if ((item.getOriginType() == 1 || item.getOriginType() == 2 || item.getOriginType() == 8)) {

                     pushChange = true;

                     zlmMediaListManager.addMedia(item);

                     StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(mediaServerItem, app, streamId, tracks);

                     redisCatchStorage.addPushStream(mediaServerItem, app, streamId, streamInfo);



               if (mediaServerItem != null){

                  if (regist) {

                     StreamPushItem streamPushItem = null;

                     StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaServerItem, app, streamId, tracks);

                     item.setStreamInfo(streamInfoByAppAndStream);



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

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

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

                           || item.getOriginType() == OriginType.RTC_PUSH.ordinal() ) {

                        streamPushItem = 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, streamId, mediaServerId);

                     if (mediaItem != null) {

                        type = OriginType.values()[mediaItem.getOriginType()].getType();

                        redisCatchStorage.removeStream(mediaServerItem.getId(), type, app, streamId);

                     }

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

                     if (gbStream != null) {

                        eventPublisher.catalogEventPublishForStream(null, gbStream, CatalogEvent.OFF);

                     }

                     zlmMediaListManager.removeMedia(app, streamId);

                  }

               }else {

                  int result = zlmMediaListManager.removeMedia( app, streamId);

                  redisCatchStorage.removePushStream(mediaServerItem, app, streamId);

                  if (result > 0) {

                     pushChange = true;

                  if (type != null) {

                     // 发送流变化redis消息

                     JSONObject jsonObject = new JSONObject();

                     jsonObject.put("serverId", userSetup.getServerId());

                     jsonObject.put("app", app);

                     jsonObject.put("stream", streamId);

                     jsonObject.put("register", regist);

                     jsonObject.put("mediaServerId", mediaServerId);

                     redisCatchStorage.sendStreamChangeMsg(type, jsonObject);

                  }

               }

               if(pushChange) {

                  // 发送流变化redis消息

                  JSONObject jsonObject = new JSONObject();

                  jsonObject.put("serverId", userSetup.getServerId());

                  jsonObject.put("app", app);

                  jsonObject.put("stream", streamId);

                  jsonObject.put("register", regist);

                  jsonObject.put("mediaServerId", mediaServerId);

                  redisCatchStorage.sendStreamChangeMsg(jsonObject);

               }

            }

         }

@@ -353,31 +424,38 @@
   public ResponseEntity<String> onStreamNoneReader(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

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

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

      }

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

      String streamId = json.getString("stream");

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



      // TODO 如果在给上级推流，也不停止。

      JSONObject ret = new JSONObject();

      ret.put("code", 0);

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

         JSONObject ret = new JSONObject();

         ret.put("code", 0);

         ret.put("close", true);

         StreamInfo streamInfoForPlayCatch = redisCatchStorage.queryPlayByStreamId(streamId);

         if (streamInfoForPlayCatch != null) {

            // 如果在给上级推流，也不停止。

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

               ret.put("close", false);

            } else {

               cmder.streamByeCmd(streamInfoForPlayCatch.getDeviceID(), streamInfoForPlayCatch.getChannelId());

               cmder.streamByeCmd(streamInfoForPlayCatch.getDeviceID(), streamInfoForPlayCatch.getChannelId(),

                     streamInfoForPlayCatch.getStream());

               redisCatchStorage.stopPlay(streamInfoForPlayCatch);

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

            }

         }else{

            StreamInfo streamInfoForPlayBackCatch = redisCatchStorage.queryPlaybackByStreamId(streamId);

            if (streamInfoForPlayBackCatch != null) {

               cmder.streamByeCmd(streamInfoForPlayBackCatch.getDeviceID(), streamInfoForPlayBackCatch.getChannelId());

               cmder.streamByeCmd(streamInfoForPlayBackCatch.getDeviceID(),

                     streamInfoForPlayBackCatch.getChannelId(), streamInfoForPlayBackCatch.getStream());

               redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch);

            }else {

               StreamInfo streamInfoForDownload = redisCatchStorage.queryDownloadByStreamId(streamId);

               // 进行录像下载时无人观看不断流

               if (streamInfoForDownload != null) {

                  ret.put("close", false);

               }

            }

         }

         MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);

@@ -386,8 +464,6 @@
         }

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

      }else {

         JSONObject ret = new JSONObject();

         ret.put("code", 0);

         StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(app, streamId);

         if (streamProxyItem != null && streamProxyItem.isEnable_remove_none_reader()) {

            ret.put("close", true);

@@ -399,7 +475,6 @@
         }

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

      }



   }

   

   /**

@@ -410,11 +485,11 @@
   @PostMapping(value = "/on_stream_not_found", produces = "application/json;charset=UTF-8")

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

      if (logger.isDebugEnabled()) {

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

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

      }

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

      MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);

      if (userSetup.isAutoApplyPlay() && mediaInfo != null) {

      if (userSetup.isAutoApplyPlay() && mediaInfo != null && mediaInfo.isRtpEnable()) {

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

         String streamId = json.getString("stream");

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

@@ -422,30 +497,18 @@
            if (s.length == 2) {

               String deviceId = s[0];

               String channelId = s[1];

               Device device = storager.queryVideoDevice(deviceId);

               Device device = redisCatchStorage.getDevice(deviceId);

               if (device != null) {

                  UUID uuid = UUID.randomUUID();

                  SSRCInfo ssrcInfo;

                  String streamId2 = null;

                  if (mediaInfo.isRtpEnable()) {

                     streamId2 = String.format("%s_%s", device.getDeviceId(), channelId);

                  }

                  ssrcInfo = mediaServerService.openRTPServer(mediaInfo, streamId2);

                  cmder.playStreamCmd(mediaInfo, ssrcInfo, device, channelId, (MediaServerItem mediaServerItemInuse, JSONObject response) -> {

                     logger.info("收到订阅消息： " + response.toJSONString());

                     playService.onPublishHandlerForPlay(mediaServerItemInuse, response, deviceId, channelId, uuid.toString());

                  }, null);

                  playService.play(mediaInfo,deviceId, channelId, null, null, null);

               }



            }

         }



      }



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

   }

   

   /**

@@ -457,7 +520,7 @@
   public ResponseEntity<String> onServerStarted(HttpServletRequest request, @RequestBody JSONObject jsonObject){

      

      if (logger.isDebugEnabled()) {

         logger.debug("ZLM HOOK on_server_started API调用，参数：" + jsonObject.toString());

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

      }

      String remoteAddr = request.getRemoteAddr();

      jsonObject.put("ip", remoteAddr);