align(用户菜单授权): 创建/编辑用户菜单权限补齐前端客户端(app)菜单并按类型分区落库

用户管理菜单权限此前只含后台 admin(单类型):前端授权树/回显仅拉 menuType=admin,
后端 replaceDirectPermissions 也固定用 ADMIN 作用域写。现改为同时覆盖 后台(admin)+前端客户端(app):
- 前端 user-menu-auth 节点携带 type,api 并行拉取 admin/app 两类可授权树与已授权 id 合并去重,树内两类根并存(账号与权限/视频/前端工具/运营工具/后勤工具等)
- 后端 PermissionMenuService 新增 resolveMenuTypes(按 id 解析类型);AdminUserService create/update 把勾选 id 拆 admin/app 分区整树替换(internal 不纳入)
- 前端 1556 测试全绿 + build 通过;后端单测(AdminUserServiceTest/PermissionMenuServiceTest/Controller/PermissionMenuResolveTypeTest) EXIT 0
- 本地 E2E:创建用户写入 admin=7+app=3 → 按类型回读 admin[7]/app[3],删除正常
This commit is contained in:
2026-09-06 15:32:43 +08:00
parent 3d7e94a259
commit af37805a8a
7 changed files with 184 additions and 19 deletions
@@ -0,0 +1,44 @@
package com.nanri.aiimage.modules.permission.service;
import com.nanri.aiimage.modules.permission.mapper.AdminUserMapper;
import com.nanri.aiimage.modules.permission.mapper.PermissionMenuMapper;
import com.nanri.aiimage.modules.permission.mapper.UserColumnPermissionMapper;
import com.nanri.aiimage.modules.permission.model.entity.PermissionMenuEntity;
import org.junit.jupiter.api.Test;
import java.util.List;
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
class PermissionMenuResolveTypeTest {
@Test
void resolveMenuTypesGroupsAdminAndAppByIdAndDropsUnknown() {
PermissionMenuMapper menuMapper = mock(PermissionMenuMapper.class);
PermissionMenuService service = new PermissionMenuService(
menuMapper,
mock(UserColumnPermissionMapper.class),
mock(AdminUserMapper.class));
when(menuMapper.selectBatchIds(any())).thenReturn(List.of(
menu(1L, PermissionMenuService.MENU_TYPE_ADMIN),
menu(2L, PermissionMenuService.MENU_TYPE_APP)));
Map<Long, String> typeById = service.resolveMenuTypes(List.of(1L, 2L, 3L));
assertThat(typeById)
.containsEntry(1L, PermissionMenuService.MENU_TYPE_ADMIN)
.containsEntry(2L, PermissionMenuService.MENU_TYPE_APP)
.doesNotContainKey(3L);
}
private PermissionMenuEntity menu(Long id, String type) {
PermissionMenuEntity entity = new PermissionMenuEntity();
entity.setId(id);
entity.setMenuType(type);
return entity;
}
}