From d9cfe061b9b501511f5d769f751c8ff6bbcb1bf9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 17 八月 2023 15:20:25 +0800
Subject: [PATCH] 优化对讲释放流程
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
index 1b2a8f3..870dee0 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java
@@ -403,8 +403,12 @@
if (platform == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "骞冲彴鏈壘鍒�");
}
- if (platformId.equals(parentId)) {
- parentId = platform.getDeviceGBId();
+// if (platformId.equals(parentId)) {
+// parentId = platform.getDeviceGBId();
+// }
+
+ if (platformId.equals(platform.getDeviceGBId())) {
+ parentId = null;
}
return storager.getChildrenCatalogByPlatform(platformId, parentId);
@@ -424,7 +428,7 @@
if (logger.isDebugEnabled()) {
logger.debug("娣诲姞鐩綍,{}", JSON.toJSONString(platformCatalog));
}
- PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getId());
+ PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getPlatformId(), platformCatalog.getId());
if (platformCatalogInStore != null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), platformCatalog.getId() + " already exists");
@@ -449,7 +453,7 @@
if (logger.isDebugEnabled()) {
logger.debug("缂栬緫鐩綍,{}", JSON.toJSONString(platformCatalog));
}
- PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getId());
+ PlatformCatalog platformCatalogInStore = storager.getCatalog(platformCatalog.getPlatformId(), platformCatalog.getId());
if (platformCatalogInStore == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), platformCatalog.getId() + " not exists");
@@ -482,7 +486,7 @@
throw new ControllerException(ErrorCode.ERROR400);
}
- int delResult = storager.delCatalog(id);
+ int delResult = storager.delCatalog(platformId, id);
// 濡傛灉鍒犻櫎鐨勬槸榛樿鐩綍鍒欐牴鐩綍璁剧疆涓洪粯璁ょ洰褰�
PlatformCatalog parentPlatform = storager.queryDefaultCatalogInPlatform(platformId);
--
Gitblit v1.8.0