From abc65c6317db3d57c501615125b5a4e17b0448c9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 25 一月 2022 17:14:10 +0800
Subject: [PATCH] 优化目录移除时默认目录的选择
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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 1111ff7..532d928 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
@@ -465,25 +465,30 @@
})
@DeleteMapping("/catalog/del")
@ResponseBody
- public ResponseEntity<WVPResult<List<PlatformCatalog>>> delCatalog(String id){
+ public ResponseEntity<WVPResult<String>> delCatalog(String id, String platformId){
if (logger.isDebugEnabled()) {
logger.debug("鍒犻櫎鐩綍,{}", id);
}
- // 濡傛灉鍒犻櫎鐨勬槸榛樿鐩綍鍒欐牴鐩綍璁剧疆涓洪粯璁ょ洰褰�
- PlatformCatalog catalog = storager.getCatalog(id);
- if (catalog != null) {
- ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(catalog.getPlatformId());
- if (parentPlatform != null) {
- if (id.equals(parentPlatform.getCatalogId())) {
- storager.setDefaultCatalog(parentPlatform.getServerGBId(), parentPlatform.getServerGBId());
- }
- }
+ WVPResult<String> result = new WVPResult<>();
+
+ if (StringUtils.isEmpty(id) || StringUtils.isEmpty(platformId)) {
+ result.setCode(-1);
+ result.setMsg("param error");
+ return new ResponseEntity<>(result, HttpStatus.BAD_REQUEST);
}
+ result.setCode(0);
int delResult = storager.delCatalog(id);
- WVPResult<List<PlatformCatalog>> result = new WVPResult<>();
- result.setCode(0);
+ // 濡傛灉鍒犻櫎鐨勬槸榛樿鐩綍鍒欐牴鐩綍璁剧疆涓洪粯璁ょ洰褰�
+ PlatformCatalog parentPlatform = storager.queryDefaultCatalogInPlatform(platformId);
+
+ // 榛樿鑺傜偣琚Щ闄�
+ if (parentPlatform == null) {
+ storager.setDefaultCatalog(platformId, platformId);
+ result.setData(platformId);
+ }
+
if (delResult > 0) {
result.setMsg("success");
--
Gitblit v1.8.0