修复收到catalog消息是更新导致是否有音频的设置失效的BUG

648540858

2024-04-24 c21d973977a9f1d00d26179de764687ddd0ec56c

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java

@@ -15,10 +15,8 @@
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.*;
import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
import com.genersoft.iot.vmp.service.bean.RequestStopPushStreamMsg;
import com.genersoft.iot.vmp.service.redisMsg.IRedisRpcService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import gov.nist.javax.sip.message.SIPRequest;
@@ -97,6 +95,9 @@
   @Autowired
   private IStreamPushService pushService;

   @Autowired
   private IRedisRpcService redisRpcService;


   @Override
   public void afterPropertiesSet() throws Exception {
@@ -132,34 +133,22 @@
         logger.info("[收到bye] 停止推流：{}, 媒体节点： {}", streamId, sendRtpItem.getMediaServerId());

         if (sendRtpItem.getPlayType().equals(InviteStreamType.PUSH)) {
            // 查询这路流是否是本平台的
            StreamPushItem push = pushService.getPush(sendRtpItem.getApp(), sendRtpItem.getStream());
            if (push!= null && !push.isSelf()) {
               // 不是本平台的就发送redis消息让其他wvp停止发流
               ParentPlatform platform = platformService.queryPlatformByServerGBId(sendRtpItem.getPlatformId());
               if (platform != null) {
                  RequestStopPushStreamMsg streamMsg = RequestStopPushStreamMsg.getInstance(sendRtpItem, platform.getName(), platform.getId());
//                  redisGbPlayMsgListener.sendMsgForStopSendRtpStream(sendRtpItem.getServerId(), streamMsg);
            ParentPlatform platform = platformService.queryPlatformByServerGBId(sendRtpItem.getPlatformId());
            if (platform != null) {
               redisCatchStorage.sendPlatformStopPlayMsg(sendRtpItem, platform);
               if (!userSetting.getServerId().equals(sendRtpItem.getServerId())) {
                  redisRpcService.stopSendRtp(sendRtpItem.getRedisKey());
                  redisCatchStorage.deleteSendRTPServer(null, null, sendRtpItem.getCallId(), null);
               }else {
                  MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
                  redisCatchStorage.deleteSendRTPServer(null, null, callIdHeader.getCallId(), null);
                  zlmServerFactory.stopSendRtpStream(mediaInfo, param);
                  if (userSetting.getUseCustomSsrcForParentInvite()) {
                     mediaServerService.releaseSsrc(mediaInfo.getId(), sendRtpItem.getSsrc());
                  }
               }
            }else {
               MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
               redisCatchStorage.deleteSendRTPServer(sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(),
                     callIdHeader.getCallId(), null);
               zlmServerFactory.stopSendRtpStream(mediaInfo, param);
               if (userSetting.getUseCustomSsrcForParentInvite()) {
                  mediaServerService.releaseSsrc(mediaInfo.getId(), sendRtpItem.getSsrc());
               }

               ParentPlatform platform = platformService.queryPlatformByServerGBId(sendRtpItem.getPlatformId());
               if (platform != null) {
                  MessageForPushChannel messageForPushChannel = MessageForPushChannel.getInstance(0,
                        sendRtpItem.getApp(), sendRtpItem.getStream(), sendRtpItem.getChannelId(),
                        sendRtpItem.getPlatformId(), platform.getName(), userSetting.getServerId(), sendRtpItem.getMediaServerId());
                  messageForPushChannel.setPlatFormIndex(platform.getId());
                  redisCatchStorage.sendPlatformStopPlayMsg(messageForPushChannel);
               }else {
                  logger.info("[上级平台停止观看] 未找到平台{}的信息，发送redis消息失败", sendRtpItem.getPlatformId());
               }
               logger.info("[上级平台停止观看] 未找到平台{}的信息，发送redis消息失败", sendRtpItem.getPlatformId());
            }
         }else {
            MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());