From 525f325d2bfb8d111eef95242549ce00d0b41f7b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Wed, 11 Sep 2024 22:25:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CommonChannelController.java   | 21 -------------------
 .../gb28181/service/IGbChannelService.java    |  1 -
 .../service/impl/GbChannelServiceImpl.java    |  7 -------
 3 files changed, 29 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/CommonChannelController.java b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/CommonChannelController.java
index ff239c8a2..b386d56e0 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/CommonChannelController.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/CommonChannelController.java
@@ -167,25 +167,4 @@ public class CommonChannelController {
         Assert.notEmpty(param.getDeviceIds(),"参数异常");
         channelService.deleteChannelToGroupByGbDevice(param.getDeviceIds());
     }
-
-    @Operation(summary = "获取树节点", security = @SecurityRequirement(name = JwtUtils.HEADER))
-    @Parameter(name = "parentId", description = "父节点ID", required = false)
-    @Parameter(name = "parentDeviceId", description = "父节点国标编号", required = false)
-    @Parameter(name = "showRegion", description = "显示行政区划", required = false)
-    @Parameter(name = "showGroup", description = "显示分组", required = false)
-    @GetMapping("/tree")
-    public List<CommonGBChannel> queryTree(
-            @RequestParam(required = false) Integer parentId,
-            @RequestParam(required = false) String parentDeviceId,
-            @RequestParam(required = false) Boolean showRegion,
-            @RequestParam(required = false) Boolean showGroup
-    ){
-        if (showRegion == null) {
-            showRegion = false;
-        }
-        if (showGroup == null) {
-            showRegion = false;
-        }
-        return channelService.queryTree(parentId, parentDeviceId, showRegion, showGroup);
-    }
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelService.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelService.java
index 7a615b831..f5cfe8875 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelService.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelService.java
@@ -78,5 +78,4 @@ public interface IGbChannelService {
 
     void updateCivilCode(String oldCivilCode, String newCivilCode);
 
-    List<CommonGBChannel> queryTree(Integer parentId, String parentDeviceId, Boolean showRegion, Boolean showGroup);
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java
index f877767cf..b89ed35ce 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java
@@ -676,11 +676,4 @@ public class GbChannelServiceImpl implements IGbChannelService {
         }
     }
 
-    @Override
-    public List<CommonGBChannel> queryTree(Integer parentId, String parentDeviceId, Boolean showRegion, Boolean showGroup) {
-        if (parentId == null || Objects.isNull(parentDeviceId)) {
-            // 查询顶级节点
-        }
-        return Collections.emptyList();
-    }
 }