diff --git a/docs/sql/F1-5_sys_admin_schemas_upsert.sql b/docs/sql/F1-5_sys_admin_schemas_upsert.sql new file mode 100644 index 0000000..12f9101 --- /dev/null +++ b/docs/sql/F1-5_sys_admin_schemas_upsert.sql @@ -0,0 +1,49 @@ +-- ============================================================================ +-- F1-5 sys-admin-* 页面 schema upsert(幂等) +-- ---------------------------------------------------------------------------- +-- 将 4 个系统管理只读页 amis schema 入库 sys_page_schema。 +-- template_id 冲突则更新(version+1,schema_etag 取内容 hash)。 +-- 两库均需执行: +-- eip4dev (localhost:5433, schema eip3):SET search_path=eip3 已在 url 中配置 +-- eip4m0 (localhost:5433, schema public):直接执行 +-- ============================================================================ + +-- sys-admin-user +INSERT INTO sys_page_schema (template_id, name, schema_json, schema_etag, version, update_time) +VALUES ('sys-admin-user', '用户查询', '{"type":"page","title":"用户查询","body":[{"type":"crud","syncLocation":false,"api":{"method":"get","url":"/api/admin/users?page=${page}&perPage=${perPage}&keyword=${keyword}","adaptor":"if(payload&&payload.data){return payload;}return {status:0,data:{items:payload.items||[],total:payload.total||0}};"},"headerToolbar":[{"type":"tpl","tpl":"共 ${total} 条","className":"v-middle"},"pagination"],"footerToolbar":["statistics","pagination"],"perPage":20,"filter":{"title":"查询条件","submitText":"查询","body":[{"type":"input-text","name":"keyword","label":"账号/姓名","placeholder":"输入账号或姓名关键字","clearable":true}]},"columns":[{"name":"account","label":"账号","sortable":false},{"name":"name","label":"姓名","sortable":false},{"name":"departName","label":"部门","sortable":false},{"name":"state","label":"激活状态","type":"mapping","map":{"1":"激活","2":"停用","3":"未激活","*":"未知"}}]}]}'::jsonb, 'd39eb72e11c71eb0a0f600ec44d37db454590d826deef211338e80667f0995ce', 1, 1749600000000) +ON CONFLICT (template_id) DO UPDATE + SET name = EXCLUDED.name, + schema_json = EXCLUDED.schema_json, + schema_etag = EXCLUDED.schema_etag, + version = sys_page_schema.version + 1, + update_time = EXCLUDED.update_time; + +-- sys-admin-role +INSERT INTO sys_page_schema (template_id, name, schema_json, schema_etag, version, update_time) +VALUES ('sys-admin-role', '角色与成员', '{"type":"page","title":"角色与成员","body":[{"type":"crud","syncLocation":false,"api":{"method":"get","url":"/api/org/roles","adaptor":"var d=payload.data||{};return {status:0,data:{items:d.items||[],total:d.total||0}};"},"headerToolbar":[{"type":"tpl","tpl":"共 ${total} 条角色","className":"v-middle"}],"footerToolbar":["statistics","pagination"],"perPage":20,"columns":[{"name":"name","label":"角色名称","sortable":false},{"name":"description","label":"描述","sortable":false},{"name":"roleType","label":"类型","type":"mapping","map":{"1":"功能角色","2":"数据角色","*":"其他"}},{"type":"operation","label":"成员","buttons":[{"type":"button","label":"查看成员","level":"link","actionType":"dialog","dialog":{"title":"角色「${name}」成员列表","size":"lg","body":{"type":"service","api":{"method":"get","url":"/api/admin/roles/${id}/users","adaptor":"var d=payload.data||{};return {status:0,data:{items:d.items||[],total:d.total||0}};"},"body":{"type":"table","source":"${items}","columns":[{"name":"account","label":"账号"},{"name":"userName","label":"姓名"},{"name":"state","label":"激活状态","type":"mapping","map":{"1":"激活","2":"停用","3":"未激活","*":"未知"}}]}},"actions":[{"type":"button","label":"关闭","actionType":"close"}]}}]}]}]}'::jsonb, '0cf419e3ae6be9ed2cda3b69fbf7fc0941783662f5ea880a3bb397b6b8a725b0', 1, 1749600000000) +ON CONFLICT (template_id) DO UPDATE + SET name = EXCLUDED.name, + schema_json = EXCLUDED.schema_json, + schema_etag = EXCLUDED.schema_etag, + version = sys_page_schema.version + 1, + update_time = EXCLUDED.update_time; + +-- sys-admin-menu +INSERT INTO sys_page_schema (template_id, name, schema_json, schema_etag, version, update_time) +VALUES ('sys-admin-menu', '菜单总览(管理视角)', '{"type":"page","title":"菜单总览(管理视角)","body":[{"type":"service","api":{"method":"get","url":"/api/admin/menu-all"},"body":[{"type":"each","name":"roots","className":"mb-4","items":{"type":"panel","title":"${name}","body":{"type":"table","source":"${children}","columns":[{"name":"name","label":"目录/菜单名"},{"name":"templateId","label":"模板 ID","type":"tpl","tpl":"${templateId}"},{"name":"typename","label":"类型"},{"name":"seq","label":"排序"},{"name":"childCount","label":"子菜单数"}]}}}]}]}'::jsonb, '7b8a4883ba15dae8cc4148403da5fed13baa2a2710fc51cb164751390ca3d2dc', 1, 1749600000000) +ON CONFLICT (template_id) DO UPDATE + SET name = EXCLUDED.name, + schema_json = EXCLUDED.schema_json, + schema_etag = EXCLUDED.schema_etag, + version = sys_page_schema.version + 1, + update_time = EXCLUDED.update_time; + +-- sys-admin-filterrule +INSERT INTO sys_page_schema (template_id, name, schema_json, schema_etag, version, update_time) +VALUES ('sys-admin-filterrule', '数据权限规则', '{"type":"page","title":"数据权限规则","body":[{"type":"crud","syncLocation":false,"api":{"method":"get","url":"/api/admin/filterrules?page=${page}&perPage=${perPage}&entityName=${entityName}","adaptor":"if(payload&&payload.data){return payload;}return {status:0,data:{items:payload.items||[],total:payload.total||0}};"},"headerToolbar":[{"type":"tpl","tpl":"共 ${total} 条规则","className":"v-middle"},"pagination"],"footerToolbar":["statistics","pagination"],"perPage":20,"filter":{"title":"查询条件","submitText":"查询","body":[{"type":"input-text","name":"entityName","label":"实体名","placeholder":"按实体名过滤","clearable":true}]},"columns":[{"name":"entityName","label":"实体名","sortable":false,"width":150},{"name":"tableName","label":"表名","sortable":false,"width":180},{"name":"roles","label":"关联角色","sortable":false,"width":200,"type":"tpl","tpl":"${roles|truncate:60}"},{"name":"filterRule","label":"规则内容","sortable":false,"type":"tpl","tpl":"
${filterRule}
"}]}]}'::jsonb, '35c1ae31be4b7abead216ea53c4b8c69e30d50ca9175f02a3b087f8333f752b2', 1, 1749600000000) +ON CONFLICT (template_id) DO UPDATE + SET name = EXCLUDED.name, + schema_json = EXCLUDED.schema_json, + schema_etag = EXCLUDED.schema_etag, + version = sys_page_schema.version + 1, + update_time = EXCLUDED.update_time; diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/AdminController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/AdminController.java new file mode 100644 index 0000000..2f6673e --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/AdminController.java @@ -0,0 +1,307 @@ +package com.eip4.platform.metadata.web; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.jdbc.core.JdbcOperations; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; + +/** + * F1-5 系统管理只读端点(管理视角,不触发行级过滤)。 + * + *

提供 4 个只读端点,供 sys-admin-* 系列 amis schema 页面使用: + *

+ * + *

纪律:零改 com.dsasp;SQL 全参数化;密码列绝不下发。 + */ +@Tag(name = "系统管理(只读)", description = "F1-5 管理视角只读端点,供 sys-admin-* amis schema 页面使用") +@RestController +public class AdminController { + + private final JdbcOperations jdbcTemplate; + + public AdminController(JdbcOperations jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; + } + + // ---------------------------------------------------------------- 用户查询 + + /** + * 用户分页查询(管理视角,不触发行级过滤)。 + * + *

密码列绝不下发(SELECT 中排除 password 列)。 + * 关键字按 account/name 模糊匹配(ILIKE,大小写不敏感)。 + * 部门名通过 sys_position + sys_depart 关联取首个在岗部门。 + * + * @param page 页码(从 1 开始),默认 1 + * @param perPage 每页条数,默认 20,上限 200(防超大请求) + * @param keyword 账号/姓名关键字,为空则不过滤 + * @return amis crud 约定格式 {@code {status,data:{items,total}}} + */ + @Operation(summary = "用户分页查询(管理视角,密码不下发)", + description = "关键字按 account/name ILIKE 过滤;返回格式 {status,data:{items,total}} 适配 amis crud") + @GetMapping("/api/admin/users") + public Map users( + @Parameter(description = "页码,从 1 开始") @RequestParam(defaultValue = "1") int page, + @Parameter(description = "每页条数,最大 200") @RequestParam(defaultValue = "20") int perPage, + @Parameter(description = "账号/姓名关键字,空则不过滤") @RequestParam(required = false) String keyword) { + + // 上限保护,防止超大分页请求 + int safePerPage = Math.min(Math.max(perPage, 1), 200); + int offset = (Math.max(page, 1) - 1) * safePerPage; + + // 关键字条件(参数化,防 SQL 注入) + boolean hasKeyword = keyword != null && !keyword.isBlank(); + String like = hasKeyword ? "%" + keyword.trim() + "%" : null; + + // 主查询:用户基本信息 + 首个在岗部门名(LEFT JOIN,无部门岗位时 departName 为 null) + // 密码列不出现在 SELECT 中 + String sql = "SELECT TRIM(u.sys_user_id) AS id," + + " TRIM(u.account) AS account," + + " TRIM(u.name) AS name," + + " TRIM(d.name) AS \"departName\"," + + " u.state" + + " FROM sys_user u" + + " LEFT JOIN LATERAL (" + + " SELECT d2.name FROM sys_position p" + + " JOIN sys_positionuser pu ON pu.positionid = p.sys_position_id" + + " JOIN sys_depart d2 ON TRIM(d2.sys_depart_id) = TRIM(p.parentdepartid)" + + " WHERE TRIM(pu.userid) = TRIM(u.sys_user_id)" + + " LIMIT 1" + + " ) d ON TRUE" + + (hasKeyword ? " WHERE u.account ILIKE ? OR u.name ILIKE ?" : "") + + " ORDER BY u.account" + + " LIMIT ? OFFSET ?"; + + // 计数查询 + String countSql = "SELECT COUNT(*) FROM sys_user u" + + (hasKeyword ? " WHERE u.account ILIKE ? OR u.name ILIKE ?" : ""); + + List> items; + int total; + + if (hasKeyword) { + items = jdbcTemplate.queryForList(sql, like, like, safePerPage, offset); + total = jdbcTemplate.queryForObject(countSql, Integer.class, like, like); + } else { + items = jdbcTemplate.queryForList(sql, safePerPage, offset); + total = jdbcTemplate.queryForObject(countSql, Integer.class); + } + + return okList(items, total); + } + + // ---------------------------------------------------------------- 角色成员 + + /** + * 某角色下的用户列表(通过 sys_usergrouprole → sys_usergroupuser 中转)。 + * + *

引擎角色-用户关联语义:角色挂在岗位组(sys_usergroup),用户加入岗位组, + * 关联路径:sys_role ← sys_usergrouprole → sys_usergroup → sys_usergroupuser → sys_user。 + * + * @param roleId SYS_ROLE.SYS_ROLE_ID(36 位 UUID) + * @return amis service 约定格式 {@code {status,data:{items,total}}} + */ + @Operation(summary = "某角色下的用户列表(通过岗位组中转,密码不下发)", + description = "关联路径: sys_usergrouprole → sys_usergroupuser → sys_user;返回 {status,data:{items,total}}") + @GetMapping("/api/admin/roles/{roleId}/users") + public Map roleUsers( + @Parameter(description = "SYS_ROLE.SYS_ROLE_ID 角色 ID(36 位)") @PathVariable String roleId) { + + // 密码列不出现在 SELECT 中;DISTINCT + ORDER BY 必须用 SELECT 列表别名(PostgreSQL 要求) + String sql = "SELECT DISTINCT TRIM(u.sys_user_id) AS id," + + " TRIM(u.account) AS account," + + " TRIM(u.name) AS \"userName\"," + + " u.state" + + " FROM sys_usergrouprole ugr" + + " JOIN sys_usergroupuser ugu ON ugu.usergroupid = ugr.usergroupid" + + " JOIN sys_user u ON TRIM(u.sys_user_id) = TRIM(ugu.userid)" + + " WHERE TRIM(ugr.roleid) = ?" + + " ORDER BY account"; + + List> items = jdbcTemplate.queryForList(sql, roleId.trim()); + return okList(items, items.size()); + } + + // ---------------------------------------------------------------- 菜单全量树(管理视角) + + /** + * 全量菜单树(不按用户裁剪的管理视角)。 + * + *

与 {@link MenuController} 的区别:不 JOIN view_sys_usermenuid, + * 返回所有 isactive=1 的菜单,供系统管理员查看全量菜单结构。 + * 结构:roots → children(每个目录/叶子节点带 childCount 统计子菜单数)。 + * + * @return {@code { roots: [ {id, name, seq, children: [ {id, name, templateId, typename, seq, childCount, children:[...]} ]} ] }} + */ + @Operation(summary = "全量菜单树(管理视角,不按用户裁剪)", + description = "不 JOIN view_sys_usermenuid;返回所有 isactive=1 菜单;管理视角 @Operation 标记") + @GetMapping("/api/admin/menu-all") + public Map menuAll() { + // 查询所有根节点 + List> roots = jdbcTemplate.query( + "SELECT TRIM(sys_menu_root_id) AS id, TRIM(name) AS name, seq" + + " FROM sys_menu_root WHERE isactive = 1 ORDER BY seq", + (rs, i) -> { + Map m = new LinkedHashMap<>(); + m.put("id", rs.getString("id")); + m.put("name", rs.getString("name")); + m.put("seq", rs.getObject("seq")); + return m; + }); + + // 查询所有活跃菜单(全量,不裁剪) + List> menus = jdbcTemplate.query( + "SELECT TRIM(sys_menu_id) AS id, TRIM(name) AS name," + + " TRIM(parentid) AS parentid, TRIM(menuroot) AS menuroot," + + " TRIM(view_templateid) AS templateId," + + " TRIM(typename) AS typename, seq" + + " FROM sys_menu WHERE isactive = 1 ORDER BY seq", + (rs, i) -> { + Map m = new LinkedHashMap<>(); + m.put("id", rs.getString("id")); + m.put("name", rs.getString("name")); + m.put("parentid", rs.getString("parentid")); + m.put("menuroot", rs.getString("menuroot")); + m.put("templateId", rs.getString("templateId")); + m.put("typename", rs.getString("typename")); + m.put("seq", rs.getObject("seq")); + return m; + }); + + // 按 root 分组构建两级树(目录→叶子) + List> result = new ArrayList<>(); + for (Map root : roots) { + String rootId = (String) root.get("id"); + List> children = buildMenuChildren(menus, rootId, null); + Map rootNode = new LinkedHashMap<>(root); + rootNode.put("children", children); + result.add(rootNode); + } + + Map resp = new LinkedHashMap<>(); + resp.put("status", 0); + resp.put("msg", ""); + resp.put("roots", result); + return resp; + } + + /** + * 递归构建菜单子树(两级:目录→叶子;目录 parentid=null,叶子 parentid≠null)。 + * childCount 统计直接子菜单数量,供管理视角快速了解菜单规模。 + */ + private List> buildMenuChildren( + List> allMenus, String rootId, String parentId) { + List> children = new ArrayList<>(); + for (Map m : allMenus) { + String menuRoot = (String) m.get("menuroot"); + String mParentId = (String) m.get("parentid"); + // 根节点匹配 + parentid 匹配(null 比对用 isEmpty 兼容空白字符) + boolean rootMatch = rootId != null && rootId.equals(menuRoot); + boolean parentMatch = (parentId == null || parentId.isBlank()) + ? (mParentId == null || mParentId.isBlank()) + : parentId.equals(mParentId); + if (rootMatch && parentMatch) { + Map node = new LinkedHashMap<>(); + node.put("id", m.get("id")); + node.put("name", m.get("name")); + node.put("templateId", m.get("templateId")); + node.put("typename", m.get("typename")); + node.put("seq", m.get("seq")); + // 递归取子节点 + List> subChildren = buildMenuChildren(allMenus, rootId, (String) m.get("id")); + node.put("childCount", subChildren.size()); + node.put("children", subChildren); + children.add(node); + } + } + return children; + } + + // ---------------------------------------------------------------- 数据权限规则 + + /** + * 数据权限规则分页列表(SYS_FILTERRULE,1,079 条)。 + * + *

关联 SYS_ENTITY 取实体名/表名,关联 SYS_FILTERRULEROLE→SYS_ROLE 聚合角色名。 + * 支持按实体名关键字过滤(ILIKE,大小写不敏感)。 + * + * @param page 页码(从 1 开始),默认 1 + * @param perPage 每页条数,默认 20,上限 200 + * @param entityName 实体名关键字(按 sys_entity.name ILIKE 过滤),空则不过滤 + * @return amis crud 约定格式 {@code {status,data:{items,total}}} + */ + @Operation(summary = "数据权限规则分页列表(按实体名过滤)", + description = "关联 sys_entity(实体名/表名) + sys_filterrulerole→sys_role(角色名聚合);返回 {status,data:{items,total}}") + @GetMapping("/api/admin/filterrules") + public Map filterRules( + @Parameter(description = "页码,从 1 开始") @RequestParam(defaultValue = "1") int page, + @Parameter(description = "每页条数,最大 200") @RequestParam(defaultValue = "20") int perPage, + @Parameter(description = "实体名关键字,空则不过滤") @RequestParam(required = false) String entityName) { + + int safePerPage = Math.min(Math.max(perPage, 1), 200); + int offset = (Math.max(page, 1) - 1) * safePerPage; + + boolean hasFilter = entityName != null && !entityName.isBlank(); + String like = hasFilter ? "%" + entityName.trim() + "%" : null; + + // 主查询:filterrule + 实体名/表名 + 聚合角色名(STRING_AGG) + String sql = "SELECT TRIM(fr.sys_filterrule_id) AS id," + + " TRIM(e.name) AS \"entityName\"," + + " TRIM(e.tablename) AS \"tableName\"," + + " fr.filterrule AS \"filterRule\"," + + " STRING_AGG(TRIM(r.name), ', ' ORDER BY r.name) AS roles" + + " FROM sys_filterrule fr" + + " LEFT JOIN sys_entity e ON TRIM(e.sys_entity_id) = TRIM(fr.entityid)" + + " LEFT JOIN sys_filterrulerole frr ON TRIM(frr.filterruleid) = TRIM(fr.sys_filterrule_id)" + + " LEFT JOIN sys_role r ON TRIM(r.sys_role_id) = TRIM(frr.roleid)" + + (hasFilter ? " WHERE e.name ILIKE ?" : "") + + " GROUP BY fr.sys_filterrule_id, e.name, e.tablename, fr.filterrule" + + " ORDER BY e.name, fr.sys_filterrule_id" + + " LIMIT ? OFFSET ?"; + + String countSql = "SELECT COUNT(*) FROM sys_filterrule fr" + + " LEFT JOIN sys_entity e ON TRIM(e.sys_entity_id) = TRIM(fr.entityid)" + + (hasFilter ? " WHERE e.name ILIKE ?" : ""); + + List> items; + int total; + + if (hasFilter) { + items = jdbcTemplate.queryForList(sql, like, safePerPage, offset); + total = jdbcTemplate.queryForObject(countSql, Integer.class, like); + } else { + items = jdbcTemplate.queryForList(sql, safePerPage, offset); + total = jdbcTemplate.queryForObject(countSql, Integer.class); + } + + return okList(items, total); + } + + // ---------------------------------------------------------------- 内部工具 + + private Map okList(List> items, int total) { + Map data = new LinkedHashMap<>(); + data.put("items", items); + data.put("total", total); + Map resp = new LinkedHashMap<>(); + resp.put("status", 0); + resp.put("msg", ""); + resp.put("data", data); + return resp; + } +} diff --git a/platform-metadata/src/main/resources/admin-schemas/sys-admin-filterrule.json b/platform-metadata/src/main/resources/admin-schemas/sys-admin-filterrule.json new file mode 100644 index 0000000..4d22e43 --- /dev/null +++ b/platform-metadata/src/main/resources/admin-schemas/sys-admin-filterrule.json @@ -0,0 +1,67 @@ +{ + "type": "page", + "title": "数据权限规则", + "body": [ + { + "type": "crud", + "syncLocation": false, + "api": { + "method": "get", + "url": "/api/admin/filterrules?page=${page}&perPage=${perPage}&entityName=${entityName}", + "adaptor": "if(payload&&payload.data){return payload;}return {status:0,data:{items:payload.items||[],total:payload.total||0}};" + }, + "headerToolbar": [ + { + "type": "tpl", + "tpl": "共 ${total} 条规则", + "className": "v-middle" + }, + "pagination" + ], + "footerToolbar": ["statistics", "pagination"], + "perPage": 20, + "filter": { + "title": "查询条件", + "submitText": "查询", + "body": [ + { + "type": "input-text", + "name": "entityName", + "label": "实体名", + "placeholder": "按实体名过滤", + "clearable": true + } + ] + }, + "columns": [ + { + "name": "entityName", + "label": "实体名", + "sortable": false, + "width": 150 + }, + { + "name": "tableName", + "label": "表名", + "sortable": false, + "width": 180 + }, + { + "name": "roles", + "label": "关联角色", + "sortable": false, + "width": 200, + "type": "tpl", + "tpl": "${roles|truncate:60}" + }, + { + "name": "filterRule", + "label": "规则内容", + "sortable": false, + "type": "tpl", + "tpl": "

${filterRule}
" + } + ] + } + ] +} diff --git a/platform-metadata/src/main/resources/admin-schemas/sys-admin-menu.json b/platform-metadata/src/main/resources/admin-schemas/sys-admin-menu.json new file mode 100644 index 0000000..2c71b92 --- /dev/null +++ b/platform-metadata/src/main/resources/admin-schemas/sys-admin-menu.json @@ -0,0 +1,52 @@ +{ + "type": "page", + "title": "菜单总览(管理视角)", + "body": [ + { + "type": "service", + "api": { + "method": "get", + "url": "/api/admin/menu-all" + }, + "body": [ + { + "type": "each", + "name": "roots", + "className": "mb-4", + "items": { + "type": "panel", + "title": "${name}", + "body": { + "type": "table", + "source": "${children}", + "columns": [ + { + "name": "name", + "label": "目录/菜单名" + }, + { + "name": "templateId", + "label": "模板 ID", + "type": "tpl", + "tpl": "${templateId}" + }, + { + "name": "typename", + "label": "类型" + }, + { + "name": "seq", + "label": "排序" + }, + { + "name": "childCount", + "label": "子菜单数" + } + ] + } + } + } + ] + } + ] +} diff --git a/platform-metadata/src/main/resources/admin-schemas/sys-admin-role.json b/platform-metadata/src/main/resources/admin-schemas/sys-admin-role.json new file mode 100644 index 0000000..147d44b --- /dev/null +++ b/platform-metadata/src/main/resources/admin-schemas/sys-admin-role.json @@ -0,0 +1,82 @@ +{ + "type": "page", + "title": "角色与成员", + "body": [ + { + "type": "crud", + "syncLocation": false, + "api": { + "method": "get", + "url": "/api/org/roles", + "adaptor": "var d=payload.data||{};return {status:0,data:{items:d.items||[],total:d.total||0}};" + }, + "headerToolbar": [ + { + "type": "tpl", + "tpl": "共 ${total} 条角色", + "className": "v-middle" + } + ], + "footerToolbar": ["statistics", "pagination"], + "perPage": 20, + "columns": [ + { + "name": "name", + "label": "角色名称", + "sortable": false + }, + { + "name": "description", + "label": "描述", + "sortable": false + }, + { + "name": "roleType", + "label": "类型", + "type": "mapping", + "map": { + "1": "功能角色", + "2": "数据角色", + "*": "其他" + } + }, + { + "type": "operation", + "label": "成员", + "buttons": [ + { + "type": "button", + "label": "查看成员", + "level": "link", + "actionType": "dialog", + "dialog": { + "title": "角色「${name}」成员列表", + "size": "lg", + "body": { + "type": "service", + "api": { + "method": "get", + "url": "/api/admin/roles/${id}/users", + "adaptor": "var d=payload.data||{};return {status:0,data:{items:d.items||[],total:d.total||0}};" + }, + "body": { + "type": "table", + "source": "${items}", + "columns": [ + {"name": "account", "label": "账号"}, + {"name": "userName", "label": "姓名"}, + {"name": "state", "label": "激活状态", "type": "mapping", "map": {"1": "激活", "2": "停用", "3": "未激活", "*": "未知"}} + ] + } + }, + "actions": [ + {"type": "button", "label": "关闭", "actionType": "close"} + ] + } + } + ] + } + ] + } + ] +} diff --git a/platform-metadata/src/main/resources/admin-schemas/sys-admin-user.json b/platform-metadata/src/main/resources/admin-schemas/sys-admin-user.json new file mode 100644 index 0000000..bff9f51 --- /dev/null +++ b/platform-metadata/src/main/resources/admin-schemas/sys-admin-user.json @@ -0,0 +1,66 @@ +{ + "type": "page", + "title": "用户查询", + "body": [ + { + "type": "crud", + "syncLocation": false, + "api": { + "method": "get", + "url": "/api/admin/users?page=${page}&perPage=${perPage}&keyword=${keyword}", + "adaptor": "if(payload&&payload.data){return payload;}return {status:0,data:{items:payload.items||[],total:payload.total||0}};" + }, + "headerToolbar": [ + { + "type": "tpl", + "tpl": "共 ${total} 条", + "className": "v-middle" + }, + "pagination" + ], + "footerToolbar": ["statistics", "pagination"], + "perPage": 20, + "filter": { + "title": "查询条件", + "submitText": "查询", + "body": [ + { + "type": "input-text", + "name": "keyword", + "label": "账号/姓名", + "placeholder": "输入账号或姓名关键字", + "clearable": true + } + ] + }, + "columns": [ + { + "name": "account", + "label": "账号", + "sortable": false + }, + { + "name": "name", + "label": "姓名", + "sortable": false + }, + { + "name": "departName", + "label": "部门", + "sortable": false + }, + { + "name": "state", + "label": "激活状态", + "type": "mapping", + "map": { + "1": "激活", + "2": "停用", + "3": "未激活", + "*": "未知" + } + } + ] + } + ] +} diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/AdminControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/AdminControllerTest.java new file mode 100644 index 0000000..2a2dad8 --- /dev/null +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/AdminControllerTest.java @@ -0,0 +1,236 @@ +package com.eip4.platform.metadata.web; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.jdbc.core.JdbcOperations; +import org.springframework.jdbc.core.RowMapper; + +/** + * F1-5 AdminController 单测(mock JdbcTemplate,不连库)。 + * + *

覆盖:用户分页(有/无关键字)、角色成员、菜单全量树、数据权限规则分页。 + * 响应格式统一校验 amis crud 约定 {status:0, data:{items, total}}。 + */ +@SuppressWarnings({"unchecked", "rawtypes"}) +class AdminControllerTest { + + // ---------------------------------------------------------------- 用户查询 + + @Test + @DisplayName("1. 用户分页无关键字 → status=0, items+total 正常") + void usersNoKeyword() { + JdbcOperations jdbc = mock(JdbcOperations.class); + List> fakeRows = List.of(fakeUser("u001", "admin", "管理员", "IT部", 1)); + // queryForList(sql, perPage, offset) → 无关键字版本 2 个参数 + when(jdbc.queryForList(anyString(), eq(20), eq(0))).thenReturn(fakeRows); + when(jdbc.queryForObject(anyString(), eq(Integer.class))).thenReturn(1); + + AdminController c = new AdminController(jdbc); + Map resp = c.users(1, 20, null); + + assertEquals(0, resp.get("status")); + Map data = (Map) resp.get("data"); + assertNotNull(data); + assertEquals(1, ((List) data.get("items")).size()); + assertEquals(1, data.get("total")); + } + + @Test + @DisplayName("2. 用户分页有关键字 → status=0, 正常返回") + void usersWithKeyword() { + JdbcOperations jdbc = mock(JdbcOperations.class); + List> fakeRows = List.of(fakeUser("u002", "test", "测试员", "研发部", 1)); + // 有关键字版本:(sql, like, like, perPage, offset) 5 参数 + when(jdbc.queryForList(anyString(), eq("%测试%"), eq("%测试%"), eq(20), eq(0))).thenReturn(fakeRows); + when(jdbc.queryForObject(anyString(), eq(Integer.class), eq("%测试%"), eq("%测试%"))).thenReturn(1); + + AdminController c = new AdminController(jdbc); + Map resp = c.users(1, 20, "测试"); + + assertEquals(0, resp.get("status")); + Map data = (Map) resp.get("data"); + assertEquals(1, ((List) data.get("items")).size()); + } + + @Test + @DisplayName("3. perPage 超上限 200 → 截断为 200") + void usersPerPageCap() { + JdbcOperations jdbc = mock(JdbcOperations.class); + // perPage=200(截断后),offset=0 + when(jdbc.queryForList(anyString(), eq(200), eq(0))).thenReturn(List.of()); + when(jdbc.queryForObject(anyString(), eq(Integer.class))).thenReturn(0); + + AdminController c = new AdminController(jdbc); + Map resp = c.users(1, 9999, null); + + assertEquals(0, resp.get("status")); + } + + // ---------------------------------------------------------------- 角色成员 + + @Test + @DisplayName("4. 角色成员列表 → status=0, items+total 正常") + void roleUsers() { + JdbcOperations jdbc = mock(JdbcOperations.class); + List> fakeRows = List.of( + Map.of("id", "u001", "account", "admin", "userName", "管理员", "state", 1)); + when(jdbc.queryForList(anyString(), eq("role-001"))).thenReturn(fakeRows); + + AdminController c = new AdminController(jdbc); + Map resp = c.roleUsers("role-001"); + + assertEquals(0, resp.get("status")); + Map data = (Map) resp.get("data"); + assertEquals(1, data.get("total")); + assertEquals(1, ((List) data.get("items")).size()); + } + + @Test + @DisplayName("5. 角色无成员 → total=0, items=[]") + void roleUsersEmpty() { + JdbcOperations jdbc = mock(JdbcOperations.class); + when(jdbc.queryForList(anyString(), eq("empty-role"))).thenReturn(List.of()); + + AdminController c = new AdminController(jdbc); + Map resp = c.roleUsers("empty-role"); + + assertEquals(0, resp.get("status")); + Map data = (Map) resp.get("data"); + assertEquals(0, data.get("total")); + } + + // ---------------------------------------------------------------- 菜单全量树 + + @Test + @DisplayName("6. 菜单全量树 → roots 非空、children 嵌套正常") + void menuAll() { + JdbcOperations jdbc = mock(JdbcOperations.class); + // mock roots 查询 + List> fakeRoots = List.of(rootNode("ROOT1", "审批", 1)); + // mock menus 查询:一个目录(parentid 为空)+ 一个叶子(parentid = 目录 id) + List> fakeMenus = List.of( + menuNode("M001", "人事类", null, "ROOT1", null, "目录", 1), + menuNode("M002", "入职申请", "M001", "ROOT1", "tpl-001", "页面", 2)); + + // 第一次 query 调用返回 roots,第二次返回 menus + when(jdbc.query(anyString(), any(RowMapper.class))) + .thenReturn((List) fakeRoots) + .thenReturn((List) fakeMenus); + + AdminController c = new AdminController(jdbc); + Map resp = c.menuAll(); + + assertEquals(0, resp.get("status")); + List> roots = (List>) resp.get("roots"); + assertEquals(1, roots.size()); + List> children = (List>) roots.get(0).get("children"); + assertNotNull(children); + assertTrue(children.size() >= 1); + } + + @Test + @DisplayName("7. 无根节点 → roots=[]") + void menuAllEmpty() { + JdbcOperations jdbc = mock(JdbcOperations.class); + when(jdbc.query(anyString(), any(RowMapper.class))) + .thenReturn((List) List.of()) + .thenReturn((List) List.of()); + + AdminController c = new AdminController(jdbc); + Map resp = c.menuAll(); + + assertEquals(0, resp.get("status")); + List roots = (List) resp.get("roots"); + assertTrue(roots.isEmpty()); + } + + // ---------------------------------------------------------------- 数据权限规则 + + @Test + @DisplayName("8. 数据权限规则无过滤 → status=0, items+total 正常") + void filterRulesNoFilter() { + JdbcOperations jdbc = mock(JdbcOperations.class); + List> fakeRows = List.of(fakeRule("fr001", "用户", "SYS_USER", "[]", "角色A")); + when(jdbc.queryForList(anyString(), eq(20), eq(0))).thenReturn(fakeRows); + when(jdbc.queryForObject(anyString(), eq(Integer.class))).thenReturn(1); + + AdminController c = new AdminController(jdbc); + Map resp = c.filterRules(1, 20, null); + + assertEquals(0, resp.get("status")); + Map data = (Map) resp.get("data"); + assertEquals(1, data.get("total")); + } + + @Test + @DisplayName("9. 数据权限规则有实体名过滤 → status=0, 正常返回") + void filterRulesWithFilter() { + JdbcOperations jdbc = mock(JdbcOperations.class); + List> fakeRows = List.of(fakeRule("fr002", "用户", "SYS_USER", "[]", "")); + when(jdbc.queryForList(anyString(), eq("%用户%"), eq(20), eq(0))).thenReturn(fakeRows); + when(jdbc.queryForObject(anyString(), eq(Integer.class), eq("%用户%"))).thenReturn(1); + + AdminController c = new AdminController(jdbc); + Map resp = c.filterRules(1, 20, "用户"); + + assertEquals(0, resp.get("status")); + Map data = (Map) resp.get("data"); + assertEquals(1, ((List) data.get("items")).size()); + } + + // ---------------------------------------------------------------- 测试数据构建 + + private Map fakeUser(String id, String account, String name, String departName, int state) { + Map m = new LinkedHashMap<>(); + m.put("id", id); + m.put("account", account); + m.put("name", name); + m.put("departName", departName); + m.put("state", state); + return m; + } + + private Map fakeRule(String id, String entityName, String tableName, String filterRule, String roles) { + Map m = new LinkedHashMap<>(); + m.put("id", id); + m.put("entityName", entityName); + m.put("tableName", tableName); + m.put("filterRule", filterRule); + m.put("roles", roles); + return m; + } + + private Map rootNode(String id, String name, int seq) { + Map m = new LinkedHashMap<>(); + m.put("id", id); + m.put("name", name); + m.put("seq", seq); + return m; + } + + private Map menuNode(String id, String name, String parentid, String menuroot, + String templateId, String typename, int seq) { + Map m = new LinkedHashMap<>(); + m.put("id", id); + m.put("name", name); + m.put("parentid", parentid); + m.put("menuroot", menuroot); + m.put("templateId", templateId); + m.put("typename", typename); + m.put("seq", seq); + return m; + } +}