task-144(Java 菜单树与 Flyway): 实现 parent_id 树组装

组装器新增 groupChildrenById/递归 assemble(孤儿按根),currentUserMenus 改走统一
组装器 toMapList。

TDD: Task144Test 8 用例 RED→GREEN。
This commit is contained in:
2026-09-05 17:56:49 +08:00
parent 37a4584f0c
commit 99f22eeebd
3 changed files with 201 additions and 101 deletions
@@ -5,6 +5,7 @@ import com.nanri.aiimage.modules.admin.support.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.model.entity.AdminUserEntity;
import com.nanri.aiimage.modules.permission.model.vo.PermissionMenuItemVo;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
import com.nanri.aiimage.modules.permission.service.support.AdminMenuTreeBuilder;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
@@ -12,9 +13,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -75,79 +73,8 @@ public class AdminConsoleController {
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
List<PermissionMenuItemVo> menus = permissionMenuService.getUserColumnPermissions(
operator, operator.getId(), PermissionMenuService.MENU_TYPE_ADMIN);
return ApiResponse.success(Map.of("items", buildAdminMenuTree(menus)));
}
/**
* 将 columns 的有效权限项转换为新版后台菜单树。权限 key 使用 column_key,
* 页面地址单独使用 route;这样后续调整 Vue URL 时不会改变授权标识。
*/
private List<Map<String, Object>> buildAdminMenuTree(List<PermissionMenuItemVo> menus) {
Map<Long, Map<String, Object>> nodes = new HashMap<>();
for (PermissionMenuItemVo menu : menus) {
if (menu.getId() == null) {
continue;
}
Map<String, Object> node = new LinkedHashMap<>();
node.put("key", menu.getColumnKey() == null ? String.valueOf(menu.getId()) : menu.getColumnKey());
node.put("name", menu.getName() == null ? "未命名菜单" : menu.getName());
node.put("sort", menu.getSortOrder() == null ? 0 : menu.getSortOrder());
String route = adminRoute(menu.getColumnKey(), menu.getRoutePath());
if (route != null && !route.isBlank() && !route.startsWith("group-")) {
node.put("route", "/" + route.replaceFirst("^/", ""));
}
node.put("children", new ArrayList<Map<String, Object>>());
nodes.put(menu.getId(), node);
}
List<Map<String, Object>> roots = new ArrayList<>();
for (PermissionMenuItemVo menu : menus) {
Map<String, Object> node = nodes.get(menu.getId());
if (node == null) continue;
@SuppressWarnings("unchecked")
List<Map<String, Object>> children = (List<Map<String, Object>>) node.get("children");
if (menu.getParentId() != null && nodes.containsKey(menu.getParentId())) {
@SuppressWarnings("unchecked")
List<Map<String, Object>> parentChildren = (List<Map<String, Object>>) nodes.get(menu.getParentId()).get("children");
parentChildren.add(node);
} else {
roots.add(node);
}
}
Comparator<Map<String, Object>> order = Comparator
.comparingInt((Map<String, Object> node) -> ((Number) node.get("sort")).intValue())
.thenComparing(node -> String.valueOf(node.get("key")));
sortMenuTree(roots, order);
stripSort(roots);
return roots;
}
private void sortMenuTree(List<Map<String, Object>> nodes,
Comparator<Map<String, Object>> order) {
nodes.sort(order);
for (Map<String, Object> node : nodes) {
@SuppressWarnings("unchecked")
List<Map<String, Object>> children = (List<Map<String, Object>>) node.get("children");
sortMenuTree(children, order);
}
}
private void stripSort(List<Map<String, Object>> nodes) {
for (Map<String, Object> node : nodes) {
node.remove("sort");
@SuppressWarnings("unchecked")
List<Map<String, Object>> children = (List<Map<String, Object>>) node.get("children");
if (children.isEmpty()) node.remove("children");
else stripSort(children);
}
}
private String adminRoute(String columnKey, String storedRoute) {
if (columnKey == null) return storedRoute;
return switch (columnKey) {
case "admin_users" -> "account/users";
case "admin_columns" -> "account/menus";
case "admin_group_manage" -> "account/groups";
default -> storedRoute;
};
menus = AdminMenuTreeBuilder.filterByMenuType(menus, PermissionMenuService.MENU_TYPE_ADMIN);
List<Map<String, Object>> items = AdminMenuTreeBuilder.toMapList(AdminMenuTreeBuilder.build(menus));
return ApiResponse.success(Map.of("items", items));
}
}