Merge branch '2.6.8' into wvp-28181-2.0

648540858

2023-07-03 43ef195543c087d88ac3eea98067b81d7e2b10c2

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

@@ -1,35 +1,30 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;

import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.bean.CmdType;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.SubscribeHolder;
import com.genersoft.iot.vmp.gb28181.bean.SubscribeInfo;
import com.genersoft.iot.vmp.gb28181.task.impl.MobilePositionSubscribeHandlerTask;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.SIPSender;
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.gb28181.utils.SipUtils;
import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import gov.nist.javax.sip.SipProviderImpl;
import gov.nist.javax.sip.message.SIPRequest;
import gov.nist.javax.sip.message.SIPResponse;
import org.dom4j.DocumentException;
import org.dom4j.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;

import javax.sip.*;
import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
import javax.sip.SipException;
import javax.sip.header.ExpiresHeader;
import javax.sip.message.Request;
import javax.sip.message.Response;
import java.text.ParseException;

@@ -49,24 +44,11 @@
   @Autowired
   private IVideoManagerStorage storager;

   @Lazy
   @Autowired
   @Qualifier(value="tcpSipProvider")
   private SipProviderImpl tcpSipProvider;

   @Lazy
   @Autowired
   @Qualifier(value="udpSipProvider")
   private SipProviderImpl udpSipProvider;

   @Autowired
   private DynamicTask dynamicTask;

   @Autowired
   private UserSetting userSetting;

   @Autowired
   private SubscribeHolder subscribeHolder;

   @Autowired
   private SIPSender sipSender;

   @Override
   public void afterPropertiesSet() throws Exception {
@@ -81,17 +63,21 @@
    */
   @Override
   public void process(RequestEvent evt) {
      Request request = evt.getRequest();
      SIPRequest request = (SIPRequest) evt.getRequest();
      try {
         Element rootElement = getRootElement(evt);
         if (rootElement == null) {
            logger.error("处理SUBSCRIBE请求  未获取到消息体{}", evt.getRequest());
            return;
         }
         String cmd = XmlUtil.getText(rootElement, "CmdType");
         if (CmdType.MOBILE_POSITION.equals(cmd)) {
            processNotifyMobilePosition(evt, rootElement);
            processNotifyMobilePosition(request, rootElement);
//         } else if (CmdType.ALARM.equals(cmd)) {
//            logger.info("接收到Alarm订阅");
//            processNotifyAlarm(evt, rootElement);
//            processNotifyAlarm(serverTransaction, rootElement);
         } else if (CmdType.CATALOG.equals(cmd)) {
            processNotifyCatalogList(evt, rootElement);
            processNotifyCatalogList(request, rootElement);
         } else {
            logger.info("接收到消息：" + cmd);

@@ -101,17 +87,10 @@
               response.setExpires(expireHeader);
            }
            logger.info("response : " + response);
            ServerTransaction transaction = getServerTransaction(evt);
            if (transaction != null) {
               transaction.sendResponse(response);
               transaction.getDialog().delete();
               transaction.terminate();
            } else {
               logger.info("processRequest serverTransactionId is null.");
            }
            sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), response);
         }
      } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
         e.printStackTrace();
         logger.error("未处理的异常 ", e);
      }

   }
@@ -119,24 +98,20 @@
   /**
    * 处理移动位置订阅消息
    */
   private void processNotifyMobilePosition(RequestEvent evt, Element rootElement) throws SipException {
      String platformId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
   private void processNotifyMobilePosition(SIPRequest request, Element rootElement) throws SipException {
      if (request == null) {
         return;
      }
      String platformId = SipUtils.getUserIdFromFromHeader(request);
      String deviceId = XmlUtil.getText(rootElement, "DeviceID");
      ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
      SubscribeInfo subscribeInfo = new SubscribeInfo(evt, platformId);
      SubscribeInfo subscribeInfo = new SubscribeInfo(request, platformId);
      if (platform == null) {
         return;
      }
      if (evt.getServerTransaction() == null) {
         ServerTransaction serverTransaction = "TCP".equals(platform.getTransport()) ? tcpSipProvider.getNewServerTransaction(evt.getRequest())
               : udpSipProvider.getNewServerTransaction(evt.getRequest());
         subscribeInfo.setTransaction(serverTransaction);
         Dialog dialog = serverTransaction.getDialog();
         dialog.terminateOnBye(false);
         subscribeInfo.setDialog(dialog);
      }

      String sn = XmlUtil.getText(rootElement, "SN");
      logger.info("[回复 移动位置订阅]: {}", platformId);
      logger.info("[回复上级的移动位置订阅请求]: {}", platformId);
      StringBuilder resultXml = new StringBuilder(200);
      resultXml.append("<?xml version=\"1.0\" ?>\r\n")
            .append("<Response>\r\n")
@@ -154,19 +129,21 @@
         }else {
            subscribeInfo.setGpsInterval(Integer.parseInt(interval));
         }

         subscribeInfo.setSn(sn);
         subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo);

      }else if (subscribeInfo.getExpires() == 0) {
         subscribeHolder.removeMobilePositionSubscribe(platformId);
      }

      try {
         ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
         responseXmlAck(evt, resultXml.toString(), parentPlatform);
         SIPResponse response = responseXmlAck(request, resultXml.toString(), parentPlatform, subscribeInfo.getExpires());
         if (subscribeInfo.getExpires() == 0) {
            subscribeHolder.removeMobilePositionSubscribe(platformId);
         }else {
            subscribeInfo.setResponse(response);
            subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo);
         }

      } catch (SipException | InvalidArgumentException | ParseException e) {
         e.printStackTrace();
         logger.error("未处理的异常 ", e);
      }
   }

@@ -174,26 +151,20 @@

   }

   private void processNotifyCatalogList(RequestEvent evt, Element rootElement) throws SipException {

      System.out.println(evt.getRequest().toString());
      String platformId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
   private void processNotifyCatalogList(SIPRequest request, Element rootElement) throws SipException {
      if (request == null) {
         return;
      }
      String platformId = SipUtils.getUserIdFromFromHeader(request);
      String deviceId = XmlUtil.getText(rootElement, "DeviceID");
      ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
      if (platform == null){
         return;
      }
      SubscribeInfo subscribeInfo = new SubscribeInfo(evt, platformId);
      if (evt.getServerTransaction() == null) {
         ServerTransaction serverTransaction = "TCP".equals(platform.getTransport()) ? tcpSipProvider.getNewServerTransaction(evt.getRequest())
               : udpSipProvider.getNewServerTransaction(evt.getRequest());
         subscribeInfo.setTransaction(serverTransaction);
         Dialog dialog = serverTransaction.getDialog();
         dialog.terminateOnBye(false);
         subscribeInfo.setDialog(dialog);
      }
      SubscribeInfo subscribeInfo = new SubscribeInfo(request, platformId);

      String sn = XmlUtil.getText(rootElement, "SN");
      logger.info("[回复 目录订阅]: {}/{}", platformId, deviceId);
      logger.info("[回复上级的目录订阅请求]: {}/{}", platformId, deviceId);
      StringBuilder resultXml = new StringBuilder(200);
      resultXml.append("<?xml version=\"1.0\" ?>\r\n")
            .append("<Response>\r\n")
@@ -208,13 +179,17 @@
      }else if (subscribeInfo.getExpires() == 0) {
         subscribeHolder.removeCatalogSubscribe(platformId);
      }

      try {
         ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
         responseXmlAck(evt, resultXml.toString(), parentPlatform);
         SIPResponse response = responseXmlAck(request, resultXml.toString(), parentPlatform, subscribeInfo.getExpires());
         if (subscribeInfo.getExpires() == 0) {
            subscribeHolder.removeCatalogSubscribe(platformId);
         }else {
            subscribeInfo.setResponse(response);
            subscribeHolder.putCatalogSubscribe(platformId, subscribeInfo);
         }
      } catch (SipException | InvalidArgumentException | ParseException e) {
         e.printStackTrace();
         logger.error("未处理的异常 ", e);
      }
   }

}