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

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

@@ -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')")
+    @PreAuthorize("hasAuthority('system:role:get')")
-    public ResponseResult<List<Role>> getAllRole() {
+    public ResponseResult<IPage<Role>> getAllRole(Long currentPage, Long pageSize) {
-        List<Role> roles = roleService.getAllRole();
+        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);
     }
 

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

@@ -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);
 }

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

@@ -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);
 

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

@@ -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() {
+    public IPage<Role> getAllRole(Long currentPage, Long pageSize) {
-        return roleMapper.getAll();
+        IPage<Role> roleIPage = PageDTO.of(currentPage, pageSize);
+        return roleMapper.getAll(roleIPage);
     }
 
     @Override

ui/src/pages/power/GroupManagement.vue

@@ -155,7 +155,7 @@ export default {
         },
         getRoles() {
             this.dialogLoading = true
-            request.get('/role').then((res) => {
+            request.get('/role/list').then((res) => {
                 const response = res.data
                 if (response.code === DATABASE_SELECT_OK) {
                     this.roles = response.data

ui/src/pages/power/RoleManagement.vue

@@ -21,6 +21,19 @@
         @onDelete="handleDelete"
         custom-column-label_1="权限"
     />
+
+    <div class="pagination">
+        <el-pagination
+            v-model:current-page="currentPage"
+            v-model:page-size="pageSize"
+            :page-sizes="[50, 100, 200, 500, 1000]"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="totalCount"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+        />
+    </div>
+
     <el-dialog
         :title="dialogTitle"
         :close-on-click-modal="false"
@@ -98,6 +111,9 @@ export default {
             dialogVisible: false,
             tableLoading: true,
             dialogLoading: true,
+            currentPage: 1,
+            pageSize: 50,
+            totalCount: 0,
             roleTable: [],
             powerTree: [],
             powerProps: {
@@ -126,47 +142,50 @@ export default {
     methods: {
         loadRoleTable() {
             this.tableLoading = true
-            request.get('/role').then((res) => {
+            request
-                const response = res.data
+                .get('/role', { currentPage: this.currentPage, pageSize: this.pageSize })
-                if (response.code === DATABASE_SELECT_OK) {
+                .then((res) => {
-                    const roles = response.data
+                    const response = res.data
-                    for (const role of roles) {
+                    if (response.code === DATABASE_SELECT_OK) {
-                        role.customColumn_1 = []
+                        const roles = response.data.records
-                        const menus = role.menus
+                        this.totalCount = response.data.total
-                        const elements = role.elements
+                        for (const role of roles) {
-                        const operations = role.operations
+                            role.customColumn_1 = []
-                        for (const operation of operations) {
+                            const menus = role.menus
-                            const element = _.find(elements, { id: operation.elementId })
+                            const elements = role.elements
-                            if (element.operations === undefined) {
+                            const operations = role.operations
-                                element.operations = []
+                            for (const operation of operations) {
+                                const element = _.find(elements, { id: operation.elementId })
+                                if (element.operations === undefined) {
+                                    element.operations = []
+                                }
+                                element.operations.push(operation)
                             }
-                            element.operations.push(operation)
+                            for (const element of elements) {
-                        }
+                                const menu = _.find(menus, { id: element.menuId })
-                        for (const element of elements) {
+                                if (menu.elements === undefined) {
-                            const menu = _.find(menus, { id: element.menuId })
+                                    menu.elements = []
-                            if (menu.elements === undefined) {
+                                }
-                                menu.elements = []
+                                menu.elements.push(element)
-                            }
-                            menu.elements.push(element)
 
-                            const operas = []
+                                const operas = []
-                            _.forEach(element.operations, (value) => {
+                                _.forEach(element.operations, (value) => {
-                                operas.push(value.name)
+                                    operas.push(value.name)
-                            })
+                                })
-                            role.customColumn_1.push(
+                                role.customColumn_1.push(
-                                `${menu.name}/${element.name}/${_.join(operas, ';')}`
+                                    `${menu.name}/${element.name}/${_.join(operas, ';')}`
-                            )
+                                )
+                            }
                         }
+                        this.roleTable = roles
+                        this.tableLoading = false
+                    } else {
+                        ElMessage.error({
+                            dangerouslyUseHTMLString: true,
+                            message: '<strong>查询出错</strong>: ' + response.msg
+                        })
                     }
-                    this.roleTable = roles
+                })
-                    this.tableLoading = false
-                } else {
-                    ElMessage.error({
-                        dangerouslyUseHTMLString: true,
-                        message: '<strong>查询出错</strong>: ' + response.msg
-                    })
-                }
-            })
         },
         handleDialogOpen() {
             this.getPowerTree()
@@ -330,6 +349,14 @@ export default {
         },
         handleCancel() {
             this.dialogVisible = false
+        },
+        handleSizeChange(pageSize) {
+            this.pageSize = pageSize
+            this.loadRoleTable()
+        },
+        handleCurrentChange(currentPage) {
+            this.currentPage = currentPage
+            this.loadRoleTable()
         }
     },
     mounted() {
@@ -338,4 +365,10 @@ export default {
 }
 </script>
 
-<style scoped></style>
+<style scoped>
+.pagination {
+    display: flex;
+    margin-top: 10px;
+    justify-content: center;
+}
+</style>

ui/src/pages/power/UserManagement.vue

@@ -226,7 +226,7 @@ export default {
         },
         getRoles() {
             this.dialogLoading = true
-            request.get('/role').then((res) => {
+            request.get('/role/list').then((res) => {
                 const response = res.data
                 if (response.code === DATABASE_SELECT_OK) {
                     this.roles = response.data