From 89847f0c5a5d37e5a720afd32cdd7e4d9ead664b Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期一, 13 四月 2026 08:15:47 +0800
Subject: [PATCH] #新的菜单接口
---
rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/RoleMenuServiceImpl.java | 5 +
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java | 103 ++++++++++++++++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/result/UserMenuRouteVo.java | 30 ++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/RoleMenuMapper.java | 3 +
rsf-server/src/main/java/com/vincent/rsf/server/system/service/RoleMenuService.java | 2
rsf-design/src/api/auth.js | 2
rsf-server/src/main/resources/mapper/system/RoleMenuMapper.xml | 13 ++++
7 files changed, 157 insertions(+), 1 deletions(-)
diff --git a/rsf-design/src/api/auth.js b/rsf-design/src/api/auth.js
index 36b0ab9..0d070a1 100644
--- a/rsf-design/src/api/auth.js
+++ b/rsf-design/src/api/auth.js
@@ -114,7 +114,7 @@
}
function fetchGetMenuList() {
return request.get({
- url: '/auth/menu'
+ url: '/auth/menu/v2'
})
}
export {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
index 32cf3b3..adb7030 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/AuthController.java
@@ -1,5 +1,6 @@
package com.vincent.rsf.server.system.controller;
+import com.alibaba.fastjson.JSONObject;
import com.vincent.rsf.common.enums.SystemModeType;
import com.vincent.rsf.common.utils.Utils;
import com.vincent.rsf.framework.common.BaseRes;
@@ -12,6 +13,7 @@
import com.vincent.rsf.server.common.security.JwtSubject;
import com.vincent.rsf.server.common.service.EmailService;
import com.vincent.rsf.server.common.service.RedisService;
+import com.vincent.rsf.server.common.utils.JSONUtil;
import com.vincent.rsf.server.common.utils.JwtUtil;
import com.vincent.rsf.server.system.controller.param.LoginParam;
import com.vincent.rsf.server.system.controller.param.RegisterParam;
@@ -20,6 +22,7 @@
import com.vincent.rsf.server.system.controller.result.LoginResult;
import com.vincent.rsf.server.system.controller.result.MenuVo;
import com.vincent.rsf.server.system.controller.result.SystemInfoVo;
+import com.vincent.rsf.server.system.controller.result.UserMenuRouteVo;
import com.vincent.rsf.server.system.entity.Menu;
import com.vincent.rsf.server.system.entity.Tenant;
import com.vincent.rsf.server.system.entity.User;
@@ -36,7 +39,9 @@
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -178,6 +183,22 @@
return R.ok().add(buildPageRowsUtils.rowsMap(Utils.toTreeData(voList, 0L, MenuVo::getParentId, MenuVo::getId, MenuVo::setChildren)));
}
+ @GetMapping("/auth/menu/v2")
+ public R userMenuV2() {
+ List<Menu> menus = roleMenuService.listMenuByUserId(getLoginUserId(), Menu.TYPE_MENU);
+ Map<Long, List<Menu>> buttonMap = roleMenuService.listButtonByUserId(getLoginUserId())
+ .stream()
+ .collect(Collectors.groupingBy(Menu::getParentId));
+ List<UserMenuRouteVo> voList = menus.stream().map(menu -> convertToRouteVo(menu, buttonMap)).collect(Collectors.toList());
+ if (!configProperties.getSuperUserList().contains(getLoginUser().getUsername())) {
+ voList = voList.stream().filter(vo ->
+ !vo.getName().equals("menu.tenant")
+ && !vo.getName().equals("menu.menu")
+ ).collect(Collectors.toList());
+ }
+ return R.ok().add(buildPageRowsUtils.rowsMap(Utils.toTreeData(voList, 0L, UserMenuRouteVo::getParentId, UserMenuRouteVo::getId, UserMenuRouteVo::setChildren)));
+ }
+
@OperationLog("Update UserInfo")
@PostMapping("/auth/user")
public R updateInfo(@RequestBody User user) {
@@ -252,5 +273,87 @@
return vo;
}
+ private UserMenuRouteVo convertToRouteVo(Menu menu, Map<Long, List<Menu>> buttonMap) {
+ if (menu == null) {
+ return null;
+ }
+ UserMenuRouteVo vo = new UserMenuRouteVo();
+ vo.setId(menu.getId());
+ vo.setParentId(menu.getParentId());
+ vo.setName(menu.getName());
+ vo.setPath(resolveRoutePath(menu));
+ vo.setComponent(resolveComponent(menu));
+ vo.setMeta(buildMenuMeta(menu, buttonMap.get(menu.getId())));
+ if (menu.getChildren() != null && !menu.getChildren().isEmpty()) {
+ vo.setChildren(menu.getChildren().stream().map(child -> convertToRouteVo(child, buttonMap)).collect(Collectors.toList()));
+ }
+ return vo;
+ }
+
+ private String resolveComponent(Menu menu) {
+ if (menu.getParentId() == null || menu.getParentId() == 0L) {
+ return "/index/index";
+ }
+ return "/"+menu.getComponent();
+ }
+
+ private String resolveRoutePath(Menu menu) {
+ String route = menu.getRoute();
+ if (Cools.isEmpty(route)) {
+ return route;
+ }
+ if (menu.getParentId() != null && menu.getParentId() > 0 && route.startsWith("/")) {
+ return route.substring(1 + route.lastIndexOf("/", route.length() - 2));
+ }
+ return route;
+ }
+
+ private Map<String, Object> buildMenuMeta(Menu menu, List<Menu> buttons) {
+ Map<String, Object> meta = parseMeta(menu.getMeta());
+ if (Cools.isEmpty(meta.get("title")) && !Cools.isEmpty(menu.getName())) {
+ meta.put("title", menu.getName());
+ }
+ if (Cools.isEmpty(meta.get("icon")) && !Cools.isEmpty(menu.getIcon())) {
+ meta.put("icon", menu.getIcon());
+ }
+ if (!Cools.isEmpty(buttons)) {
+ meta.put("authList", buttons.stream().map(this::convertButtonAuth).collect(Collectors.toList()));
+ }
+ return meta;
+ }
+
+ private Map<String, Object> convertButtonAuth(Menu button) {
+ Map<String, Object> authItem = new LinkedHashMap<>();
+ authItem.put("title", button.getName());
+ authItem.put("authMark", extractAuthMark(button.getAuthority()));
+ return authItem;
+ }
+
+ private String extractAuthMark(String authority) {
+ if (Cools.isEmpty(authority)) {
+ return null;
+ }
+ int lastIndex = authority.lastIndexOf(":");
+ if (lastIndex < 0 || lastIndex == authority.length() - 1) {
+ return authority;
+ }
+ return authority.substring(lastIndex + 1);
+ }
+
+ private Map<String, Object> parseMeta(String metaJson) {
+ if (Cools.isEmpty(metaJson)) {
+ return new LinkedHashMap<>();
+ }
+ try {
+ JSONObject jsonObject = JSONUtil.parseObject(metaJson, JSONObject.class);
+ if (jsonObject == null) {
+ return new LinkedHashMap<>();
+ }
+ return new LinkedHashMap<>(jsonObject);
+ } catch (Exception e) {
+ return new LinkedHashMap<>();
+ }
+ }
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/result/UserMenuRouteVo.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/result/UserMenuRouteVo.java
new file mode 100644
index 0000000..6524c70
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/result/UserMenuRouteVo.java
@@ -0,0 +1,30 @@
+package com.vincent.rsf.server.system.controller.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class UserMenuRouteVo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @JsonIgnore
+ private Long id;
+
+ @JsonIgnore
+ private Long parentId;
+
+ private String name;
+
+ private String path;
+
+ private String component;
+
+ private Map<String, Object> meta;
+
+ private List<UserMenuRouteVo> children;
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/RoleMenuMapper.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/RoleMenuMapper.java
index 48611b5..4de92b0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/RoleMenuMapper.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/mapper/RoleMenuMapper.java
@@ -17,6 +17,9 @@
@InterceptorIgnore(tenantLine = "true")
List<Menu> listMenuByUserId(@Param("userId") Long userId, @Param("type") Integer menuType);
+ @InterceptorIgnore(tenantLine = "true")
+ List<Menu> listButtonByUserId(@Param("userId") Long userId);
+
List<Long> listStrictlyMenuByRoleId(@Param("roleId") Long roleId);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/RoleMenuService.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/RoleMenuService.java
index 331a951..6b4b914 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/RoleMenuService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/RoleMenuService.java
@@ -10,6 +10,8 @@
List<Menu> listMenuByUserId(Long userId, Integer menuType);
+ List<Menu> listButtonByUserId(Long userId);
+
List<Long> listStrictlyMenuByRoleId(Long roleId);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/RoleMenuServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/RoleMenuServiceImpl.java
index 21625f8..d558792 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/RoleMenuServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/RoleMenuServiceImpl.java
@@ -18,6 +18,11 @@
}
@Override
+ public List<Menu> listButtonByUserId(Long userId) {
+ return baseMapper.listButtonByUserId(userId);
+ }
+
+ @Override
public List<Long> listStrictlyMenuByRoleId(Long roleId) {
return baseMapper.listStrictlyMenuByRoleId(roleId);
}
diff --git a/rsf-server/src/main/resources/mapper/system/RoleMenuMapper.xml b/rsf-server/src/main/resources/mapper/system/RoleMenuMapper.xml
index 7f9dcb5..a7b6029 100644
--- a/rsf-server/src/main/resources/mapper/system/RoleMenuMapper.xml
+++ b/rsf-server/src/main/resources/mapper/system/RoleMenuMapper.xml
@@ -18,6 +18,19 @@
ORDER BY sm.sort
</select>
+ <select id="listButtonByUserId" resultType="com.vincent.rsf.server.system.entity.Menu">
+ SELECT DISTINCT sm.*
+ FROM sys_menu sm
+ JOIN sys_role_menu srm ON sm.id = srm.menu_id
+ JOIN sys_user_role sur ON srm.role_id = sur.role_id
+ JOIN sys_role sr ON sur.role_id = sr.id
+ WHERE sur.user_id = #{userId}
+ AND sm.type = 1
+ AND sr.deleted = 0
+ AND sm.deleted = 0
+ ORDER BY sm.sort
+ </select>
+
<select id="listStrictlyMenuByRoleId" resultType="java.lang.Long">
select sm.id
from sys_menu sm
--
Gitblit v1.9.1