From 16b7e4a7ef473a6af29ec78aeb2f471fa398efdd Mon Sep 17 00:00:00 2001
From: leesam <leesam@leesam.cn>
Date: 星期三, 10 四月 2024 20:49:44 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into develop-add-api-key
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 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
index 0c23ace..34d7077 100755
--- 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
@@ -37,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;
@@ -100,9 +100,9 @@
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) {
@@ -110,23 +110,23 @@
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(request, 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(request, Response.UNSUPPORTED_MEDIA_TYPE, "Unsupported message type, must Control/Notify/Query/Response");
}
}
} catch (SipException e) {
--
Gitblit v1.8.0