新增菜单

src/main/java/cn/qg/holmes/entity/auth/Permission.java

@@ -11,6 +11,8 @@ import java.util.Date;
 public class Permission {
     @TableId(type = IdType.AUTO)
     private Integer id;
+    private String menuCode;
+    private String menuName;
     private String permissionName;
     private String permissionCode;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

src/main/java/cn/qg/holmes/entity/auth/UserInfoVo.java

@@ -10,6 +10,6 @@ public class UserInfoVo {
     private Integer userId;
     private String username;
     private List<Integer> roleIds;
-//    private Set<String> menuList;
+    private Set<String> menuList;
     private Set<String> permissionCodeList;
 }

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

@@ -9,4 +9,6 @@ import java.util.Set;
 public interface RolePermissionService extends IService<RolePermission> {
 
     Set<String> getPermissionSetForRoleIds(List<Integer> roleIds);
+
+    Set<String> getMenuSetForRoleIds(List<Integer> roleIds);
 }

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

@@ -35,4 +35,18 @@ public class RolePermissionServiceImpl extends ServiceImpl<RolePermissionMapper,
         }
         return permissionCodeSet;
     }
+
+    @Override
+    public Set<String> getMenuSetForRoleIds(List<Integer> roleIds) {
+        Set<String> menuCodeSet = new HashSet<>();
+        for (Integer roleId: roleIds) {
+            QueryWrapper<RolePermission> rolePermissionQueryWrapper = new QueryWrapper<>();
+            rolePermissionQueryWrapper.eq("role_id", roleId);
+            List<RolePermission> rolePermissionList = rolePermissionMapper.selectList(rolePermissionQueryWrapper);
+            rolePermissionList.forEach(rolePermission -> {
+                menuCodeSet.add(permissionMapper.selectById(rolePermission.getPermissionId()).getMenuCode());
+            });
+        }
+        return menuCodeSet;
+    }
 }

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

@@ -3,7 +3,6 @@ package cn.qg.holmes.service.auth.impl;
 import cn.qg.holmes.entity.auth.User;
 import cn.qg.holmes.entity.auth.UserInfoVo;
 import cn.qg.holmes.mapper.auth.UserMapper;
-import cn.qg.holmes.mapper.auth.UserRoleMapper;
 import cn.qg.holmes.service.auth.RolePermissionService;
 import cn.qg.holmes.service.auth.UserRoleService;
 import cn.qg.holmes.service.auth.UserService;
@@ -12,7 +11,6 @@ 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.List;
 import java.util.Set;
 
@@ -47,6 +45,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         userInfoVo.setRoleIds(roleIds);
         Set<String> permissionCodeSet = rolePermissionService.getPermissionSetForRoleIds(roleIds);
         userInfoVo.setPermissionCodeList(permissionCodeSet);
+        Set<String> menuCodeSet = rolePermissionService.getMenuSetForRoleIds(roleIds);
+        userInfoVo.setMenuList(menuCodeSet);
         return userInfoVo;
     }
 }