RBAC 管理后台对齐老系统:用户/角色/部门/菜单/数据权限 增删改 + amis 管理页(A1–A5)
A1 SYS_MENU CRUD(软删+清role_menu+有子拒删)+menuAll isGroup+sys-admin-menu crud树
A2 用户 reset-password(MD5 110)+sys-admin-user 新建/编辑/停用/重置按钮
A3 SYS_ROLE CRUD(删清三关联表+evictAll)+sys-admin-role 新建/编辑/删除
A4 SYS_DEPART CRUD(有子拒删)+departs/tree 读端点+新页 sys-admin-depart
A5 sys_filterrule CRUD+set-roles+filterrules/{id}/roles+sys-admin-filterrule 授权UI
AdminWriteControllerTest 35测 + AdminUserControllerTest 3测;全部 API e2e 对真实库 + 浏览器验收
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
13
docs/sql/A1_sys_admin_menu_manage_upsert.sql
Normal file
13
docs/sql/A1_sys_admin_menu_manage_upsert.sql
Normal file
@@ -0,0 +1,13 @@
|
||||
-- ============================================================================
|
||||
-- A1 菜单管理页 schema upsert(幂等)—— 升级 sys-admin-menu 为可管理(增删改)
|
||||
-- 依赖后端 AdminWriteController /api/admin/menus/{create,update,delete} + AdminController menu-all(isGroup)
|
||||
-- 应用:psql -h localhost -p 5433 -U zhengwr -d eip4dev(schema eip3 在 url)
|
||||
-- ============================================================================
|
||||
INSERT INTO sys_page_schema (template_id, name, schema_json, schema_etag, version, update_time)
|
||||
VALUES ('sys-admin-menu', '菜单管理', '{"type":"page","title":"菜单管理","body":[{"type":"crud","name":"menuCrud","syncLocation":false,"api":{"method":"get","url":"/api/admin/menu-all","adaptor":"return {status:0,data:{items:payload.roots||[]}};"},"childrenColumnName":"children","headerToolbar":[{"type":"button","label":"新增菜单","level":"primary","icon":"fa fa-plus","actionType":"dialog","dialog":{"title":"新增菜单","body":{"type":"form","api":"post:/api/admin/menus/create","reload":"menuCrud","body":[{"type":"select","name":"menuroot","label":"所属分组","required":true,"source":{"method":"get","url":"/api/admin/menu-all","adaptor":"return {status:0,data:{options:(payload.roots||[]).map(function(r){return {label:r.name,value:r.id};})}};"}},{"type":"input-text","name":"name","label":"菜单名称","required":true},{"type":"input-text","name":"typename","label":"类型","placeholder":"如 目录/菜单"},{"type":"input-text","name":"viewTemplateId","label":"模板ID","placeholder":"指向页面 templateId,目录可空"},{"type":"input-number","name":"seq","label":"排序号","value":0}]}}},{"type":"reload","label":"刷新"}],"footerToolbar":[],"columns":[{"name":"name","label":"菜单名"},{"name":"typename","label":"类型"},{"name":"templateId","label":"模板ID","type":"tpl","tpl":"<span class=\"text-muted\">${templateId|default:-}</span>"},{"name":"seq","label":"排序"},{"type":"operation","label":"操作","width":240,"buttons":[{"type":"button","label":"加子菜单","level":"link","visibleOn":"${!isGroup}","actionType":"dialog","dialog":{"title":"在「${name}」下新增子菜单","body":{"type":"form","api":"post:/api/admin/menus/create","reload":"menuCrud","body":[{"type":"hidden","name":"parentId","value":"${id}"},{"type":"input-text","name":"name","label":"菜单名称","required":true},{"type":"input-text","name":"typename","label":"类型"},{"type":"input-text","name":"viewTemplateId","label":"模板ID"},{"type":"input-number","name":"seq","label":"排序号","value":0}]}}},{"type":"button","label":"编辑","level":"link","visibleOn":"${!isGroup}","actionType":"dialog","dialog":{"title":"编辑菜单「${name}」","body":{"type":"form","api":"post:/api/admin/menus/${id}/update","reload":"menuCrud","body":[{"type":"input-text","name":"name","label":"菜单名称","required":true,"value":"${name}"},{"type":"input-text","name":"typename","label":"类型","value":"${typename}"},{"type":"input-text","name":"viewTemplateId","label":"模板ID","value":"${templateId}"},{"type":"input-number","name":"seq","label":"排序号","value":"${seq}"}]}}},{"type":"button","label":"删除","level":"link","className":"text-danger","visibleOn":"${!isGroup}","actionType":"ajax","confirmText":"确认删除菜单「${name}」?有子菜单时会被拒绝。","api":"post:/api/admin/menus/${id}/delete","reload":"menuCrud"}]}]}]}'::jsonb, '3d65184270fcf65b71189fb0a4ba2e96624c71d1e90a7bc9527a0a685e064c12', 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;
|
||||
10
docs/sql/A2-A4_sys_admin_upsert.sql
Normal file
10
docs/sql/A2-A4_sys_admin_upsert.sql
Normal file
@@ -0,0 +1,10 @@
|
||||
-- A2/A3/A4 sys-admin 管理页 schema upsert(幂等)
|
||||
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","name":"userCrud","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":"button","label":"新建用户","level":"primary","icon":"fa fa-plus","actionType":"dialog","dialog":{"title":"新建用户","body":{"type":"form","api":"post:/api/admin/users/create","reload":"userCrud","body":[{"type":"input-text","name":"account","label":"账号","required":true},{"type":"input-text","name":"name","label":"姓名","required":true},{"type":"input-text","name":"userorgid","label":"所属部门ID","placeholder":"可空,部门主键"},{"type":"alert","level":"info","body":"初始密码为 110,可在列表「重置密码」恢复。角色通过「权限分配」页按用户组授予。"}]}}},{"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":"账号"},{"name":"name","label":"姓名"},{"name":"departName","label":"部门"},{"name":"state","label":"激活状态","type":"mapping","map":{"1":"<span class=\"label label-success\">激活</span>","2":"<span class=\"label label-warning\">停用</span>","3":"<span class=\"label label-default\">未激活</span>","*":"<span class=\"label label-default\">未知</span>"}},{"type":"operation","label":"操作","width":290,"buttons":[{"type":"button","label":"编辑","level":"link","actionType":"dialog","dialog":{"title":"编辑用户「${name}」","body":{"type":"form","api":"post:/api/admin/users/${id}/update","reload":"userCrud","body":[{"type":"static","name":"account","label":"账号"},{"type":"input-text","name":"name","label":"姓名","required":true,"value":"${name}"}]}}},{"type":"button","label":"停用","level":"link","className":"text-warning","visibleOn":"${state == 1}","actionType":"ajax","confirmText":"确认停用用户「${name}」?","api":{"method":"post","url":"/api/admin/users/${id}/toggle-state","data":{"state":2}},"reload":"userCrud"},{"type":"button","label":"启用","level":"link","className":"text-success","visibleOn":"${state != 1}","actionType":"ajax","confirmText":"确认启用用户「${name}」?","api":{"method":"post","url":"/api/admin/users/${id}/toggle-state","data":{"state":1}},"reload":"userCrud"},{"type":"button","label":"重置密码","level":"link","className":"text-danger","actionType":"ajax","confirmText":"确认将「${name}」密码重置为初始密码(110)?","api":"post:/api/admin/users/${id}/reset-password","reload":"userCrud"}]}]}]}'::jsonb, 'f351ba9ccab80bc1a9cf3ca5cc876b5f2c3930f29d021baa85982c65af84b523', 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;
|
||||
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","name":"roleCrud","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":"button","label":"新建角色","level":"primary","icon":"fa fa-plus","actionType":"dialog","dialog":{"title":"新建角色","body":{"type":"form","api":"post:/api/admin/roles/create","reload":"roleCrud","body":[{"type":"input-text","name":"name","label":"角色名称","required":true},{"type":"textarea","name":"description","label":"描述"},{"type":"select","name":"roletype","label":"角色类型","value":1,"options":[{"label":"功能角色","value":1},{"label":"数据角色","value":2}]}]}}},{"type":"tpl","tpl":"共 ${total} 条角色","className":"v-middle"}],"footerToolbar":["statistics","pagination"],"perPage":20,"columns":[{"name":"name","label":"角色名称"},{"name":"description","label":"描述"},{"name":"roleType","label":"类型","type":"mapping","map":{"1":"功能角色","2":"数据角色","*":"其他"}},{"type":"operation","label":"操作","width":260,"buttons":[{"type":"button","label":"编辑","level":"link","actionType":"dialog","dialog":{"title":"编辑角色「${name}」","body":{"type":"form","api":"post:/api/admin/roles/${id}/update","reload":"roleCrud","body":[{"type":"input-text","name":"name","label":"角色名称","required":true,"value":"${name}"},{"type":"textarea","name":"description","label":"描述","value":"${description}"},{"type":"select","name":"roletype","label":"角色类型","value":"${roleType}","options":[{"label":"功能角色","value":1},{"label":"数据角色","value":2}]}]}}},{"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"}]}},{"type":"button","label":"删除","level":"link","className":"text-danger","actionType":"ajax","confirmText":"确认删除角色「${name}」?将一并清除其菜单权限与用户组关联。","api":"post:/api/admin/roles/${id}/delete","reload":"roleCrud"}]}]}]}'::jsonb, '1a7b151ef4b28444fc0d15d1a1003a763b77864d807cd701721c7bccc11ad87c', 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;
|
||||
INSERT INTO sys_page_schema (template_id, name, schema_json, schema_etag, version, update_time)
|
||||
VALUES ('sys-admin-depart', '部门管理', '{"type":"page","title":"部门管理","body":[{"type":"crud","name":"deptCrud","syncLocation":false,"api":{"method":"get","url":"/api/admin/departs/tree","adaptor":"return {status:0,data:{items:payload.items||[]}};"},"childrenColumnName":"children","headerToolbar":[{"type":"button","label":"新建顶级部门","level":"primary","icon":"fa fa-plus","actionType":"dialog","dialog":{"title":"新建顶级部门","body":{"type":"form","api":"post:/api/admin/departs/create","reload":"deptCrud","body":[{"type":"input-text","name":"name","label":"部门名称","required":true},{"type":"input-text","name":"leader","label":"负责人"},{"type":"textarea","name":"description","label":"描述"},{"type":"input-number","name":"seq","label":"排序号","value":0}]}}},{"type":"reload","label":"刷新"}],"footerToolbar":[],"columns":[{"name":"name","label":"部门名"},{"name":"leader","label":"负责人"},{"name":"seq","label":"排序"},{"type":"operation","label":"操作","width":240,"buttons":[{"type":"button","label":"加子部门","level":"link","actionType":"dialog","dialog":{"title":"在「${name}」下新增子部门","body":{"type":"form","api":"post:/api/admin/departs/create","reload":"deptCrud","body":[{"type":"hidden","name":"parentId","value":"${id}"},{"type":"input-text","name":"name","label":"部门名称","required":true},{"type":"input-text","name":"leader","label":"负责人"},{"type":"input-number","name":"seq","label":"排序号","value":0}]}}},{"type":"button","label":"编辑","level":"link","actionType":"dialog","dialog":{"title":"编辑部门「${name}」","body":{"type":"form","api":"post:/api/admin/departs/${id}/update","reload":"deptCrud","body":[{"type":"input-text","name":"name","label":"部门名称","required":true,"value":"${name}"},{"type":"input-text","name":"leader","label":"负责人","value":"${leader}"},{"type":"input-number","name":"seq","label":"排序号","value":"${seq}"}]}}},{"type":"button","label":"删除","level":"link","className":"text-danger","actionType":"ajax","confirmText":"确认删除部门「${name}」?有子部门时会被拒绝。","api":"post:/api/admin/departs/${id}/delete","reload":"deptCrud"}]}]}]}'::jsonb, '16ae6c51f5889b0cfa058b0f30311a3bd5688e79ee539c1b2522cc381d3f020c', 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;
|
||||
4
docs/sql/A5_sys_admin_filterrule_upsert.sql
Normal file
4
docs/sql/A5_sys_admin_filterrule_upsert.sql
Normal file
@@ -0,0 +1,4 @@
|
||||
-- A5 数据权限规则管理页 schema upsert(幂等)
|
||||
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","name":"ruleCrud","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":"button","label":"新建规则","level":"primary","icon":"fa fa-plus","actionType":"dialog","dialog":{"title":"新建数据权限规则","body":{"type":"form","api":"post:/api/admin/filterrules/create","reload":"ruleCrud","body":[{"type":"input-text","name":"entityid","label":"实体ID","required":true,"placeholder":"SYS_ENTITY 主键"},{"type":"textarea","name":"filterrule","label":"规则(WHERE子句)","required":true,"minRows":3,"placeholder":"如 DEPTID = :currentDept"},{"type":"select","name":"roleIds","label":"关联角色","multiple":true,"joinValues":false,"extractValue":true,"source":{"method":"get","url":"/api/org/roles","adaptor":"var d=payload.data||{};return {status:0,data:{options:(d.items||[]).map(function(r){return {label:r.name,value:r.id};})}};"}}]}}},{"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":"实体名","width":150},{"name":"tableName","label":"表名","width":170},{"name":"roles","label":"关联角色","width":180,"type":"tpl","tpl":"<span title=\"${roles}\">${roles|truncate:50}</span>"},{"name":"filterRule","label":"规则内容","type":"tpl","tpl":"<pre style=\"font-size:0.8em;max-height:70px;overflow:auto;white-space:pre-wrap;word-break:break-all\">${filterRule}</pre>"},{"type":"operation","label":"操作","width":220,"buttons":[{"type":"button","label":"编辑","level":"link","actionType":"dialog","dialog":{"title":"编辑规则(${entityName})","body":{"type":"form","api":"post:/api/admin/filterrules/${id}/update","reload":"ruleCrud","body":[{"type":"static","name":"entityName","label":"实体名"},{"type":"textarea","name":"filterrule","label":"规则(WHERE子句)","required":true,"minRows":3,"value":"${filterRule}"}]}}},{"type":"button","label":"配置角色","level":"link","actionType":"dialog","dialog":{"title":"配置规则角色(${entityName})","body":{"type":"form","initApi":{"method":"get","url":"/api/admin/filterrules/${id}/roles","adaptor":"return {status:0,data:{roleIds:payload.roleIds||[]}};"},"api":"post:/api/admin/filterrules/${id}/set-roles","reload":"ruleCrud","body":[{"type":"select","name":"roleIds","label":"关联角色","multiple":true,"joinValues":false,"extractValue":true,"source":{"method":"get","url":"/api/org/roles","adaptor":"var d=payload.data||{};return {status:0,data:{options:(d.items||[]).map(function(r){return {label:r.name,value:r.id};})}};"}}]}}},{"type":"button","label":"删除","level":"link","className":"text-danger","actionType":"ajax","confirmText":"确认删除该数据权限规则?","api":"post:/api/admin/filterrules/${id}/delete","reload":"ruleCrud"}]}]}]}'::jsonb, '18d58a4fd3c0b981bf7e397348c23ad0c47c3c865b671e9c366ae0cb4d152911', 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;
|
||||
@@ -157,6 +157,29 @@ public class AdminUserController {
|
||||
return ResponseEntity.ok(ok("用户" + action + "成功"));
|
||||
}
|
||||
|
||||
/**
|
||||
* 管理员重置用户密码为系统初始密码(MD5("110"))。
|
||||
*
|
||||
* <p>密码列不下发;仅管理员可调。用于用户遗忘密码后的运维重置。
|
||||
*
|
||||
* @param id SYS_USER.SYS_USER_ID
|
||||
*/
|
||||
@PostMapping("/users/{id}/reset-password")
|
||||
public ResponseEntity<Map<String, Object>> resetPassword(@PathVariable String id) {
|
||||
requireAdmin();
|
||||
long now = System.currentTimeMillis();
|
||||
String operator = currentUserId();
|
||||
int rows = jdbcTemplate.update(
|
||||
"UPDATE sys_user SET password=?, updatetime=?, updateby=?, version=version+1"
|
||||
+ " WHERE TRIM(sys_user_id)=? AND isactive=1",
|
||||
DEFAULT_PASSWORD, now, operator, id.trim());
|
||||
if (rows == 0) {
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(fail("用户不存在或已停用: " + id));
|
||||
}
|
||||
log.info("[A2][重置密码] operator={} userId={}", operator, id.trim());
|
||||
return ResponseEntity.ok(ok("密码已重置为初始密码(110)"));
|
||||
}
|
||||
|
||||
// ================================================================ 内部工具
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,96 @@
|
||||
package com.eip4.platform.auth.security;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.contains;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.mockStatic;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Properties;
|
||||
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.MockedStatic;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.web.server.ResponseStatusException;
|
||||
|
||||
import com.dsasp.server.common.user.service.LoggedInUser;
|
||||
import com.dsasp.server.common.util.UserSession;
|
||||
|
||||
/**
|
||||
* A2 AdminUserController 单测(mock JdbcTemplate + UserSession,不连库)。
|
||||
*
|
||||
* <p>本轮新增覆盖管理员重置密码端点:正例(重置为初始密码)、404、403。
|
||||
*/
|
||||
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||
class AdminUserControllerTest {
|
||||
|
||||
private JdbcTemplate jdbc;
|
||||
private AdminUserController controller;
|
||||
private MockedStatic<UserSession> userSessionMock;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
jdbc = mock(JdbcTemplate.class);
|
||||
controller = new AdminUserController(jdbc);
|
||||
userSessionMock = mockStatic(UserSession.class);
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
void tearDown() {
|
||||
userSessionMock.close();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("1. 管理员重置密码 → status=0,写 password 列")
|
||||
void resetPassword_ok() {
|
||||
mockAdmin();
|
||||
when(jdbc.update(contains("SET password"), any(), any(), any(), anyString())).thenReturn(1);
|
||||
ResponseEntity<Map<String, Object>> resp = controller.resetPassword("uid-1");
|
||||
assertEquals(HttpStatus.OK, resp.getStatusCode());
|
||||
assertEquals(0, resp.getBody().get("status"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("2. 重置密码用户不存在 → 404")
|
||||
void resetPassword_notFound_404() {
|
||||
mockAdmin();
|
||||
when(jdbc.update(contains("SET password"), any(), any(), any(), anyString())).thenReturn(0);
|
||||
ResponseEntity<Map<String, Object>> resp = controller.resetPassword("no-such");
|
||||
assertEquals(HttpStatus.NOT_FOUND, resp.getStatusCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("3. 非管理员重置密码 → 403")
|
||||
void resetPassword_nonAdmin_403() {
|
||||
mockNonAdmin();
|
||||
ResponseStatusException ex = assertThrows(ResponseStatusException.class,
|
||||
() -> controller.resetPassword("uid-1"));
|
||||
assertEquals(HttpStatus.FORBIDDEN, ex.getStatusCode());
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 工具
|
||||
|
||||
private void mockAdmin() {
|
||||
Properties ctx = new Properties();
|
||||
ctx.setProperty(LoggedInUser.CURRENTUSER, "ADMIN");
|
||||
userSessionMock.when(UserSession::get).thenReturn(ctx);
|
||||
}
|
||||
|
||||
private void mockNonAdmin() {
|
||||
Properties ctx = new Properties();
|
||||
ctx.setProperty(LoggedInUser.CURRENTUSER, "normal-user-id");
|
||||
userSessionMock.when(UserSession::get).thenReturn(ctx);
|
||||
when(jdbc.queryForObject(contains("account"), eq(Integer.class), anyString()))
|
||||
.thenReturn(0);
|
||||
}
|
||||
}
|
||||
@@ -190,6 +190,7 @@ public class AdminController {
|
||||
List<Map<String, Object>> children = buildMenuChildren(menus, rootId, null);
|
||||
Map<String, Object> rootNode = new LinkedHashMap<>(root);
|
||||
rootNode.put("children", children);
|
||||
rootNode.put("isGroup", true); // A1:根分组行(sys_menu_root,非 sys_menu)→ 前端隐藏编辑/删除
|
||||
result.add(rootNode);
|
||||
}
|
||||
|
||||
@@ -235,6 +236,69 @@ public class AdminController {
|
||||
return children;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 部门树(A4 管理视角)
|
||||
|
||||
/**
|
||||
* 全部门递归树(管理视角):返回 {@code {status,items:[{id,name,leader,seq,children:[...]}]}}。
|
||||
*
|
||||
* <p>按 parentid 链父子(顶层 = parentid 为空),供 A4 部门管理页 crud 树表消费。
|
||||
* 与 {@code /api/org/depart-tree/{orgId}/amis-tree}({label,value} 选择器格式)区别:
|
||||
* 本端点保留 leader/seq 管理字段、无需先选 org。
|
||||
*/
|
||||
@Operation(summary = "全部门递归树(管理视角,含 leader/seq)")
|
||||
@GetMapping("/api/admin/departs/tree")
|
||||
public Map<String, Object> departTree() {
|
||||
List<Map<String, Object>> all = jdbcTemplate.query(
|
||||
"SELECT TRIM(sys_depart_id) AS id, TRIM(name) AS name, TRIM(parentid) AS parentid,"
|
||||
+ " TRIM(leader) AS leader, seq FROM sys_depart WHERE isactive=1 ORDER BY seq",
|
||||
(rs, i) -> {
|
||||
Map<String, Object> m = new LinkedHashMap<>();
|
||||
m.put("id", rs.getString("id"));
|
||||
m.put("name", rs.getString("name"));
|
||||
m.put("parentid", rs.getString("parentid"));
|
||||
m.put("leader", rs.getString("leader"));
|
||||
m.put("seq", rs.getObject("seq"));
|
||||
return m;
|
||||
});
|
||||
Map<String, Object> resp = new LinkedHashMap<>();
|
||||
resp.put("status", 0);
|
||||
resp.put("msg", "");
|
||||
resp.put("items", buildDepartChildren(all, null));
|
||||
return resp;
|
||||
}
|
||||
|
||||
private List<Map<String, Object>> buildDepartChildren(List<Map<String, Object>> all, String parentId) {
|
||||
List<Map<String, Object>> children = new ArrayList<>();
|
||||
for (Map<String, Object> m : all) {
|
||||
String p = (String) m.get("parentid");
|
||||
boolean match = (parentId == null || parentId.isBlank())
|
||||
? (p == null || p.isBlank())
|
||||
: parentId.equals(p);
|
||||
if (match) {
|
||||
Map<String, Object> node = new LinkedHashMap<>(m);
|
||||
node.put("children", buildDepartChildren(all, (String) m.get("id")));
|
||||
children.add(node);
|
||||
}
|
||||
}
|
||||
return children;
|
||||
}
|
||||
|
||||
/**
|
||||
* 取某条数据权限规则当前绑定的角色 ID 列表(A5 角色配置回填)。
|
||||
*/
|
||||
@Operation(summary = "规则当前绑定的角色 ID 列表")
|
||||
@GetMapping("/api/admin/filterrules/{id}/roles")
|
||||
public Map<String, Object> filterRuleRoles(@PathVariable String id) {
|
||||
List<String> roleIds = jdbcTemplate.queryForList(
|
||||
"SELECT TRIM(roleid) FROM sys_filterrulerole WHERE TRIM(filterruleid)=?",
|
||||
String.class, id.trim());
|
||||
Map<String, Object> resp = new LinkedHashMap<>();
|
||||
resp.put("status", 0);
|
||||
resp.put("msg", "");
|
||||
resp.put("roleIds", roleIds);
|
||||
return resp;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 数据权限规则
|
||||
|
||||
/**
|
||||
|
||||
@@ -301,8 +301,364 @@ public class AdminWriteController {
|
||||
return ResponseEntity.ok(ok("角色菜单保存成功", data));
|
||||
}
|
||||
|
||||
// ================================================================ 菜单 CRUD(A1)
|
||||
|
||||
/**
|
||||
* 新建菜单。
|
||||
*
|
||||
* @param body {@code {name*, parentId?, viewTemplateId?, typename?, menuroot?, seq?}}
|
||||
*/
|
||||
@Operation(summary = "新建菜单", description = "仅系统管理员可调;挂在 parentId 下(顶级则空)")
|
||||
@PostMapping("/menus/create")
|
||||
public ResponseEntity<Map<String, Object>> createMenu(@RequestBody Map<String, Object> body) {
|
||||
requireAdmin();
|
||||
String name = requireString(body, "name", "菜单名称不能为空");
|
||||
String newId = UUID.randomUUID().toString();
|
||||
long now = System.currentTimeMillis();
|
||||
String operator = currentUserId();
|
||||
jdbcTemplate.update(
|
||||
"INSERT INTO sys_menu(sys_menu_id, name, parentid, view_templateid, typename, menuroot, seq,"
|
||||
+ " isactive, version, createtime, createby, updatetime, updateby)"
|
||||
+ " VALUES(?,?,?,?,?,?,?,1,0,?,?,?,?)",
|
||||
newId, name.trim(),
|
||||
trimOrNull(body.get("parentId")),
|
||||
trimOrNull(body.get("viewTemplateId")),
|
||||
trimOrNull(body.get("typename")),
|
||||
trimOrNull(body.get("menuroot")),
|
||||
toInt(body.get("seq"), 0),
|
||||
now, operator, now, operator);
|
||||
log.info("[A1][菜单新建] operator={} menuId={} name={} parentId={}",
|
||||
operator, newId, name.trim(), trimOrNull(body.get("parentId")));
|
||||
return ResponseEntity.ok(okWithId("菜单新建成功", newId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑菜单(名称/上级/模板/类型/排序)。
|
||||
*
|
||||
* @param id SYS_MENU.SYS_MENU_ID
|
||||
* @param body {@code {name*, parentId?, viewTemplateId?, typename?, seq?}}
|
||||
*/
|
||||
@Operation(summary = "编辑菜单(名称/模板/类型/排序,不改父子层级)", description = "仅系统管理员可调")
|
||||
@PostMapping("/menus/{id}/update")
|
||||
public ResponseEntity<Map<String, Object>> updateMenu(
|
||||
@PathVariable String id, @RequestBody Map<String, Object> body) {
|
||||
requireAdmin();
|
||||
String name = requireString(body, "name", "菜单名称不能为空");
|
||||
long now = System.currentTimeMillis();
|
||||
String operator = currentUserId();
|
||||
// 不更新 parentid/menuroot:编辑表单不带这些字段时不应把菜单误移到顶层。
|
||||
// 改变父子层级属“移动”操作,留作单独端点。
|
||||
int rows = jdbcTemplate.update(
|
||||
"UPDATE sys_menu SET name=?, view_templateid=?, typename=?, seq=?,"
|
||||
+ " updatetime=?, updateby=?, version=version+1"
|
||||
+ " WHERE TRIM(sys_menu_id)=? AND isactive=1",
|
||||
name.trim(),
|
||||
trimOrNull(body.get("viewTemplateId")),
|
||||
trimOrNull(body.get("typename")),
|
||||
toInt(body.get("seq"), 0),
|
||||
now, operator, id.trim());
|
||||
if (rows == 0) {
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(fail("菜单不存在: " + id));
|
||||
}
|
||||
log.info("[A1][菜单编辑] operator={} menuId={} name={}", operator, id.trim(), name.trim());
|
||||
return ResponseEntity.ok(ok("菜单更新成功"));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除菜单(软删 isactive=0,级联清 sys_role_menu)。
|
||||
*
|
||||
* <p>有未删子菜单时拒绝(防孤儿节点)——须先删子级。
|
||||
*
|
||||
* @param id SYS_MENU.SYS_MENU_ID
|
||||
*/
|
||||
@Operation(summary = "删除菜单(软删+清角色授权)",
|
||||
description = "仅系统管理员可调;有子菜单时拒绝,须先删子级")
|
||||
@PostMapping("/menus/{id}/delete")
|
||||
@Transactional
|
||||
public ResponseEntity<Map<String, Object>> deleteMenu(@PathVariable String id) {
|
||||
requireAdmin();
|
||||
String mid = id.trim();
|
||||
Integer childCount = jdbcTemplate.queryForObject(
|
||||
"SELECT COUNT(*) FROM sys_menu WHERE TRIM(parentid)=? AND isactive=1",
|
||||
Integer.class, mid);
|
||||
if (childCount != null && childCount > 0) {
|
||||
return badRequest("该菜单下还有 " + childCount + " 个子菜单,请先删除子菜单");
|
||||
}
|
||||
// 清角色授权(否则软删菜单仍残留在 sys_role_menu)
|
||||
jdbcTemplate.update("DELETE FROM sys_role_menu WHERE TRIM(menuid)=?", mid);
|
||||
long now = System.currentTimeMillis();
|
||||
String operator = currentUserId();
|
||||
int rows = jdbcTemplate.update(
|
||||
"UPDATE sys_menu SET isactive=0, updatetime=?, updateby=? WHERE TRIM(sys_menu_id)=?",
|
||||
now, operator, mid);
|
||||
if (rows == 0) {
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(fail("菜单不存在: " + id));
|
||||
}
|
||||
log.info("[A1][菜单删除] operator={} menuId={}", operator, mid);
|
||||
return ResponseEntity.ok(ok("菜单删除成功"));
|
||||
}
|
||||
|
||||
// ================================================================ 角色 CRUD(A3)
|
||||
|
||||
@Operation(summary = "新建角色", description = "仅系统管理员可调;roletype 1=功能 2=数据")
|
||||
@PostMapping("/roles/create")
|
||||
public ResponseEntity<Map<String, Object>> createRole(@RequestBody Map<String, Object> body) {
|
||||
requireAdmin();
|
||||
String name = requireString(body, "name", "角色名称不能为空");
|
||||
String newId = UUID.randomUUID().toString();
|
||||
long now = System.currentTimeMillis();
|
||||
String operator = currentUserId();
|
||||
jdbcTemplate.update(
|
||||
"INSERT INTO sys_role(sys_role_id, name, description, roletype, isactive, version,"
|
||||
+ " createtime, createby, updatetime, updateby) VALUES(?,?,?,?,1,0,?,?,?,?)",
|
||||
newId, name.trim(), trimOrNull(body.get("description")),
|
||||
toInt(body.get("roletype"), 1), now, operator, now, operator);
|
||||
log.info("[A3][角色新建] operator={} roleId={} name={}", operator, newId, name.trim());
|
||||
return ResponseEntity.ok(okWithId("角色新建成功", newId));
|
||||
}
|
||||
|
||||
@Operation(summary = "编辑角色", description = "仅系统管理员可调")
|
||||
@PostMapping("/roles/{id}/update")
|
||||
public ResponseEntity<Map<String, Object>> updateRole(
|
||||
@PathVariable String id, @RequestBody Map<String, Object> body) {
|
||||
requireAdmin();
|
||||
String name = requireString(body, "name", "角色名称不能为空");
|
||||
long now = System.currentTimeMillis();
|
||||
String operator = currentUserId();
|
||||
int rows = jdbcTemplate.update(
|
||||
"UPDATE sys_role SET name=?, description=?, roletype=?, updatetime=?, updateby=?,"
|
||||
+ " version=version+1 WHERE TRIM(sys_role_id)=? AND isactive=1",
|
||||
name.trim(), trimOrNull(body.get("description")),
|
||||
toInt(body.get("roletype"), 1), now, operator, id.trim());
|
||||
if (rows == 0) {
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(fail("角色不存在: " + id));
|
||||
}
|
||||
log.info("[A3][角色编辑] operator={} roleId={} name={}", operator, id.trim(), name.trim());
|
||||
return ResponseEntity.ok(ok("角色更新成功"));
|
||||
}
|
||||
|
||||
@Operation(summary = "删除角色(软删+清菜单/用户组/数据权限关联)", description = "仅系统管理员可调")
|
||||
@PostMapping("/roles/{id}/delete")
|
||||
@Transactional
|
||||
public ResponseEntity<Map<String, Object>> deleteRole(@PathVariable String id) {
|
||||
requireAdmin();
|
||||
String rid = id.trim();
|
||||
jdbcTemplate.update("DELETE FROM sys_role_menu WHERE TRIM(roleid)=?", rid);
|
||||
jdbcTemplate.update("DELETE FROM sys_usergrouprole WHERE TRIM(roleid)=?", rid);
|
||||
jdbcTemplate.update("DELETE FROM sys_filterrulerole WHERE TRIM(roleid)=?", rid);
|
||||
long now = System.currentTimeMillis();
|
||||
String operator = currentUserId();
|
||||
int rows = jdbcTemplate.update(
|
||||
"UPDATE sys_role SET isactive=0, updatetime=?, updateby=? WHERE TRIM(sys_role_id)=?",
|
||||
now, operator, rid);
|
||||
if (rows == 0) {
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(fail("角色不存在: " + id));
|
||||
}
|
||||
roleResolver.evictAll();
|
||||
log.info("[A3][角色删除] operator={} roleId={}", operator, rid);
|
||||
return ResponseEntity.ok(ok("角色删除成功"));
|
||||
}
|
||||
|
||||
// ================================================================ 部门 CRUD(A4)
|
||||
|
||||
@Operation(summary = "新建部门", description = "仅系统管理员可调;挂在 parentId 下")
|
||||
@PostMapping("/departs/create")
|
||||
public ResponseEntity<Map<String, Object>> createDepart(@RequestBody Map<String, Object> body) {
|
||||
requireAdmin();
|
||||
String name = requireString(body, "name", "部门名称不能为空");
|
||||
String newId = UUID.randomUUID().toString();
|
||||
long now = System.currentTimeMillis();
|
||||
String operator = currentUserId();
|
||||
jdbcTemplate.update(
|
||||
"INSERT INTO sys_depart(sys_depart_id, name, parentid, parentorgid, leader, description,"
|
||||
+ " seq, isactive, version, createtime, createby, updatetime, updateby)"
|
||||
+ " VALUES(?,?,?,?,?,?,?,1,0,?,?,?,?)",
|
||||
newId, name.trim(),
|
||||
trimOrNull(body.get("parentId")),
|
||||
trimOrNull(body.get("parentOrgId")),
|
||||
trimOrNull(body.get("leader")),
|
||||
trimOrNull(body.get("description")),
|
||||
toInt(body.get("seq"), 0),
|
||||
now, operator, now, operator);
|
||||
log.info("[A4][部门新建] operator={} departId={} name={} parentId={}",
|
||||
operator, newId, name.trim(), trimOrNull(body.get("parentId")));
|
||||
return ResponseEntity.ok(okWithId("部门新建成功", newId));
|
||||
}
|
||||
|
||||
@Operation(summary = "编辑部门(名称/负责人/描述/排序,不改父子层级)", description = "仅系统管理员可调")
|
||||
@PostMapping("/departs/{id}/update")
|
||||
public ResponseEntity<Map<String, Object>> updateDepart(
|
||||
@PathVariable String id, @RequestBody Map<String, Object> body) {
|
||||
requireAdmin();
|
||||
String name = requireString(body, "name", "部门名称不能为空");
|
||||
long now = System.currentTimeMillis();
|
||||
String operator = currentUserId();
|
||||
int rows = jdbcTemplate.update(
|
||||
"UPDATE sys_depart SET name=?, leader=?, description=?, seq=?, updatetime=?, updateby=?,"
|
||||
+ " version=version+1 WHERE TRIM(sys_depart_id)=? AND isactive=1",
|
||||
name.trim(), trimOrNull(body.get("leader")), trimOrNull(body.get("description")),
|
||||
toInt(body.get("seq"), 0), now, operator, id.trim());
|
||||
if (rows == 0) {
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(fail("部门不存在: " + id));
|
||||
}
|
||||
log.info("[A4][部门编辑] operator={} departId={} name={}", operator, id.trim(), name.trim());
|
||||
return ResponseEntity.ok(ok("部门更新成功"));
|
||||
}
|
||||
|
||||
@Operation(summary = "删除部门(软删;有子部门时拒绝)", description = "仅系统管理员可调")
|
||||
@PostMapping("/departs/{id}/delete")
|
||||
@Transactional
|
||||
public ResponseEntity<Map<String, Object>> deleteDepart(@PathVariable String id) {
|
||||
requireAdmin();
|
||||
String did = id.trim();
|
||||
Integer childCount = jdbcTemplate.queryForObject(
|
||||
"SELECT COUNT(*) FROM sys_depart WHERE TRIM(parentid)=? AND isactive=1",
|
||||
Integer.class, did);
|
||||
if (childCount != null && childCount > 0) {
|
||||
return badRequest("该部门下还有 " + childCount + " 个子部门,请先删除子部门");
|
||||
}
|
||||
long now = System.currentTimeMillis();
|
||||
String operator = currentUserId();
|
||||
int rows = jdbcTemplate.update(
|
||||
"UPDATE sys_depart SET isactive=0, updatetime=?, updateby=? WHERE TRIM(sys_depart_id)=?",
|
||||
now, operator, did);
|
||||
if (rows == 0) {
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(fail("部门不存在: " + id));
|
||||
}
|
||||
log.info("[A4][部门删除] operator={} departId={}", operator, did);
|
||||
return ResponseEntity.ok(ok("部门删除成功"));
|
||||
}
|
||||
|
||||
// ================================================================ 数据权限规则 CRUD(A5)
|
||||
|
||||
@Operation(summary = "新建数据权限规则", description = "仅系统管理员可调;entityid=SYS_ENTITY 主键,filterrule=WHERE 子句")
|
||||
@PostMapping("/filterrules/create")
|
||||
@Transactional
|
||||
public ResponseEntity<Map<String, Object>> createFilterRule(@RequestBody Map<String, Object> body) {
|
||||
requireAdmin();
|
||||
String entityId = requireString(body, "entityid", "实体 ID 不能为空");
|
||||
String rule = requireString(body, "filterrule", "规则内容不能为空");
|
||||
String newId = UUID.randomUUID().toString();
|
||||
long now = System.currentTimeMillis();
|
||||
String operator = currentUserId();
|
||||
jdbcTemplate.update(
|
||||
"INSERT INTO sys_filterrule(sys_filterrule_id, entityid, filterrule, isactive, version,"
|
||||
+ " createtime, createby, updatetime, updateby) VALUES(?,?,?,1,0,?,?,?,?)",
|
||||
newId, entityId.trim(), rule.trim(), now, operator, now, operator);
|
||||
bindFilterRuleRoles(newId, body.get("roleIds"));
|
||||
log.info("[A5][规则新建] operator={} ruleId={} entityId={}", operator, newId, entityId.trim());
|
||||
return ResponseEntity.ok(okWithId("数据权限规则新建成功", newId));
|
||||
}
|
||||
|
||||
@Operation(summary = "编辑数据权限规则内容", description = "仅系统管理员可调")
|
||||
@PostMapping("/filterrules/{id}/update")
|
||||
public ResponseEntity<Map<String, Object>> updateFilterRule(
|
||||
@PathVariable String id, @RequestBody Map<String, Object> body) {
|
||||
requireAdmin();
|
||||
String rule = requireString(body, "filterrule", "规则内容不能为空");
|
||||
long now = System.currentTimeMillis();
|
||||
String operator = currentUserId();
|
||||
int rows = jdbcTemplate.update(
|
||||
"UPDATE sys_filterrule SET filterrule=?, updatetime=?, updateby=?, version=version+1"
|
||||
+ " WHERE TRIM(sys_filterrule_id)=? AND isactive=1",
|
||||
rule.trim(), now, operator, id.trim());
|
||||
if (rows == 0) {
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(fail("规则不存在: " + id));
|
||||
}
|
||||
log.info("[A5][规则编辑] operator={} ruleId={}", operator, id.trim());
|
||||
return ResponseEntity.ok(ok("规则更新成功"));
|
||||
}
|
||||
|
||||
@Operation(summary = "删除数据权限规则(软删+清角色关联)", description = "仅系统管理员可调")
|
||||
@PostMapping("/filterrules/{id}/delete")
|
||||
@Transactional
|
||||
public ResponseEntity<Map<String, Object>> deleteFilterRule(@PathVariable String id) {
|
||||
requireAdmin();
|
||||
String fid = id.trim();
|
||||
jdbcTemplate.update("DELETE FROM sys_filterrulerole WHERE TRIM(filterruleid)=?", fid);
|
||||
long now = System.currentTimeMillis();
|
||||
String operator = currentUserId();
|
||||
int rows = jdbcTemplate.update(
|
||||
"UPDATE sys_filterrule SET isactive=0, updatetime=?, updateby=? WHERE TRIM(sys_filterrule_id)=?",
|
||||
now, operator, fid);
|
||||
if (rows == 0) {
|
||||
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(fail("规则不存在: " + id));
|
||||
}
|
||||
log.info("[A5][规则删除] operator={} ruleId={}", operator, fid);
|
||||
return ResponseEntity.ok(ok("规则删除成功"));
|
||||
}
|
||||
|
||||
@Operation(summary = "规则角色整存(差量)", description = "仅系统管理员可调;空 roleIds 表示清空")
|
||||
@PostMapping("/filterrules/{id}/set-roles")
|
||||
@Transactional
|
||||
public ResponseEntity<Map<String, Object>> setFilterRuleRoles(
|
||||
@PathVariable String id, @RequestBody Map<String, Object> body) {
|
||||
requireAdmin();
|
||||
if (body.get("roleIds") == null) {
|
||||
return badRequest("roleIds 字段不能为空(传空数组表示清空)");
|
||||
}
|
||||
Map<String, Object> data = bindFilterRuleRoles(id.trim(), body.get("roleIds"));
|
||||
log.info("[A5][规则角色整存] operator={} ruleId={} {}", currentUserId(), id.trim(), data);
|
||||
return ResponseEntity.ok(ok("规则角色保存成功", data));
|
||||
}
|
||||
|
||||
/** 差量整存规则↔角色(filterRuleId 为目标规则),返回 inserted/deleted/total。 */
|
||||
private Map<String, Object> bindFilterRuleRoles(String ruleId, Object roleIdsObj) {
|
||||
List<String> target = new java.util.ArrayList<>();
|
||||
if (roleIdsObj instanceof List<?> raw) {
|
||||
for (Object o : raw) {
|
||||
if (o != null && !o.toString().isBlank()) target.add(o.toString().trim());
|
||||
}
|
||||
}
|
||||
target = target.stream().distinct().toList();
|
||||
List<String> current = jdbcTemplate.queryForList(
|
||||
"SELECT TRIM(roleid) FROM sys_filterrulerole WHERE TRIM(filterruleid)=?", String.class, ruleId);
|
||||
int inserted = 0;
|
||||
for (String r : target) {
|
||||
if (!current.contains(r)) {
|
||||
jdbcTemplate.update(
|
||||
"INSERT INTO sys_filterrulerole(filterruleid, roleid) VALUES(?,?) ON CONFLICT DO NOTHING",
|
||||
ruleId, r);
|
||||
inserted++;
|
||||
}
|
||||
}
|
||||
int deleted = 0;
|
||||
for (String r : current) {
|
||||
if (!target.contains(r)) {
|
||||
jdbcTemplate.update(
|
||||
"DELETE FROM sys_filterrulerole WHERE TRIM(filterruleid)=? AND TRIM(roleid)=?",
|
||||
ruleId, r);
|
||||
deleted++;
|
||||
}
|
||||
}
|
||||
Map<String, Object> data = new LinkedHashMap<>();
|
||||
data.put("inserted", inserted);
|
||||
data.put("deleted", deleted);
|
||||
data.put("total", target.size());
|
||||
return data;
|
||||
}
|
||||
|
||||
// ================================================================ 内部工具
|
||||
|
||||
/** 取字符串并 trim,空白/缺失返 null(写入可空列)。 */
|
||||
private static String trimOrNull(Object v) {
|
||||
if (v == null) return null;
|
||||
String s = v.toString().trim();
|
||||
return s.isEmpty() ? null : s;
|
||||
}
|
||||
|
||||
/** 宽松解析整型(amis 表单可能送字符串/数字),失败回退默认值。 */
|
||||
private static int toInt(Object v, int dft) {
|
||||
if (v == null) return dft;
|
||||
if (v instanceof Number n) return n.intValue();
|
||||
try {
|
||||
String s = v.toString().trim();
|
||||
return s.isEmpty() ? dft : Integer.parseInt(s);
|
||||
} catch (NumberFormatException e) {
|
||||
return dft;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 管理员身份检查:userId='ADMIN' 或其对应 account='admin',否则 403。
|
||||
*/
|
||||
|
||||
@@ -255,6 +255,261 @@ class AdminWriteControllerTest {
|
||||
assertEquals(HttpStatus.BAD_REQUEST, resp.getStatusCode());
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 菜单 CRUD(A1)
|
||||
|
||||
@Test
|
||||
@DisplayName("15. 新建菜单 → status=0, id 非空")
|
||||
void createMenu_ok() {
|
||||
mockAdmin();
|
||||
ResponseEntity<Map<String, Object>> resp =
|
||||
controller.createMenu(Map.of("name", "测试菜单", "parentId", "p-1", "seq", 3));
|
||||
assertEquals(HttpStatus.OK, resp.getStatusCode());
|
||||
assertEquals(0, resp.getBody().get("status"));
|
||||
assertNotNull(((Map<String, Object>) resp.getBody().get("data")).get("id"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("16. 非管理员新建菜单 → 403")
|
||||
void createMenu_nonAdmin_403() {
|
||||
mockNonAdmin();
|
||||
ResponseStatusException ex = assertThrows(ResponseStatusException.class,
|
||||
() -> controller.createMenu(Map.of("name", "x")));
|
||||
assertEquals(HttpStatus.FORBIDDEN, ex.getStatusCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("17. 新建菜单缺 name → 400")
|
||||
void createMenu_missingName_400() {
|
||||
mockAdmin();
|
||||
ResponseStatusException ex = assertThrows(ResponseStatusException.class,
|
||||
() -> controller.createMenu(Map.of("seq", 1)));
|
||||
assertEquals(HttpStatus.BAD_REQUEST, ex.getStatusCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("18. 编辑菜单 → status=0")
|
||||
void updateMenu_ok() {
|
||||
mockAdmin();
|
||||
when(jdbc.update(contains("UPDATE sys_menu SET name"), any(), any(), any(),
|
||||
any(), any(), any(), any())).thenReturn(1);
|
||||
ResponseEntity<Map<String, Object>> resp =
|
||||
controller.updateMenu("m-1", Map.of("name", "改名", "seq", 5));
|
||||
assertEquals(HttpStatus.OK, resp.getStatusCode());
|
||||
assertEquals(0, resp.getBody().get("status"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("19. 编辑菜单不存在 → 404")
|
||||
void updateMenu_notFound_404() {
|
||||
mockAdmin();
|
||||
when(jdbc.update(contains("UPDATE sys_menu SET name"), any(), any(), any(),
|
||||
any(), any(), any(), any())).thenReturn(0);
|
||||
ResponseEntity<Map<String, Object>> resp =
|
||||
controller.updateMenu("no-such", Map.of("name", "改名"));
|
||||
assertEquals(HttpStatus.NOT_FOUND, resp.getStatusCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("20. 删除菜单(无子菜单)→ status=0,清 role_menu + 软删")
|
||||
void deleteMenu_ok() {
|
||||
mockAdmin();
|
||||
when(jdbc.queryForObject(contains("COUNT(*) FROM sys_menu"), eq(Integer.class), anyString()))
|
||||
.thenReturn(0);
|
||||
when(jdbc.update(contains("DELETE FROM sys_role_menu"), anyString())).thenReturn(0);
|
||||
when(jdbc.update(contains("UPDATE sys_menu SET isactive=0"), any(), any(), anyString()))
|
||||
.thenReturn(1);
|
||||
ResponseEntity<Map<String, Object>> resp = controller.deleteMenu("m-1");
|
||||
assertEquals(HttpStatus.OK, resp.getStatusCode());
|
||||
verify(jdbc, atLeastOnce()).update(contains("DELETE FROM sys_role_menu"), anyString());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("21. 删除菜单(有子菜单)→ 400,拒绝软删")
|
||||
void deleteMenu_withChildren_blocked() {
|
||||
mockAdmin();
|
||||
when(jdbc.queryForObject(contains("COUNT(*) FROM sys_menu"), eq(Integer.class), anyString()))
|
||||
.thenReturn(2);
|
||||
ResponseEntity<Map<String, Object>> resp = controller.deleteMenu("parent-1");
|
||||
assertEquals(HttpStatus.BAD_REQUEST, resp.getStatusCode());
|
||||
verify(jdbc, never()).update(contains("UPDATE sys_menu SET isactive=0"), any(), any(), anyString());
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 角色 CRUD(A3)
|
||||
|
||||
@Test
|
||||
@DisplayName("22. 新建角色 → status=0, id 非空")
|
||||
void createRole_ok() {
|
||||
mockAdmin();
|
||||
ResponseEntity<Map<String, Object>> resp =
|
||||
controller.createRole(Map.of("name", "测试角色", "roletype", 1));
|
||||
assertEquals(HttpStatus.OK, resp.getStatusCode());
|
||||
assertEquals(0, resp.getBody().get("status"));
|
||||
assertNotNull(((Map<String, Object>) resp.getBody().get("data")).get("id"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("23. 编辑角色 → status=0")
|
||||
void updateRole_ok() {
|
||||
mockAdmin();
|
||||
when(jdbc.update(contains("UPDATE sys_role SET name"), any(), any(), any(),
|
||||
any(), any(), any())).thenReturn(1);
|
||||
ResponseEntity<Map<String, Object>> resp =
|
||||
controller.updateRole("r-1", Map.of("name", "改名"));
|
||||
assertEquals(HttpStatus.OK, resp.getStatusCode());
|
||||
assertEquals(0, resp.getBody().get("status"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("24. 编辑角色不存在 → 404")
|
||||
void updateRole_notFound_404() {
|
||||
mockAdmin();
|
||||
when(jdbc.update(contains("UPDATE sys_role SET name"), any(), any(), any(),
|
||||
any(), any(), any())).thenReturn(0);
|
||||
ResponseEntity<Map<String, Object>> resp =
|
||||
controller.updateRole("no-such", Map.of("name", "改名"));
|
||||
assertEquals(HttpStatus.NOT_FOUND, resp.getStatusCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("25. 删除角色 → status=0,清三张关联表 + evictAll")
|
||||
void deleteRole_ok() {
|
||||
mockAdmin();
|
||||
when(jdbc.update(contains("DELETE FROM sys_role_menu"), anyString())).thenReturn(0);
|
||||
when(jdbc.update(contains("DELETE FROM sys_usergrouprole"), anyString())).thenReturn(0);
|
||||
when(jdbc.update(contains("DELETE FROM sys_filterrulerole"), anyString())).thenReturn(0);
|
||||
when(jdbc.update(contains("UPDATE sys_role SET isactive=0"), any(), any(), anyString()))
|
||||
.thenReturn(1);
|
||||
ResponseEntity<Map<String, Object>> resp = controller.deleteRole("r-1");
|
||||
assertEquals(HttpStatus.OK, resp.getStatusCode());
|
||||
verify(jdbc, atLeastOnce()).update(contains("DELETE FROM sys_filterrulerole"), anyString());
|
||||
verify(roleResolver).evictAll();
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 部门 CRUD(A4)
|
||||
|
||||
@Test
|
||||
@DisplayName("26. 新建部门 → status=0, id 非空")
|
||||
void createDepart_ok() {
|
||||
mockAdmin();
|
||||
ResponseEntity<Map<String, Object>> resp =
|
||||
controller.createDepart(Map.of("name", "测试部门", "parentId", "d-0"));
|
||||
assertEquals(HttpStatus.OK, resp.getStatusCode());
|
||||
assertEquals(0, resp.getBody().get("status"));
|
||||
assertNotNull(((Map<String, Object>) resp.getBody().get("data")).get("id"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("27. 编辑部门 → status=0")
|
||||
void updateDepart_ok() {
|
||||
mockAdmin();
|
||||
when(jdbc.update(contains("UPDATE sys_depart SET name"), any(), any(), any(),
|
||||
any(), any(), any(), any())).thenReturn(1);
|
||||
ResponseEntity<Map<String, Object>> resp =
|
||||
controller.updateDepart("d-1", Map.of("name", "改名", "leader", "张三"));
|
||||
assertEquals(HttpStatus.OK, resp.getStatusCode());
|
||||
assertEquals(0, resp.getBody().get("status"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("28. 编辑部门不存在 → 404")
|
||||
void updateDepart_notFound_404() {
|
||||
mockAdmin();
|
||||
when(jdbc.update(contains("UPDATE sys_depart SET name"), any(), any(), any(),
|
||||
any(), any(), any(), any())).thenReturn(0);
|
||||
ResponseEntity<Map<String, Object>> resp =
|
||||
controller.updateDepart("no-such", Map.of("name", "改名"));
|
||||
assertEquals(HttpStatus.NOT_FOUND, resp.getStatusCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("29. 删除部门(无子部门)→ status=0")
|
||||
void deleteDepart_ok() {
|
||||
mockAdmin();
|
||||
when(jdbc.queryForObject(contains("COUNT(*) FROM sys_depart"), eq(Integer.class), anyString()))
|
||||
.thenReturn(0);
|
||||
when(jdbc.update(contains("UPDATE sys_depart SET isactive=0"), any(), any(), anyString()))
|
||||
.thenReturn(1);
|
||||
ResponseEntity<Map<String, Object>> resp = controller.deleteDepart("d-1");
|
||||
assertEquals(HttpStatus.OK, resp.getStatusCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("30. 删除部门(有子部门)→ 400,拒绝软删")
|
||||
void deleteDepart_withChildren_blocked() {
|
||||
mockAdmin();
|
||||
when(jdbc.queryForObject(contains("COUNT(*) FROM sys_depart"), eq(Integer.class), anyString()))
|
||||
.thenReturn(3);
|
||||
ResponseEntity<Map<String, Object>> resp = controller.deleteDepart("parent-d");
|
||||
assertEquals(HttpStatus.BAD_REQUEST, resp.getStatusCode());
|
||||
verify(jdbc, never()).update(contains("UPDATE sys_depart SET isactive=0"), any(), any(), anyString());
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 数据权限规则 CRUD(A5)
|
||||
|
||||
@Test
|
||||
@DisplayName("31. 新建数据权限规则 → status=0, id 非空")
|
||||
void createFilterRule_ok() {
|
||||
mockAdmin();
|
||||
when(jdbc.queryForList(contains("sys_filterrulerole"), eq(String.class), anyString()))
|
||||
.thenReturn(List.of());
|
||||
ResponseEntity<Map<String, Object>> resp = controller.createFilterRule(
|
||||
Map.of("entityid", "ent-1", "filterrule", "DEPTID = :dept"));
|
||||
assertEquals(HttpStatus.OK, resp.getStatusCode());
|
||||
assertEquals(0, resp.getBody().get("status"));
|
||||
assertNotNull(((Map<String, Object>) resp.getBody().get("data")).get("id"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("32. 编辑规则内容 → status=0")
|
||||
void updateFilterRule_ok() {
|
||||
mockAdmin();
|
||||
when(jdbc.update(contains("UPDATE sys_filterrule SET filterrule"), any(), any(), any(), anyString()))
|
||||
.thenReturn(1);
|
||||
ResponseEntity<Map<String, Object>> resp =
|
||||
controller.updateFilterRule("f-1", Map.of("filterrule", "X = 2"));
|
||||
assertEquals(HttpStatus.OK, resp.getStatusCode());
|
||||
assertEquals(0, resp.getBody().get("status"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("33. 编辑规则不存在 → 404")
|
||||
void updateFilterRule_notFound_404() {
|
||||
mockAdmin();
|
||||
when(jdbc.update(contains("UPDATE sys_filterrule SET filterrule"), any(), any(), any(), anyString()))
|
||||
.thenReturn(0);
|
||||
ResponseEntity<Map<String, Object>> resp =
|
||||
controller.updateFilterRule("no-such", Map.of("filterrule", "X = 2"));
|
||||
assertEquals(HttpStatus.NOT_FOUND, resp.getStatusCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("34. 删除规则 → status=0,清 sys_filterrulerole")
|
||||
void deleteFilterRule_ok() {
|
||||
mockAdmin();
|
||||
when(jdbc.update(contains("DELETE FROM sys_filterrulerole"), anyString())).thenReturn(0);
|
||||
when(jdbc.update(contains("UPDATE sys_filterrule SET isactive=0"), any(), any(), anyString()))
|
||||
.thenReturn(1);
|
||||
ResponseEntity<Map<String, Object>> resp = controller.deleteFilterRule("f-1");
|
||||
assertEquals(HttpStatus.OK, resp.getStatusCode());
|
||||
verify(jdbc, atLeastOnce()).update(contains("DELETE FROM sys_filterrulerole"), anyString());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("35. 规则角色差量:现有[A,B] 目标[B,C] → inserted=1 deleted=1 total=2")
|
||||
void setFilterRuleRoles_delta() {
|
||||
mockAdmin();
|
||||
when(jdbc.queryForList(contains("sys_filterrulerole"), eq(String.class), anyString()))
|
||||
.thenReturn(List.of("role-A", "role-B"));
|
||||
when(jdbc.update(anyString(), anyString(), anyString())).thenReturn(1);
|
||||
ResponseEntity<Map<String, Object>> resp = controller.setFilterRuleRoles(
|
||||
"f-1", Map.of("roleIds", List.of("role-B", "role-C")));
|
||||
assertEquals(HttpStatus.OK, resp.getStatusCode());
|
||||
Map<String, Object> data = (Map<String, Object>) resp.getBody().get("data");
|
||||
assertEquals(1, data.get("inserted"));
|
||||
assertEquals(1, data.get("deleted"));
|
||||
assertEquals(2, data.get("total"));
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 工具
|
||||
|
||||
private void mockAdmin() {
|
||||
|
||||
Reference in New Issue
Block a user