From ffb21248cb270475ce9156b5056e591e14cbc20d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 30 五月 2023 11:20:22 +0800
Subject: [PATCH] 去除多余配置
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java | 200 +++++++++++++++++++-------------------------------
1 files changed, 76 insertions(+), 124 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 979849e..4ff4e98 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
@@ -1,77 +1,54 @@
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 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;
/**
* SIP鍛戒护绫诲瀷锛� SUBSCRIBE璇锋眰
+ * @author lin
*/
@Component
public class SubscribeRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
- private Logger logger = LoggerFactory.getLogger(SubscribeRequestProcessor.class);
- private String method = "SUBSCRIBE";
+ private final Logger logger = LoggerFactory.getLogger(SubscribeRequestProcessor.class);
+ private final String method = "SUBSCRIBE";
@Autowired
private SIPProcessorObserver sipProcessorObserver;
@Autowired
- private IRedisCatchStorage redisCatchStorage;
-
- @Autowired
- private ISIPCommanderForPlatform sipCommanderForPlatform;
-
- @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;
+
+ @Autowired
+ private SIPSender sipSender;
@Override
public void afterPropertiesSet() throws Exception {
@@ -82,49 +59,38 @@
/**
* 澶勭悊SUBSCRIBE璇锋眰
*
- * @param evt
+ * @param evt 浜嬩欢
*/
@Override
public void process(RequestEvent evt) {
- Request request = evt.getRequest();
-
+ SIPRequest request = (SIPRequest) evt.getRequest();
try {
Element rootElement = getRootElement(evt);
+ if (rootElement == null) {
+ logger.error("澶勭悊SUBSCRIBE璇锋眰 鏈幏鍙栧埌娑堟伅浣搟}", evt.getRequest());
+ return;
+ }
String cmd = XmlUtil.getText(rootElement, "CmdType");
if (CmdType.MOBILE_POSITION.equals(cmd)) {
- processNotifyMobilePosition(evt, rootElement);
+ processNotifyMobilePosition(request, 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(request, rootElement);
} else {
logger.info("鎺ユ敹鍒版秷鎭細" + cmd);
- Response response = null;
- response = getMessageFactory().createResponse(200, request);
+ Response response = getMessageFactory().createResponse(200, request);
if (response != null) {
ExpiresHeader expireHeader = getHeaderFactory().createExpiresHeader(30);
response.setExpires(expireHeader);
}
- logger.info("response : " + response.toString());
- ServerTransaction transaction = getServerTransaction(evt);
- if (transaction != null) {
- transaction.sendResponse(response);
- transaction.getDialog().delete();
- transaction.terminate();
- } else {
- logger.info("processRequest serverTransactionId is null.");
- }
+ logger.info("response : " + response);
+ sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), response);
}
- } catch (ParseException e) {
- e.printStackTrace();
- } catch (SipException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (DocumentException e) {
- e.printStackTrace();
+ } catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
}
}
@@ -132,64 +98,52 @@
/**
* 澶勭悊绉诲姩浣嶇疆璁㈤槄娑堟伅
*/
- private void processNotifyMobilePosition(RequestEvent evt, Element rootElement) throws SipException {
- String platformId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
- String deviceID = XmlUtil.getText(rootElement, "DeviceID");
+ private void processNotifyMobilePosition(SIPRequest request, Element rootElement) throws SipException {
+ if (request == null) {
+ return;
+ }
+ String platformId = SipUtils.getUserIdFromFromHeader(request);
+ String deviceId = XmlUtil.getText(rootElement, "DeviceID");
ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
- SubscribeInfo subscribeInfo = new SubscribeInfo(evt, platformId);
+ SubscribeInfo subscribeInfo = new SubscribeInfo(request, 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 + userSetting.getServerId() + "_MobilePosition_" + platformId;
- logger.info("[鍥炲 绉诲姩浣嶇疆璁㈤槄]: {}", platformId);
+ logger.info("[鍥炲涓婄骇鐨勭Щ鍔ㄤ綅缃闃呰姹俔: {}", platformId);
StringBuilder resultXml = new StringBuilder(200);
resultXml.append("<?xml version=\"1.0\" ?>\r\n")
.append("<Response>\r\n")
.append("<CmdType>MobilePosition</CmdType>\r\n")
- .append("<SN>" + sn + "</SN>\r\n")
- .append("<DeviceID>" + deviceID + "</DeviceID>\r\n")
+ .append("<SN>").append(sn).append("</SN>\r\n")
+ .append("<DeviceID>").append(deviceId).append("</DeviceID>\r\n")
.append("<Result>OK</Result>\r\n")
.append("</Response>\r\n");
if (subscribeInfo.getExpires() > 0) {
-
- if (subscribeHolder.getMobilePositionSubscribe(platformId) == null ) {
- String interval = XmlUtil.getText(rootElement, "Interval"); // GPS涓婃姤鏃堕棿闂撮殧
- subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo);
- dynamicTask.startCron(key, new MobilePositionSubscribeHandlerTask(redisCatchStorage, sipCommanderForPlatform, storager, platformId, sn, key, subscribeHolder), Integer.parseInt(interval));
+ // GPS涓婃姤鏃堕棿闂撮殧
+ String interval = XmlUtil.getText(rootElement, "Interval");
+ if (interval == null) {
+ subscribeInfo.setGpsInterval(5);
}else {
- if (subscribeHolder.getMobilePositionSubscribe(platformId).getDialog() != null
- && subscribeHolder.getMobilePositionSubscribe(platformId).getDialog().getState() != null
- && !subscribeHolder.getMobilePositionSubscribe(platformId).getDialog().getState().equals(DialogState.CONFIRMED)) {
- dynamicTask.stop(key);
- String interval = XmlUtil.getText(rootElement, "Interval"); // GPS涓婃姤鏃堕棿闂撮殧
- subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo);
- dynamicTask.startCron(key, new MobilePositionSubscribeHandlerTask(redisCatchStorage, sipCommanderForPlatform, storager, platformId, sn, key, subscribeHolder), Integer.parseInt(interval));
- }
+ subscribeInfo.setGpsInterval(Integer.parseInt(interval));
}
- }else if (subscribeInfo.getExpires() == 0) {
- dynamicTask.stop(key);
- subscribeHolder.removeMobilePositionSubscribe(platformId);
+ subscribeInfo.setSn(sn);
}
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();
+ SIPResponse response = responseXmlAck(request, 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) {
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
}
}
@@ -197,28 +151,26 @@
}
- 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);
+ private void processNotifyCatalogList(SIPRequest request, Element rootElement) throws SipException {
+ if (request == null) {
+ return;
}
+ String platformId = SipUtils.getUserIdFromFromHeader(request);
+ String deviceId = XmlUtil.getText(rootElement, "DeviceID");
+ ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
+ if (platform == null){
+ return;
+ }
+ SubscribeInfo subscribeInfo = new SubscribeInfo(request, platformId);
+
String sn = XmlUtil.getText(rootElement, "SN");
- String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + userSetting.getServerId() + "_Catalog_" + platformId;
- 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")
.append("<CmdType>Catalog</CmdType>\r\n")
- .append("<SN>" + sn + "</SN>\r\n")
- .append("<DeviceID>" + deviceID + "</DeviceID>\r\n")
+ .append("<SN>").append(sn).append("</SN>\r\n")
+ .append("<DeviceID>").append(deviceId).append("</DeviceID>\r\n")
.append("<Result>OK</Result>\r\n")
.append("</Response>\r\n");
@@ -227,17 +179,17 @@
}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();
+ SIPResponse response = responseXmlAck(request, 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) {
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
}
}
-
}
--
Gitblit v1.8.0