规范api

panlinlin

2021-04-11 a004a978fa54779425d7498b4737c970b8c71f7b

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

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



import java.math.BigInteger;

import java.text.DecimalFormat;

import java.util.ArrayList;

import java.util.List;

import java.util.UUID;



@@ -13,8 +10,7 @@
import com.genersoft.iot.vmp.gb28181.bean.Device;

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

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

import com.genersoft.iot.vmp.utils.IpUtil;

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

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

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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

@@ -57,8 +53,8 @@
   @Autowired

   private IRedisCatchStorage redisCatchStorage;



   @Autowired

   private ZLMRESTfulUtils zlmresTfulUtils;

    @Autowired

    private ZLMMediaListManager zlmMediaListManager;



   @Autowired

   private ZLMHttpHookSubscribe subscribe;

@@ -121,6 +117,10 @@
      

      if (logger.isDebugEnabled()) {

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

      }

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

      if (subscribe != null ) {

         subscribe.response(json);

      }

      JSONObject ret = new JSONObject();

      ret.put("code", 0);

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

      }

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

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

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

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

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



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

      if (subscribe != null) subscribe.response(json);

@@ -243,17 +243,34 @@
      // 流消失移除redis play

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

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

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

      JSONArray tracks = json.getJSONArray("tracks");

      boolean regist = json.getBoolean("regist");

      StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);

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

         if (streamInfo!=null){

            redisCatchStorage.stopPlay(streamInfo);

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

         }else{

            streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);

            redisCatchStorage.stopPlayback(streamInfo);

      if (tracks != null) {

         System.out.println("222222" + schema);

      }

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



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

            StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);

            if (streamInfo!=null){

               redisCatchStorage.stopPlay(streamInfo);

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

            }else{

               streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);

               redisCatchStorage.stopPlayback(streamInfo);

            }

         }else {

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

               if (regist) {

                  zlmMediaListManager.addMedia(app, streamId);

               }else {

                  zlmMediaListManager.removeMedia(app, streamId);

               }

            }

         }

      }



      JSONObject ret = new JSONObject();

      ret.put("code", 0);

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

@@ -273,21 +290,35 @@
      }

      

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



      cmder.streamByeCmd(streamId);

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

      StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);

      if (streamInfo!=null){

         redisCatchStorage.stopPlay(streamInfo);

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

      }else{

         streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);

         redisCatchStorage.stopPlayback(streamInfo);





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

         JSONObject ret = new JSONObject();

         ret.put("code", 0);

         ret.put("close", true);

         if (streamInfo != null) {

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

               ret.put("close", false);

            } else {

               cmder.streamByeCmd(streamId);

               redisCatchStorage.stopPlay(streamInfo);

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

            }

         }else{

            cmder.streamByeCmd(streamId);

            streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);

            redisCatchStorage.stopPlayback(streamInfo);

         }

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

      }else {

         JSONObject ret = new JSONObject();

         ret.put("code", 0);

         ret.put("close", false);

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

      }

		
      JSONObject ret = new JSONObject();

      ret.put("code", 0);

      ret.put("close", true);

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



   }

   

   /**

@@ -346,10 +377,21 @@
//      String data = json.getString("data");

//      List<MediaServerConfig> mediaServerConfigs = JSON.parseArray(JSON.toJSONString(json), MediaServerConfig.class);

//      MediaServerConfig mediaServerConfig = mediaServerConfigs.get(0);



      List<ZLMHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(ZLMHttpHookSubscribe.HookType.on_server_started);

      if (subscribes != null && subscribes.size() > 0) {

         for (ZLMHttpHookSubscribe.Event subscribe : subscribes) {

            subscribe.response(json);

         }

      }



      MediaServerConfig mediaServerConfig = JSON.toJavaObject(json, MediaServerConfig.class);

      mediaServerConfig.setWanIp(StringUtils.isEmpty(mediaWanIp)? mediaIp: mediaWanIp);

      mediaServerConfig.setLocalIP(mediaIp);

      redisCatchStorage.updateMediaInfo(mediaServerConfig);



      // 重新发起代理



      JSONObject ret = new JSONObject();

      ret.put("code", 0);

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