From bf88054c35b297a29ac4b721eda80c758d8f8b7a Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Thu, 1 Jun 2023 18:10:44 +0800
Subject: [PATCH] Added pagination to GroupManagement. Optimized get group list
 in UserManagement.

---
 .../permission/GroupController.java           | 15 ++-
 .../mapper/permission/GroupMapper.java        |  5 +-
 .../service/permission/IGroupService.java     |  5 +-
 .../permission/impl/GroupServiceImpl.java     |  9 +-
 .../mapper/permission/GroupMapper.xml         |  2 +-
 .../mapper/permission/RoleMapper.xml          |  2 +-
 ui/src/pages/power/GroupManagement.vue        | 95 +++++++++++++------
 ui/src/pages/power/RoleManagement.vue         |  6 +-
 ui/src/pages/power/UserManagement.vue         |  2 +-
 9 files changed, 92 insertions(+), 49 deletions(-)

diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/GroupController.java b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/GroupController.java
index 6383009..ec8805a 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/GroupController.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/GroupController.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.Group;
 import com.cfive.pinnacle.entity.common.ResponseCode;
 import com.cfive.pinnacle.entity.common.ResponseResult;
@@ -38,9 +39,17 @@ public class GroupController {
 
     @Operation(summary = "获取所有用户组")
     @GetMapping
-    @PreAuthorize("hasAnyAuthority('system:group:get', 'system:group:add', 'system:group:delete', 'system:group:modify', 'system:user:add', 'system:user:modify')")
-    public ResponseResult<List<Group>> getAllGroup() {
-        List<Group> groups = groupService.getAllGroup();
+    @PreAuthorize("hasAuthority('system:group:get' )")
+    public ResponseResult<IPage<Group>> getAllGroup(Long currentPage, Long pageSize) {
+        IPage<Group> groups = groupService.getAllGroup(currentPage, pageSize);
+        return ResponseResult.databaseSelectSuccess(groups);
+    }
+
+    @Operation(summary = "获取用户组列表")
+    @GetMapping("list")
+    @PreAuthorize("hasAnyAuthority('system:user:add', 'system:user:modify')")
+    public ResponseResult<List<Group>> getGroupList() {
+        List<Group> groups = groupService.list();
         return ResponseResult.databaseSelectSuccess(groups);
     }
 
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/GroupMapper.java b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/GroupMapper.java
index c537eb2..fc1af2d 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/GroupMapper.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/GroupMapper.java
@@ -1,12 +1,11 @@
 package com.cfive.pinnacle.mapper.permission;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.cfive.pinnacle.entity.permission.Group;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * <p>
  * 用户组 Mapper 接口
@@ -17,7 +16,7 @@ import java.util.List;
  */
 @Mapper
 public interface GroupMapper extends BaseMapper<Group> {
-    List<Group> getAll();
+    IPage<Group> getAll(IPage<Group> groupIPage);
 
     Group getOneById(@Param("id") long id);
 }
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IGroupService.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IGroupService.java
index 2f991b4..e777aae 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IGroupService.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IGroupService.java
@@ -1,10 +1,9 @@
 package com.cfive.pinnacle.service.permission;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.cfive.pinnacle.entity.permission.Group;
 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 IGroupService extends IService<Group> {
-    List<Group> getAllGroup();
+    IPage<Group> getAllGroup(Long currentPage, Long pageSize);
 
     Group getGroup(Long id);
 
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/GroupServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/GroupServiceImpl.java
index 90c2583..2276930 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/GroupServiceImpl.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/GroupServiceImpl.java
@@ -1,6 +1,9 @@
 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.Page;
+import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
 import com.cfive.pinnacle.entity.permission.Group;
 import com.cfive.pinnacle.entity.permission.RoleGroup;
 import com.cfive.pinnacle.mapper.permission.GroupMapper;
@@ -12,7 +15,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashSet;
-import java.util.List;
 
 /**
  * <p>
@@ -38,8 +40,9 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
     }
 
     @Override
-    public List<Group> getAllGroup() {
-        return groupMapper.getAll();
+    public IPage<Group> getAllGroup(Long currentPage, Long pageSize) {
+        Page<Group> groupIPage = PageDTO.of(currentPage, pageSize);
+        return groupMapper.getAll(groupIPage);
     }
 
     @Override
diff --git a/Pinnacle/src/main/resources/mapper/permission/GroupMapper.xml b/Pinnacle/src/main/resources/mapper/permission/GroupMapper.xml
index 0c49316..6f2b5b1 100644
--- a/Pinnacle/src/main/resources/mapper/permission/GroupMapper.xml
+++ b/Pinnacle/src/main/resources/mapper/permission/GroupMapper.xml
@@ -15,7 +15,7 @@
         from t_group
                  left join (select * from t_role_group where deleted = 0) as trg on t_group.id = trg.group_id
                  left join (select * from t_role where deleted = 0) as tr on tr.id = trg.role_id
-        where t_group.deleted = 0;
+        where t_group.deleted = 0
     </select>
 
     <select id="getOneById" resultMap="groupMap">
diff --git a/Pinnacle/src/main/resources/mapper/permission/RoleMapper.xml b/Pinnacle/src/main/resources/mapper/permission/RoleMapper.xml
index 2956544..37b3044 100644
--- a/Pinnacle/src/main/resources/mapper/permission/RoleMapper.xml
+++ b/Pinnacle/src/main/resources/mapper/permission/RoleMapper.xml
@@ -59,7 +59,7 @@
                  left join t_element te on tp.id = te.power_id
                  left join t_operation t on tp.id = t.power_id
         where t_role.deleted = 0
-          and t_role.id = #{id};
+          and t_role.id = #{id}
     </select>
 
     <resultMap id="roleMap" type="role">
diff --git a/ui/src/pages/power/GroupManagement.vue b/ui/src/pages/power/GroupManagement.vue
index 42446ac..31a3331 100644
--- a/ui/src/pages/power/GroupManagement.vue
+++ b/ui/src/pages/power/GroupManagement.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"
@@ -30,13 +43,13 @@
     >
         <template #default>
             <el-form
-                label-width="100px"
+                label-width="60px"
                 v-loading="dialogLoading"
                 :rules="rules"
                 ref="formRef"
                 :model="groupForm"
             >
-                <el-form-item label="用户组名称" prop="inputGroupName">
+                <el-form-item label="名称" prop="inputGroupName">
                     <el-input
                         autocomplete="off"
                         v-model="groupForm.inputGroupName"
@@ -45,16 +58,6 @@
                         show-word-limit
                     />
                 </el-form-item>
-                <el-form-item label="用户组角色">
-                    <el-select v-model="groupForm.selectedRoles" multiple style="width: 100%">
-                        <el-option
-                            v-for="role in roles"
-                            :key="role.id"
-                            :label="role.name"
-                            :value="role.id"
-                        />
-                    </el-select>
-                </el-form-item>
                 <el-form-item label="状态">
                     <el-switch
                         v-model="groupForm.enable"
@@ -65,6 +68,16 @@
                         :inactive-value="0"
                     />
                 </el-form-item>
+                <el-form-item label="角色">
+                    <el-select v-model="groupForm.selectedRoles" multiple style="width: 100%">
+                        <el-option
+                            v-for="role in roles"
+                            :key="role.id"
+                            :label="role.name"
+                            :value="role.id"
+                        />
+                    </el-select>
+                </el-form-item>
             </el-form>
         </template>
         <template #footer>
@@ -93,6 +106,9 @@ export default {
             dialogVisible: false,
             tableLoading: true,
             dialogLoading: true,
+            currentPage: 1,
+            pageSize: 50,
+            totalCount: 0,
             groupTable: [],
             roles: [],
             groupForm: {
@@ -116,26 +132,29 @@ export default {
     methods: {
         loadGroupTable() {
             this.tableLoading = true
-            request.get('/group').then((res) => {
-                const response = res.data
-                if (response.code === DATABASE_SELECT_OK) {
-                    const groups = response.data
-                    for (const group of groups) {
-                        group.customColumn_1 = []
-                        const roles = group.roles
-                        for (const role of roles) {
-                            group.customColumn_1.push(role.name)
+            request
+                .get('/group', { currentPage: this.currentPage, pageSize: this.pageSize })
+                .then((res) => {
+                    const response = res.data
+                    if (response.code === DATABASE_SELECT_OK) {
+                        const groups = response.data.records
+                        this.totalCount = response.data.total
+                        for (const group of groups) {
+                            group.customColumn_1 = []
+                            const roles = group.roles
+                            for (const role of roles) {
+                                group.customColumn_1.push(role.name)
+                            }
                         }
+                        this.groupTable = groups
+                        this.tableLoading = false
+                    } else {
+                        ElMessage.error({
+                            dangerouslyUseHTMLString: true,
+                            message: '<strong>查询出错</strong>: ' + response.msg
+                        })
                     }
-                    this.groupTable = groups
-                    this.tableLoading = false
-                } else {
-                    ElMessage.error({
-                        dangerouslyUseHTMLString: true,
-                        message: '<strong>查询出错</strong>: ' + response.msg
-                    })
-                }
-            })
+                })
         },
         handleAddBtn() {
             this.isAddNew = true
@@ -264,6 +283,14 @@ export default {
         },
         handleCancel() {
             this.dialogVisible = false
+        },
+        handleSizeChange(pageSize) {
+            this.pageSize = pageSize
+            this.loadGroupTable()
+        },
+        handleCurrentChange(currentPage) {
+            this.currentPage = currentPage
+            this.loadGroupTable()
         }
     },
     mounted() {
@@ -272,4 +299,10 @@ export default {
 }
 </script>
 
-<style scoped></style>
+<style scoped>
+.pagination {
+    display: flex;
+    margin-top: 10px;
+    justify-content: center;
+}
+</style>
diff --git a/ui/src/pages/power/RoleManagement.vue b/ui/src/pages/power/RoleManagement.vue
index a604afb..ba71505 100644
--- a/ui/src/pages/power/RoleManagement.vue
+++ b/ui/src/pages/power/RoleManagement.vue
@@ -44,13 +44,13 @@
         <template #default>
             <el-scrollbar max-height="60vh">
                 <el-form
-                    label-width="80px"
+                    label-width="60px"
                     v-loading="dialogLoading"
                     :rules="rules"
                     ref="formRef"
                     :model="roleForm"
                 >
-                    <el-form-item label="角色名称" prop="inputRoleName">
+                    <el-form-item label="名称" prop="inputRoleName">
                         <el-input
                             autocomplete="off"
                             v-model="roleForm.inputRoleName"
@@ -69,7 +69,7 @@
                             :inactive-value="0"
                         />
                     </el-form-item>
-                    <el-form-item label="角色权限">
+                    <el-form-item label="权限">
                         <el-tree
                             :data="powerTree"
                             node-key="powerId"
diff --git a/ui/src/pages/power/UserManagement.vue b/ui/src/pages/power/UserManagement.vue
index 37b5f67..83527da 100644
--- a/ui/src/pages/power/UserManagement.vue
+++ b/ui/src/pages/power/UserManagement.vue
@@ -240,7 +240,7 @@ export default {
             })
         },
         getGroups() {
-            request.get('/group').then((res) => {
+            request.get('/group/list').then((res) => {
                 const response = res.data
                 if (response.code === DATABASE_SELECT_OK) {
                     this.groups = response.data