From 7ecc86b33d37df8ecda167ca390e932df1442171 Mon Sep 17 00:00:00 2001
From: wym <421132955@qq.com>
Date: 星期一, 08 八月 2022 08:31:12 +0800
Subject: [PATCH] zlm关闭一段时间后，重启后信令服务不重连zlm
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 8d2278e..7a22693 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
@@ -8,6 +8,7 @@
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.PlatformCatalog;
import com.genersoft.iot.vmp.gb28181.bean.SubscribeHolder;
+import com.genersoft.iot.vmp.gb28181.bean.TreeType;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
import com.genersoft.iot.vmp.service.IPlatformChannelService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
@@ -463,13 +464,20 @@
if (logger.isDebugEnabled()) {
logger.debug("鏌ヨ鐩綍,platformId: {}, parentId: {}", platformId, parentId);
}
+ ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
+ if (platform == null) {
+ return new ResponseEntity<>(new WVPResult<>(400, "骞冲彴鏈壘鍒�", null), HttpStatus.OK);
+ }
+ if (platformId.equals(parentId)) {
+ parentId = platform.getDeviceGBId();
+ }
List<PlatformCatalog> platformCatalogList = storager.getChildrenCatalogByPlatform(platformId, parentId);
- // 鏌ヨ涓嬪睘鐨勫浗鏍囬�氶亾
-// List<PlatformCatalog> catalogsForChannel = storager.queryChannelInParentPlatformAndCatalog(platformId, parentId);
- // 鏌ヨ涓嬪睘鐨勭洿鎾祦閫氶亾
-// List<PlatformCatalog> catalogsForStream = storager.queryStreamInParentPlatformAndCatalog(platformId, parentId);
-// platformCatalogList.addAll(catalogsForChannel);
-// platformCatalogList.addAll(catalogsForStream);
+// if (platform.getTreeType().equals(TreeType.BUSINESS_GROUP)) {
+// platformCatalogList = storager.getChildrenCatalogByPlatform(platformId, parentId);
+// }else {
+//
+// }
+
WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
result.setCode(0);
result.setMsg("success");
--
Gitblit v1.8.0