From d7a1b94f905c5f28c9c8f2d48c3f9e28ebcf9cc4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 24 九月 2022 21:04:58 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java | 93 ++++++++++++++++++++--------------------------
1 files changed, 41 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
index 8c04368..2ec4023 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
@@ -17,6 +17,12 @@
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;
@@ -49,22 +55,6 @@
@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;
@@ -81,6 +71,7 @@
*/
@Override
public void process(RequestEvent evt) {
+ ServerTransaction serverTransaction = getServerTransaction(evt);
Request request = evt.getRequest();
try {
Element rootElement = getRootElement(evt);
@@ -90,12 +81,12 @@
}
String cmd = XmlUtil.getText(rootElement, "CmdType");
if (CmdType.MOBILE_POSITION.equals(cmd)) {
- processNotifyMobilePosition(evt, rootElement);
+ processNotifyMobilePosition(serverTransaction, rootElement);
// } else if (CmdType.ALARM.equals(cmd)) {
// logger.info("鎺ユ敹鍒癆larm璁㈤槄");
-// processNotifyAlarm(evt, rootElement);
+// processNotifyAlarm(serverTransaction, rootElement);
} else if (CmdType.CATALOG.equals(cmd)) {
- processNotifyCatalogList(evt, rootElement);
+ processNotifyCatalogList(serverTransaction, rootElement);
} else {
logger.info("鎺ユ敹鍒版秷鎭細" + cmd);
@@ -108,7 +99,6 @@
ServerTransaction transaction = getServerTransaction(evt);
if (transaction != null) {
transaction.sendResponse(response);
- transaction.getDialog().delete();
transaction.terminate();
} else {
logger.info("processRequest serverTransactionId is null.");
@@ -123,24 +113,20 @@
/**
* 澶勭悊绉诲姩浣嶇疆璁㈤槄娑堟伅
*/
- private void processNotifyMobilePosition(RequestEvent evt, Element rootElement) throws SipException {
- String platformId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+ private void processNotifyMobilePosition(ServerTransaction serverTransaction, Element rootElement) throws SipException {
+ if (serverTransaction == null) {
+ return;
+ }
+ String platformId = SipUtils.getUserIdFromFromHeader(serverTransaction.getRequest());
String deviceId = XmlUtil.getText(rootElement, "DeviceID");
ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
- SubscribeInfo subscribeInfo = new SubscribeInfo(evt, platformId);
+ SubscribeInfo subscribeInfo = new SubscribeInfo(serverTransaction, platformId);
if (platform == null) {
return;
}
- if (evt.getServerTransaction() == null) {
- ServerTransaction serverTransaction = "TCP".equalsIgnoreCase(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")
@@ -158,17 +144,19 @@
}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(serverTransaction, 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();
}
@@ -178,25 +166,20 @@
}
- private void processNotifyCatalogList(RequestEvent evt, Element rootElement) throws SipException {
-
- String platformId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+ private void processNotifyCatalogList(ServerTransaction serverTransaction, Element rootElement) throws SipException {
+ if (serverTransaction == null) {
+ return;
+ }
+ String platformId = SipUtils.getUserIdFromFromHeader(serverTransaction.getRequest());
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".equalsIgnoreCase(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(serverTransaction, 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")
@@ -213,7 +196,13 @@
}
try {
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
- responseXmlAck(evt, resultXml.toString(), parentPlatform);
+ SIPResponse response = responseXmlAck(serverTransaction, 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();
}
--
Gitblit v1.8.0