优化--端口获取失败之时（如zlm连接失败），不进行invite点播消息的发送

chenjialing

2022-06-14 0e826e3448a21bcb68f52b3e87ecb00d3070d977

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

@@ -241,6 +238,23 @@
      

      if (logger.isDebugEnabled()) {

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

   }

   /**

    * 录制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();

@@ -396,7 +410,7 @@
                        }

                     }

                     if (gbStreams.size() > 0) {

                        eventPublisher.catalogEventPublishForStream(null, gbStreams, CatalogEvent.ON);

//                        eventPublisher.catalogEventPublishForStream(null, gbStreams, CatalogEvent.ON);

                     }



                  }else {

@@ -408,7 +422,7 @@
                     }

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

                     if (gbStream != null) {

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

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

                     }

                     zlmMediaListManager.removeMedia(app, streamId);

                  }