From c21d973977a9f1d00d26179de764687ddd0ec56c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 24 四月 2024 14:59:41 +0800
Subject: [PATCH] 修复收到catalog消息是更新导致是否有音频的设置失效的BUG
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java | 68 ++++++++++++++++------------------
1 files changed, 32 insertions(+), 36 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
old mode 100644
new mode 100755
index 2ec4023..1580baf
--- 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
@@ -7,35 +7,28 @@
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.service.IPlatformService;
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;
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;
@@ -58,6 +51,13 @@
@Autowired
private SubscribeHolder subscribeHolder;
+ @Autowired
+ private SIPSender sipSender;
+
+
+ @Autowired
+ private IPlatformService platformService;
+
@Override
public void afterPropertiesSet() throws Exception {
// 娣诲姞娑堟伅澶勭悊鐨勮闃�
@@ -71,8 +71,7 @@
*/
@Override
public void process(RequestEvent evt) {
- ServerTransaction serverTransaction = getServerTransaction(evt);
- Request request = evt.getRequest();
+ SIPRequest request = (SIPRequest) evt.getRequest();
try {
Element rootElement = getRootElement(evt);
if (rootElement == null) {
@@ -81,12 +80,12 @@
}
String cmd = XmlUtil.getText(rootElement, "CmdType");
if (CmdType.MOBILE_POSITION.equals(cmd)) {
- processNotifyMobilePosition(serverTransaction, rootElement);
+ processNotifyMobilePosition(request, rootElement);
// } else if (CmdType.ALARM.equals(cmd)) {
// logger.info("鎺ユ敹鍒癆larm璁㈤槄");
// processNotifyAlarm(serverTransaction, rootElement);
} else if (CmdType.CATALOG.equals(cmd)) {
- processNotifyCatalogList(serverTransaction, rootElement);
+ processNotifyCatalogList(request, rootElement);
} else {
logger.info("鎺ユ敹鍒版秷鎭細" + cmd);
@@ -96,16 +95,10 @@
response.setExpires(expireHeader);
}
logger.info("response : " + response);
- ServerTransaction transaction = getServerTransaction(evt);
- if (transaction != null) {
- transaction.sendResponse(response);
- transaction.terminate();
- } else {
- logger.info("processRequest serverTransactionId is null.");
- }
+ sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), response);
}
} catch (ParseException | SipException | InvalidArgumentException | DocumentException e) {
- e.printStackTrace();
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
}
}
@@ -113,14 +106,14 @@
/**
* 澶勭悊绉诲姩浣嶇疆璁㈤槄娑堟伅
*/
- private void processNotifyMobilePosition(ServerTransaction serverTransaction, Element rootElement) throws SipException {
- if (serverTransaction == null) {
+ private void processNotifyMobilePosition(SIPRequest request, Element rootElement) throws SipException {
+ if (request == null) {
return;
}
- String platformId = SipUtils.getUserIdFromFromHeader(serverTransaction.getRequest());
+ String platformId = SipUtils.getUserIdFromFromHeader(request);
String deviceId = XmlUtil.getText(rootElement, "DeviceID");
ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
- SubscribeInfo subscribeInfo = new SubscribeInfo(serverTransaction, platformId);
+ SubscribeInfo subscribeInfo = new SubscribeInfo(request, platformId);
if (platform == null) {
return;
}
@@ -149,7 +142,7 @@
try {
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
- SIPResponse response = responseXmlAck(serverTransaction, resultXml.toString(), parentPlatform, subscribeInfo.getExpires());
+ SIPResponse response = responseXmlAck(request, resultXml.toString(), parentPlatform, subscribeInfo.getExpires());
if (subscribeInfo.getExpires() == 0) {
subscribeHolder.removeMobilePositionSubscribe(platformId);
}else {
@@ -158,7 +151,7 @@
}
} catch (SipException | InvalidArgumentException | ParseException e) {
- e.printStackTrace();
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
}
}
@@ -166,17 +159,17 @@
}
- private void processNotifyCatalogList(ServerTransaction serverTransaction, Element rootElement) throws SipException {
- if (serverTransaction == null) {
+ private void processNotifyCatalogList(SIPRequest request, Element rootElement) throws SipException {
+ if (request == null) {
return;
}
- String platformId = SipUtils.getUserIdFromFromHeader(serverTransaction.getRequest());
+ String platformId = SipUtils.getUserIdFromFromHeader(request);
String deviceId = XmlUtil.getText(rootElement, "DeviceID");
ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
if (platform == null){
return;
}
- SubscribeInfo subscribeInfo = new SubscribeInfo(serverTransaction, platformId);
+ SubscribeInfo subscribeInfo = new SubscribeInfo(request, platformId);
String sn = XmlUtil.getText(rootElement, "SN");
logger.info("[鍥炲涓婄骇鐨勭洰褰曡闃呰姹俔: {}/{}", platformId, deviceId);
@@ -196,7 +189,7 @@
}
try {
ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
- SIPResponse response = responseXmlAck(serverTransaction, resultXml.toString(), parentPlatform, subscribeInfo.getExpires());
+ SIPResponse response = responseXmlAck(request, resultXml.toString(), parentPlatform, subscribeInfo.getExpires());
if (subscribeInfo.getExpires() == 0) {
subscribeHolder.removeCatalogSubscribe(platformId);
}else {
@@ -204,7 +197,10 @@
subscribeHolder.putCatalogSubscribe(platformId, subscribeInfo);
}
} catch (SipException | InvalidArgumentException | ParseException e) {
- e.printStackTrace();
+ logger.error("鏈鐞嗙殑寮傚父 ", e);
+ }
+ if (subscribeHolder.getCatalogSubscribe(platformId) == null && platform.isAutoPushChannel()) {
+ platformService.addSimulatedSubscribeInfo(platform);
}
}
}
--
Gitblit v1.8.0