feat(系统管理): 角色管理接口增加根据id查询用户列表接口

koala-projects · Oct 24, 2023 · 261c0b3 · 261c0b3
1 parent 6ef50a1
commit 261c0b3
Show file tree

Hide file tree

Showing 23 changed files with 93 additions and 42 deletions.
diff --git a/...in/java/cn/koala/system/apis/RoleApi.java → ...rc/main/java/cn/koala/system/RoleApi.java b/...in/java/cn/koala/system/apis/RoleApi.java → ...rc/main/java/cn/koala/system/RoleApi.java
@@ -1,8 +1,7 @@
-package cn.koala.system.apis;
+package cn.koala.system;
 
 import cn.koala.openapi.PageableAsQueryParam;
 import cn.koala.persist.validator.EditableId;
-import cn.koala.system.Role;
 import cn.koala.system.apis.request.RoleAuthorizeRequest;
 import cn.koala.system.entities.RoleEntity;
 import cn.koala.validation.group.Create;
@@ -157,6 +156,21 @@ Response update(@EditableId(Role.class) @PathVariable("id") Long id,
   @PutMapping("{id}/authorize")
   Response setRolePermissions(@PathVariable("id") Long id, @RequestBody RoleAuthorizeRequest request);
 
+  /**
+   * 根据id查询角色的用户列表
+   *
+   * @param id 角色id
+   * @return 用户列表
+   */
+  @PreAuthorize("hasAuthority('role.read')")
+  @Operation(operationId = "listRoleUser", summary = "根据id查询角色的用户列表")
+  @ApiResponse(responseCode = "200", description = "成功", content = {
+    @Content(mediaType = "application/json", schema = @Schema(implementation = RoleUserListResult.class))
+  })
+  @Parameter(in = ParameterIn.PATH, name = "id", description = "角色id", schema = @Schema(type = "integer"))
+  @GetMapping("{id}/users")
+  DataResponse<List<User>> listUser(@PathVariable("id") Long id);
+
   class RolePageResult extends DataResponse<Page<RoleEntity>> {
 
   }
@@ -168,4 +182,8 @@ class RoleResult extends DataResponse<RoleEntity> {
   class CheckedPermissionIdsResult extends DataResponse<List<Long>> {
 
   }
+
+  class RoleUserListResult extends DataResponse<List<User>> {
+
+  }
 }
diff --git a/...cn/koala/system/services/RoleService.java → ...ain/java/cn/koala/system/RoleService.java b/...cn/koala/system/services/RoleService.java → ...ain/java/cn/koala/system/RoleService.java
@@ -1,7 +1,6 @@
-package cn.koala.system.services;
+package cn.koala.system;
 
 import cn.koala.persist.CrudService;
-import cn.koala.system.Role;
 
 import java.util.List;
 
@@ -14,4 +13,6 @@ public interface RoleService extends CrudService<Role, Long> {
   List<Long> getCheckedPermissionIds(Long id);
 
   void authorize(Long id, List<Long> checkedIds, List<Long> halfCheckedIds);
+
+  List<User> listUser(Long id);
 }
diff --git a/...em/repositories/DepartmentRepository.java → ...stem/repository/DepartmentRepository.java b/...em/repositories/DepartmentRepository.java → ...stem/repository/DepartmentRepository.java
@@ -1,4 +1,4 @@
-package cn.koala.system.repositories;
+package cn.koala.system.repository;
 
 import cn.koala.persist.CrudRepository;
 import cn.koala.system.Department;

diff --git a/...epositories/DictionaryItemRepository.java → .../repository/DictionaryItemRepository.java b/...epositories/DictionaryItemRepository.java → .../repository/DictionaryItemRepository.java
@@ -1,4 +1,4 @@
-package cn.koala.system.repositories;
+package cn.koala.system.repository;
 
 import cn.koala.persist.CrudRepository;
 import cn.koala.system.DictionaryItem;

diff --git a/...em/repositories/DictionaryRepository.java → ...stem/repository/DictionaryRepository.java b/...em/repositories/DictionaryRepository.java → ...stem/repository/DictionaryRepository.java
@@ -1,4 +1,4 @@
-package cn.koala.system.repositories;
+package cn.koala.system.repository;
 
 import cn.koala.persist.CrudRepository;
 import cn.koala.system.Dictionary;

diff --git a/...em/repositories/PermissionRepository.java → ...stem/repository/PermissionRepository.java b/...em/repositories/PermissionRepository.java → ...stem/repository/PermissionRepository.java
@@ -1,4 +1,4 @@
-package cn.koala.system.repositories;
+package cn.koala.system.repository;
 
 import cn.koala.persist.CrudRepository;
 import cn.koala.system.Permission;

diff --git a/...a/system/repositories/RoleRepository.java → ...ala/system/repository/RoleRepository.java b/...a/system/repositories/RoleRepository.java → ...ala/system/repository/RoleRepository.java
@@ -1,7 +1,8 @@
-package cn.koala.system.repositories;
+package cn.koala.system.repository;
 
 import cn.koala.persist.CrudRepository;
 import cn.koala.system.Role;
+import cn.koala.system.User;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -19,4 +20,6 @@ void authorize(
     @Param("checkedIds") List<Long> checkedIds,
     @Param("halfCheckedIds") List<Long> halfCheckedIds
   );
+
+  List<User> listUserById(Long id);
 }
diff --git a/...ystem/repositories/SettingRepository.java → .../system/repository/SettingRepository.java b/...ystem/repositories/SettingRepository.java → .../system/repository/SettingRepository.java
@@ -1,4 +1,4 @@
-package cn.koala.system.repositories;
+package cn.koala.system.repository;
 
 import cn.koala.persist.CrudRepository;
 import cn.koala.system.Setting;

diff --git a/...a/system/repositories/UserRepository.java → ...ala/system/repository/UserRepository.java b/...a/system/repositories/UserRepository.java → ...ala/system/repository/UserRepository.java
@@ -1,4 +1,4 @@
-package cn.koala.system.repositories;
+package cn.koala.system.repository;
 
 import cn.koala.persist.CrudRepository;
 import cn.koala.system.User;

diff --git a/koala-domains/koala-system/src/main/java/cn/koala/system/services/DepartmentServiceImpl.java b/koala-domains/koala-system/src/main/java/cn/koala/system/services/DepartmentServiceImpl.java
@@ -2,7 +2,7 @@
 
 import cn.koala.mybatis.AbstractMyBatisService;
 import cn.koala.system.Department;
-import cn.koala.system.repositories.DepartmentRepository;
+import cn.koala.system.repository.DepartmentRepository;
 import cn.koala.toolkit.tree.TreeHelper;
 import cn.koala.toolkit.tree.TreeNode;
 import lombok.Getter;

diff --git a/...omains/koala-system/src/main/java/cn/koala/system/services/DictionaryItemServiceImpl.java b/...omains/koala-system/src/main/java/cn/koala/system/services/DictionaryItemServiceImpl.java
@@ -2,7 +2,7 @@
 
 import cn.koala.mybatis.AbstractMyBatisService;
 import cn.koala.system.DictionaryItem;
-import cn.koala.system.repositories.DictionaryItemRepository;
+import cn.koala.system.repository.DictionaryItemRepository;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

diff --git a/koala-domains/koala-system/src/main/java/cn/koala/system/services/DictionaryServiceImpl.java b/koala-domains/koala-system/src/main/java/cn/koala/system/services/DictionaryServiceImpl.java
@@ -2,7 +2,7 @@
 
 import cn.koala.mybatis.AbstractMyBatisService;
 import cn.koala.system.Dictionary;
-import cn.koala.system.repositories.DictionaryRepository;
+import cn.koala.system.repository.DictionaryRepository;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

diff --git a/koala-domains/koala-system/src/main/java/cn/koala/system/services/PermissionServiceImpl.java b/koala-domains/koala-system/src/main/java/cn/koala/system/services/PermissionServiceImpl.java
@@ -2,7 +2,7 @@
 
 import cn.koala.mybatis.AbstractMyBatisService;
 import cn.koala.system.Permission;
-import cn.koala.system.repositories.PermissionRepository;
+import cn.koala.system.repository.PermissionRepository;
 import cn.koala.toolkit.tree.TreeHelper;
 import cn.koala.toolkit.tree.TreeNode;
 import lombok.Getter;

diff --git a/koala-domains/koala-system/src/main/java/cn/koala/system/services/SettingServiceImpl.java b/koala-domains/koala-system/src/main/java/cn/koala/system/services/SettingServiceImpl.java
@@ -2,7 +2,7 @@
 
 import cn.koala.mybatis.AbstractMyBatisService;
 import cn.koala.system.Setting;
-import cn.koala.system.repositories.SettingRepository;
+import cn.koala.system.repository.SettingRepository;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

diff --git a/koala-domains/koala-system/src/main/java/cn/koala/system/services/UserServiceImpl.java b/koala-domains/koala-system/src/main/java/cn/koala/system/services/UserServiceImpl.java
@@ -2,7 +2,7 @@
 
 import cn.koala.mybatis.AbstractMyBatisService;
 import cn.koala.system.User;
-import cn.koala.system.repositories.UserRepository;
+import cn.koala.system.repository.UserRepository;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

diff --git a/koala-domains/koala-system/src/main/java/cn/koala/system/support/AdminRegister.java b/koala-domains/koala-system/src/main/java/cn/koala/system/support/AdminRegister.java
@@ -6,9 +6,9 @@
 import cn.koala.system.User;
 import cn.koala.system.UserEntity;
 import cn.koala.system.entities.RoleEntity;
-import cn.koala.system.repositories.PermissionRepository;
-import cn.koala.system.repositories.RoleRepository;
-import cn.koala.system.repositories.UserRepository;
+import cn.koala.system.repository.PermissionRepository;
+import cn.koala.system.repository.RoleRepository;
+import cn.koala.system.repository.UserRepository;
 import cn.koala.toolkit.DateHelper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...ava/cn/koala/system/apis/RoleApiImpl.java → .../koala/system/support/DefaultRoleApi.java b/...ava/cn/koala/system/apis/RoleApiImpl.java → .../koala/system/support/DefaultRoleApi.java
@@ -1,10 +1,12 @@
-package cn.koala.system.apis;
+package cn.koala.system.support;
 
 import cn.koala.log.annotations.Log;
 import cn.koala.system.Role;
+import cn.koala.system.RoleApi;
+import cn.koala.system.RoleService;
+import cn.koala.system.User;
 import cn.koala.system.apis.request.RoleAuthorizeRequest;
 import cn.koala.system.entities.RoleEntity;
-import cn.koala.system.services.RoleService;
 import cn.koala.web.DataResponse;
 import cn.koala.web.Response;
 import lombok.RequiredArgsConstructor;
@@ -22,7 +24,7 @@
  */
 @RequiredArgsConstructor
 @RestController
-public class RoleApiImpl implements RoleApi {
+public class DefaultRoleApi implements RoleApi {
   protected final RoleService roleService;
 
   @Override
@@ -71,4 +73,9 @@ public Response setRolePermissions(Long id, RoleAuthorizeRequest request) {
     roleService.authorize(id, request.getCheckedIds(), request.getHalfCheckedIds());
     return Response.SUCCESS;
   }
+
+  @Override
+  public DataResponse<List<User>> listUser(Long id) {
+    return DataResponse.ok(roleService.listUser(id));
+  }
 }
diff --git a/...oala/system/services/RoleServiceImpl.java → ...la/system/support/DefaultRoleService.java b/...oala/system/services/RoleServiceImpl.java → ...la/system/support/DefaultRoleService.java
@@ -1,9 +1,11 @@
-package cn.koala.system.services;
+package cn.koala.system.support;
 
 import cn.koala.mybatis.AbstractMyBatisService;
 import cn.koala.persist.support.DomainHelper;
 import cn.koala.system.Role;
-import cn.koala.system.repositories.RoleRepository;
+import cn.koala.system.RoleService;
+import cn.koala.system.User;
+import cn.koala.system.repository.RoleRepository;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -16,7 +18,7 @@
  */
 @RequiredArgsConstructor
 @Getter
-public class RoleServiceImpl extends AbstractMyBatisService<Role, Long> implements RoleService {
+public class DefaultRoleService extends AbstractMyBatisService<Role, Long> implements RoleService {
 
   protected final RoleRepository repository;
 
@@ -30,4 +32,9 @@ public void authorize(Long id, List<Long> checkedIds, List<Long> halfCheckedIds)
     DomainHelper.assertEditable(repository.load(id));
     getRepository().authorize(id, checkedIds, halfCheckedIds);
   }
+
+  @Override
+  public List<User> listUser(Long id) {
+    return repository.listUserById(id);
+  }
 }
diff --git a/koala-domains/koala-system/src/main/java/cn/koala/system/support/PermissionRegister.java b/koala-domains/koala-system/src/main/java/cn/koala/system/support/PermissionRegister.java
@@ -3,7 +3,7 @@
 import cn.koala.boot.AbstractApplicationRunner;
 import cn.koala.system.Permission;
 import cn.koala.system.PermissionRegistrar;
-import cn.koala.system.repositories.PermissionRepository;
+import cn.koala.system.repository.PermissionRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.ApplicationArguments;

diff --git a/koala-domains/koala-system/src/main/resources/mappers/system/RoleMapper.xml b/koala-domains/koala-system/src/main/resources/mappers/system/RoleMapper.xml
@@ -119,4 +119,19 @@
       </foreach>
     </if>
   </insert>
+
+  <select id="listUserById" resultType="cn.koala.system.UserEntity">
+    select t.id,
+           t.username,
+           t.nickname,
+           t.avatar,
+           t.email,
+           t.mobile,
+           t.remark,
+           t.sort_index,
+           t.is_enabled
+    from k_user t
+           join k_user_role ur on t.id = ur.user_id and ur.role_id = #{id}
+    where t.is_deleted = ${@cn.koala.persist.domain.YesNo@NO.value}
+  </select>
 </mapper>
diff --git a/...-app/src/main/java/cn/koala/wechat/miniapp/support/DefaultWechatMiniAppUserRegistrar.java b/...-app/src/main/java/cn/koala/wechat/miniapp/support/DefaultWechatMiniAppUserRegistrar.java
@@ -1,7 +1,7 @@
 package cn.koala.wechat.miniapp.support;
 
 import cn.koala.system.UserEntity;
-import cn.koala.system.repositories.UserRepository;
+import cn.koala.system.repository.UserRepository;
 import cn.koala.toolkit.DateHelper;
 import cn.koala.wechat.miniapp.WechatMiniAppUser;
 import cn.koala.wechat.miniapp.WechatMiniAppUserRegistrar;

diff --git a/...a-system-starter/src/main/java/cn/koala/system/autoconfigure/SystemAutoConfiguration.java b/...a-system-starter/src/main/java/cn/koala/system/autoconfigure/SystemAutoConfiguration.java
@@ -1,6 +1,7 @@
 package cn.koala.system.autoconfigure;
 
 import cn.koala.system.PermissionRegistrar;
+import cn.koala.system.RoleService;
 import cn.koala.system.UserApi;
 import cn.koala.system.UserCreateListener;
 import cn.koala.system.apis.DepartmentApi;
@@ -11,13 +12,12 @@
 import cn.koala.system.apis.DictionaryItemApiImpl;
 import cn.koala.system.apis.PermissionApi;
 import cn.koala.system.apis.PermissionApiImpl;
-import cn.koala.system.apis.RoleApiImpl;
-import cn.koala.system.repositories.DepartmentRepository;
-import cn.koala.system.repositories.DictionaryItemRepository;
-import cn.koala.system.repositories.DictionaryRepository;
-import cn.koala.system.repositories.PermissionRepository;
-import cn.koala.system.repositories.RoleRepository;
-import cn.koala.system.repositories.UserRepository;
+import cn.koala.system.repository.DepartmentRepository;
+import cn.koala.system.repository.DictionaryItemRepository;
+import cn.koala.system.repository.DictionaryRepository;
+import cn.koala.system.repository.PermissionRepository;
+import cn.koala.system.repository.RoleRepository;
+import cn.koala.system.repository.UserRepository;
 import cn.koala.system.services.DepartmentService;
 import cn.koala.system.services.DepartmentServiceImpl;
 import cn.koala.system.services.DictionaryItemService;
@@ -26,11 +26,11 @@
 import cn.koala.system.services.DictionaryServiceImpl;
 import cn.koala.system.services.PermissionService;
 import cn.koala.system.services.PermissionServiceImpl;
-import cn.koala.system.services.RoleService;
-import cn.koala.system.services.RoleServiceImpl;
 import cn.koala.system.services.UserService;
 import cn.koala.system.services.UserServiceImpl;
 import cn.koala.system.support.AdminRegister;
+import cn.koala.system.support.DefaultRoleApi;
+import cn.koala.system.support.DefaultRoleService;
 import cn.koala.system.support.DefaultUserApi;
 import cn.koala.system.support.PermissionRegister;
 import cn.koala.system.support.SystemPermissionRegistrar;
@@ -52,7 +52,7 @@
  */
 @Configuration
 @EnableConfigurationProperties(SystemProperties.class)
-@MapperScan(basePackages = "cn.koala.system.repositories")
+@MapperScan(basePackages = "cn.koala.system.repository")
 public class SystemAutoConfiguration {
   @Bean
   @ConditionalOnMissingBean
@@ -105,13 +105,13 @@ public PermissionApi permissionApi(PermissionService permissionService) {
   @Bean
   @ConditionalOnMissingBean
   public RoleService roleService(RoleRepository roleRepository) {
-    return new RoleServiceImpl(roleRepository);
+    return new DefaultRoleService(roleRepository);
   }
 
   @Bean
   @ConditionalOnMissingBean
-  public RoleApiImpl roleApi(RoleService roleService) {
-    return new RoleApiImpl(roleService);
+  public DefaultRoleApi roleApi(RoleService roleService) {
+    return new DefaultRoleApi(roleService);
   }
 
   @Bean

diff --git a/...r/src/main/java/cn/koala/wechat/miniapp/autoconfigure/WechatMiniAppAutoConfiguration.java b/...r/src/main/java/cn/koala/wechat/miniapp/autoconfigure/WechatMiniAppAutoConfiguration.java
@@ -3,7 +3,7 @@
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.koala.authorization.builder.AuthorizationServerSecurityFilterChainPostProcessor;
 import cn.koala.authorization.client.RegisteredClientRegistrar;
-import cn.koala.system.repositories.UserRepository;
+import cn.koala.system.repository.UserRepository;
 import cn.koala.wechat.miniapp.WechatMiniAppUserRegistrar;
 import cn.koala.wechat.miniapp.processor.OAuth2WechatMiniAppPostProcessor;
 import cn.koala.wechat.miniapp.repository.WechatMiniAppUserRepository;