新增权限相关接口

src/main/java/cn/qg/holmes/controller/auth/PermissionController.java

@@ -3,9 +3,12 @@ package cn.qg.holmes.controller.auth;
 import cn.qg.holmes.common.JsonResult;
 import cn.qg.holmes.entity.auth.Permission;
 import cn.qg.holmes.service.auth.PermissionService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @CrossOrigin
 @RestController
 @RequestMapping("/permission")
@@ -44,8 +47,12 @@ public class PermissionController {
         return JsonResult.buildSuccessResult(permissionService.removeById(permissionId));
     }
 
+    /**
+     * 获取权限列表
+     * @return
+     */
     @GetMapping("/list")
     public JsonResult getPermissionList() {
-        return null;
+        return JsonResult.buildSuccessResult(permissionService.getPermissionList());
     }
 }

src/main/java/cn/qg/holmes/controller/auth/RoleController.java

@@ -3,9 +3,14 @@ package cn.qg.holmes.controller.auth;
 import cn.qg.holmes.common.JsonResult;
 import cn.qg.holmes.entity.auth.Role;
 import cn.qg.holmes.service.auth.RoleService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @CrossOrigin
 @RestController
 @RequestMapping("/role")
@@ -14,6 +19,22 @@ public class RoleController {
     @Autowired
     RoleService roleService;
 
+    /**
+     * 获取角色列表
+     * @param pageNum 第几页
+     * @param pageSize 每页多少个
+     * @return
+     */
+    @GetMapping("/list")
+    public JsonResult getRoleList(@RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        IPage<Role> roleIPage = new Page<>(pageNum, pageSize);
+        IPage page = roleService.page(roleIPage);
+        Map<String, Object> map = new HashMap<>();
+        map.put("total", page.getTotal());
+        map.put("list", page.getRecords());
+        return JsonResult.buildSuccessResult(map);
+    }
+
     /**
      * 新增角色
      * @param role 角色实体

src/main/java/cn/qg/holmes/service/auth/PermissionService.java

@@ -3,5 +3,10 @@ package cn.qg.holmes.service.auth;
 import cn.qg.holmes.entity.auth.Permission;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-public interface PermissionService extends IService<Permission> {
+import java.util.List;
+import java.util.Map;
+
+public interface PermissionService extends IService<Permission>{
+
+    List<Map<String, Object>> getPermissionList();
 }

src/main/java/cn/qg/holmes/service/auth/impl/PermissionServiceImpl.java

@@ -3,9 +3,50 @@ package cn.qg.holmes.service.auth.impl;
 import cn.qg.holmes.entity.auth.Permission;
 import cn.qg.holmes.mapper.auth.PermissionMapper;
 import cn.qg.holmes.service.auth.PermissionService;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Service
 public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permission> implements PermissionService {
+
+    @Autowired
+    PermissionMapper permissionMapper;
+
+    @Override
+    public List<Map<String, Object>> getPermissionList() {
+        List<Map<String, Object>> result = new ArrayList<>();
+        QueryWrapper<Permission> permissionQueryWrapper = new QueryWrapper<>();
+        permissionQueryWrapper.select("DISTINCT menu_name");
+        List<Permission> permissionList = permissionMapper.selectList(permissionQueryWrapper);
+        List<String> menuNameList = new ArrayList<>();
+        permissionList.forEach(permission -> {
+            menuNameList.add(permission.getMenuName());
+        });
+        permissionQueryWrapper.clear();
+        for (String menuName: menuNameList) {
+            permissionQueryWrapper.eq("menu_name", menuName);
+            List<Permission> permissions = permissionMapper.selectList(permissionQueryWrapper);
+            Map<String, Object> map = new HashMap<>();
+            List<Map<String, Object>> tempPermissionList = new ArrayList<>();
+            permissions.forEach(permission -> {
+                Map<String, Object> map2 = new HashMap<>();
+                map2.put("id", permission.getId());
+                map2.put("permissionName", permission.getPermissionName());
+                tempPermissionList.add(map2);
+            });
+            map.put("menuName", menuName);
+            map.put("permissionList", tempPermissionList);
+            result.add(map);
+            permissionQueryWrapper.clear();
+        }
+        return result;
+    }
 }