From 8205ea111b2518caf6a6b0ca23e63d8ea86b055d Mon Sep 17 00:00:00 2001
From: ludj <ldj_willow@163.com>
Date: Mon, 5 Dec 2022 14:45:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/rest/RoleController.java   |  8 ----
 .../modules/system/service/RoleService.java   | 28 -----------
 .../system/service/impl/RoleServiceImpl.java  | 47 -------------------
 3 files changed, 83 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/RoleController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/RoleController.java
index e0c5662..1040754 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/RoleController.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/RoleController.java
@@ -32,14 +32,6 @@ public class RoleController {
     private final RoleService roleService;
 
 
-    @ApiOperation("获取单个role")
-    @GetMapping(value = "/all")
-//    @SaCheckPermission("roles:list")
-    public ResponseEntity<Object> query() {
-        List<RoleVo> roles = roleService.findRoles(null, RoleVo.class);
-        return new ResponseEntity<>(roles, HttpStatus.OK);
-    }
-
     @ApiOperation("查询角色")
     @GetMapping
     @SaCheckPermission("roles:list")
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/RoleService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/RoleService.java
index d1890f8..eb0d8dd 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/RoleService.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/RoleService.java
@@ -44,13 +44,6 @@ public interface RoleService {
      */
     JSONObject queryAll(Map whereJson, Pageable page);
 
-    /**
-     * 根据ID查询
-     * @param id /
-     * @return /
-     */
-    <T> List<T> findRoles(Long id, Class<T>target);
-
     /**
      * 创建
      * @param form /
@@ -69,27 +62,6 @@ public interface RoleService {
      */
     void delete(Set<Long> ids);
 
-    /**
-     * 根据用户ID查询
-     * @param id 用户ID
-     * @return /
-     */
-    List<RoleSmallDto> findByUsersId(Long id);
-
-
-
-    /**
-     * 修改绑定的菜单
-     * @param resources /
-     * @param roleDTO /
-     */
-    void updateMenu(Role resources, RoleDto roleDTO);
-
-    /**
-     * 解绑菜单
-     * @param id /
-     */
-    void untiedMenu(Long id);
 
     /**
      * 通过id获取用户的权限
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java
index 3ba2342..36cbd35 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/RoleServiceImpl.java
@@ -31,7 +31,6 @@ import org.nl.modules.system.domain.Role;
 import org.nl.modules.system.domain.User;
 import org.nl.modules.system.service.RoleService;
 import org.nl.modules.system.service.dto.RoleDto;
-import org.nl.modules.system.service.dto.RoleQueryCriteria;
 import org.nl.modules.system.service.dto.RoleSmallDto;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.ResultBean;
@@ -73,18 +72,6 @@ public class RoleServiceImpl implements RoleService {
         return json;
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public <T> List<T> findRoles(Long id, Class<T> target) {
-        String sql = "is_used = '1' and is_delete = '0' ";
-        if (id != null) {
-            sql = sql + "role_id = '" + id + "'";
-        }
-        JSONArray array = WQLObject.getWQLObject("sys_role").query(sql).getResultJSONArray(0);
-        return array.toJavaList(target);
-    }
-
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void create(JSONObject form) {
@@ -130,17 +117,6 @@ public class RoleServiceImpl implements RoleService {
         roleTab.update(form);
     }
 
-    @Override
-    public void updateMenu(Role resources, RoleDto roleDTO) {
-
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void untiedMenu(Long menuId) {
-
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(Set<Long> ids) {
@@ -152,12 +128,6 @@ public class RoleServiceImpl implements RoleService {
         }
     }
 
-    @Override
-    public List<RoleSmallDto> findByUsersId(Long id) {
-        return null;
-    }
-
-
     @Override
     public List<String> getPermissionList(JSONObject userDto) {
         List<String> permission = new LinkedList<>();
@@ -174,21 +144,4 @@ public class RoleServiceImpl implements RoleService {
         return permission;
     }
 
-
-    /**
-     * 清理缓存
-     *
-     * @param id /
-     */
-    public void delCaches(Long id, List<User> users) {
-//        users = CollectionUtil.isEmpty(users) ? userRepository.findByRoleId(id) : users;
-        if (CollectionUtil.isNotEmpty(users)) {
-//            users.forEach(item -> userCacheClean.cleanUserCache(item.getUsername()));
-            Set<Long> userIds = users.stream().map(User::getId).collect(Collectors.toSet());
-            redisUtils.delByKeys(CacheKey.DATA_USER, userIds);
-            redisUtils.delByKeys(CacheKey.MENU_USER, userIds);
-            redisUtils.delByKeys(CacheKey.ROLE_AUTH, userIds);
-        }
-        redisUtils.del(CacheKey.ROLE_ID + id);
-    }
 }