From 6bb8f45e270681dbcb70aed663b406e7d905e091 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 18 四月 2022 15:04:22 +0800
Subject: [PATCH] 优化摄像头注册流程
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java | 117 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 72 insertions(+), 45 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 13335d6..da1088a 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
@@ -2,10 +2,12 @@
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.DynamicTask;
-import com.genersoft.iot.vmp.conf.UserSetup;
+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.GPSSubscribeTask;
+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.event.request.ISIPRequestProcessor;
@@ -13,23 +15,20 @@
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.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+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;
import java.text.ParseException;
@@ -53,13 +52,26 @@
private ISIPCommanderForPlatform sipCommanderForPlatform;
@Autowired
- private IVideoManagerStorager storager;
+ 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 UserSetup userSetup;
+ private UserSetting userSetting;
+
+ @Autowired
+ private SubscribeHolder subscribeHolder;
@Override
public void afterPropertiesSet() throws Exception {
@@ -80,17 +92,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 {
logger.info("鎺ユ敹鍒版秷鎭細" + cmd);
-// responseAck(evt, Response.OK);
Response response = null;
response = getMessageFactory().createResponse(200, request);
@@ -108,9 +117,6 @@
logger.info("processRequest serverTransactionId is null.");
}
}
-
-
-
} catch (ParseException e) {
e.printStackTrace();
} catch (SipException e) {
@@ -126,13 +132,24 @@
/**
* 澶勭悊绉诲姩浣嶇疆璁㈤槄娑堟伅
*/
- private void processNotifyMobilePosition(RequestEvent evt, Element rootElement) {
+ private void processNotifyMobilePosition(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 (platform == null) {
+ return;
+ }
+ 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() + "_MobilePosition_" + platformId;
-
+ logger.info("[鍥炲 绉诲姩浣嶇疆璁㈤槄]: {}", platformId);
StringBuilder resultXml = new StringBuilder(200);
resultXml.append("<?xml version=\"1.0\" ?>\r\n")
.append("<Response>\r\n")
@@ -143,26 +160,31 @@
.append("</Response>\r\n");
if (subscribeInfo.getExpires() > 0) {
- if (redisCatchStorage.getSubscribe(key) != null) {
- dynamicTask.stopCron(key);
- }
String interval = XmlUtil.getText(rootElement, "Interval"); // GPS涓婃姤鏃堕棿闂撮殧
- dynamicTask.startCron(key, new GPSSubscribeTask(redisCatchStorage, sipCommanderForPlatform, storager, platformId, sn, key), Integer.parseInt(interval));
+ if (interval == null) {
+ subscribeInfo.setGpsInterval(5);
+ }else {
+ subscribeInfo.setGpsInterval(Integer.parseInt(interval));
+ }
- redisCatchStorage.updateSubscribe(key, subscribeInfo);
+ subscribeInfo.setSn(sn);
+ subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo);
+// if (subscribeHolder.getMobilePositionSubscribe(platformId) == null ) {
+// subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo);
+// }else {
+// if (subscribeHolder.getMobilePositionSubscribe(platformId).getDialog() != null
+// && subscribeHolder.getMobilePositionSubscribe(platformId).getDialog().getState() != null
+// && !subscribeHolder.getMobilePositionSubscribe(platformId).getDialog().getState().equals(DialogState.CONFIRMED)) {
+// subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo);
+// }
+// }
}else if (subscribeInfo.getExpires() == 0) {
- dynamicTask.stopCron(key);
- redisCatchStorage.delSubscribe(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,13 +198,21 @@
}
- 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("[鍥炲 鐩綍璁㈤槄]: {}/{}", platformId, deviceID);
StringBuilder resultXml = new StringBuilder(200);
resultXml.append("<?xml version=\"1.0\" ?>\r\n")
.append("<Response>\r\n")
@@ -193,17 +223,14 @@
.append("</Response>\r\n");
if (subscribeInfo.getExpires() > 0) {
- redisCatchStorage.updateSubscribe(key, subscribeInfo);
+ subscribeHolder.putCatalogSubscribe(platformId, subscribeInfo);
}else if (subscribeInfo.getExpires() == 0) {
- redisCatchStorage.delSubscribe(key);
+ subscribeHolder.removeCatalogSubscribe(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) {
--
Gitblit v1.8.0