添加第二种语音对讲实现

648540858

2022-09-29 06bbe3fe01e5af9486c309693a975077df813f7c

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

@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.media.zlm;



import java.text.ParseException;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

@@ -7,22 +8,25 @@
import com.alibaba.fastjson.JSON;

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

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

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

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

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

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

import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;

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

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

import com.genersoft.iot.vmp.gb28181.session.AudioBroadcastManager;

import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;

import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;

import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;

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

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

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

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

import com.genersoft.iot.vmp.vmanager.bean.AudioBroadcastResult;

import com.genersoft.iot.vmp.vmanager.bean.WVPResult;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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

import org.springframework.http.HttpStatus;

import org.springframework.http.ResponseEntity;

import org.springframework.util.StringUtils;

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

import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;

import org.springframework.util.ObjectUtils;

import org.springframework.web.bind.annotation.PostMapping;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

@@ -33,6 +37,8 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;



import javax.servlet.http.HttpServletRequest;

import javax.sip.InvalidArgumentException;

import javax.sip.SipException;



/**    

 * @description:针对 ZLMediaServer的hook事件监听

@@ -49,6 +55,15 @@
   private SIPCommander cmder;



   @Autowired

   private ISIPCommanderForPlatform commanderFroPlatform;



   @Autowired

   private AudioBroadcastManager audioBroadcastManager;



   @Autowired

   private ZLMRTPServerFactory zlmrtpServerFactory;



   @Autowired

   private IPlayService playService;



   @Autowired

@@ -56,6 +71,9 @@


   @Autowired

   private IRedisCatchStorage redisCatchStorage;



   @Autowired

   private IDeviceService deviceService;



   @Autowired

   private IMediaServerService mediaServerService;

@@ -76,7 +94,7 @@
    private ZLMMediaListManager zlmMediaListManager;



   @Autowired

   private ZLMHttpHookSubscribe subscribe;

   private ZlmHttpHookSubscribe subscribe;



   @Autowired

   private UserSetting userSetting;

@@ -90,29 +108,33 @@
   @Autowired

   private AssistRESTfulUtils assistRESTfulUtils;



   @Qualifier("taskExecutor")

   @Autowired

   private ThreadPoolTaskExecutor taskExecutor;



   /**

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

    *

    */

   @ResponseBody

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

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

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

         for (ZlmHttpHookSubscribe.Event subscribe : subscribes) {

            subscribe.response(null, json);

         }

      }

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



      JSONObject ret = new JSONObject();

      ret.put("code", 0);

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

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



      return ret;

   }



   /**

@@ -121,16 +143,15 @@
    */

   @ResponseBody

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

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

   public JSONObject onFlowReport(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

         logger.debug("[ ZLM HOOK ]on_flow_report 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);

      return ret;

   }

   

   /**

@@ -139,7 +160,7 @@
    */

   @ResponseBody

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

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

   public JSONObject onHttpAccess(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

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

@@ -150,7 +171,7 @@
      ret.put("err", "");

      ret.put("path", "");

      ret.put("second", 600);

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

      return ret;

   }

   

   /**

@@ -159,7 +180,7 @@
    */

   @ResponseBody

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

   public ResponseEntity<String> onPlay(@RequestBody OnPlayHookParam param){

   public JSONObject onPlay(@RequestBody OnPlayHookParam param){



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



@@ -167,7 +188,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) {

@@ -178,17 +199,16 @@
      if (!"rtp".equals(param.getApp())) {

         Map<String, String> paramMap = urlParamToMap(param.getParams());

         StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(param.getApp(), param.getStream());

         if (streamAuthorityInfo == null

               || (streamAuthorityInfo.getCallId() != null && !streamAuthorityInfo.getCallId().equals(paramMap.get("callId")))) {

         if (streamAuthorityInfo != null && streamAuthorityInfo.getCallId() != null && !streamAuthorityInfo.getCallId().equals(paramMap.get("callId"))) {

            ret.put("code", 401);

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

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

            return ret;

         }

      }



      ret.put("code", 0);

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

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

      return ret;

   }

   

   /**

@@ -197,7 +217,7 @@
    */

   @ResponseBody

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

   public ResponseEntity<String> onPublish(@RequestBody OnPublishHookParam param) {

   public JSONObject onPublish(@RequestBody OnPublishHookParam param) {



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



@@ -211,7 +231,7 @@
            logger.info("推流鉴权失败： 缺少不要参数：sign=md5(user表的pushKey)");

            ret.put("code", 401);

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

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

            return ret;

         }

         Map<String, String> paramMap = urlParamToMap(param.getParams());

         String sign = paramMap.get("sign");

@@ -219,7 +239,7 @@
            logger.info("推流鉴权失败： 缺少不要参数：sign=md5(user表的pushKey)");

            ret.put("code", 401);

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

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

            return ret;

         }

         // 推流自定义播放鉴权码

         String callId = paramMap.get("callId");

@@ -229,7 +249,7 @@
            logger.info("推流鉴权失败： sign 无权限: callId={}. sign={}", callId, sign);

            ret.put("code", 401);

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

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

            return ret;

         }

         StreamAuthorityInfo streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(param);

         streamAuthorityInfo.setCallId(callId);

@@ -237,9 +257,13 @@
         // 鉴权通过

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

         // 通知assist新的callId

         if (mediaInfo != null) {

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

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

            taskExecutor.execute(()->{

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

            });

         }

      }else {

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

      }



      ret.put("code", 0);

@@ -250,7 +274,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);

@@ -281,10 +305,7 @@


         }

      }







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

      return ret;

   }





@@ -295,7 +316,7 @@
    */

   @ResponseBody

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

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

   public JSONObject onRecordMp4(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

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

@@ -304,7 +325,7 @@
      JSONObject ret = new JSONObject();

      ret.put("code", 0);

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

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

      return ret;

   }

   /**

    * 录制hls完成后通知事件；此事件对回复不敏感。

@@ -312,7 +333,7 @@
    */

   @ResponseBody

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

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

   public JSONObject onRecordTs(@RequestBody JSONObject json){



      if (logger.isDebugEnabled()) {

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

@@ -321,7 +342,7 @@
      JSONObject ret = new JSONObject();

      ret.put("code", 0);

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

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

      return ret;

   }

   

   /**

@@ -330,7 +351,7 @@
    */

   @ResponseBody

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

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

   public JSONObject onRtspRealm(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

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

@@ -339,7 +360,7 @@
      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      ret.put("realm", "");

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

      return ret;

   }

   

   

@@ -349,7 +370,7 @@
    */

   @ResponseBody

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

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

   public JSONObject onRtspAuth(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

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

@@ -359,7 +380,7 @@
      ret.put("code", 0);

      ret.put("encrypted", false);

      ret.put("passwd", "test");

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

      return ret;

   }

   

   /**

@@ -368,13 +389,13 @@
    */

   @ResponseBody

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

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

   public JSONObject onShellLogin(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

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

@@ -386,7 +407,7 @@
      JSONObject ret = new JSONObject();

      ret.put("code", 0);

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

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

      return ret;

   }

   

   /**

@@ -395,12 +416,12 @@
    */

   @ResponseBody

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

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

   public JSONObject onStreamChanged(@RequestBody MediaItem item){



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

@@ -414,18 +435,24 @@
      List<MediaItem.MediaTrack> tracks = item.getTracks();

      boolean regist = item.isRegist();

      if (regist) {

         StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(app, stream);

         if (streamAuthorityInfo == null) {

            streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(item);

         }else {

            streamAuthorityInfo.setOriginType(item.getOriginType());

            streamAuthorityInfo.setOriginTypeStr(item.getOriginTypeStr());

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

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

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



            StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(app, stream);

            if (streamAuthorityInfo == null) {

               streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(item);

            }else {

               streamAuthorityInfo.setOriginType(item.getOriginType());

               streamAuthorityInfo.setOriginTypeStr(item.getOriginTypeStr());

            }

            redisCatchStorage.updateStreamAuthorityInfo(app, stream, streamAuthorityInfo);

         }

         redisCatchStorage.updateStreamAuthorityInfo(app, stream, streamAuthorityInfo);

      }else {

         redisCatchStorage.removeStreamAuthorityInfo(app, stream);

      }

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



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

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

         if (regist) {

            mediaServerService.addCount(mediaServerId);

@@ -448,9 +475,128 @@
                  redisCatchStorage.stopPlayback(streamInfo.getDeviceID(), streamInfo.getChannelId(),

                        streamInfo.getStream(), null);

               }



            }

         }else {

         }else if ("broadcast".equals(app)){

            // 语音对讲推流  stream需要满足格式deviceId_channelId

            if (regist && stream.indexOf("_") > 0) {

               String[] streamArray = stream.split("_");

               if (streamArray.length == 2) {

                  String deviceId = streamArray[0];

                  String channelId = streamArray[1];

                  Device device = deviceService.queryDevice(deviceId);

                  if (device != null) {

                     DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);

                     if (deviceChannel != null) {

                        if (audioBroadcastManager.exit(deviceId, channelId)) {

                           // 直接推流

                           SendRtpItem sendRtpItem =  redisCatchStorage.querySendRTPServer(null, null, stream, null);

                           if (sendRtpItem == null) {

                              // TODO 可能数据错误，重新开启语音通道

                           }else {

                              String is_Udp = sendRtpItem.isTcp() ? "0" : "1";

                              MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());

                              logger.info("rtp/{}开始向上级推流, 目标={}:{}，SSRC={}", sendRtpItem.getStreamId(), sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc());

                              Map<String, Object> param = new HashMap<>(12);

                              param.put("vhost","__defaultVhost__");

                              param.put("app",sendRtpItem.getApp());

                              param.put("stream",sendRtpItem.getStreamId());

                              param.put("ssrc", sendRtpItem.getSsrc());

                              param.put("src_port", sendRtpItem.getLocalPort());

                              param.put("pt", sendRtpItem.getPt());

                              param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");

                              param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");



                              JSONObject jsonObject;

                              if (sendRtpItem.isTcpActive()) {

                                 jsonObject = zlmrtpServerFactory.startSendRtpPassive(mediaInfo, param);

                              } else {

                                 param.put("is_udp", is_Udp);

                                 param.put("dst_url", sendRtpItem.getIp());

                                 param.put("dst_port", sendRtpItem.getPort());

                                 jsonObject = zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);

                              }

                              if (jsonObject != null && jsonObject.getInteger("code") == 0) {

                                 logger.info("[语音对讲] 自动推流成功, device: {}, channel: {}", deviceId, channelId);

                              }



                           }

                        }else {

                           // 开启语音对讲通道

                           try {

                              playService.audioBroadcastCmd(device, channelId, 60, (msg)->{

                                 logger.info("[语音对讲] 通道建立成功, device: {}, channel: {}", deviceId, channelId);

                              });

                           } catch (InvalidArgumentException | ParseException | SipException e) {

                              logger.error("[命令发送失败] 语音对讲: {}", e.getMessage());

                           }

                        }



                     }

                  }

               }

            }



         }else if ("talk".equals(app)){

            // 语音对讲推流  stream需要满足格式deviceId_channelId

            if (regist && stream.indexOf("_") > 0) {

               String[] streamArray = stream.split("_");

               if (streamArray.length == 2) {

                  String deviceId = streamArray[0];

                  String channelId = streamArray[1];

                  Device device = deviceService.queryDevice(deviceId);

                  if (device != null) {

                     DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);

                     if (deviceChannel != null) {

                        if (audioBroadcastManager.exit(deviceId, channelId)) {

                           // 直接推流

                           SendRtpItem sendRtpItem =  redisCatchStorage.querySendRTPServer(null, null, stream, null);

                           if (sendRtpItem == null) {

                              // TODO 可能数据错误，重新开启语音通道

                           }else {

                              String is_Udp = sendRtpItem.isTcp() ? "0" : "1";

                              MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());

                              logger.info("rtp/{}开始向上级推流, 目标={}:{}，SSRC={}", sendRtpItem.getStreamId(), sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc());

                              Map<String, Object> param = new HashMap<>(12);

                              param.put("vhost","__defaultVhost__");

                              param.put("app",sendRtpItem.getApp());

                              param.put("stream",sendRtpItem.getStreamId());

                              param.put("ssrc", sendRtpItem.getSsrc());

                              param.put("src_port", sendRtpItem.getLocalPort());

                              param.put("pt", sendRtpItem.getPt());

                              param.put("use_ps", sendRtpItem.isUsePs() ? "1" : "0");

                              param.put("only_audio", sendRtpItem.isOnlyAudio() ? "1" : "0");



                              JSONObject jsonObject;

                              if (sendRtpItem.isTcpActive()) {

                                 jsonObject = zlmrtpServerFactory.startSendRtpPassive(mediaInfo, param);

                              } else {

                                 param.put("is_udp", is_Udp);

                                 param.put("dst_url", sendRtpItem.getIp());

                                 param.put("dst_port", sendRtpItem.getPort());

                                 jsonObject = zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);

                              }

                              if (jsonObject != null && jsonObject.getInteger("code") == 0) {

                                 logger.info("[语音对讲] 自动推流成功, device: {}, channel: {}", deviceId, channelId);

                              }

                           }

                        }else {

                           // 开启语音对讲通道

                           MediaServerItem mediaServerForMinimumLoad = mediaServerService.getMediaServerForMinimumLoad();

                           playService.talk(mediaServerForMinimumLoad, device, channelId, (mediaServerItem, jsonObject)->{

                              System.out.println("开始推流");

                           }, eventResult -> {

                              System.out.println(eventResult.msg);

                           }, ()->{

                              System.out.println("超时");

                           });

                        }



                     }

                  }

               }

            }



         }else{

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

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

               MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);

@@ -458,8 +604,12 @@
               if (mediaServerItem != null){

                  if (regist) {

                     StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(app, stream);

                     String callId = null;

                     if (streamAuthorityInfo != null) {

                        callId = streamAuthorityInfo.getCallId();

                     }

                     StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaServerItem,

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

                           app, stream, tracks, callId);

                     item.setStreamInfo(streamInfoByAppAndStream);

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

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

@@ -494,12 +644,42 @@
               }

            }

         }

         if (!regist) {

            List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByStream(stream);

            if (sendRtpItems.size() > 0) {

               for (SendRtpItem sendRtpItem : sendRtpItems) {

                  if (sendRtpItem.getApp().equals(app)) {

                     String platformId = sendRtpItem.getPlatformId();

                     ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);

                     Device device = deviceService.queryDevice(platformId);



                     try {

                        if (platform != null) {

                           commanderFroPlatform.streamByeCmd(platform, sendRtpItem);

                        }else {

                           if (sendRtpItem.isOnlyAudio()) {

                              AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());

                              if (device != null && audioBroadcastCatch != null) {

//                                 cmder.streamByeCmd(device, sendRtpItem.getChannelId(), audioBroadcastCatch.getSipTransactionInfo(), null);

                              }

                           }else {

                              cmder.streamByeCmd(device, sendRtpItem.getChannelId(), stream, sendRtpItem.getCallId());

                           }



                        }

                     } catch (SipException | InvalidArgumentException | ParseException | SsrcTransactionNotFoundException e) {

                        logger.error("[命令发送失败] 国标级联 发送BYE: {}", e.getMessage());

                     }

                  }

               }

            }

         }

      }



      JSONObject ret = new JSONObject();

      ret.put("code", 0);

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

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

      return ret;

   }

   

   /**

@@ -508,7 +688,7 @@
    */

   @ResponseBody

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

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

   public JSONObject onStreamNoneReader(@RequestBody JSONObject json){



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

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

@@ -519,22 +699,48 @@
      if ("rtp".equals(app)){

         ret.put("close", true);

         StreamInfo streamInfoForPlayCatch = redisCatchStorage.queryPlayByStreamId(streamId);

         SsrcTransaction ssrcTransaction = sessionManager.getSsrcTransaction(null, null, null, streamId);

         if (streamInfoForPlayCatch != null) {

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

            // 收到无人观看说明流也没有在往上级推送

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

               ret.put("close", false);

            } else {

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

                     streamInfoForPlayCatch.getStream(), null);

               redisCatchStorage.stopPlay(streamInfoForPlayCatch);

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

               List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByChnnelId(streamInfoForPlayCatch.getChannelId());

               if (sendRtpItems.size() > 0) {

                  for (SendRtpItem sendRtpItem : sendRtpItems) {

                     ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(sendRtpItem.getPlatformId());

                     try {

                        commanderFroPlatform.streamByeCmd(parentPlatform, sendRtpItem.getCallId());

                     } catch (SipException | InvalidArgumentException | ParseException e) {

                        logger.error("[命令发送失败] 国标级联 发送BYE: {}", e.getMessage());

                     }

                     redisCatchStorage.deleteSendRTPServer(parentPlatform.getServerGBId(), sendRtpItem.getChannelId(),

                           sendRtpItem.getCallId(), sendRtpItem.getStreamId());

                  }

               }

            }

            Device device = deviceService.queryDevice(streamInfoForPlayCatch.getDeviceID());

            if (device != null) {

               try {

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

                        streamInfoForPlayCatch.getStream(), null);

               } catch (InvalidArgumentException | ParseException | SipException | SsrcTransactionNotFoundException e) {

                  logger.error("[无人观看]点播， 发送BYE失败 {}", e.getMessage());

               }

            }



            redisCatchStorage.stopPlay(streamInfoForPlayCatch);

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

         }else{

            StreamInfo streamInfoForPlayBackCatch = redisCatchStorage.queryPlayback(null, null, streamId, null);

            if (streamInfoForPlayBackCatch != null) {

               cmder.streamByeCmd(streamInfoForPlayBackCatch.getDeviceID(),

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

               Device device = deviceService.queryDevice(streamInfoForPlayCatch.getDeviceID());

               if (device != null) {

                  try {

                     cmder.streamByeCmd(device,streamInfoForPlayBackCatch.getChannelId(),

                           streamInfoForPlayBackCatch.getStream(), null);

                  } catch (InvalidArgumentException | ParseException | SipException |

                         SsrcTransactionNotFoundException e) {

                     logger.error("[无人观看]回放， 发送BYE失败 {}", e.getMessage());

                  }

               }

               redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch.getDeviceID(),

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

            }else {

@@ -549,18 +755,24 @@
         if (mediaServerItem != null && mediaServerItem.getStreamNoneReaderDelayMS() == -1) {

            ret.put("close", false);

         }

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

         return ret;

      }else {

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

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

            ret.put("close", true);

            streamProxyService.del(app, streamId);

            String url = streamProxyItem.getUrl() != null?streamProxyItem.getUrl():streamProxyItem.getSrc_url();

            logger.info("[{}/{}]<-[{}] 拉流代理无人观看已经移除",  app, streamId, url);

         }else {

            ret.put("close", false);

         if (streamProxyItem != null ) {

            if (streamProxyItem.isEnable_remove_none_reader()) {

               // 无人观看自动移除

               ret.put("close", true);

               streamProxyService.del(app, streamId);

               String url = streamProxyItem.getUrl() != null?streamProxyItem.getUrl():streamProxyItem.getSrc_url();

               logger.info("[{}/{}]<-[{}] 拉流代理无人观看已经移除",  app, streamId, url);

            }else if (streamProxyItem.isEnable_disable_none_reader()) {

               // 无人观看停用

               ret.put("close", true);

            }else {

               ret.put("close", false);

            }

         }

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

         return ret;

      }

   }

   

@@ -570,7 +782,7 @@
    */

   @ResponseBody

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

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

   public JSONObject onStreamNotFound(@RequestBody JSONObject json){

      if (logger.isDebugEnabled()) {

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

      }

@@ -595,7 +807,7 @@
      JSONObject ret = new JSONObject();

      ret.put("code", 0);

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

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

      return ret;

   }

   

   /**

@@ -604,28 +816,70 @@
    */

   @ResponseBody

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

   public ResponseEntity<String> onServerStarted(HttpServletRequest request, @RequestBody JSONObject jsonObject){

		
   public JSONObject onServerStarted(HttpServletRequest request, @RequestBody JSONObject jsonObject){



      if (logger.isDebugEnabled()) {

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

      }

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

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

   }



   /**

    * 发送rtp(startSendRtp)被动关闭时回调

    */

   @ResponseBody

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

   public JSONObject onSendRtpStopped(HttpServletRequest request, @RequestBody JSONObject jsonObject){



      logger.info("[ ZLM HOOK ]on_send_rtp_stopped API调用，参数：" + jsonObject);



      JSONObject ret = new JSONObject();

      ret.put("code", 0);

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



      // 查找对应的上级推流，发送停止

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

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

         return ret;

      }

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

      List<SendRtpItem> sendRtpItems = redisCatchStorage.querySendRTPServerByStream(stream);

      if (sendRtpItems.size() > 0) {

         for (SendRtpItem sendRtpItem : sendRtpItems) {

            ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(sendRtpItem.getPlatformId());

            try {

               commanderFroPlatform.streamByeCmd(parentPlatform, sendRtpItem.getCallId());

            } catch (SipException | InvalidArgumentException | ParseException e) {

               logger.error("[命令发送失败] 国标级联 发送BYE: {}", e.getMessage());

            }

            redisCatchStorage.deleteSendRTPServer(parentPlatform.getServerGBId(), sendRtpItem.getChannelId(),

                  sendRtpItem.getCallId(), sendRtpItem.getStreamId());

         }

      }





      return ret;

   }



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

      HashMap<String, String> map = new HashMap<>();

      if (StringUtils.isEmpty(params)) {

      if (ObjectUtils.isEmpty(params)) {

         return map;

      }

      String[] paramsArray = params.split("&");