Merge pull request #608 from wenyanjun/wvp-28181-2.0

648540858

2022-09-15 7462e2776bc064748c6ddfd9dd53d07b498e1a42

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

@@ -132,7 +132,7 @@
         return;
      }
      if (evt.getServerTransaction() == null) {
         ServerTransaction serverTransaction = "TCP".equals(platform.getTransport()) ? tcpSipProvider.getNewServerTransaction(evt.getRequest())
         ServerTransaction serverTransaction = "TCP".equalsIgnoreCase(platform.getTransport()) ? tcpSipProvider.getNewServerTransaction(evt.getRequest())
               : udpSipProvider.getNewServerTransaction(evt.getRequest());
         subscribeInfo.setTransaction(serverTransaction);
         Dialog dialog = serverTransaction.getDialog();
@@ -180,7 +180,6 @@

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

      System.out.println(evt.getRequest().toString());
      String platformId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
      String deviceId = XmlUtil.getText(rootElement, "DeviceID");
      ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
@@ -189,7 +188,7 @@
      }
      SubscribeInfo subscribeInfo = new SubscribeInfo(evt, platformId);
      if (evt.getServerTransaction() == null) {
         ServerTransaction serverTransaction = "TCP".equals(platform.getTransport()) ? tcpSipProvider.getNewServerTransaction(evt.getRequest())
         ServerTransaction serverTransaction = "TCP".equalsIgnoreCase(platform.getTransport()) ? tcpSipProvider.getNewServerTransaction(evt.getRequest())
               : udpSipProvider.getNewServerTransaction(evt.getRequest());
         subscribeInfo.setTransaction(serverTransaction);
         Dialog dialog = serverTransaction.getDialog();
@@ -212,7 +211,6 @@
      }else if (subscribeInfo.getExpires() == 0) {
         subscribeHolder.removeCatalogSubscribe(platformId);
      }

      try {
         ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
         responseXmlAck(evt, resultXml.toString(), parentPlatform);
@@ -220,5 +218,4 @@
         e.printStackTrace();
      }
   }

}