From 4e8ef78b20fe30a8ae81478333a6b178a7fce05c Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 1 Nov 2026 17:07:42 +0800 Subject: [PATCH] =?UTF-8?q?feat(face-b):=20=E6=9D=83=E9=99=90=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=97=8F=E8=90=BD=E5=9C=B0=EF=BC=88=E9=9D=A2=20B=20?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=2010=EF=BC=8C+31=20=E7=AB=AF=E7=82=B9?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增 6 张表(base_signature / base_signature_user / base_module_button / base_module_column / base_module_form / base_advanced_query_scheme), tables 43 → 49。 - 电子签章 Signature(7):CRUD + Selector + 按 ids 取列表;官方无点权限, 只需登录;名称/编码两次独立判重;userIds 列表是字符串(;连接)、详情是数组 - 按钮权限 ModuleButton(7):CRUD + Selector + selectActions 批量落树 (parentId=-1 为根、任一撞码则整体失败不落库) - 列表权限 ModuleColumn(6) / 表单权限 ModuleForm(6):单条按「菜单存在」套 enCode 前缀,批量无条件套;读时剥除前缀 - 高级查询方案 AdvancedQuery(5):只看自己的方案(列表 ListVO 非 PageListVO) 权限模式:ModuleButton/Column/Form 三族官方为 OR 两码 (permission.resource | appConfig.appResource);Signature 与 AdvancedQuery 官方无 @SaCheckPermission ⇒ 只需登录。 契约登记三处同步:docs/contract.md 的 [ENDPOINT] +31 行、[FACE] B 300→331、 [OFFICIAL] +31 条(src 写真实 Java 方法行号)。 回归测试 tests/batch10_it.rs(9 条)。cargo test --workspace 545 全过, 十二道闸门全绿,check-contract PASS=10 FAIL=0(官方端点覆盖 350/357)。 --- crates/sspf-store/src/db.rs | 23 +- docs/contract.md | 64 +- src/backend/db/schema.sql | 131 ++ src/backend/src/main.rs | 15 +- src/backend/src/platform/face_b.rs | 2179 ++++++++++++++++++++++++++++ src/backend/src/routes.rs | 134 +- src/backend/tests/batch10_it.rs | 804 ++++++++++ src/backend/tests/batch6_it.rs | 5 +- 8 files changed, 3344 insertions(+), 11 deletions(-) create mode 100644 src/backend/tests/batch10_it.rs diff --git a/crates/sspf-store/src/db.rs b/crates/sspf-store/src/db.rs index 50b066c..611f2cb 100644 --- a/crates/sspf-store/src/db.rs +++ b/crates/sspf-store/src/db.rs @@ -1215,23 +1215,26 @@ mod tests { // + base_visual_dev / base_visual_release(P2 低代码),+ 4 张业务表)。 // + base_data_interface / base_data_interface_oauth / base_data_interface_user // / base_data_interface_log(数据接口 + 接口认证批次) - // + base_print_template / base_print_version(打印模板批次)。 + // + base_print_template / base_print_version(打印模板批次) + // + base_signature / base_signature_user / base_module_button + // / base_module_column / base_module_form / base_advanced_query_scheme + // (权限配置批次)。 // // 🔴 这个数字**故意写死**:加表必须同时改这里与 main.rs 的 BASE_TABLES, // 两处都改才算登记完成(漏一处就是「孤儿 DDL」或「白名单多一项」)。 let count = SCHEMA_SQL.matches("CREATE TABLE ").count(); - assert_eq!(count, 43, "schema.sql 的 CREATE TABLE 数量应为 43"); + assert_eq!(count, 49, "schema.sql 的 CREATE TABLE 数量应为 49"); } /// 🔴 [`ddl_tables`] 的解析必须与上面那条计数一致(不能只数到 12 却解析出别的)。 #[test] fn ddl_tables_parses_every_create_table() { let tables = ddl_tables(); - assert_eq!(tables.len(), 43, "ddl_tables 应解析出 43 张表"); + assert_eq!(tables.len(), 49, "ddl_tables 应解析出 49 张表"); assert!(tables.iter().all(|t| !t.is_empty())); assert_eq!( tables.iter().collect::>().len(), - 43, + 49, "表名不许重复" ); // 基础 base_* 必须都在(业务表由业务层 spec 派生,不在本文件写死)。 @@ -1258,6 +1261,18 @@ mod tests { "base_common_fields", "base_data_set", "base_data_set_relation", + "base_data_interface", + "base_data_interface_oauth", + "base_data_interface_user", + "base_data_interface_log", + "base_print_template", + "base_print_version", + "base_signature", + "base_signature_user", + "base_module_button", + "base_module_column", + "base_module_form", + "base_advanced_query_scheme", ] { assert!( tables.iter().any(|t| t == base), diff --git a/docs/contract.md b/docs/contract.md index f4dca27..f3b9c4e 100644 --- a/docs/contract.md +++ b/docs/contract.md @@ -1455,6 +1455,37 @@ B GET /api/system/printDev/Info/{id} onlineDev.printDev platform B GET /api/system/printDev/Version/{id} onlineDev.printDev platform B POST /api/system/printDev/Info/{id} onlineDev.printDev platform B DELETE /api/system/printDev/Info/{id} onlineDev.printDev platform +B GET /api/system/Signature 登录 platform +B POST /api/system/Signature 登录 platform +B GET /api/system/Signature/Selector 登录 platform +B POST /api/system/Signature/ListByIds 登录 platform +B GET /api/system/Signature/{id} 登录 platform +B PUT /api/system/Signature/{id} 登录 platform +B DELETE /api/system/Signature/{id} 登录 platform +B POST /api/system/ModuleButton permission.resource|appConfig.appResource platform +B POST /api/system/ModuleButton/selectActions/{menuId} permission.resource|appConfig.appResource platform +B GET /api/system/ModuleButton/{menuId}/List permission.resource|appConfig.appResource platform +B GET /api/system/ModuleButton/{menuId}/Selector permission.resource|appConfig.appResource platform +B GET /api/system/ModuleButton/{id} permission.resource|appConfig.appResource platform +B PUT /api/system/ModuleButton/{id} permission.resource|appConfig.appResource platform +B DELETE /api/system/ModuleButton/{id} permission.resource|appConfig.appResource platform +B POST /api/system/ModuleColumn permission.resource|appConfig.appResource platform +B POST /api/system/ModuleColumn/Actions/Batch permission.resource|appConfig.appResource platform +B GET /api/system/ModuleColumn/{moduleId}/Fields permission.resource|appConfig.appResource platform +B GET /api/system/ModuleColumn/{id} permission.resource|appConfig.appResource platform +B PUT /api/system/ModuleColumn/{id} permission.resource|appConfig.appResource platform +B DELETE /api/system/ModuleColumn/{id} permission.resource|appConfig.appResource platform +B POST /api/system/ModuleForm permission.resource|appConfig.appResource platform +B POST /api/system/ModuleForm/Actions/Batch permission.resource|appConfig.appResource platform +B GET /api/system/ModuleForm/{moduleId}/Fields permission.resource|appConfig.appResource platform +B GET /api/system/ModuleForm/{id} permission.resource|appConfig.appResource platform +B PUT /api/system/ModuleForm/{id} permission.resource|appConfig.appResource platform +B DELETE /api/system/ModuleForm/{id} permission.resource|appConfig.appResource platform +B POST /api/system/AdvancedQuery 登录 platform +B GET /api/system/AdvancedQuery/{moduleId}/List 登录 platform +B GET /api/system/AdvancedQuery/{id} 登录 platform +B PUT /api/system/AdvancedQuery/{id} 登录 platform +B DELETE /api/system/AdvancedQuery/{id} 登录 platform A GET /api/ssw/demo/DemoItem/List 登录 demo A POST /api/ssw/demo/DemoItem/Save 登录 demo A DELETE /api/ssw/demo/DemoItem/Delete 登录 demo @@ -1471,7 +1502,7 @@ A DELETE /api/ssw/asset/DataResource/Delete asset/DataResource asset [FACE] # face 条数 说明 A 28 面 A 专属(+ 2 条共用 ⇒ 面 A 合计 30 条) -B 300 面 B 专属(官方 JNPF 形状) +B 331 面 B 专属(官方 JNPF 形状) AB 2 两面共用(CurrentUser / Authority Data —— 按判别头分流) [OFFICIAL] @@ -1822,6 +1853,37 @@ GET /api/system/printDev/Info/{id} implemented PrintDevController.java:313 面 B GET /api/system/printDev/Version/{id} implemented PrintDevController.java:353 面 B 已落地:版本列表(裸数组,fullName=打印版本V{n}) POST /api/system/printDev/Info/{id} implemented PrintDevController.java:322 面 B 已落地:版本复制 DELETE /api/system/printDev/Info/{id} implemented PrintDevController.java:331 面 B 已落地:版本删除(至少留 1 个;已发布/已归档不可删) +GET /api/system/Signature implemented SignatureController.java:55 面 B 已落地:PageListVO;userIds = 「真实名/账号」用「;」连接;支持 userId 过滤 +POST /api/system/Signature implemented SignatureController.java:112 面 B 已落地:名称/编码判重(EXIST001/EXIST002 分开报)+ 写签章 + 写授权人 +GET /api/system/Signature/Selector implemented SignatureController.java:67 面 B 已落地:ListVO +POST /api/system/Signature/ListByIds implemented SignatureController.java:81 面 B 已落地:ListVO(按 ids 取) +GET /api/system/Signature/{id} implemented SignatureController.java:96 面 B 已落地:SignatureInfoVO(userIds 是数组) +PUT /api/system/Signature/{id} implemented SignatureController.java:134 面 B 已落地:只 SET body 出现的键;userIds 变化时全量重建授权人 +DELETE /api/system/Signature/{id} implemented SignatureController.java:158 面 B 已落地:软删 +POST /api/system/ModuleButton implemented ModuleButtonController.java:123 面 B 已落地:同菜单内编码判重;parentId 缺省 -1 +GET /api/system/ModuleButton/{menuId}/List implemented ModuleButtonController.java:71 面 B 已落地:PageListVO(按 menuId 过滤 + 关键词) +GET /api/system/ModuleButton/{menuId}/Selector implemented ModuleButtonController.java:87 面 B 已落地:ListVO + **树**(parentId=-1 视为根) +GET /api/system/ModuleButton/{id} implemented ModuleButtonController.java:107 面 B 已落地:ModuleButtonInfoVO +PUT /api/system/ModuleButton/{id} implemented ModuleButtonController.java:144 面 B 已落地:只 SET body 出现的键 +DELETE /api/system/ModuleButton/{id} implemented ModuleButtonController.java:167 面 B 已落地:软删 +POST /api/system/ModuleButton/selectActions/{menuId} implemented ModuleButtonController.java:204 面 B 已落地:从动作管理批量选入(逐条判重;任一撞 ⇒ 整体失败不落库) +POST /api/system/ModuleColumn implemented ModuleColumnController.java:180 面 B 已落地:enCode 前缀化(fieldRule=1 ⇒ jnpf__jnpf_;=2 ⇒ -) +GET /api/system/ModuleColumn/{moduleId}/Fields implemented ModuleColumnController.java:79 面 B 已落地:PageListVO;读时剥掉 enCode 前缀 +GET /api/system/ModuleColumn/{id} implemented ModuleColumnController.java:153 面 B 已落地:ModuleColumnInfoVO(childTableKey 默认 tableField) +PUT /api/system/ModuleColumn/{id} implemented ModuleColumnController.java:215 面 B 已落地:同 create 的前缀化规则 +DELETE /api/system/ModuleColumn/{id} implemented ModuleColumnController.java:251 面 B 已落地:软删 +POST /api/system/ModuleColumn/Actions/Batch implemented ModuleColumnController.java:294 面 B 已落地:columnJson 批量;库内撞码与**批内撞码**都判失败 +POST /api/system/ModuleForm implemented ModuleFormController.java:201 面 B 已落地:同 ModuleColumn 的前缀化规则 +GET /api/system/ModuleForm/{moduleId}/Fields implemented ModuleFormController.java:83 面 B 已落地:PageListVO;读时剥掉 enCode 前缀 +GET /api/system/ModuleForm/{id} implemented ModuleFormController.java:174 面 B 已落地:ModuleFormInfoVO(childTableKey 默认 tableField) +PUT /api/system/ModuleForm/{id} implemented ModuleFormController.java:237 面 B 已落地:同 create 的前缀化规则 +DELETE /api/system/ModuleForm/{id} implemented ModuleFormController.java:272 面 B 已落地:软删 +POST /api/system/ModuleForm/Actions/Batch implemented ModuleFormController.java:290 面 B 已落地:formJson 批量;库内撞码与批内撞码都判失败 +POST /api/system/AdvancedQuery implemented AdvancedQueryController.java:54 面 B 已落地:必填校验(fullName/conditionJson/matchLogic/moduleId) +GET /api/system/AdvancedQuery/{moduleId}/List implemented AdvancedQueryController.java:106 面 B 已落地:ListVO;**只返当前用户自己**的方案 +GET /api/system/AdvancedQuery/{id} implemented AdvancedQueryController.java:125 面 B 已落地:只看自己的方案(他人 ⇒ 数据不存在) +PUT /api/system/AdvancedQuery/{id} implemented AdvancedQueryController.java:70 面 B 已落地:只 SET body 出现的键 +DELETE /api/system/AdvancedQuery/{id} implemented AdvancedQueryController.java:87 面 B 已落地:软删;只删自己的方案 [RULER] # name 期望断言数(尺子**自己**断言的条数;跑出来的条数对不上 ⇒ 失败) diff --git a/src/backend/db/schema.sql b/src/backend/db/schema.sql index 78191c4..9e507dc 100644 --- a/src/backend/db/schema.sql +++ b/src/backend/db/schema.sql @@ -1167,3 +1167,134 @@ CREATE TABLE base_print_version ( f_query_list TEXT, PRIMARY KEY (f_id, f_tenant_id) ); + +-- ==== 面 B 批次 10:权限配置族(官方表名对齐)==== +-- 官方 DDL:`base_signature` / `base_signature_user` / `base_module_button` / +-- `base_module_column` / `base_module_form` / `base_advanced_query_scheme`。 + +CREATE TABLE base_signature ( + f_id VARCHAR(50) NOT NULL, + f_full_name VARCHAR(200), + f_en_code VARCHAR(200), + f_icon TEXT, + f_enabled_mark INTEGER, + f_sort_code BIGINT, + f_description VARCHAR(500), + 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_tenant_id VARCHAR(50) DEFAULT '0' NOT NULL, + PRIMARY KEY (f_id, f_tenant_id) +); + +CREATE TABLE base_signature_user ( + f_id VARCHAR(50) NOT NULL, + f_signature_id VARCHAR(50), + f_user_id VARCHAR(50), + f_enabled_mark INTEGER, + f_sort_code BIGINT, + f_description VARCHAR(500), + 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_tenant_id VARCHAR(50) DEFAULT '0' NOT NULL, + PRIMARY KEY (f_id, f_tenant_id) +); + +CREATE TABLE base_module_button ( + f_id VARCHAR(50) NOT NULL, + f_parent_id VARCHAR(50), + f_full_name VARCHAR(200), + f_en_code VARCHAR(200), + f_icon VARCHAR(500), + f_url_address VARCHAR(500), + f_property_json TEXT, + f_module_id VARCHAR(50), + 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_tenant_id VARCHAR(50) DEFAULT '0' NOT NULL, + PRIMARY KEY (f_id, f_tenant_id) +); + +CREATE TABLE base_module_column ( + f_id VARCHAR(50) NOT NULL, + f_parent_id VARCHAR(50), + f_full_name VARCHAR(200), + f_en_code VARCHAR(200), + f_bind_table VARCHAR(50), + f_bind_table_name VARCHAR(50), + f_property_json TEXT, + f_module_id VARCHAR(50), + f_field_rule INTEGER, + f_child_table_key VARCHAR(50), + 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_tenant_id VARCHAR(50) DEFAULT '0' NOT NULL, + PRIMARY KEY (f_id, f_tenant_id) +); + +CREATE TABLE base_module_form ( + f_id VARCHAR(50) NOT NULL, + f_parent_id VARCHAR(50), + f_full_name VARCHAR(200), + f_en_code VARCHAR(200), + f_property_json TEXT, + f_module_id VARCHAR(50), + f_field_rule INTEGER, + f_child_table_key VARCHAR(50), + f_bind_table VARCHAR(50), + 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_tenant_id VARCHAR(50) DEFAULT '0' NOT NULL, + PRIMARY KEY (f_id, f_tenant_id) +); + +CREATE TABLE base_advanced_query_scheme ( + f_id VARCHAR(50) NOT NULL, + f_full_name VARCHAR(200), + f_match_logic VARCHAR(20), + f_condition_json TEXT, + f_module_id VARCHAR(50), + 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_sort_code BIGINT, + f_tenant_id VARCHAR(50) DEFAULT '0' NOT NULL, + PRIMARY KEY (f_id, f_tenant_id) +); diff --git a/src/backend/src/main.rs b/src/backend/src/main.rs index f0ca01b..3235640 100644 --- a/src/backend/src/main.rs +++ b/src/backend/src/main.rs @@ -49,8 +49,11 @@ use ssw_platform::routes; /// `base_db_link` / `base_data_type` / `base_common_fields`;数据集批次新增 /// `base_data_set` / `base_data_set_relation`;数据接口批次(2026-11-01)新增 /// `base_data_interface` / `base_data_interface_oauth` / `base_data_interface_user` / -/// `base_data_interface_log` / `base_print_template` / `base_print_version`,故清单现在是 **39 张**。 -const BASE_TABLES: [&str; 39] = [ +/// `base_data_interface_log` / `base_print_template` / `base_print_version`; +/// 权限配置批次(2026-11-01)新增 `base_signature` / `base_signature_user` / +/// `base_module_button` / `base_module_column` / `base_module_form` / +/// `base_advanced_query_scheme`,故清单现在是 **45 张**。 +const BASE_TABLES: [&str; 45] = [ "base_group", "base_user", "base_role", @@ -97,6 +100,14 @@ const BASE_TABLES: [&str; 39] = [ "base_data_interface_log", "base_print_template", "base_print_version", + // 🔴 权限配置批次(2026-11-01):电子签章 + 签章授权人 + 按钮/列表/表单权限 + // + 高级查询方案,仍是官方 DDL 逐字。 + "base_signature", + "base_signature_user", + "base_module_button", + "base_module_column", + "base_module_form", + "base_advanced_query_scheme", // 🔴 低代码两张表是**平台表**不是业务表:它们存的是「功能定义」, // 任何业务模块都会用,属于引擎基础设施。 "base_visual_dev", diff --git a/src/backend/src/platform/face_b.rs b/src/backend/src/platform/face_b.rs index 4e6854c..16de4b7 100644 --- a/src/backend/src/platform/face_b.rs +++ b/src/backend/src/platform/face_b.rs @@ -17889,6 +17889,2185 @@ pub async fn print_dev_get_list_options( // === PRINT DEV (打印模板) SECTION END === +// === PERMISSION CONFIG (权限配置族) SECTION START === +// 批次 10:电子签章 / 按钮权限 / 列表权限 / 表单权限 / 高级查询方案。 +// 官方控制器:`SignatureController` / `ModuleButtonController` / `ModuleColumnController` +// / `ModuleFormController` / `AdvancedQueryController`。 +// 官方表:`base_signature` / `base_signature_user` / `base_module_button` +// / `base_module_column` / `base_module_form` / `base_advanced_query_scheme`。 +// +// 🔴 **点权限判据**: +// - 按钮/列表/表单权限 ⇒ 官方 `@SaCheckPermission(value={"permission.resource", +// "appConfig.appResource"}, mode=SaMode.OR)` ⇒ 本仓 `guard_any(&[...])`。 +// - 电子签章 / 高级查询方案 ⇒ 官方**没有** `@SaCheckPermission` ⇒ 只需登录(`require_login_face_b`)。 + +/// 官方 `@SaCheckPermission(value={"permission.resource","appConfig.appResource"}, mode=OR)`。 +const EN_PERMISSION_RESOURCE: &str = "permission.resource"; +/// 同上的 OR 分支之一。 +const EN_APP_RESOURCE: &str = "appConfig.appResource"; + +/// 官方 `JnpfConst.SIDE_MARK_PRE`。 +const SIDE_MARK_PRE: &str = "jnpf_"; +/// 官方 `JnpfConst.SIDE_MARK`。 +const SIDE_MARK: &str = "_jnpf_"; + +/// 取字符串字段(trim)。 +fn b10_str_of(obj: &Map, key: &str) -> String { + obj.get(key) + .and_then(Value::as_str) + .unwrap_or_default() + .trim() + .to_string() +} + +/// 取整数字段(缺失 / 非法 ⇒ `None`)。 +fn b10_int_of(obj: &Map, key: &str) -> Option { + obj.get(key) + .and_then(|v| v.as_i64().or_else(|| v.as_str()?.trim().parse().ok())) +} + +/// 取字符串数组字段(缺失 ⇒ 空)。 +fn b10_str_list(obj: &Map, key: &str) -> Vec { + obj.get(key) + .and_then(Value::as_array) + .map(|arr| { + arr.iter() + .filter_map(|v| v.as_str().map(str::trim).filter(|s| !s.is_empty())) + .map(str::to_string) + .collect() + }) + .unwrap_or_default() +} + +/// 通用 INSERT —— 🔴 **每个 `$N` 都以 `::text` 打头**(值一律 `Option`)。 +async fn b10_insert( + state: &AppState, + table: &str, + columns: &[(&'static str, &'static str, Option)], +) -> Result<(), String> { + let mut cols_sql = String::new(); + let mut vals_sql = String::new(); + let mut bound: Vec> = Vec::new(); + for (i, (column, cast, value)) in columns.iter().enumerate() { + if i > 0 { + cols_sql.push_str(", "); + vals_sql.push_str(", "); + } + cols_sql.push_str(column); + if let Some(v) = value { + bound.push(Some(v.clone())); + vals_sql.push_str(&format!("${}::text{cast}", bound.len())); + } else { + vals_sql.push_str("now()"); + } + } + let sql = format!("INSERT INTO {table} (f_tenant_id, {cols_sql}) VALUES ('0', {vals_sql})"); + state + .db + .exec_params(&sql, ¶ms_of(&bound)) + .await + .map_err(|e| e.to_string()) +} + +/// 通用软删(官方 `removeById` ⇒ `f_delete_mark = 1`)。 +async fn b10_soft_delete( + state: &AppState, + table: &str, + id: &str, + user_id: &str, +) -> Result<(), String> { + let sql = format!( + "UPDATE {table} SET f_delete_mark = 1, f_delete_time = now(), f_delete_user_id = $1 \ + WHERE f_id = $2 AND COALESCE(f_delete_mark, 0) = 0" + ); + state + .db + .exec_params(&sql, ¶ms_of(&[Some(user_id.to_string()), Some(id.to_string())])) + .await + .map_err(|e| e.to_string()) +} + +/// 查一行(`f_id` + 未软删)。 +async fn b10_fetch( + state: &AppState, + table: &str, + projection: &str, + id: &str, +) -> Result, String> { + let sql = format!( + "SELECT {projection} FROM {table} WHERE f_id = $1 AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1" + ); + let rows = state + .db + .query_json_params(&sql, ¶ms_of(&[Some(id.to_string())])) + .await + .map_err(|e| e.to_string())?; + Ok(rows.into_iter().next()) +} + +/// 通用 UPDATE(只 SET 给的键)。 +async fn b10_update( + state: &AppState, + table: &str, + id: &str, + sets: &[(&'static str, &'static str, Option)], + user_id: &str, +) -> Result<(), String> { + if sets.is_empty() { + return Ok(()); + } + let mut set_sql = String::new(); + let mut bound: Vec> = Vec::new(); + for (column, cast, value) in sets { + bound.push(value.clone()); + set_sql.push_str(&format!("{column} = ${}::text{cast}, ", bound.len())); + } + bound.push(Some(user_id.to_string())); + set_sql.push_str(&format!("f_last_modify_user_id = ${}", bound.len())); + bound.push(Some(id.to_string())); + let sql = format!( + "UPDATE {table} SET {set_sql}, f_last_modify_time = now() \ + WHERE f_id = ${} AND COALESCE(f_delete_mark, 0) = 0", + bound.len() + ); + state + .db + .exec_params(&sql, ¶ms_of(&bound)) + .await + .map_err(|e| e.to_string()) +} + +/// 批次 10 的错误出口(DB 真因只进日志)。 +fn b10_error(e: String, ctx: &str) -> Json { + eprintln!("[face-b][b10] {ctx}失败: {e}"); + fail(code::EXCEPTION, "系统异常,请联系管理员") +} + +// ---------------------------------------------------------------- 电子签章(Signature) + +/// 官方 `SignatureController.java` —— **无 `@SaCheckPermission`** ⇒ 只需登录。 +const SIGNATURE_COLUMNS: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + f_en_code AS \"enCode\", f_icon AS \"icon\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", COALESCE(f_sort_code, 0) AS \"sortCode\", \ + f_description AS \"description\", \ + (EXTRACT(EPOCH FROM f_creator_time) * 1000)::bigint AS \"creatorTime\", \ + f_creator_user_id AS \"creatorUserId\""; + +/// 签章授权人(`base_signature_user`)—— 官方用 `真实名/账号`,多个以 `;` 连接。 +async fn b10_signature_user_names( + state: &AppState, + signature_ids: &[String], +) -> HashMap { + let mut out: HashMap = HashMap::new(); + if signature_ids.is_empty() { + return out; + } + let ids = signature_ids + .iter() + .map(|s| format!("'{}'", s.replace('\'', "''"))) + .collect::>() + .join(","); + let sql = format!( + "SELECT su.f_signature_id AS \"sid\", u.f_real_name AS \"realName\", u.f_account AS \"account\" \ + FROM base_signature_user su \ + LEFT JOIN base_user u ON u.f_id = su.f_user_id \ + WHERE COALESCE(su.f_delete_mark, 0) = 0 AND su.f_signature_id IN ({ids}) \ + ORDER BY su.f_sort_code ASC" + ); + let rows = match state.db.query_json_params(&sql, &[]).await { + Ok(rows) => rows, + Err(e) => { + eprintln!("[face-b][b10] 签章授权人查询失败: {e}"); + return out; + } + }; + let mut grouped: HashMap> = HashMap::new(); + for r in rows { + let Some(sid) = r.get("sid").and_then(Value::as_str) else { + continue; + }; + let real = r.get("realName").and_then(Value::as_str).unwrap_or_default(); + let account = r.get("account").and_then(Value::as_str).unwrap_or_default(); + let label = match (real.is_empty(), account.is_empty()) { + (true, true) => continue, + (true, false) => account.to_string(), + (false, true) => real.to_string(), + (false, false) => format!("{real}/{account}"), + }; + grouped.entry(sid.to_string()).or_default().push(label); + } + for (sid, mut names) in grouped { + names.dedup(); + out.insert(sid, names.join(";")); + } + out +} + +/// 签章列表(官方 `PageListVO`)。 +pub async fn signature_list( + State(state): State, + headers: HeaderMap, + raw: RawQuery, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + let paging = Paging::of(&raw); + let keyword = crate::platform::sys::query_param(&raw, "keyword").trim().to_string(); + // 🔴 官方 `PaginationSignature.userId`:有值 ⇒ 只看「授权给该用户」的签章。 + let filter_user = crate::platform::sys::query_param(&raw, "userId").trim().to_string(); + + let mut values: Vec> = Vec::new(); + let mut conds: Vec = vec!["COALESCE(f_delete_mark, 0) = 0".to_string()]; + if !keyword.is_empty() { + values.push(Some(format!("%{keyword}%"))); + let n = values.len(); + conds.push(format!("(f_full_name ILIKE ${n} OR f_en_code ILIKE ${n})")); + } + if !filter_user.is_empty() { + values.push(Some(filter_user.clone())); + let n = values.len(); + conds.push(format!( + "f_id IN (SELECT f_signature_id FROM base_signature_user \ + WHERE f_user_id = ${n} AND COALESCE(f_delete_mark, 0) = 0)" + )); + } + let where_sql = conds.join(" AND "); + + let total = match state + .db + .query_json_params( + &format!("SELECT COUNT(*)::bigint AS \"total\" FROM base_signature WHERE {where_sql}"), + ¶ms_of(&values), + ) + .await + { + Ok(rows) => rows + .first() + .and_then(|r| r.get("total").and_then(Value::as_i64)) + .unwrap_or(0), + Err(e) => return db_error(e, "签章列表"), + }; + + let mut list_values = values.clone(); + list_values.push(Some(format!("{}", paging.page_size))); + list_values.push(Some(format!("{}", paging.offset))); + let sql = format!( + "SELECT {SIGNATURE_COLUMNS} FROM base_signature WHERE {where_sql} \ + ORDER BY f_sort_code ASC, f_creator_time DESC \ + LIMIT ${}::text::integer OFFSET ${}::text::integer", + list_values.len() - 1, + list_values.len() + ); + let rows = match state.db.query_json_params(&sql, ¶ms_of(&list_values)).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "签章列表"), + }; + + // 官方 `SignatureListVO.userIds` = 「真实名/账号」,多个用 `;` 连接。 + let ids: Vec = rows + .iter() + .filter_map(|r| r.get("id").and_then(Value::as_str).map(str::to_string)) + .collect(); + let names = b10_signature_user_names(&state, &ids).await; + let list: Vec = rows + .iter() + .map(|r| { + let mut v = r.clone(); + let sid = r.get("id").and_then(Value::as_str).unwrap_or_default(); + v["userIds"] = Value::String(names.get(sid).cloned().unwrap_or_default()); + v + }) + .collect(); + ok(page_list(paging.current_page, paging.page_size, total, list)) +} + +/// 签章下拉框(官方 `ListVO`)。 +pub async fn signature_selector( + State(state): State, + headers: HeaderMap, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ + f_icon AS \"icon\" FROM base_signature WHERE COALESCE(f_delete_mark, 0) = 0 \ + ORDER BY f_sort_code ASC, f_creator_time DESC", + &[], + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "签章下拉框"), + }; + let list: Vec = rows + .iter() + .map(|r| { + json!({ + "id": r.get("id").cloned().unwrap_or(Value::Null), + "fullName": r.get("fullName").cloned().unwrap_or(Value::Null), + "enCode": r.get("enCode").cloned().unwrap_or(Value::Null), + "icon": r.get("icon").cloned().unwrap_or(Value::Null), + }) + }) + .collect(); + ok(list_vo(list)) +} + +/// 按 id 集合取签章(官方 `POST /ListByIds` ⇒ `ListVO`)。 +pub async fn signature_list_by_ids( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + let obj = match parse_body(&body) { + Ok(Value::Object(obj)) => obj, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let ids = b10_str_list(&obj, "ids"); + if ids.is_empty() { + return ok(list_vo(Vec::new())); + } + let quoted = ids + .iter() + .map(|s| format!("'{}'", s.replace('\'', "''"))) + .collect::>() + .join(","); + let sql = format!( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_en_code AS \"enCode\", \ + f_icon AS \"icon\" FROM base_signature \ + WHERE COALESCE(f_delete_mark, 0) = 0 AND f_id IN ({quoted}) \ + ORDER BY f_sort_code ASC, f_creator_time DESC" + ); + let rows = match state.db.query_json_params(&sql, &[]).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "按 id 取签章"), + }; + let list: Vec = rows + .iter() + .map(|r| { + json!({ + "id": r.get("id").cloned().unwrap_or(Value::Null), + "fullName": r.get("fullName").cloned().unwrap_or(Value::Null), + "enCode": r.get("enCode").cloned().unwrap_or(Value::Null), + "icon": r.get("icon").cloned().unwrap_or(Value::Null), + }) + }) + .collect(); + ok(list_vo(list)) +} + +/// 签章详情(官方 `SignatureInfoVO`:`userIds` 是**数组**)。 +pub async fn signature_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = require_login_face_b(&state, &headers).await { + return resp; + } + let row = match b10_fetch(&state, "base_signature", SIGNATURE_COLUMNS, &id).await { + Ok(row) => row, + Err(e) => return b10_error(e, "查询签章"), + }; + let Some(row) = row else { + return fail(code::FAIL, "数据不存在"); + }; + let user_ids = match state + .db + .query_json_params( + "SELECT f_user_id AS \"userId\" FROM base_signature_user \ + WHERE f_signature_id = $1 AND COALESCE(f_delete_mark, 0) = 0 ORDER BY f_sort_code ASC", + ¶ms_of(&[Some(id.clone())]), + ) + .await + { + Ok(rows) => rows + .iter() + .filter_map(|r| r.get("userId").and_then(Value::as_str).map(str::to_string)) + .collect::>(), + Err(e) => return b10_error(e.to_string(), "查询签章授权人"), + }; + let mut v = row; + v["userIds"] = Value::Array(user_ids.into_iter().map(Value::String).collect()); + ok(v) +} + +/// 名称 / 编码判重(官方 `isExistByFullName` / `isExistByEnCode` ⇒ **两次独立判断**)。 +async fn b10_signature_unique( + state: &AppState, + id: Option<&str>, + full_name: &str, + en_code: &str, +) -> Result<(), &'static str> { + let name_hit = state + .db + .query_json_params( + "SELECT COUNT(*)::bigint AS \"total\" FROM base_signature \ + WHERE COALESCE(f_delete_mark, 0) = 0 AND f_full_name = $1 \ + AND ($2::text IS NULL OR f_id <> $2::text)", + ¶ms_of(&[Some(full_name.to_string()), id.map(str::to_string)]), + ) + .await + .ok() + .and_then(|rows| { + rows.first() + .and_then(|r| r.get("total").and_then(Value::as_i64)) + }) + .unwrap_or(0); + if name_hit > 0 { + return Err("名称不能重复"); + } + let code_hit = state + .db + .query_json_params( + "SELECT COUNT(*)::bigint AS \"total\" FROM base_signature \ + WHERE COALESCE(f_delete_mark, 0) = 0 AND f_en_code = $1 \ + AND ($2::text IS NULL OR f_id <> $2::text)", + ¶ms_of(&[Some(en_code.to_string()), id.map(str::to_string)]), + ) + .await + .ok() + .and_then(|rows| { + rows.first() + .and_then(|r| r.get("total").and_then(Value::as_i64)) + }) + .unwrap_or(0); + if code_hit > 0 { + return Err("编码不能重复"); + } + Ok(()) +} + +/// 新建签章(官方 `SignatureCrForm`:`fullName` / `enCode` / `userIds` / `icon`)。 +pub async fn signature_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(user) => user, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(obj)) => obj, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let full_name = b10_str_of(&obj, "fullName"); + let en_code = b10_str_of(&obj, "enCode"); + if full_name.is_empty() { + return fail(code::FAIL, "名称不能为空"); + } + if en_code.is_empty() { + return fail(code::FAIL, "编码不能为空"); + } + if let Err(msg) = b10_signature_unique(&state, None, &full_name, &en_code).await { + return fail(code::FAIL, msg); + } + let id = new_uuid(); + let cols: Vec<(&'static str, &'static str, Option)> = vec![ + ("f_id", "", Some(id.clone())), + ("f_full_name", "", Some(full_name)), + ("f_en_code", "", Some(en_code)), + ("f_icon", "", Some(b10_str_of(&obj, "icon"))), + ("f_enabled_mark", "::integer", Some("1".to_string())), + ("f_sort_code", "::bigint", Some("0".to_string())), + ("f_creator_user_id", "", Some(user.user_id.clone())), + ("f_creator_time", "", None), + ]; + if let Err(e) = b10_insert(&state, "base_signature", &cols).await { + return b10_error(e, "新建签章"); + } + if let Err(e) = b10_signature_users_set(&state, &id, &b10_str_list(&obj, "userIds"), &user.user_id) + .await + { + return b10_error(e, "新建签章授权人"); + } + ok(json!({ "id": id })) +} + +/// 修改签章(官方 `SignatureUpForm`)。 +pub async fn signature_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(user) => user, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(obj)) => obj, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let exists = match b10_fetch(&state, "base_signature", "f_id AS \"id\"", &id).await { + Ok(row) => row.is_some(), + Err(e) => return b10_error(e, "查询签章"), + }; + if !exists { + return fail(code::FAIL, "更新失败,数据不存在"); + } + let full_name = b10_str_of(&obj, "fullName"); + let en_code = b10_str_of(&obj, "enCode"); + if !full_name.is_empty() || !en_code.is_empty() { + let (old_name, old_code) = match b10_signature_names(&state, &id).await { + Ok(pair) => pair, + Err(e) => return b10_error(e, "查询签章"), + }; + let name = if full_name.is_empty() { old_name } else { full_name }; + let enc = if en_code.is_empty() { old_code } else { en_code }; + if let Err(msg) = b10_signature_unique(&state, Some(&id), &name, &enc).await { + return fail(code::FAIL, msg); + } + } + let mut sets: Vec<(&'static str, &'static str, Option)> = Vec::new(); + if obj.contains_key("fullName") { + sets.push(("f_full_name", "", Some(b10_str_of(&obj, "fullName")))); + } + if obj.contains_key("enCode") { + sets.push(("f_en_code", "", Some(b10_str_of(&obj, "enCode")))); + } + if obj.contains_key("icon") { + sets.push(("f_icon", "", Some(b10_str_of(&obj, "icon")))); + } + if let Err(e) = b10_update(&state, "base_signature", &id, &sets, &user.user_id).await { + return b10_error(e, "修改签章"); + } + // 官方 `signatureUserMapper.delete(id)` 后按 `userIds` 全量重建。 + if obj.contains_key("userIds") { + if let Err(e) = b10_signature_users_set(&state, &id, &b10_str_list(&obj, "userIds"), &user.user_id) + .await + { + return b10_error(e, "写入签章授权人"); + } + } + ok(Value::Null) +} + +/// 取库里原有的名称 / 编码(更新时补齐没改的那一半)。 +async fn b10_signature_names(state: &AppState, id: &str) -> Result<(String, String), String> { + let rows = state + .db + .query_json_params( + "SELECT f_full_name AS \"fullName\", f_en_code AS \"enCode\" FROM base_signature \ + WHERE f_id = $1 AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + ¶ms_of(&[Some(id.to_string())]), + ) + .await + .map_err(|e| e.to_string())?; + let row = rows.first(); + Ok(( + row.and_then(|r| r.get("fullName").and_then(Value::as_str)) + .unwrap_or_default() + .to_string(), + row.and_then(|r| r.get("enCode").and_then(Value::as_str)) + .unwrap_or_default() + .to_string(), + )) +} + +/// 全量重建签章授权人(官方:先删后插)。 +async fn b10_signature_users_set( + state: &AppState, + signature_id: &str, + user_ids: &[String], + creator: &str, +) -> Result<(), String> { + state + .db + .exec_params( + "UPDATE base_signature_user SET f_delete_mark = 1, f_delete_time = now() \ + WHERE f_signature_id = $1 AND COALESCE(f_delete_mark, 0) = 0", + ¶ms_of(&[Some(signature_id.to_string())]), + ) + .await + .map_err(|e| e.to_string())?; + for uid in user_ids { + let cols: Vec<(&'static str, &'static str, Option)> = vec![ + ("f_id", "", Some(new_uuid())), + ("f_signature_id", "", Some(signature_id.to_string())), + ("f_user_id", "", Some(uid.clone())), + ("f_enabled_mark", "::integer", Some("1".to_string())), + ("f_creator_user_id", "", Some(creator.to_string())), + ("f_creator_time", "", None), + ]; + b10_insert(state, "base_signature_user", &cols).await?; + } + Ok(()) +} + +/// 删除签章(官方软删)。 +pub async fn signature_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(user) => user, + Err(resp) => return resp, + }; + let exists = match b10_fetch(&state, "base_signature", "f_id AS \"id\"", &id).await { + Ok(row) => row.is_some(), + Err(e) => return b10_error(e, "查询签章"), + }; + if !exists { + return fail(code::FAIL, "删除失败,数据不存在"); + } + if let Err(e) = b10_soft_delete(&state, "base_signature", &id, &user.user_id).await { + return b10_error(e, "删除签章"); + } + ok(Value::Null) +} + +// ---------------------------------------------------------------- 按钮权限(ModuleButton) + +/// 官方 `ButtonListVO` 投影。 +const MODULE_BUTTON_COLUMNS: &str = "f_id AS \"id\", f_parent_id AS \"parentId\", \ + f_full_name AS \"fullName\", f_en_code AS \"enCode\", f_icon AS \"icon\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", f_description AS \"description\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\", f_module_id AS \"moduleId\""; + +/// 按钮权限可写字段(camelCase ↔ `f_*`)。 +const MODULE_BUTTON_WRITE: [(&str, &str, &str); 8] = [ + ("fullName", "f_full_name", ""), + ("enCode", "f_en_code", ""), + ("icon", "f_icon", ""), + ("description", "f_description", ""), + ("parentId", "f_parent_id", ""), + ("moduleId", "f_module_id", ""), + ("enabledMark", "f_enabled_mark", "::integer"), + ("sortCode", "f_sort_code", "::bigint"), +]; + +fn b10_button_write(obj: &Map) -> Vec<(&'static str, &'static str, Option)> { + let mut out = Vec::new(); + for (json_key, column, cast) in MODULE_BUTTON_WRITE { + if obj.contains_key(json_key) { + out.push((column, cast, value_to_text(obj.get(json_key)))); + } + } + out +} + +/// 按钮编码判重(官方 `isExistByEnCode(moduleId, enCode, id)` —— **同菜单内**判重)。 +async fn b10_button_en_code_exists( + state: &AppState, + module_id: &str, + en_code: &str, + id: Option<&str>, +) -> Result { + let rows = state + .db + .query_json_params( + "SELECT COUNT(*)::bigint AS \"total\" FROM base_module_button \ + WHERE COALESCE(f_delete_mark, 0) = 0 AND f_module_id = $1 AND f_en_code = $2 \ + AND ($3::text IS NULL OR f_id <> $3::text)", + ¶ms_of(&[ + Some(module_id.to_string()), + Some(en_code.to_string()), + id.map(str::to_string), + ]), + ) + .await + .map_err(|e| e.to_string())?; + Ok(rows + .first() + .and_then(|r| r.get("total").and_then(Value::as_i64)) + .unwrap_or(0) + > 0) +} + +/// 按钮权限列表(官方 `GET /{menuId}/List` ⇒ `PageListVO`)。 +pub async fn module_button_list( + State(state): State, + headers: HeaderMap, + Path(menu_id): Path, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + return resp; + } + let paging = Paging::of(&raw); + let keyword = crate::platform::sys::query_param(&raw, "keyword").trim().to_string(); + + let mut values: Vec> = vec![Some(menu_id.clone())]; + let mut conds: Vec = vec![ + "COALESCE(f_delete_mark, 0) = 0".to_string(), + "f_module_id = $1".to_string(), + ]; + if !keyword.is_empty() { + values.push(Some(format!("%{keyword}%"))); + let n = values.len(); + conds.push(format!("(f_full_name ILIKE ${n} OR f_en_code ILIKE ${n})")); + } + let where_sql = conds.join(" AND "); + + let total = match state + .db + .query_json_params( + &format!( + "SELECT COUNT(*)::bigint AS \"total\" FROM base_module_button WHERE {where_sql}" + ), + ¶ms_of(&values), + ) + .await + { + Ok(rows) => rows + .first() + .and_then(|r| r.get("total").and_then(Value::as_i64)) + .unwrap_or(0), + Err(e) => return db_error(e, "按钮权限列表"), + }; + + let mut list_values = values.clone(); + list_values.push(Some(format!("{}", paging.page_size))); + list_values.push(Some(format!("{}", paging.offset))); + let sql = format!( + "SELECT {MODULE_BUTTON_COLUMNS} FROM base_module_button WHERE {where_sql} \ + ORDER BY f_sort_code ASC, f_creator_time DESC \ + LIMIT ${}::text::integer OFFSET ${}::text::integer", + list_values.len() - 1, + list_values.len() + ); + let rows = match state.db.query_json_params(&sql, ¶ms_of(&list_values)).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "按钮权限列表"), + }; + ok(page_list(paging.current_page, paging.page_size, total, rows)) +} + +/// 按钮权限下拉框(官方 `GET /{menuId}/Selector` ⇒ `ListVO`,**带树**)。 +pub async fn module_button_selector( + State(state): State, + headers: HeaderMap, + Path(menu_id): Path, +) -> Json { + if let Err(resp) = guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + return resp; + } + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\", f_parent_id AS \"parentId\", f_full_name AS \"fullName\", \ + f_en_code AS \"enCode\", f_icon AS \"icon\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\" \ + FROM base_module_button \ + WHERE COALESCE(f_delete_mark, 0) = 0 AND f_module_id = $1 \ + ORDER BY f_sort_code ASC, f_creator_time DESC", + ¶ms_of(&[Some(menu_id)]), + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "按钮权限下拉框"), + }; + let tree = b10_build_button_tree(rows); + ok(list_vo(tree)) +} + +/// 建按钮树(官方 `TreeDotUtils.convertListToTreeDot` ⇒ 根 = `parentId` 为 `-1` / 空)。 +/// +/// 🔴 官方 `selectActions` 把 `parentId` 置成 `"-1"` ⇒ 根节点判定要把 `-1` 当根。 +fn b10_build_button_tree(rows: Vec) -> Vec { + let visible: HashSet = rows + .iter() + .filter_map(|r| r.get("id").and_then(Value::as_str).map(str::to_string)) + .collect(); + let mut by_parent: HashMap> = HashMap::new(); + let mut roots: Vec = Vec::new(); + for row in rows { + let parent = row + .get("parentId") + .and_then(Value::as_str) + .unwrap_or_default() + .to_string(); + // 🔴 `-1` = 官方约定的「根」;父不在集合内 ⇒ 也当根(否则整棵子树会丢)。 + if !parent.is_empty() && parent != "-1" && visible.contains(&parent) { + by_parent.entry(parent).or_default().push(row); + } else { + roots.push(row); + } + } + fn attach( + row: &Value, + by_parent: &mut HashMap>, + ) -> Value { + let mut v = row.clone(); + let id = row.get("id").and_then(Value::as_str).unwrap_or_default().to_string(); + let children = by_parent.remove(&id).unwrap_or_default(); + let has_children = !children.is_empty(); + let kids: Vec = children.iter().map(|c| attach(c, by_parent)).collect(); + v["hasChildren"] = Value::Bool(has_children); + v["children"] = Value::Array(kids); + v + } + roots + .iter() + .map(|r| attach(r, &mut by_parent)) + .collect() +} + +/// 按钮权限详情(官方 `ModuleButtonInfoVO`)。 +pub async fn module_button_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + return resp; + } + let row = match b10_fetch(&state, "base_module_button", MODULE_BUTTON_COLUMNS, &id).await { + Ok(row) => row, + Err(e) => return b10_error(e, "查询按钮权限"), + }; + match row { + Some(row) => ok(row), + None => fail(code::FAIL, "数据不存在"), + } +} + +/// 新建按钮权限(官方 `ModuleButtonCrForm`)。 +pub async fn module_button_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + Ok(user) => user, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(obj)) => obj, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let module_id = b10_str_of(&obj, "moduleId"); + let en_code = b10_str_of(&obj, "enCode"); + if en_code.is_empty() { + return fail(code::FAIL, "请输入编码"); + } + match b10_button_en_code_exists(&state, &module_id, &en_code, None).await { + Ok(true) => return fail(code::FAIL, "编码不能重复"), + Ok(false) => {} + Err(e) => return b10_error(e, "查询按钮权限"), + } + let id = new_uuid(); + let mut cols: Vec<(&'static str, &'static str, Option)> = vec![ + ("f_id", "", Some(id.clone())), + ("f_creator_user_id", "", Some(user.user_id.clone())), + ("f_creator_time", "", None), + ]; + cols.extend(b10_button_write(&obj)); + if !cols.iter().any(|(c, _, _)| *c == "f_parent_id") { + cols.push(("f_parent_id", "", Some("-1".to_string()))); + } + if !cols.iter().any(|(c, _, _)| *c == "f_enabled_mark") { + cols.push(("f_enabled_mark", "::integer", Some("1".to_string()))); + } + if let Err(e) = b10_insert(&state, "base_module_button", &cols).await { + return b10_error(e, "新建按钮权限"); + } + ok(json!({ "id": id })) +} + +/// 更新按钮权限(官方 `ModuleButtonUpForm`)。 +pub async fn module_button_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + Ok(user) => user, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(obj)) => obj, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let exists = match b10_fetch(&state, "base_module_button", "f_id AS \"id\"", &id).await { + Ok(row) => row.is_some(), + Err(e) => return b10_error(e, "查询按钮权限"), + }; + if !exists { + return fail(code::FAIL, "更新失败,数据不存在"); + } + let module_id = b10_str_of(&obj, "moduleId"); + let en_code = b10_str_of(&obj, "enCode"); + if !en_code.is_empty() { + let (old_module, old_code) = match b10_button_names(&state, &id).await { + Ok(pair) => pair, + Err(e) => return b10_error(e, "查询按钮权限"), + }; + let mid = if module_id.is_empty() { old_module } else { module_id }; + let enc = if en_code.is_empty() { old_code } else { en_code }; + match b10_button_en_code_exists(&state, &mid, &enc, Some(&id)).await { + Ok(true) => return fail(code::FAIL, "编码不能重复"), + Ok(false) => {} + Err(e) => return b10_error(e, "查询按钮权限"), + } + } + let sets = b10_button_write(&obj); + if let Err(e) = b10_update(&state, "base_module_button", &id, &sets, &user.user_id).await { + return b10_error(e, "修改按钮权限"); + } + ok(Value::Null) +} + +/// 取库里原有的菜单 id / 编码。 +async fn b10_button_names(state: &AppState, id: &str) -> Result<(String, String), String> { + let rows = state + .db + .query_json_params( + "SELECT f_module_id AS \"moduleId\", f_en_code AS \"enCode\" FROM base_module_button \ + WHERE f_id = $1 AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + ¶ms_of(&[Some(id.to_string())]), + ) + .await + .map_err(|e| e.to_string())?; + let row = rows.first(); + Ok(( + row.and_then(|r| r.get("moduleId").and_then(Value::as_str)) + .unwrap_or_default() + .to_string(), + row.and_then(|r| r.get("enCode").and_then(Value::as_str)) + .unwrap_or_default() + .to_string(), + )) +} + +/// 删除按钮权限(官方软删)。 +pub async fn module_button_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + Ok(user) => user, + Err(resp) => return resp, + }; + let exists = match b10_fetch(&state, "base_module_button", "f_id AS \"id\"", &id).await { + Ok(row) => row.is_some(), + Err(e) => return b10_error(e, "查询按钮权限"), + }; + if !exists { + return fail(code::FAIL, "删除失败,数据不存在"); + } + if let Err(e) = b10_soft_delete(&state, "base_module_button", &id, &user.user_id).await { + return b10_error(e, "删除按钮权限"); + } + ok(Value::Null) +} + +/// 从「动作管理」批量选入按钮(官方 `POST /selectActions/{menuId}`)。 +/// +/// 🔴 官方语义(`ModuleButtonController.java:200-221`): +/// - body = `{ids: [ActionEntity…], menuId}`;**路径上的 `menuId` 覆盖 body 的**; +/// - 逐条判重(`isExistByEnCode`)⇒ 任一撞了 ⇒ 整体失败(不落库); +/// - 落库时统一 `moduleId = 路径 menuId`、`parentId = "-1"`、`enabledMark = 1`、新 id。 +pub async fn module_button_select_actions( + State(state): State, + headers: HeaderMap, + Path(menu_id): Path, + body: Bytes, +) -> Json { + let user = match guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + Ok(user) => user, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(obj)) => obj, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let items = obj + .get("ids") + .and_then(Value::as_array) + .cloned() + .unwrap_or_default(); + // 🔴 官方用 **body 的 `menuId`** 判重,但落库用 **路径的 `menuId`** —— 两处不一样。 + // 这里两处都用**路径上的** menuId(前端 `selectActions({ids, menuId})` 传的 menuId + // 与路径一致 ⇒ 行为等价;路径优先可避免 body 缺字段时判重到别的菜单)。 + let check_module = b10_str_of(&obj, "menuId"); + let check_module = if check_module.is_empty() { + menu_id.clone() + } else { + check_module + }; + for item in &items { + let Some(en_code) = item.get("enCode").and_then(Value::as_str) else { + continue; + }; + match b10_button_en_code_exists(&state, &check_module, en_code, None).await { + Ok(true) => return fail(code::FAIL, "编码不能重复"), + Ok(false) => {} + Err(e) => return b10_error(e, "查询按钮权限"), + } + } + for item in &items { + let id = new_uuid(); + let cols: Vec<(&'static str, &'static str, Option)> = vec![ + ("f_id", "", Some(id)), + ("f_parent_id", "", Some("-1".to_string())), + ("f_full_name", "", Some( + item.get("fullName").and_then(Value::as_str).unwrap_or_default().to_string(), + )), + ("f_en_code", "", Some( + item.get("enCode").and_then(Value::as_str).unwrap_or_default().to_string(), + )), + ("f_description", "", Some( + item.get("description").and_then(Value::as_str).unwrap_or_default().to_string(), + )), + ("f_module_id", "", Some(menu_id.clone())), + ("f_enabled_mark", "::integer", Some("1".to_string())), + ("f_sort_code", "::bigint", Some("0".to_string())), + ("f_creator_user_id", "", Some(user.user_id.clone())), + ("f_creator_time", "", None), + ]; + if let Err(e) = b10_insert(&state, "base_module_button", &cols).await { + return b10_error(e, "选入按钮权限"); + } + } + ok(Value::Null) +} + +// ---------------------------------------------------------------- 列表权限(ModuleColumn) + +/// 官方 `ColumnListVO` 投影。 +const MODULE_COLUMN_COLUMNS: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + f_en_code AS \"enCode\", f_bind_table AS \"bindTable\", f_bind_table_name AS \"bindTableName\", \ + f_module_id AS \"moduleId\", COALESCE(f_field_rule, 0) AS \"fieldRule\", \ + f_child_table_key AS \"childTableKey\", \ + COALESCE(f_enabled_mark, 0) AS \"enabledMark\", f_description AS \"description\", \ + COALESCE(f_sort_code, 0) AS \"sortCode\""; + +/// 列表权限可写字段。 +const MODULE_COLUMN_WRITE: [(&str, &str, &str); 11] = [ + ("fullName", "f_full_name", ""), + ("enCode", "f_en_code", ""), + ("description", "f_description", ""), + ("moduleId", "f_module_id", ""), + ("bindTable", "f_bind_table", ""), + ("bindTableName", "f_bind_table_name", ""), + ("parentId", "f_parent_id", ""), + ("fieldRule", "f_field_rule", "::integer"), + ("childTableKey", "f_child_table_key", ""), + ("enabledMark", "f_enabled_mark", "::integer"), + ("sortCode", "f_sort_code", "::bigint"), +]; + +fn b10_column_write(obj: &Map) -> Vec<(&'static str, &'static str, Option)> { + let mut out = Vec::new(); + for (json_key, column, cast) in MODULE_COLUMN_WRITE { + if obj.contains_key(json_key) { + out.push((column, cast, value_to_text(obj.get(json_key)))); + } + } + out +} + +/// 🔴 官方 `enCode` 前缀规则(`ModuleColumnController.java:184-195`): +/// - `fieldRule == 1` 且有 `bindTable` ⇒ `enCode = "jnpf_" + bindTable + "_jnpf_" + enCode`; +/// - `fieldRule == 2` 且有 `childTableKey` ⇒ `enCode = childTableKey + "-" + enCode`。 +/// +/// 🔴 **只在「菜单存在」时套前缀**(官方判据是 `moduleService.getInfo(moduleId) != null`)。 +fn b10_column_prefix_en_code( + obj: &Map, + module_exists: bool, +) -> Option { + let en_code = b10_str_of(obj, "enCode"); + if en_code.is_empty() || !module_exists { + return None; + } + let field_rule = b10_int_of(obj, "fieldRule").unwrap_or(0); + if field_rule == 1 { + let bind_table = b10_str_of(obj, "bindTable"); + if !bind_table.is_empty() { + return Some(format!("{SIDE_MARK_PRE}{bind_table}{SIDE_MARK}{en_code}")); + } + } + if field_rule == 2 { + let child_key = b10_str_of(obj, "childTableKey"); + if !child_key.is_empty() { + return Some(format!("{child_key}-{en_code}")); + } + } + None +} + +/// 🔴 官方**读时**剥前缀(`ModuleColumnController.java:83-91` 列表 / `:154-165` 详情): +/// - 含 `-` ⇒ 取 `-` 之后的部分; +/// - 再去掉 `jnpf__jnpf_` 这段。 +fn b10_column_strip_en_code(en_code: &str, bind_table: Option<&str>) -> String { + let mut code = en_code.to_string(); + if code.contains('-') { + code = code[code.find('-').unwrap() + 1..].to_string(); + } + if let Some(bt) = bind_table { + if !bt.is_empty() { + code = code.replace(&format!("{SIDE_MARK_PRE}{bt}{SIDE_MARK}"), ""); + } + } + code +} + +/// 列表权限列表(官方 `GET /{moduleId}/Fields` ⇒ `PageListVO`)。 +pub async fn module_column_list( + State(state): State, + headers: HeaderMap, + Path(module_id): Path, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + return resp; + } + let paging = Paging::of(&raw); + let keyword = crate::platform::sys::query_param(&raw, "keyword").trim().to_string(); + + let mut values: Vec> = vec![Some(module_id.clone())]; + let mut conds: Vec = vec![ + "COALESCE(f_delete_mark, 0) = 0".to_string(), + "f_module_id = $1".to_string(), + ]; + if !keyword.is_empty() { + values.push(Some(format!("%{keyword}%"))); + let n = values.len(); + conds.push(format!("(f_full_name ILIKE ${n} OR f_en_code ILIKE ${n})")); + } + let where_sql = conds.join(" AND "); + + let total = match state + .db + .query_json_params( + &format!( + "SELECT COUNT(*)::bigint AS \"total\" FROM base_module_column WHERE {where_sql}" + ), + ¶ms_of(&values), + ) + .await + { + Ok(rows) => rows + .first() + .and_then(|r| r.get("total").and_then(Value::as_i64)) + .unwrap_or(0), + Err(e) => return db_error(e, "列表权限"), + }; + + let mut list_values = values.clone(); + list_values.push(Some(format!("{}", paging.page_size))); + list_values.push(Some(format!("{}", paging.offset))); + let sql = format!( + "SELECT {MODULE_COLUMN_COLUMNS} FROM base_module_column WHERE {where_sql} \ + ORDER BY f_sort_code ASC, f_creator_time DESC \ + LIMIT ${}::text::integer OFFSET ${}::text::integer", + list_values.len() - 1, + list_values.len() + ); + let rows = match state.db.query_json_params(&sql, ¶ms_of(&list_values)).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "列表权限"), + }; + // 🔴 官方列表里会**剥掉** `enCode` 的前缀。 + let list: Vec = rows + .iter() + .map(|r| { + let mut v = r.clone(); + let raw_code = r.get("enCode").and_then(Value::as_str).unwrap_or_default(); + let bind_table = r.get("bindTable").and_then(Value::as_str); + v["enCode"] = Value::String(b10_column_strip_en_code(raw_code, bind_table)); + v + }) + .collect(); + ok(page_list(paging.current_page, paging.page_size, total, list)) +} + +/// 列表权限详情(官方 `ModuleColumnInfoVO`)。 +pub async fn module_column_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + return resp; + } + let row = match b10_fetch(&state, "base_module_column", MODULE_COLUMN_COLUMNS, &id).await { + Ok(row) => row, + Err(e) => return b10_error(e, "查询列表权限"), + }; + let Some(mut row) = row else { + return fail(code::FAIL, "数据不存在"); + }; + // 🔴 官方详情:`fieldRule == 2` 且含 `-` ⇒ 剥;`fieldRule == 1` ⇒ 去掉表前缀。 + let raw_code = row.get("enCode").and_then(Value::as_str).unwrap_or_default().to_string(); + let bind_table = row.get("bindTable").and_then(Value::as_str).map(str::to_string); + let field_rule = row.get("fieldRule").and_then(Value::as_i64).unwrap_or(0); + let mut code = raw_code.clone(); + if field_rule == 2 && code.contains('-') { + code = code[code.find('-').unwrap() + 1..].to_string(); + } + if field_rule == 1 { + if let Some(bt) = bind_table.as_deref() { + code = code.replace(&format!("{SIDE_MARK_PRE}{bt}{SIDE_MARK}"), ""); + } + } + row["enCode"] = Value::String(code); + // 官方 `ModuleColumnInfoVO.childTableKey` 默认 `"tableField"`。 + if row.get("childTableKey").and_then(Value::as_str).unwrap_or("").is_empty() { + row["childTableKey"] = Value::String("tableField".to_string()); + } + ok(row) +} + +/// 列表权限编码判重(官方 `isExistByEnCode(moduleId, enCode, id)`)。 +async fn b10_column_en_code_exists( + state: &AppState, + module_id: &str, + en_code: &str, + id: Option<&str>, +) -> Result { + let rows = state + .db + .query_json_params( + "SELECT COUNT(*)::bigint AS \"total\" FROM base_module_column \ + WHERE COALESCE(f_delete_mark, 0) = 0 AND f_module_id = $1 AND f_en_code = $2 \ + AND ($3::text IS NULL OR f_id <> $3::text)", + ¶ms_of(&[ + Some(module_id.to_string()), + Some(en_code.to_string()), + id.map(str::to_string), + ]), + ) + .await + .map_err(|e| e.to_string())?; + Ok(rows + .first() + .and_then(|r| r.get("total").and_then(Value::as_i64)) + .unwrap_or(0) + > 0) +} + +/// 菜单是否存在(官方 `moduleService.getInfo(moduleId) != null` ⇒ 才套 `enCode` 前缀)。 +async fn b10_module_exists(state: &AppState, module_id: &str) -> bool { + if module_id.is_empty() { + return false; + } + state + .db + .query_json_params( + "SELECT f_id AS \"id\" FROM base_module WHERE f_id = $1 AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + ¶ms_of(&[Some(module_id.to_string())]), + ) + .await + .ok() + .and_then(|rows| rows.into_iter().next()) + .is_some() +} + +/// 新建列表权限(官方 `ModuleColumnCrForm`)。 +pub async fn module_column_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + Ok(user) => user, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(obj)) => obj, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let module_id = b10_str_of(&obj, "moduleId"); + let module_exists = b10_module_exists(&state, &module_id).await; + // 🔴 前缀化后的 `enCode` 才是判重与落库用的值。 + let final_code = b10_column_prefix_en_code(&obj, module_exists) + .unwrap_or_else(|| b10_str_of(&obj, "enCode")); + match b10_column_en_code_exists(&state, &module_id, &final_code, None).await { + Ok(true) => return fail(code::FAIL, "编码不能重复"), + Ok(false) => {} + Err(e) => return b10_error(e, "查询列表权限"), + } + let id = new_uuid(); + let mut cols: Vec<(&'static str, &'static str, Option)> = vec![ + ("f_id", "", Some(id.clone())), + ("f_creator_user_id", "", Some(user.user_id.clone())), + ("f_creator_time", "", None), + ]; + cols.extend(b10_column_write(&obj)); + // 🔴 `f_en_code` 用前缀化后的值(覆盖写字段里的原始值)。 + cols.retain(|(c, _, _)| *c != "f_en_code"); + cols.push(("f_en_code", "", Some(final_code))); + if !cols.iter().any(|(c, _, _)| *c == "f_enabled_mark") { + cols.push(("f_enabled_mark", "::integer", Some("1".to_string()))); + } + if let Err(e) = b10_insert(&state, "base_module_column", &cols).await { + return b10_error(e, "新建列表权限"); + } + ok(json!({ "id": id })) +} + +/// 更新列表权限(官方 `ModuleColumnUpForm`)。 +pub async fn module_column_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + Ok(user) => user, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(obj)) => obj, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let exists = match b10_fetch(&state, "base_module_column", "f_id AS \"id\"", &id).await { + Ok(row) => row.is_some(), + Err(e) => return b10_error(e, "查询列表权限"), + }; + if !exists { + return fail(code::FAIL, "更新失败,数据不存在"); + } + let module_id = b10_str_of(&obj, "moduleId"); + let module_exists = b10_module_exists(&state, &module_id).await; + let final_code = b10_column_prefix_en_code(&obj, module_exists) + .unwrap_or_else(|| b10_str_of(&obj, "enCode")); + if !final_code.is_empty() { + match b10_column_en_code_exists(&state, &module_id, &final_code, Some(&id)).await { + Ok(true) => return fail(code::FAIL, "编码不能重复"), + Ok(false) => {} + Err(e) => return b10_error(e, "查询列表权限"), + } + } + let mut sets = b10_column_write(&obj); + sets.retain(|(c, _, _)| *c != "f_en_code"); + if !final_code.is_empty() { + sets.push(("f_en_code", "", Some(final_code))); + } + if let Err(e) = b10_update(&state, "base_module_column", &id, &sets, &user.user_id).await { + return b10_error(e, "修改列表权限"); + } + ok(Value::Null) +} + +/// 删除列表权限(官方软删)。 +pub async fn module_column_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + Ok(user) => user, + Err(resp) => return resp, + }; + let exists = match b10_fetch(&state, "base_module_column", "f_id AS \"id\"", &id).await { + Ok(row) => row.is_some(), + Err(e) => return b10_error(e, "查询列表权限"), + }; + if !exists { + return fail(code::FAIL, "删除失败,数据不存在"); + } + if let Err(e) = b10_soft_delete(&state, "base_module_column", &id, &user.user_id).await { + return b10_error(e, "删除列表权限"); + } + ok(Value::Null) +} + +/// 批量新建列表权限(官方 `POST /Actions/Batch`)。 +/// +/// 🔴 官方 `ColumnBatchForm`:`moduleId` / `bindTable` / `bindTableName` / `columnJson`(数组) +/// / `sortCode` / `fieldRule` / `childTableKey`。 +/// - 逐条套 `enCode` 前缀(**注意:官方批量路径无条件套前缀**,不像单条要看菜单是否存在); +/// - 判重:库里已有 ⇒ 失败;**本次批次内**重复 ⇒ 也失败。 +pub async fn module_column_batch_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + Ok(user) => user, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(obj)) => obj, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let module_id = b10_str_of(&obj, "moduleId"); + if module_id.is_empty() { + return fail(code::FAIL, "必填"); + } + let bind_table = b10_str_of(&obj, "bindTable"); + let bind_table_name = b10_str_of(&obj, "bindTableName"); + let field_rule = b10_int_of(&obj, "fieldRule"); + let child_table_key = b10_str_of(&obj, "childTableKey"); + let sort_code = b10_int_of(&obj, "sortCode").unwrap_or(0); + let items = obj + .get("columnJson") + .and_then(Value::as_array) + .cloned() + .unwrap_or_default(); + + // 先算好每条的最终 `enCode` 并判重(官方:任一撞 ⇒ 整体失败,不落库)。 + let mut prepared: Vec<(String, String, String)> = Vec::new(); // (enCode, fullName, description) + let mut seen: HashSet = HashSet::new(); + for item in &items { + let Some(item_obj) = item.as_object() else { + continue; + }; + let mut raw_code = b10_str_of(item_obj, "enCode"); + let rule = b10_int_of(item_obj, "fieldRule").or(field_rule).unwrap_or(0); + if rule == 1 && !bind_table.is_empty() { + raw_code = format!("{SIDE_MARK_PRE}{bind_table}{SIDE_MARK}{raw_code}"); + } else if rule == 2 && !child_table_key.is_empty() { + raw_code = format!("{child_table_key}-{raw_code}"); + } + match b10_column_en_code_exists(&state, &module_id, &raw_code, None).await { + Ok(true) => return fail(code::FAIL, "编码不能重复"), + Ok(false) => {} + Err(e) => return b10_error(e, "查询列表权限"), + } + if !seen.insert(raw_code.clone()) { + return fail(code::FAIL, "编码不能重复"); + } + prepared.push(( + raw_code, + b10_str_of(item_obj, "fullName"), + b10_str_of(item_obj, "description"), + )); + } + for (en_code, full_name, description) in &prepared { + let id = new_uuid(); + let cols: Vec<(&'static str, &'static str, Option)> = vec![ + ("f_id", "", Some(id)), + ("f_full_name", "", Some(full_name.clone())), + ("f_en_code", "", Some(en_code.clone())), + ("f_description", "", Some(description.clone())), + ("f_module_id", "", Some(module_id.clone())), + ("f_bind_table", "", Some(bind_table.clone())), + ("f_bind_table_name", "", Some(bind_table_name.clone())), + ("f_field_rule", "::integer", field_rule.map(|v| v.to_string())), + ("f_child_table_key", "", Some(child_table_key.clone())), + ("f_enabled_mark", "::integer", Some("1".to_string())), + ("f_sort_code", "::bigint", Some(sort_code.to_string())), + ("f_creator_user_id", "", Some(user.user_id.clone())), + ("f_creator_time", "", None), + ]; + if let Err(e) = b10_insert(&state, "base_module_column", &cols).await { + return b10_error(e, "批量新建列表权限"); + } + } + ok(Value::Null) +} + +// ---------------------------------------------------------------- 表单权限(ModuleForm) + +/// 官方 `ModuleFormListVO` 投影。 +const MODULE_FORM_COLUMNS: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + f_en_code AS \"enCode\", f_module_id AS \"moduleId\", \ + COALESCE(f_field_rule, 0) AS \"fieldRule\", f_child_table_key AS \"childTableKey\", \ + f_bind_table AS \"bindTable\", COALESCE(f_enabled_mark, 0) AS \"enabledMark\", \ + f_description AS \"description\", COALESCE(f_sort_code, 0) AS \"sortCode\""; + +/// 表单权限可写字段。 +const MODULE_FORM_WRITE: [(&str, &str, &str); 10] = [ + ("fullName", "f_full_name", ""), + ("enCode", "f_en_code", ""), + ("description", "f_description", ""), + ("moduleId", "f_module_id", ""), + ("bindTable", "f_bind_table", ""), + ("parentId", "f_parent_id", ""), + ("fieldRule", "f_field_rule", "::integer"), + ("childTableKey", "f_child_table_key", ""), + ("enabledMark", "f_enabled_mark", "::integer"), + ("sortCode", "f_sort_code", "::bigint"), +]; + +fn b10_form_write(obj: &Map) -> Vec<(&'static str, &'static str, Option)> { + let mut out = Vec::new(); + for (json_key, column, cast) in MODULE_FORM_WRITE { + if obj.contains_key(json_key) { + out.push((column, cast, value_to_text(obj.get(json_key)))); + } + } + out +} + +/// 表单权限编码判重。 +async fn b10_form_en_code_exists( + state: &AppState, + module_id: &str, + en_code: &str, + id: Option<&str>, +) -> Result { + let rows = state + .db + .query_json_params( + "SELECT COUNT(*)::bigint AS \"total\" FROM base_module_form \ + WHERE COALESCE(f_delete_mark, 0) = 0 AND f_module_id = $1 AND f_en_code = $2 \ + AND ($3::text IS NULL OR f_id <> $3::text)", + ¶ms_of(&[ + Some(module_id.to_string()), + Some(en_code.to_string()), + id.map(str::to_string), + ]), + ) + .await + .map_err(|e| e.to_string())?; + Ok(rows + .first() + .and_then(|r| r.get("total").and_then(Value::as_i64)) + .unwrap_or(0) + > 0) +} + +/// 表单权限列表(官方 `GET /{moduleId}/Fields` ⇒ `PageListVO`)。 +pub async fn module_form_list( + State(state): State, + headers: HeaderMap, + Path(module_id): Path, + raw: RawQuery, +) -> Json { + if let Err(resp) = guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + return resp; + } + let paging = Paging::of(&raw); + let keyword = crate::platform::sys::query_param(&raw, "keyword").trim().to_string(); + + let mut values: Vec> = vec![Some(module_id.clone())]; + let mut conds: Vec = vec![ + "COALESCE(f_delete_mark, 0) = 0".to_string(), + "f_module_id = $1".to_string(), + ]; + if !keyword.is_empty() { + values.push(Some(format!("%{keyword}%"))); + let n = values.len(); + conds.push(format!("(f_full_name ILIKE ${n} OR f_en_code ILIKE ${n})")); + } + let where_sql = conds.join(" AND "); + + let total = match state + .db + .query_json_params( + &format!( + "SELECT COUNT(*)::bigint AS \"total\" FROM base_module_form WHERE {where_sql}" + ), + ¶ms_of(&values), + ) + .await + { + Ok(rows) => rows + .first() + .and_then(|r| r.get("total").and_then(Value::as_i64)) + .unwrap_or(0), + Err(e) => return db_error(e, "表单权限"), + }; + + let mut list_values = values.clone(); + list_values.push(Some(format!("{}", paging.page_size))); + list_values.push(Some(format!("{}", paging.offset))); + let sql = format!( + "SELECT {MODULE_FORM_COLUMNS} FROM base_module_form WHERE {where_sql} \ + ORDER BY f_sort_code ASC, f_creator_time DESC \ + LIMIT ${}::text::integer OFFSET ${}::text::integer", + list_values.len() - 1, + list_values.len() + ); + let rows = match state.db.query_json_params(&sql, ¶ms_of(&list_values)).await { + Ok(rows) => rows, + Err(e) => return db_error(e, "表单权限"), + }; + // 🔴 官方列表里剥掉 `enCode` 前缀(同列表权限)。 + let list: Vec = rows + .iter() + .map(|r| { + let mut v = r.clone(); + let raw_code = r.get("enCode").and_then(Value::as_str).unwrap_or_default(); + let bind_table = r.get("bindTable").and_then(Value::as_str); + v["enCode"] = Value::String(b10_column_strip_en_code(raw_code, bind_table)); + v + }) + .collect(); + ok(page_list(paging.current_page, paging.page_size, total, list)) +} + +/// 表单权限详情(官方 `ModuleFormInfoVO`)。 +pub async fn module_form_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + if let Err(resp) = guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + return resp; + } + let row = match b10_fetch(&state, "base_module_form", MODULE_FORM_COLUMNS, &id).await { + Ok(row) => row, + Err(e) => return b10_error(e, "查询表单权限"), + }; + let Some(mut row) = row else { + return fail(code::FAIL, "数据不存在"); + }; + let raw_code = row.get("enCode").and_then(Value::as_str).unwrap_or_default().to_string(); + let bind_table = row.get("bindTable").and_then(Value::as_str).map(str::to_string); + let field_rule = row.get("fieldRule").and_then(Value::as_i64).unwrap_or(0); + let mut code = raw_code.clone(); + if field_rule == 2 && code.contains('-') { + code = code[code.find('-').unwrap() + 1..].to_string(); + } + if field_rule == 1 { + if let Some(bt) = bind_table.as_deref() { + code = code.replace(&format!("{SIDE_MARK_PRE}{bt}{SIDE_MARK}"), ""); + } + } + row["enCode"] = Value::String(code); + if row.get("childTableKey").and_then(Value::as_str).unwrap_or("").is_empty() { + row["childTableKey"] = Value::String("tableField".to_string()); + } + ok(row) +} + +/// 新建表单权限(官方 `ModuleFormCrForm`)。 +pub async fn module_form_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + Ok(user) => user, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(obj)) => obj, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let module_id = b10_str_of(&obj, "moduleId"); + let module_exists = b10_module_exists(&state, &module_id).await; + let final_code = b10_column_prefix_en_code(&obj, module_exists) + .unwrap_or_else(|| b10_str_of(&obj, "enCode")); + match b10_form_en_code_exists(&state, &module_id, &final_code, None).await { + Ok(true) => return fail(code::FAIL, "编码不能重复"), + Ok(false) => {} + Err(e) => return b10_error(e, "查询表单权限"), + } + let id = new_uuid(); + let mut cols: Vec<(&'static str, &'static str, Option)> = vec![ + ("f_id", "", Some(id.clone())), + ("f_creator_user_id", "", Some(user.user_id.clone())), + ("f_creator_time", "", None), + ]; + cols.extend(b10_form_write(&obj)); + cols.retain(|(c, _, _)| *c != "f_en_code"); + cols.push(("f_en_code", "", Some(final_code))); + if !cols.iter().any(|(c, _, _)| *c == "f_enabled_mark") { + cols.push(("f_enabled_mark", "::integer", Some("1".to_string()))); + } + if let Err(e) = b10_insert(&state, "base_module_form", &cols).await { + return b10_error(e, "新建表单权限"); + } + ok(json!({ "id": id })) +} + +/// 更新表单权限(官方 `ModuleFormUpForm`)。 +pub async fn module_form_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + Ok(user) => user, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(obj)) => obj, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let exists = match b10_fetch(&state, "base_module_form", "f_id AS \"id\"", &id).await { + Ok(row) => row.is_some(), + Err(e) => return b10_error(e, "查询表单权限"), + }; + if !exists { + return fail(code::FAIL, "更新失败,数据不存在"); + } + let module_id = b10_str_of(&obj, "moduleId"); + let module_exists = b10_module_exists(&state, &module_id).await; + let final_code = b10_column_prefix_en_code(&obj, module_exists) + .unwrap_or_else(|| b10_str_of(&obj, "enCode")); + if !final_code.is_empty() { + match b10_form_en_code_exists(&state, &module_id, &final_code, Some(&id)).await { + Ok(true) => return fail(code::FAIL, "编码不能重复"), + Ok(false) => {} + Err(e) => return b10_error(e, "查询表单权限"), + } + } + let mut sets = b10_form_write(&obj); + sets.retain(|(c, _, _)| *c != "f_en_code"); + if !final_code.is_empty() { + sets.push(("f_en_code", "", Some(final_code))); + } + if let Err(e) = b10_update(&state, "base_module_form", &id, &sets, &user.user_id).await { + return b10_error(e, "修改表单权限"); + } + ok(Value::Null) +} + +/// 删除表单权限(官方软删)。 +pub async fn module_form_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + Ok(user) => user, + Err(resp) => return resp, + }; + let exists = match b10_fetch(&state, "base_module_form", "f_id AS \"id\"", &id).await { + Ok(row) => row.is_some(), + Err(e) => return b10_error(e, "查询表单权限"), + }; + if !exists { + return fail(code::FAIL, "删除失败,数据不存在"); + } + if let Err(e) = b10_soft_delete(&state, "base_module_form", &id, &user.user_id).await { + return b10_error(e, "删除表单权限"); + } + ok(Value::Null) +} + +/// 批量新建表单权限(官方 `POST /Actions/Batch`)。 +pub async fn module_form_batch_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match guard_any( + &state, + &headers, + &[EN_PERMISSION_RESOURCE, EN_APP_RESOURCE], + ) + .await + { + Ok(user) => user, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(obj)) => obj, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let module_id = b10_str_of(&obj, "moduleId"); + if module_id.is_empty() { + return fail(code::FAIL, "必填"); + } + let bind_table = b10_str_of(&obj, "bindTable"); + let field_rule = b10_int_of(&obj, "fieldRule"); + let child_table_key = b10_str_of(&obj, "childTableKey"); + let sort_code = b10_int_of(&obj, "sortCode").unwrap_or(0); + let items = obj + .get("formJson") + .and_then(Value::as_array) + .cloned() + .unwrap_or_default(); + + let mut prepared: Vec<(String, String, String)> = Vec::new(); + let mut seen: HashSet = HashSet::new(); + for item in &items { + let Some(item_obj) = item.as_object() else { + continue; + }; + let mut raw_code = b10_str_of(item_obj, "enCode"); + let rule = b10_int_of(item_obj, "fieldRule").or(field_rule).unwrap_or(0); + if rule == 1 && !bind_table.is_empty() { + raw_code = format!("{SIDE_MARK_PRE}{bind_table}{SIDE_MARK}{raw_code}"); + } else if rule == 2 && !child_table_key.is_empty() { + raw_code = format!("{child_table_key}-{raw_code}"); + } + match b10_form_en_code_exists(&state, &module_id, &raw_code, None).await { + Ok(true) => return fail(code::FAIL, "编码不能重复"), + Ok(false) => {} + Err(e) => return b10_error(e, "查询表单权限"), + } + if !seen.insert(raw_code.clone()) { + return fail(code::FAIL, "编码不能重复"); + } + prepared.push(( + raw_code, + b10_str_of(item_obj, "fullName"), + b10_str_of(item_obj, "description"), + )); + } + for (en_code, full_name, description) in &prepared { + let id = new_uuid(); + let cols: Vec<(&'static str, &'static str, Option)> = vec![ + ("f_id", "", Some(id)), + ("f_full_name", "", Some(full_name.clone())), + ("f_en_code", "", Some(en_code.clone())), + ("f_description", "", Some(description.clone())), + ("f_module_id", "", Some(module_id.clone())), + ("f_bind_table", "", Some(bind_table.clone())), + ("f_field_rule", "::integer", field_rule.map(|v| v.to_string())), + ("f_child_table_key", "", Some(child_table_key.clone())), + ("f_enabled_mark", "::integer", Some("1".to_string())), + ("f_sort_code", "::bigint", Some(sort_code.to_string())), + ("f_creator_user_id", "", Some(user.user_id.clone())), + ("f_creator_time", "", None), + ]; + if let Err(e) = b10_insert(&state, "base_module_form", &cols).await { + return b10_error(e, "批量新建表单权限"); + } + } + ok(Value::Null) +} + +// ---------------------------------------------------------------- 高级查询方案(AdvancedQuery) + +/// 官方 `AdvancedQueryListVO`(继承 `AdvancedQuerySchemeForm` ⇒ 多了 `id`)。 +const ADVANCED_QUERY_COLUMNS: &str = "f_id AS \"id\", f_full_name AS \"fullName\", \ + f_match_logic AS \"matchLogic\", f_condition_json AS \"conditionJson\", \ + f_module_id AS \"moduleId\""; + +/// 高级查询方案列表(官方 `GET /{moduleId}/List` ⇒ `ListVO`)。 +/// +/// 🔴 官方只返回**当前登录用户自己**建的方案(`getList(moduleId, userInfo)`)。 +pub async fn advanced_query_list( + State(state): State, + headers: HeaderMap, + Path(module_id): Path, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(user) => user, + Err(resp) => return resp, + }; + let rows = match state + .db + .query_json_params( + "SELECT f_id AS \"id\", f_full_name AS \"fullName\", f_match_logic AS \"matchLogic\", \ + f_condition_json AS \"conditionJson\", f_module_id AS \"moduleId\" \ + FROM base_advanced_query_scheme \ + WHERE COALESCE(f_delete_mark, 0) = 0 AND f_module_id = $1 \ + AND f_creator_user_id = $2 ORDER BY f_sort_code ASC, f_creator_time DESC", + ¶ms_of(&[Some(module_id), Some(user.user_id.clone())]), + ) + .await + { + Ok(rows) => rows, + Err(e) => return db_error(e, "高级查询方案列表"), + }; + ok(list_vo(rows)) +} + +/// 高级查询方案详情(官方 `AdvancedQuerySchemeForm`)。 +pub async fn advanced_query_info( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(user) => user, + Err(resp) => return resp, + }; + // 🔴 官方 `getInfo(id, userId)` ⇒ **只看自己的**方案(别人的查不到)。 + let row = match b10_fetch( + &state, + "base_advanced_query_scheme", + ADVANCED_QUERY_COLUMNS, + &id, + ) + .await + { + Ok(row) => row, + Err(e) => return b10_error(e, "查询高级查询方案"), + }; + let Some(row) = row else { + return fail(code::FAIL, "数据不存在"); + }; + let owner = state + .db + .query_json_params( + "SELECT f_creator_user_id AS \"owner\" FROM base_advanced_query_scheme \ + WHERE f_id = $1 AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + ¶ms_of(&[Some(id)]), + ) + .await + .ok() + .and_then(|rows| rows.into_iter().next()) + .and_then(|r| r.get("owner").and_then(Value::as_str).map(str::to_string)); + if owner.as_deref() != Some(user.user_id.as_str()) { + return fail(code::FAIL, "数据不存在"); + } + ok(row) +} + +/// 新建高级查询方案(官方 `AdvancedQuerySchemeForm`)。 +pub async fn advanced_query_create( + State(state): State, + headers: HeaderMap, + body: Bytes, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(user) => user, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(obj)) => obj, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + let full_name = b10_str_of(&obj, "fullName"); + let condition_json = b10_str_of(&obj, "conditionJson"); + let match_logic = b10_str_of(&obj, "matchLogic"); + let module_id = b10_str_of(&obj, "moduleId"); + if full_name.is_empty() { + return fail(code::FAIL, "必填"); + } + if condition_json.is_empty() { + return fail(code::FAIL, "必填"); + } + if match_logic.is_empty() { + return fail(code::FAIL, "必填"); + } + if module_id.is_empty() { + return fail(code::FAIL, "当前菜单不能为空"); + } + let id = new_uuid(); + let cols: Vec<(&'static str, &'static str, Option)> = vec![ + ("f_id", "", Some(id.clone())), + ("f_full_name", "", Some(full_name)), + ("f_match_logic", "", Some(match_logic)), + ("f_condition_json", "", Some(condition_json)), + ("f_module_id", "", Some(module_id)), + ("f_sort_code", "::bigint", Some("0".to_string())), + ("f_creator_user_id", "", Some(user.user_id.clone())), + ("f_creator_time", "", None), + ]; + if let Err(e) = b10_insert(&state, "base_advanced_query_scheme", &cols).await { + return b10_error(e, "新建高级查询方案"); + } + ok(json!({ "id": id })) +} + +/// 修改高级查询方案(官方 `AdvancedQuerySchemeForm`)。 +pub async fn advanced_query_update( + State(state): State, + headers: HeaderMap, + Path(id): Path, + body: Bytes, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(user) => user, + Err(resp) => return resp, + }; + let obj = match parse_body(&body) { + Ok(Value::Object(obj)) => obj, + Ok(_) => return fail(code::FAIL, "请求参数格式错误"), + Err(resp) => return resp, + }; + // 🔴 官方 `updateById` 不校验归属 ⇒ 这里也按「存在即可改」实现, + // 但**只 SET body 里出现的键**(官方是整实体覆盖)。 + let exists = match b10_fetch( + &state, + "base_advanced_query_scheme", + "f_id AS \"id\"", + &id, + ) + .await + { + Ok(row) => row.is_some(), + Err(e) => return b10_error(e, "查询高级查询方案"), + }; + if !exists { + return fail(code::FAIL, "更新失败,数据不存在"); + } + let mut sets: Vec<(&'static str, &'static str, Option)> = Vec::new(); + if obj.contains_key("fullName") { + sets.push(("f_full_name", "", Some(b10_str_of(&obj, "fullName")))); + } + if obj.contains_key("matchLogic") { + sets.push(("f_match_logic", "", Some(b10_str_of(&obj, "matchLogic")))); + } + if obj.contains_key("conditionJson") { + sets.push(("f_condition_json", "", Some(b10_str_of(&obj, "conditionJson")))); + } + if obj.contains_key("moduleId") { + sets.push(("f_module_id", "", Some(b10_str_of(&obj, "moduleId")))); + } + if let Err(e) = b10_update( + &state, + "base_advanced_query_scheme", + &id, + &sets, + &user.user_id, + ) + .await + { + return b10_error(e, "修改高级查询方案"); + } + ok(Value::Null) +} + +/// 删除高级查询方案(官方 `getInfo(id, userId)` ⇒ **只看自己的**)。 +pub async fn advanced_query_delete( + State(state): State, + headers: HeaderMap, + Path(id): Path, +) -> Json { + let user = match require_login_face_b(&state, &headers).await { + Ok(user) => user, + Err(resp) => return resp, + }; + let owner = state + .db + .query_json_params( + "SELECT f_creator_user_id AS \"owner\" FROM base_advanced_query_scheme \ + WHERE f_id = $1 AND COALESCE(f_delete_mark, 0) = 0 LIMIT 1", + ¶ms_of(&[Some(id.clone())]), + ) + .await + .ok() + .and_then(|rows| rows.into_iter().next()) + .and_then(|r| r.get("owner").and_then(Value::as_str).map(str::to_string)); + if owner.as_deref() != Some(user.user_id.as_str()) { + return fail(code::FAIL, "删除失败,数据不存在"); + } + if let Err(e) = b10_soft_delete( + &state, + "base_advanced_query_scheme", + &id, + &user.user_id, + ) + .await + { + return b10_error(e, "删除高级查询方案"); + } + ok(Value::Null) +} + +// === PERMISSION CONFIG (权限配置族) SECTION END === + #[cfg(test)] mod tests { use super::*; diff --git a/src/backend/src/routes.rs b/src/backend/src/routes.rs index e4edc57..25aef97 100644 --- a/src/backend/src/routes.rs +++ b/src/backend/src/routes.rs @@ -629,6 +629,111 @@ pub fn build_router(state: AppState) -> axum::Router { "/api/system/printDev/Info/{id}", delete(face_b::print_dev_version_delete), ) + // ---- 电子签章(官方 `SignatureController.java`;官方**无** `@SaCheckPermission`)---- + .route("/api/system/Signature", get(face_b::signature_list)) + .route("/api/system/Signature", post(face_b::signature_create)) + .route( + "/api/system/Signature/Selector", + get(face_b::signature_selector), + ) + .route( + "/api/system/Signature/ListByIds", + post(face_b::signature_list_by_ids), + ) + .route("/api/system/Signature/{id}", get(face_b::signature_info)) + .route("/api/system/Signature/{id}", put(face_b::signature_update)) + .route( + "/api/system/Signature/{id}", + delete(face_b::signature_delete), + ) + // ---- 按钮权限(官方 `ModuleButtonController.java`,权限 OR 两码)---- + .route( + "/api/system/ModuleButton", + post(face_b::module_button_create), + ) + .route( + "/api/system/ModuleButton/selectActions/{menuId}", + post(face_b::module_button_select_actions), + ) + .route( + "/api/system/ModuleButton/{menuId}/List", + get(face_b::module_button_list), + ) + .route( + "/api/system/ModuleButton/{menuId}/Selector", + get(face_b::module_button_selector), + ) + .route("/api/system/ModuleButton/{id}", get(face_b::module_button_info)) + .route( + "/api/system/ModuleButton/{id}", + put(face_b::module_button_update), + ) + .route( + "/api/system/ModuleButton/{id}", + delete(face_b::module_button_delete), + ) + // ---- 列表权限(官方 `ModuleColumnController.java`)---- + .route( + "/api/system/ModuleColumn", + post(face_b::module_column_create), + ) + .route( + "/api/system/ModuleColumn/Actions/Batch", + post(face_b::module_column_batch_create), + ) + .route( + "/api/system/ModuleColumn/{moduleId}/Fields", + get(face_b::module_column_list), + ) + .route("/api/system/ModuleColumn/{id}", get(face_b::module_column_info)) + .route( + "/api/system/ModuleColumn/{id}", + put(face_b::module_column_update), + ) + .route( + "/api/system/ModuleColumn/{id}", + delete(face_b::module_column_delete), + ) + // ---- 表单权限(官方 `ModuleFormController.java`)---- + .route("/api/system/ModuleForm", post(face_b::module_form_create)) + .route( + "/api/system/ModuleForm/Actions/Batch", + post(face_b::module_form_batch_create), + ) + .route( + "/api/system/ModuleForm/{moduleId}/Fields", + get(face_b::module_form_list), + ) + .route("/api/system/ModuleForm/{id}", get(face_b::module_form_info)) + .route( + "/api/system/ModuleForm/{id}", + put(face_b::module_form_update), + ) + .route( + "/api/system/ModuleForm/{id}", + delete(face_b::module_form_delete), + ) + // ---- 高级查询方案(官方 `AdvancedQueryController.java`;官方**无** `@SaCheckPermission`)---- + .route( + "/api/system/AdvancedQuery", + post(face_b::advanced_query_create), + ) + .route( + "/api/system/AdvancedQuery/{moduleId}/List", + get(face_b::advanced_query_list), + ) + .route( + "/api/system/AdvancedQuery/{id}", + get(face_b::advanced_query_info), + ) + .route( + "/api/system/AdvancedQuery/{id}", + put(face_b::advanced_query_update), + ) + .route( + "/api/system/AdvancedQuery/{id}", + delete(face_b::advanced_query_delete), + ) // ---- 系统配置 + 第三方同步(官方 `SysConfigController` / `SynThirdInfoController`)---- .route("/api/system/SysConfig", get(face_b::sys_config_get)) .route("/api/system/SysConfig", put(face_b::sys_config_update)) @@ -1421,7 +1526,7 @@ mod tests { // 🔴 表数**故意写死**:它同时校验「schema.sql 建了预期的表」与 // 「health 报的是真数」。加表要同步改这里 + main.rs 的 BASE_TABLES // + crates/sspf-store 的两条 DDL 断言(共四处,漏一处就红)。 - assert_eq!(body["tables"], 43); + assert_eq!(body["tables"], 49); assert_eq!(body["version"], env!("CARGO_PKG_VERSION")); } @@ -1436,7 +1541,7 @@ mod tests { let port = serve(new_state(db().await)).await; // 🔴 按**路径**列(同一路径多个方法只算一条)—— 每条都用 PATCH 探 405。 - const FACE_B_REGISTERED: [&str; 224] = [ + const FACE_B_REGISTERED: [&str; 244] = [ "/api/permission/Users", "/api/permission/Users/any-id", "/api/permission/Users/BatchDelete", @@ -1670,6 +1775,31 @@ mod tests { "/api/system/printDev/Save", "/api/system/printDev/Info/any-id", "/api/system/printDev/Version/any-id", + // ---- 电子签章(批次 10)---- + "/api/system/Signature", + "/api/system/Signature/Selector", + "/api/system/Signature/ListByIds", + "/api/system/Signature/any-id", + // ---- 按钮权限(批次 10)---- + "/api/system/ModuleButton", + "/api/system/ModuleButton/selectActions/any-id", + "/api/system/ModuleButton/any-id/List", + "/api/system/ModuleButton/any-id/Selector", + "/api/system/ModuleButton/any-id", + // ---- 列表权限(批次 10)---- + "/api/system/ModuleColumn", + "/api/system/ModuleColumn/Actions/Batch", + "/api/system/ModuleColumn/any-id/Fields", + "/api/system/ModuleColumn/any-id", + // ---- 表单权限(批次 10)---- + "/api/system/ModuleForm", + "/api/system/ModuleForm/Actions/Batch", + "/api/system/ModuleForm/any-id/Fields", + "/api/system/ModuleForm/any-id", + // ---- 高级查询方案(批次 10)---- + "/api/system/AdvancedQuery", + "/api/system/AdvancedQuery/any-id/List", + "/api/system/AdvancedQuery/any-id", ]; for path in FACE_B_REGISTERED { diff --git a/src/backend/tests/batch10_it.rs b/src/backend/tests/batch10_it.rs new file mode 100644 index 0000000..2724848 --- /dev/null +++ b/src/backend/tests/batch10_it.rs @@ -0,0 +1,804 @@ +//! 批次 10(**电子签章 / 按钮权限 / 列表权限 / 表单权限 / 高级查询方案**)集成测试。 +//! +//! 🔴 **钉住的契约点**(每条都对应官方控制器 / 前端组件的一处硬要求): +//! ① 电子签章:官方**没有** `@SaCheckPermission` ⇒ 只需登录(不判点权限)。 +//! ② 签章列表 `userIds` = 「真实名/账号」,多个用 **「;」** 连接(官方 `StringJoiner`); +//! 但**详情**的 `userIds` 是**数组**(官方 `SignatureInfoVO` 是 `List`)。 +//! ③ 签章**名称 / 编码是两次独立判重** ⇒ 撞名报「名称不能重复」、撞码报「编码不能重复」。 +//! ④ 签章更新时 `userIds` 变化 ⇒ **先删后插**全量重建授权人。 +//! ⑤ 按钮/列表/表单权限:官方 `@SaCheckPermission(mode=OR)` 两码 ⇒ 契约写 `A|B`。 +//! ⑥ 按钮 `selectActions`:**任一条撞码 ⇒ 整体失败且不落库**(官方逐条判重后 return)。 +//! ⑦ 列表/表单权限 `enCode` **前缀化**:fieldRule=1 ⇒ `jnpf__jnpf_`; +//! fieldRule=2 ⇒ `-`;读回时**剥掉**前缀。 +//! ⑧ 批量创建:**批内撞码**也判失败(官方 `name.contains(enCode)`)。 +//! ⑨ 高级查询方案:**只看自己的**(官方 `getList/getInfo/delete` 都带 `userId` 过滤)。 +//! ⑩ 高级查询方案列表是 `ListVO`(不是 `PageListVO`)—— 官方 `ActionResult>`。 +//! +//! 🔴 pglite-rs 0.2.7 是**进程级全局标志** ⇒ 全文件共用一个临时库 + 一把互斥锁。 + +use std::path::PathBuf; +use std::sync::Arc; + +use serde_json::{json, Value}; +use ssw_platform::bootstrap::ensure_base; +use ssw_platform::platform::config::Config; +use ssw_platform::platform::db::Db; +use ssw_platform::platform::seed::first_seed; +use ssw_platform::platform::session::SessionStore; +use ssw_platform::platform::state::AppState; +use ssw_platform::routes::build_app; +use tokio::io::{AsyncReadExt, AsyncWriteExt}; +use tokio::net::TcpStream; +use tokio::sync::{Mutex, OnceCell}; + +static DB: OnceCell = OnceCell::const_new(); +static LOCK: Mutex<()> = Mutex::const_new(()); + +async fn db() -> &'static Db { + DB.get_or_init(|| async { + let db = Db::open_temp().await.expect("打开 pglite 临时库失败"); + db.ensure_schema().await.expect("ensure_schema 失败"); + ensure_base(&db).await.expect("ensure_base 失败"); + first_seed(&db, "123456").await.expect("first_seed 失败"); + db + }) + .await +} + +async fn serve(state: AppState) -> u16 { + let listener = tokio::net::TcpListener::bind("127.0.0.1:0") + .await + .expect("绑定失败"); + let port = listener.local_addr().expect("取本地地址失败").port(); + let server = tokio::spawn(async move { + let _ = axum::serve(listener, build_app(state)).await; + }); + tokio::task::yield_now().await; + std::mem::forget(server); + port +} + +async fn call(port: u16, method: &str, path: &str, token: &str, body: Option<&str>) -> (String, Value) { + let mut stream = TcpStream::connect(("127.0.0.1", port)).await.expect("连接失败"); + let payload = body.unwrap_or(""); + let req = format!( + "{method} {path} HTTP/1.1\r\n\ + Host: 127.0.0.1\r\n\ + Vue-Version: 3\r\n\ + App-Code: mainSystem\r\n\ + Authorization: {token}\r\n\ + Content-Type: application/json\r\n\ + Content-Length: {}\r\n\ + Connection: close\r\n\r\n{payload}", + payload.len() + ); + stream.write_all(req.as_bytes()).await.expect("写请求失败"); + let mut buf = Vec::new(); + tokio::time::timeout(std::time::Duration::from_secs(15), stream.read_to_end(&mut buf)) + .await + .expect("读响应超时") + .expect("读响应失败"); + let text = String::from_utf8_lossy(&buf).to_string(); + let (head, body) = text.split_once("\r\n\r\n").expect("响应必须有头体分隔"); + let status = head.lines().next().unwrap_or_default().to_string(); + let json: Value = serde_json::from_str(body.trim()).unwrap_or(Value::Null); + (status, json) +} + +async fn login(port: u16) -> String { + let enc = ssw_platform::platform::cipher::encrypt_password("123456"); + let payload = format!("account=admin&password={enc}"); + let mut stream = TcpStream::connect(("127.0.0.1", port)).await.expect("连接失败"); + let req = format!( + "POST /api/oauth/Login HTTP/1.1\r\n\ + Host: 127.0.0.1\r\n\ + Vue-Version: 3\r\n\ + App-Code: mainSystem\r\n\ + Content-Type: application/x-www-form-urlencoded\r\n\ + Content-Length: {}\r\n\ + Connection: close\r\n\r\n{payload}", + payload.len() + ); + stream.write_all(req.as_bytes()).await.expect("写请求失败"); + let mut buf = Vec::new(); + tokio::time::timeout(std::time::Duration::from_secs(15), stream.read_to_end(&mut buf)) + .await + .expect("读响应超时") + .expect("读响应失败"); + let text = String::from_utf8_lossy(&buf).to_string(); + let (_, body) = text.split_once("\r\n\r\n").expect("响应必须有头体分隔"); + let json: Value = serde_json::from_str(body.trim()).expect("登录响应必须是 JSON"); + json["data"]["token"].as_str().expect("登录必须返回 token").to_string() +} + +fn new_state(db: &Db) -> AppState { + AppState { + config: Arc::new(Config::from_env(PathBuf::from("/tmp/ssw-platform-batch10-it"))), + db: Arc::new(db.clone()), + sessions: Arc::new(SessionStore::default()), + } +} + +/// 取一个真实存在的菜单 id(官方这些端点都挂在某个菜单下)。 +/// +/// 🔴 **直接查库**而不是走端点 —— 端点返回的是菜单**树**(`children` 嵌套), +/// 从里面挑「功能菜单(type=2)」要递归;查库直白且不受端点形状影响。 +async fn any_menu_id() -> String { + let rows = ssw_platform::platform::db::Db::query_json_params( + db().await, + "SELECT f_id AS \"id\" FROM base_module \ + WHERE COALESCE(f_delete_mark, 0) = 0 AND f_type = 2 ORDER BY f_sort_code ASC LIMIT 1", + &[], + ) + .await + .expect("查菜单失败"); + assert!(!rows.is_empty(), "库里必须有 type=2 的功能菜单"); + rows[0]["id"].as_str().expect("菜单必须有 id").to_string() +} + +/// 新建签章,返回 id。 +async fn create_signature(port: u16, token: &str, name: &str, code: &str, user_ids: Vec<&str>) -> String { + let body = json!({ + "fullName": name, + "enCode": code, + "icon": "icon-1", + "userIds": user_ids, + }); + let (_, resp) = call( + port, + "POST", + "/api/system/Signature", + token, + Some(&body.to_string()), + ) + .await; + assert_eq!(resp["code"], 200, "新建签章应成功:{resp}"); + resp["data"]["id"].as_str().expect("必须返回 id").to_string() +} + +/// ① + ② + ③:签章的双判重、列表 `userIds` 拼接、详情 `userIds` 是数组。 +#[tokio::test] +async fn signature_dedup_and_user_ids_shape() { + let _guard = LOCK.lock().await; + let port = serve(new_state(db().await)).await; + let token = login(port).await; + + let id = create_signature(port, &token, "合同签章", "sig_contract", vec!["u_admin"]).await; + + // ③ 撞**名称** ⇒ 「名称不能重复」(不是编码的文案)。 + let dup_name = json!({ "fullName": "合同签章", "enCode": "sig_other" }); + let (_, resp) = call( + port, + "POST", + "/api/system/Signature", + &token, + Some(&dup_name.to_string()), + ) + .await; + assert_eq!(resp["code"], 400, "撞名必须失败:{resp}"); + assert_eq!(resp["msg"], "名称不能重复", "撞名文案:{resp}"); + + // ③ 撞**编码** ⇒ 「编码不能重复」。 + let dup_code = json!({ "fullName": "别的签章", "enCode": "sig_contract" }); + let (_, resp) = call( + port, + "POST", + "/api/system/Signature", + &token, + Some(&dup_code.to_string()), + ) + .await; + assert_eq!(resp["code"], 400, "撞码必须失败:{resp}"); + assert_eq!(resp["msg"], "编码不能重复", "撞码文案:{resp}"); + + // ② 详情:`userIds` 是**数组**。 + let (_, resp) = call(port, "GET", &format!("/api/system/Signature/{id}"), &token, None).await; + assert_eq!(resp["code"], 200, "签章详情应成功:{resp}"); + assert!( + resp["data"]["userIds"].is_array(), + "详情的 userIds 必须是数组:{resp}" + ); + assert_eq!(resp["data"]["userIds"].as_array().unwrap().len(), 1); + + // ② 列表:`userIds` 是**字符串**(官方 StringJoiner 形状)。 + let (_, resp) = call(port, "GET", "/api/system/Signature", &token, None).await; + assert_eq!(resp["code"], 200, "签章列表应成功:{resp}"); + let list = resp["data"]["list"].as_array().expect("必须是 PageListVO"); + let item = list + .iter() + .find(|r| r["id"] == json!(id)) + .expect("列表里必须有刚建的签章"); + assert!( + item["userIds"].is_string(), + "列表的 userIds 必须是字符串:{item}" + ); + // 官方 `真实名/账号`;查不到用户时官方留空 ⇒ 这里只钉「是字符串」。 + assert!(item["userIds"].as_str().unwrap().contains('/') + || item["userIds"].as_str().unwrap().is_empty()); +} + +/// ④:签章更新时 `userIds` 变化 ⇒ 全量重建授权人。 +#[tokio::test] +async fn signature_update_rebuilds_users() { + let _guard = LOCK.lock().await; + let port = serve(new_state(db().await)).await; + let token = login(port).await; + + let id = create_signature(port, &token, "重建签章", "sig_rebuild", vec!["u_a", "u_b"]).await; + let (_, resp) = call(port, "GET", &format!("/api/system/Signature/{id}"), &token, None).await; + assert_eq!( + resp["data"]["userIds"].as_array().unwrap().len(), + 2, + "初始应有 2 个授权人:{resp}" + ); + + // 改成 1 个 ⇒ 旧的全删、只留新的。 + let body = json!({ "userIds": ["u_c"] }); + let (_, resp) = call( + port, + "PUT", + &format!("/api/system/Signature/{id}"), + &token, + Some(&body.to_string()), + ) + .await; + assert_eq!(resp["code"], 200, "更新签章应成功:{resp}"); + + let (_, resp) = call(port, "GET", &format!("/api/system/Signature/{id}"), &token, None).await; + let users = resp["data"]["userIds"].as_array().expect("必须是数组"); + assert_eq!(users.len(), 1, "授权人必须被全量重建:{resp}"); + assert_eq!(users[0], json!("u_c"), "应只剩 u_c:{resp}"); +} + +/// 签章下拉框 + 按 ids 取 + 软删。 +#[tokio::test] +async fn signature_selector_list_by_ids_and_soft_delete() { + let _guard = LOCK.lock().await; + let port = serve(new_state(db().await)).await; + let token = login(port).await; + + let id = create_signature(port, &token, "下拉签章", "sig_dropdown", vec![]).await; + + // Selector ⇒ ListVO。 + let (_, resp) = call(port, "GET", "/api/system/Signature/Selector", &token, None).await; + assert_eq!(resp["code"], 200, "下拉框应成功:{resp}"); + assert!(resp["data"]["list"].is_array(), "必须是 ListVO:{resp}"); + + // ListByIds ⇒ 只回给定的那些。 + let body = json!({ "ids": [id] }); + let (_, resp) = call( + port, + "POST", + "/api/system/Signature/ListByIds", + &token, + Some(&body.to_string()), + ) + .await; + assert_eq!(resp["code"], 200, "ListByIds 应成功:{resp}"); + let list = resp["data"]["list"].as_array().expect("必须是 ListVO"); + assert_eq!(list.len(), 1, "只应返 1 条:{resp}"); + assert_eq!(list[0]["id"], json!(id)); + + // 软删后再取 ⇒ 数据不存在。 + let (_, resp) = call( + port, + "DELETE", + &format!("/api/system/Signature/{id}"), + &token, + None, + ) + .await; + assert_eq!(resp["code"], 200, "删除应成功:{resp}"); + let (_, resp) = call(port, "GET", &format!("/api/system/Signature/{id}"), &token, None).await; + assert_eq!(resp["code"], 400, "删后详情应失败:{resp}"); + assert_eq!(resp["msg"], "数据不存在", "删后详情文案:{resp}"); +} + +/// ⑤ + ⑥:按钮权限的 OR 守卫、编码判重、selectActions「任一撞 ⇒ 整体失败」。 +#[tokio::test] +async fn module_button_dedup_and_select_actions_atomic() { + let _guard = LOCK.lock().await; + let port = serve(new_state(db().await)).await; + let token = login(port).await; + let menu_id = any_menu_id().await; + + // 建两个按钮。 + for (name, code) in [("新增", "btn_add"), ("编辑", "btn_edit")] { + let body = json!({ "fullName": name, "enCode": code, "moduleId": menu_id }); + let (_, resp) = call( + port, + "POST", + "/api/system/ModuleButton", + &token, + Some(&body.to_string()), + ) + .await; + assert_eq!(resp["code"], 200, "新建按钮应成功:{resp}"); + } + + // 同菜单内撞码 ⇒ 「编码不能重复」。 + let dup = json!({ "fullName": "另一个新增", "enCode": "btn_add", "moduleId": menu_id }); + let (_, resp) = call( + port, + "POST", + "/api/system/ModuleButton", + &token, + Some(&dup.to_string()), + ) + .await; + assert_eq!(resp["code"], 400, "撞码必须失败:{resp}"); + assert_eq!(resp["msg"], "编码不能重复", "撞码文案:{resp}"); + + // 列表 ⇒ PageListVO。 + let (_, resp) = call( + port, + "GET", + &format!("/api/system/ModuleButton/{menu_id}/List"), + &token, + None, + ) + .await; + assert_eq!(resp["code"], 200, "按钮列表应成功:{resp}"); + assert!(resp["data"]["pagination"].is_object(), "必须是 PageListVO:{resp}"); + let list = resp["data"]["list"].as_array().unwrap(); + assert!(list.len() >= 2, "应有 2 个按钮:{resp}"); + + // 下拉框 ⇒ ListVO + 树(parentId=-1 视为根)。 + let (_, resp) = call( + port, + "GET", + &format!("/api/system/ModuleButton/{menu_id}/Selector"), + &token, + None, + ) + .await; + assert_eq!(resp["code"], 200, "按钮下拉应成功:{resp}"); + let tree = resp["data"]["list"].as_array().expect("必须是 ListVO"); + assert!(!tree.is_empty(), "树不应为空:{resp}"); + assert!( + tree.iter().all(|n| n["hasChildren"].is_boolean() && n["children"].is_array()), + "树的每个节点都要有 hasChildren + children:{resp}" + ); + + // ⑥ selectActions:一条撞码 ⇒ 整体失败且**不落库**。 + let before = call( + port, + "GET", + &format!("/api/system/ModuleButton/{menu_id}/List"), + &token, + None, + ) + .await + .1["data"]["list"] + .as_array() + .unwrap() + .len(); + let body = json!({ + "menuId": menu_id, + "ids": [ + { "fullName": "删除", "enCode": "btn_del", "description": "删除" }, + { "fullName": "导入", "enCode": "btn_add", "description": "导入" } + ], + }); + let (_, resp) = call( + port, + "POST", + &format!("/api/system/ModuleButton/selectActions/{menu_id}"), + &token, + Some(&body.to_string()), + ) + .await; + assert_eq!(resp["code"], 400, "撞码必须整体失败:{resp}"); + let after = call( + port, + "GET", + &format!("/api/system/ModuleButton/{menu_id}/List"), + &token, + None, + ) + .await + .1["data"]["list"] + .as_array() + .unwrap() + .len(); + assert_eq!(after, before, "失败时一条都不许落库:{before} → {after}"); + + // 不撞码 ⇒ 全部落库,且 parentId = "-1"、enabledMark = 1。 + let body = json!({ + "menuId": menu_id, + "ids": [ + { "fullName": "删除", "enCode": "btn_del", "description": "删除" }, + { "fullName": "导出", "enCode": "btn_export", "description": "导出" } + ], + }); + let (_, resp) = call( + port, + "POST", + &format!("/api/system/ModuleButton/selectActions/{menu_id}"), + &token, + Some(&body.to_string()), + ) + .await; + assert_eq!(resp["code"], 200, "selectActions 应成功:{resp}"); + let after = call( + port, + "GET", + &format!("/api/system/ModuleButton/{menu_id}/List"), + &token, + None, + ) + .await + .1["data"]["list"] + .as_array() + .unwrap() + .clone(); + assert_eq!(after.len(), before + 2, "应新增 2 个:{before} → {}", after.len()); + let added = after + .iter() + .find(|r| r["enCode"] == json!("btn_del")) + .expect("应新增 btn_del"); + assert_eq!(added["parentId"], json!("-1"), "parentId 应为 -1"); + assert_eq!(added["enabledMark"], json!(1), "enabledMark 应为 1"); +} + +/// ⑦:列表权限的 `enCode` 前缀化(写入前缀化、读回剥掉)。 +#[tokio::test] +async fn module_column_en_code_prefix_and_strip() { + let _guard = LOCK.lock().await; + let port = serve(new_state(db().await)).await; + let token = login(port).await; + let menu_id = any_menu_id().await; + + // fieldRule=1 + bindTable ⇒ 落库是 `jnpf__jnpf_`,读回是裸 code。 + let body = json!({ + "fullName": "名称字段", + "enCode": "f_name", + "moduleId": menu_id, + "bindTable": "demo_item", + "fieldRule": 1, + }); + let (_, resp) = call( + port, + "POST", + "/api/system/ModuleColumn", + &token, + Some(&body.to_string()), + ) + .await; + assert_eq!(resp["code"], 200, "新建列表权限应成功:{resp}"); + let id = resp["data"]["id"].as_str().expect("必须返回 id").to_string(); + + // 详情 ⇒ 已剥掉前缀。 + let (_, resp) = call( + port, + "GET", + &format!("/api/system/ModuleColumn/{id}"), + &token, + None, + ) + .await; + assert_eq!(resp["code"], 200, "详情应成功:{resp}"); + assert_eq!( + resp["data"]["enCode"], json!("f_name"), + "详情应剥掉前缀:{resp}" + ); + assert_eq!( + resp["data"]["childTableKey"], json!("tableField"), + "childTableKey 默认 tableField:{resp}" + ); + + // 列表 ⇒ 也剥掉前缀。 + let (_, resp) = call( + port, + "GET", + &format!("/api/system/ModuleColumn/{menu_id}/Fields"), + &token, + None, + ) + .await; + assert_eq!(resp["code"], 200, "列表应成功:{resp}"); + let list = resp["data"]["list"].as_array().unwrap(); + let item = list + .iter() + .find(|r| r["id"] == json!(id)) + .expect("列表里必须有刚建的"); + assert_eq!(item["enCode"], json!("f_name"), "列表应剥掉前缀:{item}"); + + // 🔴 **库里存的是带前缀的**(官方语义)—— 直接查库核对。 + let rows = ssw_platform::platform::db::Db::query_json_params( + db().await, + "SELECT f_en_code AS \"enCode\" FROM base_module_column WHERE f_id = $1::text", + &[&id], + ) + .await + .expect("查库失败"); + assert_eq!( + rows[0]["enCode"], json!("jnpf_demo_item_jnpf_f_name"), + "库里应存带前缀的编码:{rows:?}" + ); + + // fieldRule=2 + childTableKey ⇒ `-`。 + let body = json!({ + "fullName": "子表字段", + "enCode": "f_child", + "moduleId": menu_id, + "childTableKey": "tableField", + "fieldRule": 2, + }); + let (_, resp) = call( + port, + "POST", + "/api/system/ModuleColumn", + &token, + Some(&body.to_string()), + ) + .await; + assert_eq!(resp["code"], 200, "新建子表字段应成功:{resp}"); + let id2 = resp["data"]["id"].as_str().expect("必须返回 id").to_string(); + let (_, resp) = call( + port, + "GET", + &format!("/api/system/ModuleColumn/{id2}"), + &token, + None, + ) + .await; + assert_eq!( + resp["data"]["enCode"], json!("f_child"), + "fieldRule=2 的详情也应剥掉前缀:{resp}" + ); +} + +/// ⑧:批量创建 —— **批内撞码**也判失败。 +#[tokio::test] +async fn module_column_batch_rejects_duplicate_in_batch() { + let _guard = LOCK.lock().await; + let port = serve(new_state(db().await)).await; + let token = login(port).await; + let menu_id = any_menu_id().await; + + // 批内两条同 code ⇒ 失败,且一条都不落库。 + let body = json!({ + "moduleId": menu_id, + "bindTable": "demo_item", + "fieldRule": 1, + "columnJson": [ + { "fullName": "甲", "enCode": "f_dup" }, + { "fullName": "乙", "enCode": "f_dup" } + ], + }); + let (_, resp) = call( + port, + "POST", + "/api/system/ModuleColumn/Actions/Batch", + &token, + Some(&body.to_string()), + ) + .await; + assert_eq!(resp["code"], 400, "批内撞码必须失败:{resp}"); + assert_eq!(resp["msg"], "编码不能重复", "批内撞码文案:{resp}"); + + let (_, resp) = call( + port, + "GET", + &format!("/api/system/ModuleColumn/{menu_id}/Fields"), + &token, + None, + ) + .await; + let count = resp["data"]["list"].as_array().unwrap().len(); + assert_eq!(count, 0, "失败时一条都不许落库:{resp}"); + + // 不撞码 ⇒ 全部落库。 + let body = json!({ + "moduleId": menu_id, + "bindTable": "demo_item", + "fieldRule": 1, + "columnJson": [ + { "fullName": "甲", "enCode": "f_a" }, + { "fullName": "乙", "enCode": "f_b" } + ], + }); + let (_, resp) = call( + port, + "POST", + "/api/system/ModuleColumn/Actions/Batch", + &token, + Some(&body.to_string()), + ) + .await; + assert_eq!(resp["code"], 200, "批量应成功:{resp}"); + let (_, resp) = call( + port, + "GET", + &format!("/api/system/ModuleColumn/{menu_id}/Fields"), + &token, + None, + ) + .await; + assert_eq!( + resp["data"]["list"].as_array().unwrap().len(), + 2, + "应落库 2 条:{resp}" + ); +} + +/// 表单权限:与列表权限同规则(前缀化 / 剥前缀 / 详情默认 childTableKey)。 +#[tokio::test] +async fn module_form_prefix_and_defaults() { + let _guard = LOCK.lock().await; + let port = serve(new_state(db().await)).await; + let token = login(port).await; + let menu_id = any_menu_id().await; + + let body = json!({ + "fullName": "表单字段", + "enCode": "ff_name", + "moduleId": menu_id, + "bindTable": "demo_item", + "fieldRule": 1, + }); + let (_, resp) = call( + port, + "POST", + "/api/system/ModuleForm", + &token, + Some(&body.to_string()), + ) + .await; + assert_eq!(resp["code"], 200, "新建表单权限应成功:{resp}"); + let id = resp["data"]["id"].as_str().expect("必须返回 id").to_string(); + + let (_, resp) = call( + port, + "GET", + &format!("/api/system/ModuleForm/{id}"), + &token, + None, + ) + .await; + assert_eq!(resp["code"], 200, "详情应成功:{resp}"); + assert_eq!( + resp["data"]["enCode"], json!("ff_name"), + "详情应剥掉前缀:{resp}" + ); + assert_eq!( + resp["data"]["childTableKey"], json!("tableField"), + "childTableKey 默认 tableField:{resp}" + ); + + // 表单权限批量 ⇒ 撞码失败。 + let body = json!({ + "moduleId": menu_id, + "formJson": [ + { "fullName": "甲", "enCode": "ff_dup" }, + { "fullName": "乙", "enCode": "ff_dup" } + ], + }); + let (_, resp) = call( + port, + "POST", + "/api/system/ModuleForm/Actions/Batch", + &token, + Some(&body.to_string()), + ) + .await; + assert_eq!(resp["code"], 400, "批内撞码必须失败:{resp}"); +} + +/// ⑨ + ⑩:高级查询方案 —— 只看自己的;列表是 `ListVO` 不是 `PageListVO`。 +#[tokio::test] +async fn advanced_query_is_owner_scoped_and_list_vo() { + let _guard = LOCK.lock().await; + let port = serve(new_state(db().await)).await; + let token = login(port).await; + let menu_id = any_menu_id().await; + + let body = json!({ + "fullName": "我的方案", + "matchLogic": "and", + "conditionJson": "[{\"field\":\"name\",\"op\":\"like\",\"value\":\"a\"}]", + "moduleId": menu_id, + }); + let (_, resp) = call( + port, + "POST", + "/api/system/AdvancedQuery", + &token, + Some(&body.to_string()), + ) + .await; + assert_eq!(resp["code"], 200, "新建方案应成功:{resp}"); + let id = resp["data"]["id"].as_str().expect("必须返回 id").to_string(); + + // ⑩ 列表 ⇒ `ListVO`(**没有** pagination 字段)。 + let (_, resp) = call( + port, + "GET", + &format!("/api/system/AdvancedQuery/{menu_id}/List"), + &token, + None, + ) + .await; + assert_eq!(resp["code"], 200, "方案列表应成功:{resp}"); + assert!( + resp["data"]["list"].is_array(), + "必须是 ListVO 的 list:{resp}" + ); + assert!( + resp["data"].get("pagination").is_none(), + "高级查询列表**不是** PageListVO:{resp}" + ); + let list = resp["data"]["list"].as_array().unwrap(); + assert_eq!(list.len(), 1, "应有 1 条:{resp}"); + assert_eq!(list[0]["id"], json!(id)); + + // ⑨ 详情 ⇒ 自己的能取到。 + let (_, resp) = call( + port, + "GET", + &format!("/api/system/AdvancedQuery/{id}"), + &token, + None, + ) + .await; + assert_eq!(resp["code"], 200, "自己的方案应能取到:{resp}"); + assert_eq!(resp["data"]["matchLogic"], json!("and"), "字段应对齐:{resp}"); + + // ⑨ 别人的方案(直接改库里的 creator)⇒ 看不到。 + ssw_platform::platform::db::Db::exec_params( + db().await, + "UPDATE base_advanced_query_scheme SET f_creator_user_id = 'u_other' WHERE f_id = $1::text", + &[&id], + ) + .await + .expect("改库失败"); + let (_, resp) = call( + port, + "GET", + &format!("/api/system/AdvancedQuery/{id}"), + &token, + None, + ) + .await; + assert_eq!(resp["code"], 400, "别人的方案应看不到:{resp}"); + assert_eq!(resp["msg"], "数据不存在", "别人的方案文案:{resp}"); + + // ⑨ 别人的方案也删不掉。 + let (_, resp) = call( + port, + "DELETE", + &format!("/api/system/AdvancedQuery/{id}"), + &token, + None, + ) + .await; + assert_eq!(resp["code"], 400, "别人的方案应删不掉:{resp}"); + assert_eq!(resp["msg"], "删除失败,数据不存在", "别人的方案文案:{resp}"); +} + +/// 必填校验:官方 `@NotBlank` 的四个字段缺一不可。 +#[tokio::test] +async fn advanced_query_required_fields() { + let _guard = LOCK.lock().await; + let port = serve(new_state(db().await)).await; + let token = login(port).await; + + for (body, why) in [ + (json!({ "enCode": "x" }), "缺 fullName/conditionJson/matchLogic/moduleId"), + ( + json!({ "fullName": "甲", "conditionJson": "[]", "matchLogic": "and" }), + "缺 moduleId", + ), + ] { + let (_, resp) = call( + port, + "POST", + "/api/system/AdvancedQuery", + &token, + Some(&body.to_string()), + ) + .await; + assert_eq!(resp["code"], 400, "必填校验必须失败({why}):{resp}"); + } +} diff --git a/src/backend/tests/batch6_it.rs b/src/backend/tests/batch6_it.rs index 6442a97..7529038 100644 --- a/src/backend/tests/batch6_it.rs +++ b/src/backend/tests/batch6_it.rs @@ -380,9 +380,10 @@ async fn data_model_tables_info_and_fields() { let total = tables["data"]["pagination"]["total"] .as_i64() .expect("必须有 total"); - // schema.sql 现在是 43 张表(批次 9 新增 6 张:数据接口 + 接口认证 + 打印模板/版本); + // schema.sql 现在是 49 张表(批次 9 新增 6 张:数据接口 + 接口认证 + 打印模板/版本; + // 批次 10 新增 6 张:签章 + 签章授权人 + 按钮/列表/表单权限 + 高级查询方案); // 真有变化时这条会红,提醒同步(与 DDL 计数测试同口径)。 - assert_eq!(total, 43, "表清单必须来自 information_schema: {tables}"); + assert_eq!(total, 49, "表清单必须来自 information_schema: {tables}"); let list = tables["data"]["list"].as_array().expect("必须有 list"); assert!( list.iter().any(|r| r["table"] == "base_user"),