启动时redis未连接导致无法启动

648540858

2022-08-29 d47902bdca2eb772c974803a5bd72e917a294b39

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

@@ -7,12 +7,10 @@
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.gb28181.bean.*;

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

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

import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;

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

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

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

@@ -22,6 +20,7 @@
import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.http.HttpStatus;

import org.springframework.http.ResponseEntity;

import org.springframework.util.ObjectUtils;

import org.springframework.util.StringUtils;

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

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

@@ -47,6 +46,9 @@


   @Autowired

   private SIPCommander cmder;



   @Autowired

   private SIPCommanderFroPlatform commanderFroPlatform;



   @Autowired

   private IPlayService playService;

@@ -98,9 +100,7 @@
   @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());

      }

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

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

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

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

@@ -238,7 +238,7 @@
         // 鉴权通过

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

         // 通知assist新的callId

         if (mediaInfo != null) {

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

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

         }

      }else {

@@ -428,7 +428,7 @@
      }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);

@@ -445,12 +445,15 @@
            if (streamInfo!=null){

               redisCatchStorage.stopPlay(streamInfo);

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

               // 如果正在给上级推送，则发送bye



            }else{

               streamInfo = redisCatchStorage.queryPlayback(null, null, stream, null);

               if (streamInfo != null) {

                  redisCatchStorage.stopPlayback(streamInfo.getDeviceID(), streamInfo.getChannelId(),

                        streamInfo.getStream(), null);

               }

               // 如果正在给上级推送，则发送bye

            }

         }else {

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

@@ -521,17 +524,21 @@
      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());

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

                  }

               }

            }

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

                  streamInfoForPlayCatch.getStream(), null);

            redisCatchStorage.stopPlay(streamInfoForPlayCatch);

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

         }else{

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

            if (streamInfoForPlayBackCatch != null) {

@@ -632,7 +639,7 @@


   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("&");