From a2cac5ca12f100d052cb31122a84de4bba829bca Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 04 一月 2024 18:34:46 +0800
Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java
old mode 100644
new mode 100755
index efc8259..6dcefa7
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java
@@ -3,6 +3,8 @@
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.cmd.CatalogQueryMessageHandler;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.dom4j.Element;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,10 +16,10 @@
public abstract class MessageHandlerAbstract extends SIPRequestProcessorParent implements IMessageHandler{
- public static Map<String, IMessageHandler> messageHandlerMap = new ConcurrentHashMap<>();
+ public Map<String, IMessageHandler> messageHandlerMap = new ConcurrentHashMap<>();
@Autowired
- public MessageRequestProcessor messageRequestProcessor;
+ private IVideoManagerStorage storage;
public void addHandler(String cmdType, IMessageHandler messageHandler) {
messageHandlerMap.put(cmdType, messageHandler);
@@ -27,7 +29,15 @@
public void handForDevice(RequestEvent evt, Device device, Element element) {
String cmd = getText(element, "CmdType");
IMessageHandler messageHandler = messageHandlerMap.get(cmd);
+
if (messageHandler != null) {
+ //涓や釜鍥芥爣骞冲彴浜掔浉绾ц仈鏃剁敱浜庝笂涓�姝ュ垽鏂鑷存湰璇ュ湪骞冲彴澶勭悊鐨勬秷鎭� 鏀惧埌浜嗚澶囩殑澶勭悊閫昏緫
+ //鎵�浠ュ鐩綍鏌ヨ鍗曠嫭鍋氫簡鏍￠獙
+ if(messageHandler instanceof CatalogQueryMessageHandler){
+ ParentPlatform parentPlatform = storage.queryParentPlatByServerGBId(device.getDeviceId());
+ messageHandler.handForPlatform(evt, parentPlatform, element);
+ return;
+ }
messageHandler.handForDevice(evt, device, element);
}
}
--
Gitblit v1.8.0