From d4f6ec39b7e0421757a6b9d1a68b1c4610ea2e8c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 14 三月 2024 14:54:20 +0800
Subject: [PATCH] 优化CivilCode缓存
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 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 cf7d112..855395c
--- 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,7 +3,12 @@
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 gov.nist.javax.sip.message.SIPRequest;
import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import javax.sip.InvalidArgumentException;
@@ -18,7 +23,12 @@
public abstract class MessageHandlerAbstract extends SIPRequestProcessorParent implements IMessageHandler{
+ private Logger logger = LoggerFactory.getLogger(MessageHandlerAbstract.class);
+
public Map<String, IMessageHandler> messageHandlerMap = new ConcurrentHashMap<>();
+
+ @Autowired
+ private IVideoManagerStorage storage;
public void addHandler(String cmdType, IMessageHandler messageHandler) {
messageHandlerMap.put(cmdType, messageHandler);
@@ -28,11 +38,23 @@
public void handForDevice(RequestEvent evt, Device device, Element element) {
String cmd = getText(element, "CmdType");
if (cmd == null) {
- handNullCmd(evt);
+ try {
+ responseAck((SIPRequest) evt.getRequest(), Response.OK);
+ } catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥炲200 OK: {}", e.getMessage());
+ }
return;
}
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);
}
}
@@ -44,18 +66,5 @@
if (messageHandler != null) {
messageHandler.handForPlatform(evt, parentPlatform, element);
}
- }
-
- public void handNullCmd(RequestEvent evt){
- try {
- responseAck(evt, Response.OK);
- } catch (SipException e) {
- throw new RuntimeException(e);
- } catch (InvalidArgumentException e) {
- throw new RuntimeException(e);
- } catch (ParseException e) {
- throw new RuntimeException(e);
- }
- return;
}
}
--
Gitblit v1.8.0