修复多wvp国标级联机制

648540858

2024-04-17 bf6e09d231f49fb0c2cd5a81f6b31cc64d27c368

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

@@ -15,10 +15,11 @@
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IPlayService;
import com.genersoft.iot.vmp.service.bean.RequestPushStreamMsg;
import com.genersoft.iot.vmp.service.redisMsg.RedisGbPlayMsgListener;
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 com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
@@ -55,6 +56,8 @@

   @Autowired
    private IRedisCatchStorage redisCatchStorage;
   @Autowired
    private IRedisRpcService redisRpcService;

   @Autowired
    private UserSetting userSetting;
@@ -76,9 +79,6 @@

   @Autowired
   private DynamicTask dynamicTask;

   @Autowired
   private RedisGbPlayMsgListener redisGbPlayMsgListener;

   @Autowired
   private IPlayService playService;
@@ -116,14 +116,16 @@

      if (parentPlatform != null) {
         Map<String, Object> param = getSendRtpParam(sendRtpItem);
         if (mediaInfo == null) {
            RequestPushStreamMsg requestPushStreamMsg = RequestPushStreamMsg.getInstance(
                  sendRtpItem.getMediaServerId(), sendRtpItem.getApp(), sendRtpItem.getStream(),
                  sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc(), sendRtpItem.isTcp(),
                  sendRtpItem.getLocalPort(), sendRtpItem.getPt(), sendRtpItem.isUsePs(), sendRtpItem.isOnlyAudio());
            redisGbPlayMsgListener.sendMsgForStartSendRtpStream(sendRtpItem.getServerId(), requestPushStreamMsg, json -> {
               playService.startSendRtpStreamHand(sendRtpItem, parentPlatform, json, param, callIdHeader);
            });
         if (!userSetting.getServerId().equals(sendRtpItem.getServerId())) {
//            redisCatchStorage.sendStartSendRtp(sendRtpItem);
            WVPResult wvpResult = redisRpcService.startSendRtp(sendRtpItem);
            if (wvpResult.getCode() == 0) {
               MessageForPushChannel messageForPushChannel = MessageForPushChannel.getInstance(0, sendRtpItem.getApp(), sendRtpItem.getStream(),
                     sendRtpItem.getChannelId(), parentPlatform.getServerGBId(), parentPlatform.getName(), userSetting.getServerId(),
                     sendRtpItem.getMediaServerId());
               messageForPushChannel.setPlatFormIndex(parentPlatform.getId());
               redisCatchStorage.sendPlatformStartPlayMsg(messageForPushChannel);
            }
         } else {
            JSONObject startSendRtpStreamResult = sendRtp(sendRtpItem, mediaInfo, param);
            if (startSendRtpStreamResult != null) {