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,41 +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 gov.nist.javax.sip.stack.SIPClientTransaction;
import gov.nist.javax.sip.stack.SIPDialog;
import gov.nist.javax.sip.stack.SIPServerTransaction;
import gov.nist.javax.sip.stack.SIPServerTransactionImpl;
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;

@@ -58,6 +47,9 @@
   @Autowired
   private SubscribeHolder subscribeHolder;

   @Autowired
   private SIPSender sipSender;

   @Override
   public void afterPropertiesSet() throws Exception {
      // 添加消息处理的订阅
@@ -71,8 +63,7 @@
    */
   @Override
   public void process(RequestEvent evt) {
      ServerTransaction serverTransaction = getServerTransaction(evt);
      Request request = evt.getRequest();
      SIPRequest request = (SIPRequest) evt.getRequest();
      try {
         Element rootElement = getRootElement(evt);
         if (rootElement == null) {
@@ -81,12 +72,12 @@
         }
         String cmd = XmlUtil.getText(rootElement, "CmdType");
         if (CmdType.MOBILE_POSITION.equals(cmd)) {
            processNotifyMobilePosition(serverTransaction, rootElement);
            processNotifyMobilePosition(request, rootElement);
//         } else if (CmdType.ALARM.equals(cmd)) {
//            logger.info("接收到Alarm订阅");
//            processNotifyAlarm(serverTransaction, rootElement);
         } else if (CmdType.CATALOG.equals(cmd)) {
            processNotifyCatalogList(serverTransaction, rootElement);
            processNotifyCatalogList(request, rootElement);
         } else {
            logger.info("接收到消息：" + cmd);

@@ -96,16 +87,10 @@
               response.setExpires(expireHeader);
            }
            logger.info("response : " + response);
            ServerTransaction transaction = getServerTransaction(evt);
            if (transaction != null) {
               transaction.sendResponse(response);
               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);
      }

   }
@@ -113,14 +98,14 @@
   /**
    * 处理移动位置订阅消息
    */
   private void processNotifyMobilePosition(ServerTransaction serverTransaction, Element rootElement) throws SipException {
      if (serverTransaction == null) {
   private void processNotifyMobilePosition(SIPRequest request, Element rootElement) throws SipException {
      if (request == null) {
         return;
      }
      String platformId = SipUtils.getUserIdFromFromHeader(serverTransaction.getRequest());
      String platformId = SipUtils.getUserIdFromFromHeader(request);
      String deviceId = XmlUtil.getText(rootElement, "DeviceID");
      ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
      SubscribeInfo subscribeInfo = new SubscribeInfo(serverTransaction, platformId);
      SubscribeInfo subscribeInfo = new SubscribeInfo(request, platformId);
      if (platform == null) {
         return;
      }
@@ -149,7 +134,7 @@

      try {
         ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
         SIPResponse response = responseXmlAck(serverTransaction, resultXml.toString(), parentPlatform, subscribeInfo.getExpires());
         SIPResponse response = responseXmlAck(request, resultXml.toString(), parentPlatform, subscribeInfo.getExpires());
         if (subscribeInfo.getExpires() == 0) {
            subscribeHolder.removeMobilePositionSubscribe(platformId);
         }else {
@@ -158,7 +143,7 @@
         }

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

@@ -166,17 +151,17 @@

   }

   private void processNotifyCatalogList(ServerTransaction serverTransaction, Element rootElement) throws SipException {
      if (serverTransaction == null) {
   private void processNotifyCatalogList(SIPRequest request, Element rootElement) throws SipException {
      if (request == null) {
         return;
      }
      String platformId = SipUtils.getUserIdFromFromHeader(serverTransaction.getRequest());
      String platformId = SipUtils.getUserIdFromFromHeader(request);
      String deviceId = XmlUtil.getText(rootElement, "DeviceID");
      ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
      if (platform == null){
         return;
      }
      SubscribeInfo subscribeInfo = new SubscribeInfo(serverTransaction, platformId);
      SubscribeInfo subscribeInfo = new SubscribeInfo(request, platformId);

      String sn = XmlUtil.getText(rootElement, "SN");
      logger.info("[回复上级的目录订阅请求]: {}/{}", platformId, deviceId);
@@ -196,7 +181,7 @@
      }
      try {
         ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
         SIPResponse response = responseXmlAck(serverTransaction, resultXml.toString(), parentPlatform, subscribeInfo.getExpires());
         SIPResponse response = responseXmlAck(request, resultXml.toString(), parentPlatform, subscribeInfo.getExpires());
         if (subscribeInfo.getExpires() == 0) {
            subscribeHolder.removeCatalogSubscribe(platformId);
         }else {
@@ -204,7 +189,7 @@
            subscribeHolder.putCatalogSubscribe(platformId, subscribeInfo);
         }
      } catch (SipException | InvalidArgumentException | ParseException e) {
         e.printStackTrace();
         logger.error("未处理的异常 ", e);
      }
   }
}