From 74aea03f9cc24230f44b59876c8abbd88913e764 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Wed, 20 Mar 2024 14:32:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BD=AC=E7=A7=BB=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xymanager_admin/controller/RoleController.java    | 11 -----------
 .../xymanager_admin/controller/UserController.java    |  9 +++++++++
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java
index 90c26d3..2450d6b 100644
--- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java
+++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java
@@ -2,12 +2,10 @@ package com.shxy.xymanager_admin.controller;
 
 import com.shxy.xymanager_common.base.BaseController;
 import com.shxy.xymanager_common.base.ResponseReult;
-import com.shxy.xymanager_common.entity.DyLevel;
 import com.shxy.xymanager_common.entity.TbRole;
 import com.shxy.xymanager_common.entity.TbRoleResource;
 import com.shxy.xymanager_common.exception.ApiException;
 import com.shxy.xymanager_common.model.RolePermissionModel;
-import com.shxy.xymanager_service.service.NewCacheService;
 import com.shxy.xymanager_service.service.RolePermissionService;
 import com.shxy.xymanager_service.service.RoleService;
 
@@ -30,8 +28,6 @@ public class RoleController extends BaseController {
     @Resource
     RoleService service;
     @Resource
-    NewCacheService cacheService;
-    @Resource
     RolePermissionService permissionService;
 
     @GetMapping("listAll")
@@ -68,13 +64,6 @@ public class RoleController extends BaseController {
         return ResponseReult.success("OK");
     }
 
-    @GetMapping("getPermissionTree")
-    @ApiOperation("查询权限树状图")
-    public ResponseReult<List<DyLevel>> getPermissionTree() {
-        List<DyLevel> list = cacheService.getFullTree();
-        return ResponseReult.success(list);
-    }
-
     @GetMapping("getPermission")
     @ApiOperation("查询权限")
     public ResponseReult<List<TbRoleResource>> getPermission(@Validated @NotNull(message = "id不能为空!") Integer id) throws Exception {
diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UserController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UserController.java
index 9cdd5e8..27c0fe4 100644
--- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UserController.java
+++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UserController.java
@@ -4,6 +4,7 @@ import com.shxy.xymanager_common.base.BaseController;
 import com.shxy.xymanager_common.base.ResponseReult;
 import com.shxy.xymanager_common.bean.PermissionDetail;
 import com.shxy.xymanager_common.bean.ServiceStatus;
+import com.shxy.xymanager_common.entity.DyLevel;
 import com.shxy.xymanager_common.entity.SysUser;
 import com.shxy.xymanager_common.entity.TbPermission;
 import com.shxy.xymanager_common.model.PermissionModel;
@@ -36,6 +37,14 @@ public class UserController extends BaseController {
     @Resource
     NewCacheService cacheService;
 
+
+    @GetMapping("getFullTree")
+    @ApiOperation("查询数据全量树")
+    public ResponseReult<List<DyLevel>> getFullTree() {
+        List<DyLevel> list = cacheService.getFullTree();
+        return ResponseReult.success(list);
+    }
+
     @GetMapping("getPermission")
     @ApiOperation("查询权限")
     public ResponseReult<List<TbPermission>> getPermission(@Validated @NotNull(message = "id不能为空!") Integer id) throws Exception {