From bde0e13682ed75d2e8c0cb8a1fd6a96bb92f1dd8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 14 三月 2022 18:34:25 +0800
Subject: [PATCH] #394
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java | 102 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 72 insertions(+), 30 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 9c5be8e..4acec14 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
@@ -4,6 +4,8 @@
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetup;
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.GPSSubscribeTask;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
@@ -14,21 +16,20 @@
import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.utils.SerializeUtils;
+import gov.nist.javax.sip.SipProviderImpl;
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.InvalidArgumentException;
-import javax.sip.RequestEvent;
-import javax.sip.ServerTransaction;
-import javax.sip.SipException;
-import javax.sip.header.CallIdHeader;
+import javax.sip.*;
import javax.sip.header.ExpiresHeader;
-import javax.sip.header.Header;
import javax.sip.header.ToHeader;
import javax.sip.message.Request;
import javax.sip.message.Response;
@@ -55,11 +56,25 @@
@Autowired
private IVideoManagerStorager storager;
+ @Lazy
+ @Autowired
+ @Qualifier(value="tcpSipProvider")
+ private SipProviderImpl tcpSipProvider;
+
+ @Lazy
+ @Autowired
+ @Qualifier(value="udpSipProvider")
+ private SipProviderImpl udpSipProvider;
+
@Autowired
private DynamicTask dynamicTask;
@Autowired
private UserSetup userSetup;
+
+
+ @Autowired
+ private SubscribeHolder subscribeHolder;
@Override
public void afterPropertiesSet() throws Exception {
@@ -80,17 +95,14 @@
Element rootElement = getRootElement(evt);
String cmd = XmlUtil.getText(rootElement, "CmdType");
if (CmdType.MOBILE_POSITION.equals(cmd)) {
- logger.info("鎺ユ敹鍒癕obilePosition璁㈤槄");
processNotifyMobilePosition(evt, rootElement);
// } else if (CmdType.ALARM.equals(cmd)) {
// logger.info("鎺ユ敹鍒癆larm璁㈤槄");
// processNotifyAlarm(evt, rootElement);
-// } else if (CmdType.CATALOG.equals(cmd)) {
-// logger.info("鎺ユ敹鍒癈atalog璁㈤槄");
-// processNotifyCatalogList(evt, rootElement);
+ } else if (CmdType.CATALOG.equals(cmd)) {
+ processNotifyCatalogList(evt, rootElement);
} else {
logger.info("鎺ユ敹鍒版秷鎭細" + cmd);
-// responseAck(evt, Response.OK);
Response response = null;
response = getMessageFactory().createResponse(200, request);
@@ -108,9 +120,6 @@
logger.info("processRequest serverTransactionId is null.");
}
}
-
-
-
} catch (ParseException e) {
e.printStackTrace();
} catch (SipException e) {
@@ -132,7 +141,7 @@
SubscribeInfo subscribeInfo = new SubscribeInfo(evt, platformId);
String sn = XmlUtil.getText(rootElement, "SN");
String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + userSetup.getServerId() + "_MobilePosition_" + platformId;
-
+ logger.info("鎺ユ敹鍒皗}鐨凪obilePosition璁㈤槄", platformId);
StringBuilder resultXml = new StringBuilder(200);
resultXml.append("<?xml version=\"1.0\" ?>\r\n")
.append("<Response>\r\n")
@@ -143,26 +152,20 @@
.append("</Response>\r\n");
if (subscribeInfo.getExpires() > 0) {
- if (redisCatchStorage.getSubscribe(key) != null) {
- dynamicTask.stopCron(key);
+ if (subscribeHolder.getMobilePositionSubscribe(platformId) != null) {
+ dynamicTask.stop(key);
}
String interval = XmlUtil.getText(rootElement, "Interval"); // GPS涓婃姤鏃堕棿闂撮殧
- dynamicTask.startCron(key, new GPSSubscribeTask(redisCatchStorage, sipCommanderForPlatform, storager, platformId, sn, key), Integer.parseInt(interval));
-
- redisCatchStorage.updateSubscribe(key, subscribeInfo);
+ dynamicTask.startCron(key, new GPSSubscribeTask(redisCatchStorage, sipCommanderForPlatform, storager, platformId, sn, key, subscribeHolder), Integer.parseInt(interval));
+ subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo);
}else if (subscribeInfo.getExpires() == 0) {
- dynamicTask.stopCron(key);
- redisCatchStorage.delSubscribe(key);
+ dynamicTask.stop(key);
+ subscribeHolder.removeMobilePositionSubscribe(platformId);
}
-
-
try {
- Response response = responseXmlAck(evt, resultXml.toString());
- ToHeader toHeader = (ToHeader)response.getHeader(ToHeader.NAME);
- subscribeInfo.setToTag(toHeader.getTag());
- redisCatchStorage.updateSubscribe(key, subscribeInfo);
-
+ ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
+ responseXmlAck(evt, resultXml.toString(), parentPlatform);
} catch (SipException e) {
e.printStackTrace();
} catch (InvalidArgumentException e) {
@@ -176,8 +179,47 @@
}
- private void processNotifyCatalogList(RequestEvent evt, Element rootElement) {
+ private void processNotifyCatalogList(RequestEvent evt, Element rootElement) throws SipException {
+ String platformId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+ String deviceID = XmlUtil.getText(rootElement, "DeviceID");
+ ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
+ SubscribeInfo subscribeInfo = new SubscribeInfo(evt, platformId);
+ if (evt.getServerTransaction() == null) {
+ ServerTransaction serverTransaction = platform.getTransport().equals("TCP") ? 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");
+ String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + userSetup.getServerId() + "_Catalog_" + platformId;
+ logger.info("鎺ユ敹鍒皗}鐨凜atalog璁㈤槄", platformId);
+ StringBuilder resultXml = new StringBuilder(200);
+ resultXml.append("<?xml version=\"1.0\" ?>\r\n")
+ .append("<Response>\r\n")
+ .append("<CmdType>Catalog</CmdType>\r\n")
+ .append("<SN>" + sn + "</SN>\r\n")
+ .append("<DeviceID>" + deviceID + "</DeviceID>\r\n")
+ .append("<Result>OK</Result>\r\n")
+ .append("</Response>\r\n");
+ if (subscribeInfo.getExpires() > 0) {
+ subscribeHolder.putCatalogSubscribe(platformId, subscribeInfo);
+ }else if (subscribeInfo.getExpires() == 0) {
+ subscribeHolder.removeCatalogSubscribe(platformId);
+ }
+
+ try {
+ ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
+ responseXmlAck(evt, resultXml.toString(), parentPlatform);
+ } catch (SipException e) {
+ e.printStackTrace();
+ } catch (InvalidArgumentException e) {
+ e.printStackTrace();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
}
}
--
Gitblit v1.8.0