FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-05 23:11:24 +08:00
Code Packages Releases Activity

Added pagination to RoleManagement. Optimized get role list in GroupManagement and UserManagement.

Browse Source
This commit is contained in:
Fat Snake
2023-06-01 17:57:59 +08:00
parent 4f8d039f88
commit c9f93927c9
7 changed files with 94 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/RoleController.java
View File

@@ -1,6 +1,7 @@
package com.cfive.pinnacle.controller.permission;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cfive.pinnacle.entity.permission.Role;
import com.cfive.pinnacle.entity.common.ResponseCode;
import com.cfive.pinnacle.entity.common.ResponseResult;
@@ -39,9 +40,17 @@ public class RoleController {
@Operation(summary = "获取所有角色")
@GetMapping
@PreAuthorize("hasAnyAuthority('system:role:get', 'system:role:add', 'system:role:delete', 'system:role:modeify', 'system:group:add', 'system:group:modify', 'system:user:add', 'system:user:modify')")
public ResponseResult<List<Role>> getAllRole() {
List<Role> roles = roleService.getAllRole();
@PreAuthorize("hasAuthority('system:role:get')")
public ResponseResult<IPage<Role>> getAllRole(Long currentPage, Long pageSize) {
IPage<Role> roles = roleService.getAllRole(currentPage, pageSize);
return ResponseResult.databaseSelectSuccess(roles);
}
@Operation(summary = "获取角色列表")
@GetMapping("list")
@PreAuthorize("hasAnyAuthority('system:group:add', 'system:group:modify', 'system:user:add', 'system:user:modify')")
public ResponseResult<List<Role>> getRoleList() {
List<Role> roles = roleService.list();
return ResponseResult.databaseSelectSuccess(roles);
}

4
Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/RoleMapper.java
View File

@@ -1,6 +1,6 @@
package com.cfive.pinnacle.mapper.permission;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cfive.pinnacle.entity.permission.Role;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -16,7 +16,7 @@ import org.apache.ibatis.annotations.Param;
*/
@Mapper
public interface RoleMapper extends BaseMapper<Role> {
List<Role> getAll();
IPage<Role> getAll(IPage<Role> roleIPage);
Role getOneById(@Param("id") long id);
}

5
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IRoleService.java
View File

@@ -1,10 +1,9 @@
package com.cfive.pinnacle.service.permission;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cfive.pinnacle.entity.permission.Role;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* <p>
* 角色 服务类
@@ -14,7 +13,7 @@ import java.util.List;
* @since 2023-04-30
*/
public interface IRoleService extends IService<Role> {
List<Role> getAllRole();
IPage<Role> getAllRole(Long currentPage, Long pageSize);
Role getRole(long id);

7
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/RoleServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.cfive.pinnacle.service.permission.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import com.cfive.pinnacle.entity.permission.Power;
import com.cfive.pinnacle.entity.permission.Role;
import com.cfive.pinnacle.entity.permission.PowerRole;
@@ -42,8 +44,9 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
}
@Override
public List<Role> getAllRole() {
return roleMapper.getAll();
public IPage<Role> getAllRole(Long currentPage, Long pageSize) {
IPage<Role> roleIPage = PageDTO.of(currentPage, pageSize);
return roleMapper.getAll(roleIPage);
}
@Override