From 764d04b497356ba6bcbb75fd42b51eca750f7223 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 五月 2024 15:02:51 +0800
Subject: [PATCH] 调整上级观看消息的发送
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java | 56 +++++++++++++++++++++++++++++---------------------------
1 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java
old mode 100644
new mode 100755
index e004b89..34d7077
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java
@@ -24,10 +24,7 @@
import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
import javax.sip.SipException;
-import javax.sip.address.SipURI;
-import javax.sip.header.CSeqHeader;
import javax.sip.header.CallIdHeader;
-import javax.sip.message.Request;
import javax.sip.message.Response;
import java.text.ParseException;
import java.util.Map;
@@ -40,7 +37,7 @@
private final String method = "MESSAGE";
- private static Map<String, IMessageHandler> messageHandlerMap = new ConcurrentHashMap<>();
+ private static final Map<String, IMessageHandler> messageHandlerMap = new ConcurrentHashMap<>();
@Autowired
private SIPProcessorObserver sipProcessorObserver;
@@ -70,7 +67,7 @@
@Override
public void process(RequestEvent evt) {
SIPRequest sipRequest = (SIPRequest)evt.getRequest();
- logger.debug("鎺ユ敹鍒版秷鎭細" + evt.getRequest());
+// logger.info("鎺ユ敹鍒版秷鎭細" + evt.getRequest());
String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
CallIdHeader callIdHeader = sipRequest.getCallIdHeader();
// 鍏堜粠浼氳瘽鍐呮煡鎵�
@@ -79,15 +76,13 @@
if (ssrcTransaction != null) {
deviceId = ssrcTransaction.getDeviceId();
}
+ SIPRequest request = (SIPRequest) evt.getRequest();
// 鏌ヨ璁惧鏄惁瀛樺湪
Device device = redisCatchStorage.getDevice(deviceId);
// 鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪
ParentPlatform parentPlatform = storage.queryParentPlatByServerGBId(deviceId);
try {
if (device != null && parentPlatform != null) {
-
- logger.warn("[閲嶅]骞冲彴涓庤澶囩紪鍙烽噸澶嶏細{}", deviceId);
- SIPRequest request = (SIPRequest) evt.getRequest();
String hostAddress = request.getRemoteAddress().getHostAddress();
int remotePort = request.getRemotePort();
if (device.getHostAddress().equals(hostAddress + ":" + remotePort)) {
@@ -98,33 +93,40 @@
}
if (device == null && parentPlatform == null) {
// 涓嶅瓨鍦ㄥ垯鍥炲404
- responseAck(evt, Response.NOT_FOUND, "device "+ deviceId +" not found");
- logger.warn("[璁惧鏈壘鍒� ]锛� {}", deviceId);
+ responseAck(request, Response.NOT_FOUND, "device "+ deviceId +" not found");
+ logger.warn("[璁惧鏈壘鍒� ]deviceId: {}, callId: {}", deviceId, callIdHeader.getCallId());
if (sipSubscribe.getErrorSubscribe(callIdHeader.getCallId()) != null){
- SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(new DeviceNotFoundEvent(evt.getDialog()));
+ DeviceNotFoundEvent deviceNotFoundEvent = new DeviceNotFoundEvent(evt.getDialog());
+ deviceNotFoundEvent.setCallId(callIdHeader.getCallId());
+ SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(deviceNotFoundEvent);
sipSubscribe.getErrorSubscribe(callIdHeader.getCallId()).response(eventResult);
- };
+ }
}else {
- Element rootElement = null;
+ Element rootElement;
try {
rootElement = getRootElement(evt);
+ if (rootElement == null) {
+ logger.error("澶勭悊MESSAGE璇锋眰 鏈幏鍙栧埌娑堟伅浣搟}", evt.getRequest());
+ responseAck(request, Response.BAD_REQUEST, "content is null");
+ return;
+ }
+ String name = rootElement.getName();
+ IMessageHandler messageHandler = messageHandlerMap.get(name);
+ if (messageHandler != null) {
+ if (device != null) {
+ messageHandler.handForDevice(evt, device, rootElement);
+ }else { // 鐢变簬涓婇潰宸茬粡鍒ゆ柇閮戒负null鍒欑洿鎺ヨ繑鍥烇紝鎵�浠ヨ繖閲宒evice鍜宲arentPlatform蹇呮湁涓�涓笉涓簄ull
+ messageHandler.handForPlatform(evt, parentPlatform, rootElement);
+ }
+ }else {
+ // 涓嶆敮鎸佺殑message
+ // 涓嶅瓨鍦ㄥ垯鍥炲415
+ responseAck(request, Response.UNSUPPORTED_MEDIA_TYPE, "Unsupported message type, must Control/Notify/Query/Response");
+ }
} catch (DocumentException e) {
logger.warn("瑙ｆ瀽XML娑堟伅鍐呭寮傚父", e);
// 涓嶅瓨鍦ㄥ垯鍥炲404
- responseAck(evt, Response.BAD_REQUEST, e.getMessage());
- }
- String name = rootElement.getName();
- IMessageHandler messageHandler = messageHandlerMap.get(name);
- if (messageHandler != null) {
- if (device != null) {
- messageHandler.handForDevice(evt, device, rootElement);
- }else { // 鐢变簬涓婇潰宸茬粡鍒ゆ柇閮戒负null鍒欑洿鎺ヨ繑鍥烇紝鎵�浠ヨ繖閲宒evice鍜宲arentPlatform蹇呮湁涓�涓笉涓簄ull
- messageHandler.handForPlatform(evt, parentPlatform, rootElement);
- }
- }else {
- // 涓嶆敮鎸佺殑message
- // 涓嶅瓨鍦ㄥ垯鍥炲415
- responseAck(evt, Response.UNSUPPORTED_MEDIA_TYPE, "Unsupported message type, must Control/Notify/Query/Response");
+ responseAck(request, Response.BAD_REQUEST, e.getMessage());
}
}
} catch (SipException e) {
--
Gitblit v1.8.0