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

648540858

2024-04-24 c21d973977a9f1d00d26179de764687ddd0ec56c

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

old mode 100644
new mode 100755
@@ -16,7 +16,7 @@
import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.*;
import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;
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;
@@ -92,6 +92,13 @@
   @Autowired
   private UserSetting userSetting;

   @Autowired
   private IStreamPushService pushService;

   @Autowired
   private IRedisRpcService redisRpcService;


   @Override
   public void afterPropertiesSet() throws Exception {
      // 添加消息处理的订阅
@@ -115,7 +122,7 @@

      // 收流端发送的停止
      if (sendRtpItem != null){
         logger.info("[收到bye] 来自{}，停止通道：{}, 类型： {}", sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(), sendRtpItem.getPlayType());
         logger.info("[收到bye] 来自{}，停止通道：{}, 类型： {}, callId: {}", sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(), sendRtpItem.getPlayType(), callIdHeader.getCallId());

         String streamId = sendRtpItem.getStream();
         Map<String, Object> param = new HashMap<>();
@@ -123,58 +130,70 @@
         param.put("app",sendRtpItem.getApp());
         param.put("stream",streamId);
         param.put("ssrc",sendRtpItem.getSsrc());
         logger.info("[收到bye] 停止推流：{}", streamId);
         MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
         redisCatchStorage.deleteSendRTPServer(sendRtpItem.getPlatformId(), sendRtpItem.getChannelId(),
               callIdHeader.getCallId(), null);
         zlmServerFactory.stopSendRtpStream(mediaInfo, param);
         logger.info("[收到bye] 停止推流：{}, 媒体节点： {}", streamId, sendRtpItem.getMediaServerId());

         if (sendRtpItem.getPlayType().equals(InviteStreamType.PUSH)) {
            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);
               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 {
               logger.info("[上级平台停止观看] 未找到平台{}的信息，发送redis消息失败", sendRtpItem.getPlatformId());
            }
         }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());
            }
         }
         MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
         if (mediaInfo != null) {
            AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
            if (audioBroadcastCatch != null && audioBroadcastCatch.getSipTransactionInfo().getCallId().equals(callIdHeader.getCallId())) {
               // 来自上级平台的停止对讲
               logger.info("[停止对讲] 来自上级，平台：{}, 通道：{}", sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
               audioBroadcastManager.del(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
            }

         AudioBroadcastCatch audioBroadcastCatch = audioBroadcastManager.get(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
         if (audioBroadcastCatch != null && audioBroadcastCatch.getSipTransactionInfo().getCallId().equals(callIdHeader.getCallId())) {
            // 来自上级平台的停止对讲
            logger.info("[停止对讲] 来自上级，平台：{}, 通道：{}", sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
            audioBroadcastManager.del(sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
         }

         int totalReaderCount = zlmServerFactory.totalReaderCount(mediaInfo, sendRtpItem.getApp(), streamId);
         if (totalReaderCount <= 0) {
            logger.info("[收到bye] {} 无其它观看者，通知设备停止推流", streamId);
            if (sendRtpItem.getPlayType().equals(InviteStreamType.PLAY)) {
               Device device = deviceService.getDevice(sendRtpItem.getDeviceId());
               if (device == null) {
                  logger.info("[收到bye] {} 通知设备停止推流时未找到设备信息", streamId);
               }
               try {
                  logger.info("[停止点播] {}/{}", sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
                  cmder.streamByeCmd(device, sendRtpItem.getChannelId(), streamId, null);
               } catch (InvalidArgumentException | ParseException | SipException |
                      SsrcTransactionNotFoundException e) {
                  logger.error("[收到bye] {} 无其它观看者，通知设备停止推流， 发送BYE失败 {}",streamId, e.getMessage());
            int totalReaderCount = zlmServerFactory.totalReaderCount(mediaInfo, sendRtpItem.getApp(), streamId);
            if (totalReaderCount <= 0) {
               logger.info("[收到bye] {} 无其它观看者，通知设备停止推流", streamId);
               if (sendRtpItem.getPlayType().equals(InviteStreamType.PLAY)) {
                  Device device = deviceService.getDevice(sendRtpItem.getDeviceId());
                  if (device == null) {
                     logger.info("[收到bye] {} 通知设备停止推流时未找到设备信息", streamId);
                  }
                  try {
                     logger.info("[停止点播] {}/{}", sendRtpItem.getDeviceId(), sendRtpItem.getChannelId());
                     cmder.streamByeCmd(device, sendRtpItem.getChannelId(), streamId, null);
                  } catch (InvalidArgumentException | ParseException | SipException |
                         SsrcTransactionNotFoundException e) {
                     logger.error("[收到bye] {} 无其它观看者，通知设备停止推流， 发送BYE失败 {}",streamId, e.getMessage());
                  }
               }
            }
         }
      }

      // 发流端发送的停止
      SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(null, null, callIdHeader.getCallId(), null);
      if (ssrcTransaction == null ) {
         logger.info("[收到bye] 但是无法获取推流信息和发流信息，忽略此请求");
         logger.info(request.toString());
      // 可能是设备发送的停止
      SsrcTransaction ssrcTransaction = streamSession.getSsrcTransactionByCallId(callIdHeader.getCallId());
      if (ssrcTransaction == null) {
         return;
      }

      logger.info("[收到bye] 来自设备：{}, 通道已停止推流: {}", ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId());

      ParentPlatform platform = platformService.queryPlatformByServerGBId(ssrcTransaction.getDeviceId());
      if (platform != null ) {
@@ -188,6 +207,8 @@
            String mediaServerId = ssrcTransaction.getMediaServerId();
            platformService.stopBroadcast(platform, channel, ssrcTransaction.getStream(), false,
                  mediaServerService.getOne(mediaServerId));

            playService.stopAudioBroadcast(channel.getDeviceId(), channel.getChannelId());
         }

      }else {
@@ -214,7 +235,7 @@
         if (mediaServerItem != null) {
            mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcTransaction.getSsrc());
         }
         streamSession.remove(device.getDeviceId(), channel.getChannelId(), ssrcTransaction.getStream());
         streamSession.removeByCallId(device.getDeviceId(), channel.getChannelId(), ssrcTransaction.getCallId());
         if (ssrcTransaction.getType() == InviteSessionType.BROADCAST) {
            // 查找来源的对讲设备，发送停止
            Device sourceDevice = storager.queryVideoDeviceByPlatformIdAndChannelId(ssrcTransaction.getDeviceId(), ssrcTransaction.getChannelId());