Merge branch 'wvp-28181-2.0'

648540858

2022-09-05 aa6bce35c710750b68d4e6c53095e9be4e1afd8d

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

@@ -93,7 +93,7 @@
            String channelId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
            SendRtpItem sendRtpItem =  redisCatchStorage.querySendRTPServer(platformGbId, null, null, callIdHeader.getCallId());
            logger.info("收到bye, [{}/{}]", platformGbId, channelId);
            if (sendRtpItem != null){
            if (sendRtpItem != null ){
               String streamId = sendRtpItem.getStreamId();
               Map<String, Object> param = new HashMap<>();
               param.put("vhost","__defaultVhost__");
@@ -133,7 +133,7 @@
               SsrcTransaction ssrcTransactionForPlay = streamSession.getSsrcTransaction(device.getDeviceId(), channelId, "play", null);
               if (ssrcTransactionForPlay != null){
                  SIPDialog dialogForPlay = (SIPDialog) SerializeUtils.deSerialize(ssrcTransactionForPlay.getDialog());
                  if (dialogForPlay.getCallId().equals(callIdHeader.getCallId())){
                  if (dialogForPlay.getCallId().getCallId().equals(callIdHeader.getCallId())){
                     // 释放ssrc
                     MediaServerItem mediaServerItem = mediaServerService.getOne(ssrcTransactionForPlay.getMediaServerId());
                     if (mediaServerItem != null) {