Merge branch 'refs/heads/2.7.0'

648540858

2024-04-23 d41d6b34af2485198ed01e1888db1571e4da1a6a

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

@@ -16,10 +16,10 @@
import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.media.service.IMediaServerService;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
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.bean.RequestStopPushStreamMsg;
import com.genersoft.iot.vmp.service.redisMsg.RedisGbPlayMsgListener;
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;
@@ -91,7 +91,8 @@
   private IStreamPushService pushService;

   @Autowired
   private RedisGbPlayMsgListener redisGbPlayMsgListener;
   private IRedisRpcService redisRpcService;


   @Override
   public void afterPropertiesSet() throws Exception {
@@ -138,17 +139,8 @@
               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());
               }
            }else {
               logger.info("[上级平台停止观看] 未找到平台{}的信息，发送redis消息失败", sendRtpItem.getPlatformId());
            }
         }else {
            MediaServer mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());