优化CivilCode缓存

648540858

2024-03-14 d4f6ec39b7e0421757a6b9d1a68b1c4610ea2e8c

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

@@ -9,7 +9,7 @@
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IDeviceService;
@@ -66,7 +66,7 @@
   private IDeviceService deviceService;

   @Autowired
   private ZLMRTPServerFactory zlmrtpServerFactory;
   private ZLMServerFactory zlmServerFactory;

   @Autowired
   private ZlmHttpHookSubscribe hookSubscribe;
@@ -90,6 +90,7 @@
   @Override
   public void process(RequestEvent evt) {
      CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
      dynamicTask.stop(callIdHeader.getCallId());
      String fromUserId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(FromHeader.NAME)).getAddress().getURI()).getUser();
      String toUserId = ((SipURI) ((HeaderAddress) evt.getRequest().getHeader(ToHeader.NAME)).getAddress().getURI()).getUser();
      logger.info("[收到ACK]： 来自->{}", fromUserId);
@@ -98,11 +99,19 @@
         logger.warn("[收到ACK]：未找到来自{}，目标为({})的推流信息",fromUserId, toUserId);
         return;
      }
      logger.info("[收到ACK]：rtp/{}开始级推流, 目标={}:{}，SSRC={}, RTCP={}", sendRtpItem.getStream(),
            sendRtpItem.getIp(), sendRtpItem.getPort(), sendRtpItem.getSsrc(), sendRtpItem.isRtcp());
      // 取消设置的超时任务
      dynamicTask.stop(callIdHeader.getCallId());
      // tcp主动时，此时是级联下级平台，在回复200ok时，本地已经请求zlm开启监听，跳过下面步骤
      if (sendRtpItem.isTcpActive()) {
         logger.info("收到ACK，rtp/{} TCP主动方式后续处理", sendRtpItem.getStream());
         return;
      }
      MediaServerItem mediaInfo = mediaServerService.getOne(sendRtpItem.getMediaServerId());
      logger.info("收到ACK，rtp/{}开始向上级推流, 目标={}:{}，SSRC={}, 协议:{}",
            sendRtpItem.getStream(),
            sendRtpItem.getIp(),
            sendRtpItem.getPort(),
            sendRtpItem.getSsrc(),
            sendRtpItem.isTcp()?(sendRtpItem.isTcpActive()?"TCP主动":"TCP被动"):"UDP"
      );
      ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(fromUserId);

      if (parentPlatform != null) {
@@ -168,19 +177,19 @@
      JSONObject startSendRtpStreamResult = null;
      if (sendRtpItem.getLocalPort() != 0) {
         if (sendRtpItem.isTcpActive()) {
            startSendRtpStreamResult = zlmrtpServerFactory.startSendRtpPassive(mediaInfo, param);
            startSendRtpStreamResult = zlmServerFactory.startSendRtpPassive(mediaInfo, param);
         }else {
            param.put("dst_url", sendRtpItem.getIp());
            param.put("dst_port", sendRtpItem.getPort());
            startSendRtpStreamResult = zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
            startSendRtpStreamResult = zlmServerFactory.startSendRtpStream(mediaInfo, param);
         }
      }else {
         if (sendRtpItem.isTcpActive()) {
            startSendRtpStreamResult = zlmrtpServerFactory.startSendRtpPassive(mediaInfo, param);
            startSendRtpStreamResult = zlmServerFactory.startSendRtpPassive(mediaInfo, param);
         }else {
            param.put("dst_url", sendRtpItem.getIp());
            param.put("dst_port", sendRtpItem.getPort());
            startSendRtpStreamResult = zlmrtpServerFactory.startSendRtpStream(mediaInfo, param);
            startSendRtpStreamResult = zlmServerFactory.startSendRtpStream(mediaInfo, param);
         }
      }
      return startSendRtpStreamResult;