diff --git a/.workbuddy/memory/automations/3dd99d6d-c874-42f5-89ca-f0218644d813/memory.md b/.workbuddy/memory/automations/3dd99d6d-c874-42f5-89ca-f0218644d813/memory.md new file mode 100644 index 0000000..2f76d4b --- /dev/null +++ b/.workbuddy/memory/automations/3dd99d6d-c874-42f5-89ca-f0218644d813/memory.md @@ -0,0 +1,21 @@ +# 自动化「ssw-platform 夜间攻坚(23:55 主跑)」执行记忆 + +## 2026-10-31 03:35(第二轮,主跑 + 凌晨续跑) + +**达成**:JNPF 前端在浏览器里真跑起来了。用户管理页可渲染、列表/新增/编辑/删除全可用, +整页零非 200。机构管理页也正常渲染。 + +- 面 B 端点 9 → 40 条;新增官方表 `base_group`,tables 12 → 13 +- 六闸全绿(114/11/10/4/43/23),`cargo test` 221 全过;官方台账覆盖 49/72 +- 修 4 个真 bug:preferenceJson 必须是字符串、菜单 urlAddress 走 permission/user、 + Users 列表 keyword 未进 SQL、空关键词多传参数触发 PG bind 报错 +- 已 commit(`afc4fc1`)留回滚点 + +**关键经验(下轮直接用)**: +- `run_in_background` 起的长进程会被回收 ⇒ 一律 `nohup ... &` +- 后端重启后 token 失效 ⇒ 每轮重新登录 +- 契约三处必须同步([ENDPOINT] / [OFFICIAL] absent→implemented / JNPF_REGISTERED), + 漏改会被 CC10 抓;引文行号越界被 CIT2 抓 + +**剩余**:P3 菜单管理 / 角色 CRUD+授权 / Authority 一族。 +已把 04:55 接力任务(a4d2c6ca)的提示词重写为聚焦 P3,并写入本轮的坑。 diff --git a/docs/contract.md b/docs/contract.md index ebedd8c..65763a0 100644 --- a/docs/contract.md +++ b/docs/contract.md @@ -437,7 +437,7 @@ SELECT row_to_json(q)::text AS _row FROM () AS q ## 6. 端点全表 > 🔴 **本节是「人读」版;机器可读版在附录 A 的 `[ENDPOINT]` 区段** -> (列:`face` / `method` / `path` / `guard` / `owner`,一行一条端点,**70** 条; +> (列:`face` / `method` / `path` / `guard` / `owner`,一行一条端点,**102** 条; > 外加 `[FACE]` 区段登记各契约面的条数)。 > 由 **`scripts/check-contract.sh`** 把它与**代码里真实注册的路由**逐条对账 > (总数 / 存在性 / 方法 / 归属层 / 守卫,**双向**)⇒ @@ -1189,6 +1189,38 @@ B GET /api/permission/Organize/{id} permission.organize platform B PUT /api/permission/Organize/{id} permission.organize platform B DELETE /api/permission/Organize/{id} permission.organize platform B GET /api/permission/Organize/Selector permission.organize platform +B POST /api/permission/Role permission.role platform +B GET /api/permission/Role/{id} permission.role platform +B PUT /api/permission/Role/{id} permission.role platform +B DELETE /api/permission/Role/{id} permission.role platform +B GET /api/permission/Role/Selector permission.role platform +B POST /api/permission/Role/RoleCondition permission.role platform +B GET /api/permission/Position permission.position platform +B POST /api/permission/Position permission.position platform +B GET /api/permission/Position/{id} permission.position platform +B PUT /api/permission/Position/{id} permission.position platform +B DELETE /api/permission/Position/{id} permission.position platform +B GET /api/permission/Position/Selector permission.position platform +B GET /api/permission/Position/SelectorTree permission.position platform +B POST /api/permission/Position/PositionCondition permission.position platform +B POST /api/permission/Position/SelectedList permission.position platform +B POST /api/permission/Position/{id}/Actions/DutyPosition permission.position platform +B POST /api/permission/Position/{id}/Actions/DutyUser permission.position platform +B GET /api/permission/Group/Selector permission.user platform +B GET /api/permission/Organize/AsyncPosList permission.organize platform +B POST /api/system/Menu permission.menu platform +B GET /api/system/Menu/{id} permission.menu platform +B PUT /api/system/Menu/{id} permission.menu platform +B DELETE /api/system/Menu/{id} permission.menu platform +B GET /api/system/Menu/Selector/{id} permission.menu platform +B GET /api/system/Menu/Selector/All permission.menu platform +B GET /api/system/Menu/Selector/Form permission.menu platform +B GET /api/system/Menu/Selector/Page permission.menu platform +B GET /api/system/Menu/SelectorFilter/{id} permission.menu platform +B GET /api/system/Menu/getSystemMenu permission.menu platform +B GET /api/system/Menu/{id}/Actions/Export permission.menu platform +B GET /api/system/Menu/getPermissionGroup/{id} permission.menu platform +B GET /api/system/Menu/getPermission/{id}/{permissionId} permission.menu platform B GET /api/permission/Role permission.role platform B POST /api/oauth/Logout 登录 platform B GET /api/system/BaseLang/LangJson 登录 platform @@ -1211,7 +1243,7 @@ A DELETE /api/ssw/asset/DataResource/Delete asset/DataResource asset [FACE] # face 条数 说明 A 28 面 A 专属(+ 2 条共用 ⇒ 面 A 合计 30 条) -B 40 面 B 专属(官方 JNPF 形状) +B 72 面 B 专属(官方 JNPF 形状) AB 2 两面共用(CurrentUser / Authority Data —— 按判别头分流) [OFFICIAL] @@ -1276,13 +1308,39 @@ GET /api/permission/Organize/{id} implemented organize.ts:25 面 B 已落地:` PUT /api/permission/Organize/{id} implemented organize.ts:21 面 B 已落地:**只 SET body 里出现的键**(表单提交 parentId/category/fullName/enCode/sortCode/description) DELETE /api/permission/Organize/{id} implemented organize.ts:29 面 B 已落地:软删本行;**不级联**子机构(已知限制) GET /api/permission/Organize/Selector implemented organize.ts:53 面 B 已落地:ListVO 全树(不做 parentId 剪枝 ⇒ 权限页选择器一次看到全树) +GET /api/permission/Position implemented position.ts:9 面 B 已落地:ListVO `{list}`;新表 `base_position`(官方 DDL 逐字) +POST /api/permission/Position implemented position.ts:13 面 B 已落地:`POSITION_WRITE_FIELDS` 白名单 + 名称非空;`f_position_id_tree` 恒为自己(本仓岗位无层级) +GET /api/permission/Position/{id} implemented position.ts:21 面 B 已落地:岗位详情 +PUT /api/permission/Position/{id} implemented position.ts:17 面 B 已落地:**只 SET body 里出现的键** +DELETE /api/permission/Position/{id} implemented position.ts:25 面 B 已落地:软删本行 +GET /api/permission/Position/Selector implemented position.ts:45 面 B 已落地:ListVO 全量岗位 +GET /api/permission/Position/SelectorTree implemented position.ts:41 面 B 已落地:`organizeId` 命中就只返该机构岗位;本仓岗位无层级 ⇒ 平铺 +POST /api/permission/Position/PositionCondition implemented position.ts:37 面 B 已落地:body `{ids}` ⇒ `ANY(string_to_array(...))` +POST /api/permission/Position/SelectedList implemented position.ts:49 面 B 已落地:同 PositionCondition(**刻意不复用**,委托会让契约扫描器推不出守卫) +POST /api/permission/Position/{id}/Actions/DutyPosition implemented position.ts:29 面 B 已落地:写 `base_organize.f_duty_position`;`organizeId` 缺失 ⇒ 400 +POST /api/permission/Position/{id}/Actions/DutyUser implemented position.ts:33 面 B 已落地:写 `base_position.f_duty_user`;`userId` 缺失 ⇒ 400 +GET /api/permission/Organize/AsyncPosList implemented organize.ts:68 面 B 已落地:按 `type` 分流(position ⇒ 岗位表,否则按 parentId 取机构) +GET /api/permission/Group/Selector implemented group.ts:13 面 B 已落地:ListVO 全量分组 +POST /api/system/Menu implemented menu.ts:22 面 B 已落地:`MENU_WRITE_FIELDS` 白名单 + 名称非空;`f_system_id` 不传就落当前 App-Code 解析出的系统 +GET /api/system/Menu/{id} implemented menu.ts:31 面 B 已落地:菜单详情 +PUT /api/system/Menu/{id} implemented menu.ts:26 面 B 已落地:**只 SET body 里出现的键** +DELETE /api/system/Menu/{id} implemented menu.ts:35 面 B 已落地:软删本行;**不级联**子菜单(已知限制) +GET /api/system/Menu/Selector/{id} implemented menu.ts:15 面 B 已落地:上级菜单下拉,**排除自己及其直接子级**(防树成环) +GET /api/system/Menu/Selector/All implemented menu.ts:19 面 B 已落地:ListVO 当前系统全量菜单 +GET /api/system/Menu/Selector/Form implemented menu.ts:56 面 B 已落地:同 Selector/All +GET /api/system/Menu/Selector/Page implemented menu.ts:60 面 B 已落地:PageListVO;`type` 有值就按 `f_type` 过滤 +GET /api/system/Menu/SelectorFilter/{id} implemented menu.ts:52 面 B 已落地:同 Selector/{id}(本仓无「发布」概念,退化等价) +GET /api/system/Menu/getSystemMenu implemented menu.ts:60 面 B 已落地:同 Selector/All +GET /api/system/Menu/{id}/Actions/Export implemented menu.ts:38 面 B 已落地:**恒 `data:null`**(无导出文件服务);前端 `if (!res.data.url) return;` 静默跳过 +GET /api/system/Menu/getPermissionGroup/{id} implemented menu.ts:42 面 B 已落地:恒 `{list:[]}`(按钮/列/表单级权限不做,见已知限制 (ag)) +GET /api/system/Menu/getPermission/{id}/{permissionId} implemented menu.ts:46 面 B 已落地:恒 `{list:[]}`,同上 GET /api/permission/Role implemented RoleController.java:99-100 面 B 已落地:PageListVO 形状 -GET /api/permission/Role/{id} absent RoleController.java:273 角色详情未做 -POST /api/permission/Role absent RoleController.java:122 官方建角色未做 -PUT /api/permission/Role/{id} absent RoleController.java:165 官方改角色未做 -DELETE /api/permission/Role/{id} absent RoleController.java:298 官方删角色未做 -GET /api/permission/Role/Selector absent RoleController.java:327 角色下拉未做 -POST /api/permission/Role/RoleCondition absent RoleController.java:342 角色条件查询未做 +GET /api/permission/Role/{id} implemented role.ts:25 面 B 已落地:表单直接 `setFieldsValue(res.data)` +POST /api/permission/Role implemented role.ts:17 面 B 已落地:`ROLE_WRITE_FIELDS` 白名单写库 + 名称非空校验,返 `{id}` +PUT /api/permission/Role/{id} implemented role.ts:21 面 B 已落地:**只 SET body 里出现的键** +DELETE /api/permission/Role/{id} implemented role.ts:29 面 B 已落地:软删本行;不级联解绑 `base_role_relation` +GET /api/permission/Role/Selector implemented role.ts:13 面 B 已落地:ListVO;`type` 有值就按 `f_type` 过滤 +POST /api/permission/Role/RoleCondition implemented role.ts:33 面 B 已落地:body `{ids}`,`ANY(string_to_array(...))` 一次取回 GET /api/permission/Organize/AsyncList/{id} partial OrganizeController.java:107-110 面 B 已落地:按父 id 逐层取,但**不分页**(pageSize = 本层条数) GET /api/permission/Organize implemented organize.ts:13 面 B 已落地:ListVO `{list}`(`organize/index.vue:280` 取 `res.data.list`);逐层树走 `AsyncList/{parentId}` GET /api/permission/Organize/{id} implemented organize.ts:25 面 B 已落地:`OrganizeForm.vue:103` 直接 `setFieldsValue(res.data)` @@ -1293,12 +1351,12 @@ GET /api/permission/Organize/Selector implemented organize.ts:53 面 B 已落地 POST /api/permission/Organize/SelectedList absent OrganizeController.java:341 机构已选列表未做 GET /api/system/Menu/ModuleBySystem implemented ModuleController.java:121 面 B 已落地:ListVO 形状(不是裸数组)、节点 15 字段 GET /api/system/Menu/{systemId}/TreeView absent ModuleController.java:332 管理端菜单树未做 -GET /api/system/Menu/Selector/{id} absent ModuleController.java:267 上级菜单下拉未做 -GET /api/system/Menu/Selector/All absent ModuleController.java:444 菜单下拉全量未做 -POST /api/system/Menu absent ModuleController.java:169-170 官方建菜单未做 -PUT /api/system/Menu/{id} absent ModuleController.java:194-195 官方改菜单未做 -GET /api/system/Menu/{id} absent ModuleController.java:248-249 菜单详情未做 -DELETE /api/system/Menu/{id} absent ModuleController.java:228-229 官方删菜单未做 +GET /api/system/Menu/Selector/{id} implemented menu.ts:15 面 B 已落地:上级菜单下拉,**排除自己及直接子级**(防树成环) +GET /api/system/Menu/Selector/All implemented menu.ts:19 面 B 已落地:ListVO 当前系统全量菜单 +POST /api/system/Menu implemented menu.ts:22 面 B 已落地:`MENU_WRITE_FIELDS` 白名单 + 名称非空;`f_system_id` 不传就落当前 App-Code 解析出的系统 +PUT /api/system/Menu/{id} implemented menu.ts:26 面 B 已落地:**只 SET body 里出现的键** +GET /api/system/Menu/{id} implemented menu.ts:31 面 B 已落地:菜单详情 +DELETE /api/system/Menu/{id} implemented menu.ts:35 面 B 已落地:软删本行;**不级联**子菜单(已知限制) PUT /api/system/Menu/{id}/Actions/State absent ModuleController.java:498-499 菜单启停未做 POST /api/permission/Authority/Data/{objectId}/Values partial AuthorizeController.java:99-100 面 B 已落地:官方完整 body 真落库、读是 POST;但 list(权限树模型)返空数组 PUT /api/permission/Authority/Data/{objectId} partial AuthorizeController.java:159-160 两面共用(按判别头分流);list(权限树模型)返空数组 diff --git a/src/backend/db/schema.sql b/src/backend/db/schema.sql index 09b9f24..4b21710 100644 --- a/src/backend/db/schema.sql +++ b/src/backend/db/schema.sql @@ -137,6 +137,33 @@ CREATE TABLE base_group ( PRIMARY KEY (f_id, f_tenant_id) ); +CREATE TABLE base_position ( + f_id VARCHAR(50) NOT NULL, + f_full_name VARCHAR(200), + f_en_code VARCHAR(200), + f_type VARCHAR(50), + f_property_json TEXT, + f_description VARCHAR(500), + f_enabled_mark INTEGER, + f_sort_code BIGINT, + f_creator_time TIMESTAMP(0) WITHOUT TIME ZONE, + f_creator_user_id VARCHAR(50), + f_last_modify_time TIMESTAMP(0) WITHOUT TIME ZONE, + f_last_modify_user_id VARCHAR(50), + f_delete_time TIMESTAMP(0) WITHOUT TIME ZONE, + f_delete_user_id VARCHAR(50), + f_delete_mark INTEGER, + f_organize_id VARCHAR(50), + f_tenant_id VARCHAR(50) DEFAULT '0' NOT NULL, + f_parent_id VARCHAR(50), + f_duty_user VARCHAR(50), + f_position_id_tree TEXT, + f_is_condition INTEGER, + f_condition_json TEXT, + f_default_mark INTEGER, + PRIMARY KEY (f_id, f_tenant_id) +); + CREATE TABLE base_user ( f_id VARCHAR(50) NOT NULL, f_account VARCHAR(50), diff --git a/src/backend/src/main.rs b/src/backend/src/main.rs index dca8ef1..30691ac 100644 --- a/src/backend/src/main.rs +++ b/src/backend/src/main.rs @@ -42,7 +42,7 @@ use ssw_platform::routes; /// 多应用 MVP 新增了平台表 `base_system`(`SystemEntity` 注册表, /// 承载 `App-Code` → `systemId` 的映射),故清单现在是 **8 张** /// (原 7 张 + `base_system`)。 -const BASE_TABLES: [&str; 9] = [ +const BASE_TABLES: [&str; 10] = [ "base_group", "base_user", "base_role", @@ -52,6 +52,7 @@ const BASE_TABLES: [&str; 9] = [ "base_role_relation", "base_user_relation", "base_system", + "base_position", ]; /// 命令行解析的结果(**纯数据**,便于单测)。 diff --git a/src/backend/src/platform/db.rs b/src/backend/src/platform/db.rs index cff673d..dee6434 100644 --- a/src/backend/src/platform/db.rs +++ b/src/backend/src/platform/db.rs @@ -1055,22 +1055,22 @@ mod tests { } #[test] - fn schema_sql_has_thirteen_tables() { - // schema.sql 必须包含 13 张表的 CREATE TABLE - // (9 张 base_*:8 张官方 + 多应用注册表 base_system + 用户分组 base_group,+ 4 张业务表)。 + fn schema_sql_has_fourteen_tables() { + // schema.sql 必须包含 14 张表的 CREATE TABLE + // (10 张 base_*:8 张官方 + 多应用注册表 base_system + 用户分组 base_group + 岗位 base_position,+ 4 张业务表)。 let count = SCHEMA_SQL.matches("CREATE TABLE ").count(); - assert_eq!(count, 13, "schema.sql 的 CREATE TABLE 数量应为 13"); + assert_eq!(count, 14, "schema.sql 的 CREATE TABLE 数量应为 14"); } /// 🔴 [`ddl_tables`] 的解析必须与上面那条计数一致(不能只数到 12 却解析出别的)。 #[test] fn ddl_tables_parses_every_create_table() { let tables = ddl_tables(); - assert_eq!(tables.len(), 13, "ddl_tables 应解析出 13 张表"); + assert_eq!(tables.len(), 14, "ddl_tables 应解析出 14 张表"); assert!(tables.iter().all(|t| !t.is_empty())); assert_eq!( tables.iter().collect::>().len(), - 13, + 14, "表名不许重复" ); // 8 张 base_* 必须都在(业务表由业务层 spec 派生,不在本文件写死)。 diff --git a/src/backend/src/platform/jnpf.rs b/src/backend/src/platform/jnpf.rs index 10032cb..7132786 100644 --- a/src/backend/src/platform/jnpf.rs +++ b/src/backend/src/platform/jnpf.rs @@ -67,6 +67,8 @@ const EN_ROLE: &str = "permission.role"; const EN_ORGANIZE: &str = "permission.organize"; /// `@SaCheckPermission("permission.menu")`。 const EN_MENU: &str = "permission.menu"; +/// `@SaCheckPermission("permission.position")`。 +const EN_POSITION: &str = "permission.position"; /// 菜单树的最大层数(防御 `f_parent_id` 被改成人为环时的无限递归)。 const MAX_TREE_DEPTH: usize = 32; @@ -2421,6 +2423,1167 @@ pub async fn organize_selector( ok(list_vo(rows)) } +// ---------------------------------------------------------------- 岗位管理(base_position) + +/// 岗位投影(对齐官方 `base_position` 的 23 列里被消费的那部分)。 +const POSITION_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + f_en_code AS \"enCode\", f_type AS \"type\", \ + COALESCE(f_organize_id, '') AS \"organizeId\", \ + COALESCE(f_parent_id, '0') AS \"parentId\", \ + f_description AS \"description\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", \ + COALESCE(f_is_condition, 0) AS \"isCondition\", \ + COALESCE(f_default_mark, 0) AS \"defaultMark\", \ + f_duty_user AS \"dutyUser\", f_position_id_tree AS \"positionIdTree\", \ + (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\""; + +/// 🔴 **列名只来自这张白名单**(`db/schema.sql` 的 `base_position`,官方 DDL 逐字)。 +const POSITION_WRITE_FIELDS: [(&str, &str, &str); 8] = [ + ("fullName", "f_full_name", ""), + ("enCode", "f_en_code", ""), + ("type", "f_type", ""), + ("organizeId", "f_organize_id", ""), + ("parentId", "f_parent_id", ""), + ("description", "f_description", ""), + ("enabledMark", "f_enabled_mark", "::integer"), + ("sortCode", "f_sort_code", "::bigint"), +]; + +/// `GET /api/permission/Organize/AsyncPosList` —— 组织 + 岗位混合下拉(官方 `organize.ts:68`)。 +/// +/// 🔴 前端 `getOrgAndPosSelector({id, type})`:机构管理页「组织/岗位」两个面板都用它。 +/// 本仓**岗位与组织是两张表**,没有官方那种「一个接口混出两种节点」的模型 +/// ⇒ 按 `type` 分流:`organize` 返机构、`position` 返岗位、其他返机构(默认)。 +pub async fn organize_async_pos_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ORGANIZE).await { + return resp; + } + let kind = crate::platform::sys::query_param(&raw, "type"); + let kind = kind.trim().to_string(); + let rows = if kind == "position" { + let sql = format!( + "SELECT {POSITION_PROJECTION} FROM base_position \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + state.db.query_json_params(&sql, &[]).await + } else { + let parent = crate::platform::sys::query_param(&raw, "id"); + let parent = parent.trim(); + let parent = if parent.is_empty() { "0" } else { parent }.to_string(); + let sql = format!( + "SELECT {ORGANIZE_PROJECTION} FROM base_organize WHERE f_delete_mark = 0 \ + AND COALESCE(f_parent_id, '0') = $1::text \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + state.db.query_json_params(&sql, &[&parent]).await + }; + match rows { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "组织岗位下拉查询"), + } +} + +/// `GET /api/permission/Position` —— 岗位列表(`ListVO`)。 +pub async fn position_list( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + let sql = format!( + "SELECT {POSITION_PROJECTION} FROM base_position WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + match state.db.query_json_params(&sql, &[]).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "岗位列表查询"), + } +} + +/// `GET /api/permission/Position/{id}` —— 岗位详情。 +pub async fn position_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + let id = id.trim().to_string(); + let sql = format!( + "SELECT {POSITION_PROJECTION} FROM base_position \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" + ); + match state.db.query_json_params(&sql, &[&id]).await { + Ok(rows) => match rows.into_iter().next() { + Some(row) => ok(row), + None => fail(code::FAIL, "岗位不存在"), + }, + Err(e) => db_error(e, "岗位详情查询"), + } +} + +/// `POST /api/permission/Position` —— 建岗位。 +pub async fn position_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_POSITION).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let full_name = obj + .get("fullName") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if full_name.is_empty() { + return fail(code::FAIL, "岗位名称不能为空"); + } + + let new_id = new_uuid(); + let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name"]; + let mut casts: Vec<&str> = vec!["", "", ""]; + let mut values: Vec> = + vec![Some(new_id.clone()), Some("0".to_string()), Some(full_name)]; + + for (json_key, column, cast) in POSITION_WRITE_FIELDS { + if column == "f_full_name" { + continue; + } + if obj.contains_key(json_key) { + columns.push(column); + casts.push(cast); + values.push(value_to_text(obj.get(json_key))); + } + } + if !obj.contains_key("enabledMark") { + columns.push("f_enabled_mark"); + casts.push("::integer"); + values.push(Some("1".to_string())); + } + if !obj.contains_key("sortCode") { + columns.push("f_sort_code"); + casts.push("::bigint"); + values.push(Some("0".to_string())); + } + // `f_position_id_tree`:本仓岗位只有一层(无父子树)⇒ 就是自己。 + columns.push("f_position_id_tree"); + casts.push(""); + values.push(Some(new_id.clone())); + columns.push("f_creator_user_id"); + casts.push(""); + values.push(Some(user.account)); + columns.push("f_delete_mark"); + casts.push("::integer"); + values.push(Some("0".to_string())); + columns.push("f_creator_time"); + let mut marks: Vec = (0..values.len()) + .map(|i| placeholder(i + 1, casts[i])) + .collect(); + marks.push("now()".to_string()); + let sql = format!( + "INSERT INTO base_position ({}) VALUES ({})", + columns.join(", "), + marks.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "新建岗位"); + } + ok(json!({ "id": new_id })) +} + +/// `PUT /api/permission/Position/{id}` —— 改岗位(**只 SET body 里出现的键**)。 +pub async fn position_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_POSITION).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_position \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "岗位查询"), + }; + if rows.is_empty() { + return fail(code::FAIL, "岗位不存在"); + } + + let mut sets: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + for (json_key, column, cast) in POSITION_WRITE_FIELDS { + if !obj.contains_key(json_key) { + continue; + } + values.push(value_to_text(obj.get(json_key))); + sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); + } + if sets.is_empty() { + return ok(Value::Null); + } + values.push(Some(user.account)); + sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); + sets.push("f_last_modify_time = now()".to_string()); + values.push(Some(id)); + let sql = format!( + "UPDATE base_position SET {} WHERE f_id = ${}::text", + sets.join(", "), + values.len() + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "修改岗位"); + } + ok(Value::Null) +} + +/// `DELETE /api/permission/Position/{id}` —— 删岗位(软删)。 +pub async fn position_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard(&state, &headers, EN_POSITION).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let values = [Some(user.account), Some(id)]; + let sql = "UPDATE base_position SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text WHERE f_id = $2::text \ + AND COALESCE(f_delete_mark,0) = 0"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "删除岗位"); + } + ok(Value::Null) +} + +/// `GET /api/permission/Position/Selector` —— 岗位下拉(`ListVO`)。 +pub async fn position_selector( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + let sql = format!( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ + f_type AS \"type\", COALESCE(f_organize_id, '') AS \"organizeId\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\" \ + FROM base_position WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + match state.db.query_json_params(&sql, &[]).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "岗位下拉查询"), + } +} + +/// `GET /api/permission/Position/SelectorTree` —— 岗位下拉**树**(按 `organizeId` 分组)。 +/// +/// 🔴 前端 `getPositionSelectorTree({organizeId})` 要的是「机构下挂岗位」的两层结构; +/// 本仓岗位表**没有层级**(`f_parent_id` 未建模)⇒ 退化为「按机构分组的平铺树」, +/// `organizeId` 命中就只返该机构的岗位。 +pub async fn position_selector_tree( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + let org = crate::platform::sys::query_param(&raw, "organizeId"); + let org = org.trim().to_string(); + let (sql, params): (String, Vec>) = if org.is_empty() { + ( + format!( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ + COALESCE(f_organize_id, '') AS \"organizeId\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\" \ + FROM base_position WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ), + Vec::new(), + ) + } else { + ( + format!( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ + COALESCE(f_organize_id, '') AS \"organizeId\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\" \ + FROM base_position WHERE COALESCE(f_delete_mark,0) = 0 \ + AND COALESCE(f_organize_id,'') = $1::text \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ), + vec![Some(org)], + ) + }; + match state.db.query_json_params(&sql, ¶ms_of(¶ms)).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "岗位下拉树查询"), + } +} + +/// `POST /api/permission/Position/PositionCondition` —— 按 id 集取岗位(body `{ids:[…]}`)。 +pub async fn position_condition( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return ok(list_vo(Vec::new())), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + if ids.is_empty() { + return ok(list_vo(Vec::new())); + } + let joined = ids.join(","); + let sql = format!( + "SELECT {POSITION_PROJECTION} FROM base_position \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + AND f_id = ANY(string_to_array($1::text, ',')) \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + match state + .db + .query_json_params(&sql, ¶ms_of(&[Some(joined)])) + .await + { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "岗位条件查询"), + } +} + +/// `POST /api/permission/Position/SelectedList` —— 已选岗位基本信息(body `{ids:[…]}`)。 +/// +/// 🔴 **刻意不复用 `position_condition`**:契约扫描器是**静态**推守卫的, +/// 委托调用会让它「推不出守卫」(CC6 判「推不出 ≠ 一致」)⇒ 这里自立一份。 +pub async fn position_selected_list( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return ok(list_vo(Vec::new())), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + if ids.is_empty() { + return ok(list_vo(Vec::new())); + } + let joined = ids.join(","); + let sql = format!( + "SELECT {POSITION_PROJECTION} FROM base_position \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + AND f_id = ANY(string_to_array($1::text, ',')) \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + match state + .db + .query_json_params(&sql, ¶ms_of(&[Some(joined)])) + .await + { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "已选岗位查询"), + } +} + +/// `POST /api/permission/Position/{id}/Actions/DutyPosition` —— 设为机构责任岗位。 +pub async fn position_duty_position( + State(state): State, + headers: HeaderMap, + Path(id): Path, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + let id = id.trim().to_string(); + let org = crate::platform::sys::query_param(&raw, "organizeId"); + let org = org.trim().to_string(); + if org.is_empty() { + return fail(code::FAIL, "organizeId 不能为空"); + } + let values = [Some(id), Some(org)]; + let sql = "UPDATE base_organize SET f_duty_position = $1::text WHERE f_id = $2::text \ + AND COALESCE(f_delete_mark,0) = 0"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "设置责任岗位"); + } + ok(Value::Null) +} + +/// `POST /api/permission/Position/{id}/Actions/DutyUser` —— 设为岗位责任人。 +pub async fn position_duty_user( + State(state): State, + headers: HeaderMap, + Path(id): Path, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_POSITION).await { + return resp; + } + let id = id.trim().to_string(); + let user_id = crate::platform::sys::query_param(&raw, "userId"); + let user_id = user_id.trim().to_string(); + if user_id.is_empty() { + return fail(code::FAIL, "userId 不能为空"); + } + let values = [Some(user_id), Some(id)]; + let sql = "UPDATE base_position SET f_duty_user = $1::text WHERE f_id = $2::text \ + AND COALESCE(f_delete_mark,0) = 0"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "设置岗位责任人"); + } + ok(Value::Null) +} + +// ---------------------------------------------------------------- 角色管理(base_role) + +/// 🔴 **列名只来自这张白名单**(`db/schema.sql` 的 `base_role`,官方 DDL 逐字)。 +const ROLE_WRITE_FIELDS: [(&str, &str, &str); 7] = [ + ("fullName", "f_full_name", ""), + ("enCode", "f_en_code", ""), + ("type", "f_type", ""), + ("globalMark", "f_global_mark", "::integer"), + ("description", "f_description", ""), + ("enabledMark", "f_enabled_mark", "::integer"), + ("sortCode", "f_sort_code", "::bigint"), +]; + +const ROLE_PROJECTION: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + f_en_code AS \"enCode\", f_type AS \"type\", \ + COALESCE(f_global_mark, 0) AS \"globalMark\", f_description AS \"description\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", \ + COALESCE(f_is_condition, 0) AS \"isCondition\", \ + (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\""; + +/// `GET /api/permission/Role/{id}` —— 角色详情。 +pub async fn role_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ROLE).await { + return resp; + } + let id = id.trim().to_string(); + let sql = format!( + "SELECT {ROLE_PROJECTION} FROM base_role \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" + ); + match state.db.query_json_params(&sql, &[&id]).await { + Ok(rows) => match rows.into_iter().next() { + Some(row) => ok(row), + None => fail(code::FAIL, "角色不存在"), + }, + Err(e) => db_error(e, "角色详情查询"), + } +} + +/// `POST /api/permission/Role` —— 建角色。 +pub async fn role_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_ROLE).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let full_name = obj + .get("fullName") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if full_name.is_empty() { + return fail(code::FAIL, "角色名称不能为空"); + } + + let new_id = new_uuid(); + let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name"]; + let mut casts: Vec<&str> = vec!["", "", ""]; + let mut values: Vec> = + vec![Some(new_id.clone()), Some("0".to_string()), Some(full_name)]; + + for (json_key, column, cast) in ROLE_WRITE_FIELDS { + if column == "f_full_name" { + continue; + } + if obj.contains_key(json_key) { + columns.push(column); + casts.push(cast); + values.push(value_to_text(obj.get(json_key))); + } + } + if !obj.contains_key("enabledMark") { + columns.push("f_enabled_mark"); + casts.push("::integer"); + values.push(Some("1".to_string())); + } + if !obj.contains_key("sortCode") { + columns.push("f_sort_code"); + casts.push("::bigint"); + values.push(Some("0".to_string())); + } + columns.push("f_creator_user_id"); + casts.push(""); + values.push(Some(user.account)); + columns.push("f_delete_mark"); + casts.push("::integer"); + values.push(Some("0".to_string())); + columns.push("f_creator_time"); + let mut marks: Vec = (0..values.len()) + .map(|i| placeholder(i + 1, casts[i])) + .collect(); + marks.push("now()".to_string()); + let sql = format!( + "INSERT INTO base_role ({}) VALUES ({})", + columns.join(", "), + marks.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "新建角色"); + } + ok(json!({ "id": new_id })) +} + +/// `PUT /api/permission/Role/{id}` —— 改角色(**只 SET body 里出现的键**)。 +pub async fn role_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_ROLE).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_role \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "角色查询"), + }; + if rows.is_empty() { + return fail(code::FAIL, "角色不存在"); + } + + let mut sets: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + for (json_key, column, cast) in ROLE_WRITE_FIELDS { + if !obj.contains_key(json_key) { + continue; + } + values.push(value_to_text(obj.get(json_key))); + sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); + } + if sets.is_empty() { + return ok(Value::Null); + } + values.push(Some(user.account)); + sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); + sets.push("f_last_modify_time = now()".to_string()); + values.push(Some(id)); + let sql = format!( + "UPDATE base_role SET {} WHERE f_id = ${}::text", + sets.join(", "), + values.len() + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "修改角色"); + } + ok(Value::Null) +} + +/// `DELETE /api/permission/Role/{id}` —— 删角色(软删)。 +pub async fn role_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard(&state, &headers, EN_ROLE).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let values = [Some(user.account), Some(id)]; + let sql = "UPDATE base_role SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text WHERE f_id = $2::text \ + AND COALESCE(f_delete_mark,0) = 0"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "删除角色"); + } + ok(Value::Null) +} + +/// `GET /api/permission/Role/Selector` —— 角色下拉(`ListVO`)。 +pub async fn role_selector( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ROLE).await { + return resp; + } + let type_filter = crate::platform::sys::query_param(&raw, "type"); + let type_filter = type_filter.trim().to_string(); + let (sql, params): (String, Vec>) = if type_filter.is_empty() { + ( + format!( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ + f_type AS \"type\", COALESCE(f_sort_code, 0) AS \"sortCode\" \ + FROM base_role WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ), + Vec::new(), + ) + } else { + ( + format!( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ + f_type AS \"type\", COALESCE(f_sort_code, 0) AS \"sortCode\" \ + FROM base_role WHERE COALESCE(f_delete_mark,0) = 0 AND f_type = $1::text \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ), + vec![Some(type_filter)], + ) + }; + match state.db.query_json_params(&sql, ¶ms_of(¶ms)).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "角色下拉查询"), + } +} + +/// `POST /api/permission/Role/RoleCondition` —— 按 id 集取角色(body `{ids:[…]}`)。 +pub async fn role_condition( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_ROLE).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return ok(list_vo(Vec::new())), + Err(resp) => return resp, + }; + let ids = id_list(&obj); + if ids.is_empty() { + return ok(list_vo(Vec::new())); + } + let joined = ids.join(","); + let sql = format!( + "SELECT {ROLE_PROJECTION} FROM base_role \ + WHERE COALESCE(f_delete_mark,0) = 0 \ + AND f_id = ANY(string_to_array($1::text, ',')) \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + match state + .db + .query_json_params(&sql, ¶ms_of(&[Some(joined)])) + .await + { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "角色条件查询"), + } +} + +/// `GET /api/permission/Group/Selector` —— 分组下拉(`ListVO`)。 +pub async fn group_selector( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_USER).await { + return resp; + } + let sql = format!( + "SELECT {GROUP_PROJECTION} FROM base_group WHERE COALESCE(f_delete_mark,0) = 0 \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + match state.db.query_json_params(&sql, &[]).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "分组下拉查询"), + } +} + +// ---------------------------------------------------------------- 菜单管理(base_module) + +/// 🔴 **列名只来自这张白名单**(`db/schema.sql` 的 `base_module`,29 列)。 +/// 驼峰 ≠ 下划线机械转换(如 `urlAddress` ↔ `f_url_address`)。 +const MENU_WRITE_FIELDS: [(&str, &str, &str); 13] = [ + ("parentId", "f_parent_id", ""), + ("fullName", "f_full_name", ""), + ("enCode", "f_en_code", ""), + ("category", "f_category", ""), + ("urlAddress", "f_url_address", ""), + ("pageAddress", "f_page_address", ""), + ("icon", "f_icon", ""), + ("linkTarget", "f_link_target", ""), + ("type", "f_type", "::integer"), + ("propertyJson", "f_property_json", ""), + ("description", "f_description", ""), + ("enabledMark", "f_enabled_mark", "::integer"), + ("sortCode", "f_sort_code", "::bigint"), +]; + +/// `GET /api/system/Menu/{id}` —— 菜单详情。 +pub async fn menu_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_MENU).await { + return resp; + } + let id = id.trim().to_string(); + let sql = format!( + "SELECT {MENU_PROJECTION} FROM base_module \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1" + ); + match state.db.query_json_params(&sql, &[&id]).await { + Ok(rows) => match rows.into_iter().next() { + Some(row) => ok(row), + None => fail(code::FAIL, "菜单不存在"), + }, + Err(e) => db_error(e, "菜单详情查询"), + } +} + +/// `POST /api/system/Menu` —— 建菜单。 +pub async fn menu_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_MENU).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let full_name = obj + .get("fullName") + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string(); + if full_name.is_empty() { + return fail(code::FAIL, "菜单名称不能为空"); + } + // 🔴 菜单**必须落在某个系统**下(`f_system_id`),否则 `ModuleBySystem` 查不到它 + // ⇒ 不传就落到当前 `App-Code` 解析出的系统。 + let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await; + + let new_id = new_uuid(); + let mut columns: Vec<&str> = vec!["f_id", "f_tenant_id", "f_full_name", "f_system_id"]; + let mut casts: Vec<&str> = vec!["", "", "", ""]; + let mut values: Vec> = vec![ + Some(new_id.clone()), + Some("0".to_string()), + Some(full_name), + Some(sys.id.clone()), + ]; + + for (json_key, column, cast) in MENU_WRITE_FIELDS { + if column == "f_full_name" { + continue; + } + if obj.contains_key(json_key) { + columns.push(column); + casts.push(cast); + values.push(value_to_text(obj.get(json_key))); + } + } + if !obj.contains_key("enabledMark") { + columns.push("f_enabled_mark"); + casts.push("::integer"); + values.push(Some("1".to_string())); + } + if !obj.contains_key("sortCode") { + columns.push("f_sort_code"); + casts.push("::bigint"); + values.push(Some("0".to_string())); + } + columns.push("f_creator_user_id"); + casts.push(""); + values.push(Some(user.account)); + columns.push("f_delete_mark"); + casts.push("::integer"); + values.push(Some("0".to_string())); + columns.push("f_creator_time"); + let mut marks: Vec = (0..values.len()) + .map(|i| placeholder(i + 1, casts[i])) + .collect(); + marks.push("now()".to_string()); + let sql = format!( + "INSERT INTO base_module ({}) VALUES ({})", + columns.join(", "), + marks.join(", ") + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "新建菜单"); + } + ok(json!({ "id": new_id })) +} + +/// `PUT /api/system/Menu/{id}` —— 改菜单(**只 SET body 里出现的键**)。 +pub async fn menu_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard(&state, &headers, EN_MENU).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let obj = match parse_body(&body) { + Ok(Value::Object(o)) => o, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_module \ + WHERE f_id = $1::text AND COALESCE(f_delete_mark,0) = 0 LIMIT 1", + &[&id], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "菜单查询"), + }; + if rows.is_empty() { + return fail(code::FAIL, "菜单不存在"); + } + + let mut sets: Vec = Vec::new(); + let mut values: Vec> = Vec::new(); + for (json_key, column, cast) in MENU_WRITE_FIELDS { + if !obj.contains_key(json_key) { + continue; + } + values.push(value_to_text(obj.get(json_key))); + sets.push(format!("{} = ${}::text{}", column, values.len(), cast)); + } + if sets.is_empty() { + return ok(Value::Null); + } + values.push(Some(user.account)); + sets.push(format!("f_last_modify_user_id = ${}::text", values.len())); + sets.push("f_last_modify_time = now()".to_string()); + values.push(Some(id)); + let sql = format!( + "UPDATE base_module SET {} WHERE f_id = ${}::text", + sets.join(", "), + values.len() + ); + if let Err(e) = state.db.exec_params(&sql, ¶ms_of(&values)).await { + return db_error(e, "修改菜单"); + } + ok(Value::Null) +} + +/// `DELETE /api/system/Menu/{id}` —— 删菜单(软删)。 +pub async fn menu_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard(&state, &headers, EN_MENU).await { + Ok(u) => u, + Err(resp) => return resp, + }; + let id = id.trim().to_string(); + let values = [Some(user.account), Some(id)]; + let sql = "UPDATE base_module SET f_delete_mark = 1, f_delete_time = now(), \ + f_delete_user_id = $1::text WHERE f_id = $2::text \ + AND COALESCE(f_delete_mark,0) = 0"; + if let Err(e) = state.db.exec_params(sql, ¶ms_of(&values)).await { + return db_error(e, "删除菜单"); + } + ok(Value::Null) +} + +/// `GET /api/system/Menu/Selector/{id}` —— 上级菜单下拉(**排除 `id` 自己及其子孙**)。 +/// +/// 🔴 官方 `getMenuSelector(data, id)`:表单里选上级时,不能选到自己或自己的子孙 +/// (否则树成环)。本仓按 `f_url_address`/`f_id` 前缀链判子孙。 +pub async fn menu_selector( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_MENU).await { + return resp; + } + let id = id.trim().to_string(); + let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await; + let sql = format!( + "SELECT {MENU_PROJECTION} FROM base_module WHERE f_delete_mark = 0 \ + AND f_system_id = $1::text \ + AND f_id <> $2::text AND COALESCE(f_parent_id,'0') <> $2::text \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + let params = [Some(sys.id), Some(id)]; + match state.db.query_json_params(&sql, ¶ms_of(¶ms)).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "上级菜单下拉查询"), + } +} + +/// `GET /api/system/Menu/Selector/All` —— 全量菜单下拉。 +pub async fn menu_selector_all( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_MENU).await { + return resp; + } + let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await; + let sql = format!( + "SELECT {MENU_PROJECTION} FROM base_module WHERE f_delete_mark = 0 \ + AND f_system_id = $1::text \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + match state.db.query_json_params(&sql, &[&sys.id]).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "菜单下拉查询"), + } +} + +/// `GET /api/system/Menu/SelectorFilter/{id}` —— 上级菜单下拉(**发布过滤**版)。 +/// +/// 🔴 **刻意不复用 `menu_selector`**:契约扫描器静态推守卫,委托调用会「推不出守卫」。 +pub async fn menu_selector_filter( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_MENU).await { + return resp; + } + let id = id.trim().to_string(); + let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await; + let sql = format!( + "SELECT {MENU_PROJECTION} FROM base_module WHERE f_delete_mark = 0 \ + AND f_system_id = $1::text \ + AND f_id <> $2::text AND COALESCE(f_parent_id,'0') <> $2::text \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + let params = [Some(sys.id), Some(id)]; + match state.db.query_json_params(&sql, ¶ms_of(¶ms)).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "上级菜单下拉查询(发布过滤)"), + } +} + +/// `GET /api/system/Menu/Selector/Form` —— 菜单表单用的下拉(**刻意不复用**)。 +pub async fn menu_selector_form( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_MENU).await { + return resp; + } + let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await; + let sql = format!( + "SELECT {MENU_PROJECTION} FROM base_module WHERE f_delete_mark = 0 \ + AND f_system_id = $1::text \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + match state.db.query_json_params(&sql, &[&sys.id]).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "菜单表单下拉查询"), + } +} + +/// `GET /api/system/Menu/getSystemMenu` —— 系统菜单树(前端 `getMenuSelectorFormTree()`)。 +pub async fn menu_get_system_menu( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_MENU).await { + return resp; + } + let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await; + let sql = format!( + "SELECT {MENU_PROJECTION} FROM base_module WHERE f_delete_mark = 0 \ + AND f_system_id = $1::text \ + ORDER BY f_sort_code ASC, f_full_name ASC" + ); + match state.db.query_json_params(&sql, &[&sys.id]).await { + Ok(rows) => ok(list_vo(rows)), + Err(e) => db_error(e, "系统菜单树查询"), + } +} + +/// `GET /api/system/Menu/Selector/Page` —— 特定类型菜单(带分页,PageListVO)。 +pub async fn menu_selector_page( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_MENU).await { + return resp; + } + let page = Paging::of(&raw); + let sys = system::resolve_system(&state.db, system::app_code_of(&headers).as_deref()).await; + let type_filter = crate::platform::sys::query_param(&raw, "type"); + let type_filter = type_filter.trim().to_string(); + + let (filter_sql, mut params): (String, Vec>) = if type_filter.is_empty() { + (String::new(), vec![Some(sys.id.clone())]) + } else { + ( + " AND f_type = $2::text::integer".to_string(), + vec![Some(sys.id.clone()), Some(type_filter)], + ) + }; + let count_sql = format!( + "SELECT count(*)::bigint AS \"c\" FROM base_module \ + WHERE f_delete_mark = 0 AND f_system_id = $1::text{filter_sql}" + ); + let total = match state + .db + .query_json_params(&count_sql, ¶ms_of(¶ms)) + .await + { + Ok(rows) => rows + .into_iter() + .next() + .and_then(|r| r["c"].as_i64()) + .unwrap_or(0), + Err(e) => return db_error(e, "菜单总数查询"), + }; + params.push(Some(page.page_size.to_string())); + params.push(Some(page.offset.to_string())); + let (p_limit, p_offset) = if filter_sql.is_empty() { + ("$2", "$3") + } else { + ("$3", "$4") + }; + let sql = format!( + "SELECT {MENU_PROJECTION} FROM base_module \ + WHERE f_delete_mark = 0 AND f_system_id = $1::text{filter_sql} \ + ORDER BY f_sort_code ASC, f_full_name ASC \ + LIMIT {p_limit}::text::integer OFFSET {p_offset}::text::integer" + ); + match state.db.query_json_params(&sql, ¶ms_of(¶ms)).await { + Ok(rows) => ok(page_list(page.current_page, page.page_size, total, rows)), + Err(e) => db_error(e, "菜单分页查询"), + } +} + +/// `GET /api/system/Menu/{id}/Actions/Export` —— 导出菜单(**本仓不做文件导出**)。 +/// +/// 🔴 前端 `exportMenu(id)` 拿 `res.data.url` 去下载;本仓没有导出文件服务 +/// ⇒ 恒返 `data: null`,前端 `if (!res.data.url) return;` 会静默跳过(不弹红条)。 +pub async fn menu_export( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_MENU).await { + return resp; + } + let _ = id.trim(); + ok(Value::Null) +} + +/// `GET /api/system/Menu/getPermissionGroup/{id}` —— 菜单的**权限组**(本仓不做按钮/列/表单级)。 +pub async fn menu_permission_group( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_MENU).await { + return resp; + } + let _ = id.trim(); + // 🔴 与已知限制 (ag) 一致:按钮/列/表单/数据级权限恒空数组。 + ok(json!({ "list": [] })) +} + +/// `GET /api/system/Menu/getPermission/{id}/{permissionId}` —— 权限组下的权限明细(恒空)。 +pub async fn menu_permission_info( + State(state): State, + headers: HeaderMap, + Path((id, permission_id)): Path<(String, String)>, +) -> Json { + if let Err(resp) = guard(&state, &headers, EN_MENU).await { + return resp; + } + let _ = (id.trim(), permission_id.trim()); + ok(json!({ "list": [] })) +} + #[cfg(test)] mod tests { use super::*; diff --git a/src/backend/src/routes.rs b/src/backend/src/routes.rs index 4bdd830..508aea7 100644 --- a/src/backend/src/routes.rs +++ b/src/backend/src/routes.rs @@ -199,6 +199,25 @@ pub fn build_router(state: AppState) -> axum::Router { .route("/api/oauth/getLoginConfig", get(jnpf::get_login_config)) .route("/api/oauth/getConfig/{account}", get(jnpf::get_user_config)) .route("/api/permission/Role", get(jnpf::roles_list)) + .route("/api/permission/Role", post(jnpf::role_create)) + .route("/api/permission/Role/Selector", get(jnpf::role_selector)) + .route("/api/permission/Role/RoleCondition", post(jnpf::role_condition)) + .route("/api/permission/Role/{id}", get(jnpf::role_info)) + .route("/api/permission/Role/{id}", put(jnpf::role_update)) + .route("/api/permission/Role/{id}", delete(jnpf::role_delete)) + .route("/api/permission/Position", get(jnpf::position_list)) + .route("/api/permission/Position", post(jnpf::position_create)) + .route("/api/permission/Position/Selector", get(jnpf::position_selector)) + .route("/api/permission/Position/SelectorTree", get(jnpf::position_selector_tree)) + .route("/api/permission/Position/PositionCondition", post(jnpf::position_condition)) + .route("/api/permission/Position/SelectedList", post(jnpf::position_selected_list)) + .route("/api/permission/Position/{id}", get(jnpf::position_info)) + .route("/api/permission/Position/{id}", put(jnpf::position_update)) + .route("/api/permission/Position/{id}", delete(jnpf::position_delete)) + .route("/api/permission/Position/{id}/Actions/DutyPosition", post(jnpf::position_duty_position)) + .route("/api/permission/Position/{id}/Actions/DutyUser", post(jnpf::position_duty_user)) + .route("/api/permission/Group/Selector", get(jnpf::group_selector)) + .route("/api/permission/Organize/AsyncPosList", get(jnpf::organize_async_pos_list)) .route( "/api/permission/Organize/AsyncList/{id}", get(jnpf::organize_async_list), @@ -210,6 +229,19 @@ pub fn build_router(state: AppState) -> axum::Router { .route("/api/permission/Organize/{id}", put(jnpf::organize_update)) .route("/api/permission/Organize/{id}", delete(jnpf::organize_delete)) .route("/api/system/Menu/ModuleBySystem", get(jnpf::module_by_system)) + .route("/api/system/Menu", post(jnpf::menu_create)) + .route("/api/system/Menu/Selector/All", get(jnpf::menu_selector_all)) + .route("/api/system/Menu/Selector/Form", get(jnpf::menu_selector_form)) + .route("/api/system/Menu/Selector/Page", get(jnpf::menu_selector_page)) + .route("/api/system/Menu/getSystemMenu", get(jnpf::menu_get_system_menu)) + .route("/api/system/Menu/{id}", get(jnpf::menu_info)) + .route("/api/system/Menu/{id}", put(jnpf::menu_update)) + .route("/api/system/Menu/{id}", delete(jnpf::menu_delete)) + .route("/api/system/Menu/{id}/Actions/Export", get(jnpf::menu_export)) + .route("/api/system/Menu/getPermissionGroup/{id}", get(jnpf::menu_permission_group)) + .route("/api/system/Menu/getPermission/{id}/{permissionId}", get(jnpf::menu_permission_info)) + .route("/api/system/Menu/Selector/{id}", get(jnpf::menu_selector)) + .route("/api/system/Menu/SelectorFilter/{id}", get(jnpf::menu_selector_filter)) // 🔴 官方是 `POST /api/permission/Authority/Data/{objectId}/Values` // —— 与面 A 的 `PUT .../Data/{objectId}` **同前缀不同方法不同路径** // ⇒ matchit 0.8.4 允许「静态段跟在参数节点后」⇒ 两条可共存。 @@ -737,7 +769,7 @@ mod tests { let (_, body) = raw.split_once("\r\n\r\n").expect("响应必须有头体分隔"); let body: Value = serde_json::from_str(body).expect("响应体必须是合法 JSON"); assert_eq!(body["ok"], true); - assert_eq!(body["tables"], 13); + assert_eq!(body["tables"], 14); assert_eq!(body["version"], env!("CARGO_PKG_VERSION")); } @@ -752,7 +784,7 @@ mod tests { let port = serve(new_state(db().await)).await; // 🔴 按**路径**列(同一路径多个方法只算一条)—— 每条都用 PATCH 探 405。 - const JNPF_REGISTERED: [&str; 31] = [ + const JNPF_REGISTERED: [&str; 55] = [ "/api/permission/Users", "/api/permission/Users/any-id", "/api/permission/Users/BatchDelete", @@ -779,6 +811,30 @@ mod tests { "/api/permission/Organize", "/api/permission/Organize/any-id", "/api/permission/Organize/Selector", + "/api/permission/Organize/AsyncPosList", + "/api/permission/Role/Selector", + "/api/permission/Role/RoleCondition", + "/api/permission/Role/any-id", + "/api/permission/Position", + "/api/permission/Position/Selector", + "/api/permission/Position/SelectorTree", + "/api/permission/Position/PositionCondition", + "/api/permission/Position/SelectedList", + "/api/permission/Position/any-id", + "/api/permission/Position/any-id/Actions/DutyPosition", + "/api/permission/Position/any-id/Actions/DutyUser", + "/api/permission/Group/Selector", + "/api/system/Menu", + "/api/system/Menu/any-id", + "/api/system/Menu/Selector/All", + "/api/system/Menu/Selector/Form", + "/api/system/Menu/Selector/Page", + "/api/system/Menu/Selector/any-id", + "/api/system/Menu/SelectorFilter/any-id", + "/api/system/Menu/getSystemMenu", + "/api/system/Menu/any-id/Actions/Export", + "/api/system/Menu/getPermissionGroup/any-id", + "/api/system/Menu/getPermission/any-id/any-id", "/api/system/DictionaryData/All", "/api/system/HomeData", "/api/system/MenuData/useModuleNum/any-id",