From a3f6de5b36d9984d4e56b245e1b78e9a0760fa59 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 26 Oct 2026 20:20:18 +0800 Subject: [PATCH] =?UTF-8?q?refactor(b1b-c1):=20=E5=AD=90=E8=A1=A8=E5=A3=B0?= =?UTF-8?q?=E6=98=8E=E5=BD=92=E4=B8=9A=E5=8A=A1=20spec=20=E2=80=94?= =?UTF-8?q?=E2=80=94=20=E5=BC=95=E6=93=8E=E9=9B=B6=20match=20api=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - TableSpec 增字段 child_tables: &'static [(&'static str, &'static str)] - 18 个实体 spec 各自声明子表(Resource / Dataset 两条,其余 16 条空) - service/crud.rs 删掉按 api_name 分叉的 child_tables(),改读 spec.child_tables - 边界账本删掉已失效条目(CP3 crud.rs match spec.api_name) --- scripts/boundary-ledger.txt | 1 - src/tdc/entity/api_consume_log.rs | 1 + src/tdc/entity/audit_log.rs | 1 + src/tdc/entity/contract.rs | 1 + src/tdc/entity/credential.rs | 1 + src/tdc/entity/data_interface.rs | 1 + src/tdc/entity/dataset.rs | 1 + src/tdc/entity/datasource.rs | 1 + src/tdc/entity/delivery_log.rs | 1 + src/tdc/entity/delivery_task.rs | 1 + src/tdc/entity/destroy_log.rs | 1 + src/tdc/entity/identity.rs | 1 + src/tdc/entity/mod.rs | 7 +++++++ src/tdc/entity/notification.rs | 1 + src/tdc/entity/order.rs | 1 + src/tdc/entity/policy.rs | 1 + src/tdc/entity/policy_check_log.rs | 1 + src/tdc/entity/policy_template.rs | 1 + src/tdc/entity/product.rs | 1 + src/tdc/entity/resource.rs | 1 + src/tdc/service/crud.rs | 24 ++++-------------------- 21 files changed, 29 insertions(+), 21 deletions(-) diff --git a/scripts/boundary-ledger.txt b/scripts/boundary-ledger.txt index 1568a96..ba1824e 100644 --- a/scripts/boundary-ledger.txt +++ b/scripts/boundary-ledger.txt @@ -16,7 +16,6 @@ CP1 auth.rs /api/ssw/tdc/ C5:白名单清单待归业务层 src/tdc/support/pu CP1 db.rs tdc_identity C4:schema 探针待通用化(改查 pg_catalog.pg_tables) B1b CP2 session.rs Identity 假阳性:SessionKind::Identity 是**会话口径**,不是业务实体 tdc_identity 永久 CP2 auth.rs SessionKind::Identity 假阳性:Principal::Session 分支里的会话种类,不是业务实体 永久 -CP3 crud.rs match spec.api_name C1:child_tables 待改成读 TableSpec 字段 B1b CP3 crud.rs match api_name C2:detail_not_found_msg 待改成读 TableSpec 字段 B1b CP3 controller/crud.rs find("Resource") C3:聚合详情注册待改成遍历 spec B1b CP3 controller/crud.rs find("Dataset") C3:聚合详情注册待改成遍历 spec B1b diff --git a/src/tdc/entity/api_consume_log.rs b/src/tdc/entity/api_consume_log.rs index 5bdc98d..6aa8e7f 100644 --- a/src/tdc/entity/api_consume_log.rs +++ b/src/tdc/entity/api_consume_log.rs @@ -31,4 +31,5 @@ pub const SPEC: TableSpec = TableSpec { no_delete: Some("计量明细只读:禁止经泛型 CRUD 删除(审计证据不可篡改)"), frozen_columns: &[], hidden_fields: &[], + child_tables: &[], }; diff --git a/src/tdc/entity/audit_log.rs b/src/tdc/entity/audit_log.rs index 1e6f74b..c25032c 100644 --- a/src/tdc/entity/audit_log.rs +++ b/src/tdc/entity/audit_log.rs @@ -27,4 +27,5 @@ pub const SPEC: TableSpec = TableSpec { no_delete: Some("审计日志不允许删除"), frozen_columns: &[], hidden_fields: &[], + child_tables: &[], }; diff --git a/src/tdc/entity/contract.rs b/src/tdc/entity/contract.rs index 30c577d..9261e85 100644 --- a/src/tdc/entity/contract.rs +++ b/src/tdc/entity/contract.rs @@ -32,4 +32,5 @@ pub const SPEC: TableSpec = TableSpec { no_delete: Some("本地合约副本不可删除(权威归档在平台,副本仅随空间/合约清退联动)"), frozen_columns: &[], hidden_fields: &[], + child_tables: &[], }; diff --git a/src/tdc/entity/credential.rs b/src/tdc/entity/credential.rs index c2b51aa..a3eccbf 100644 --- a/src/tdc/entity/credential.rs +++ b/src/tdc/entity/credential.rs @@ -28,4 +28,5 @@ pub const SPEC: TableSpec = TableSpec { // (该列是「预留 SK 密文(本期空)」,上游自注)⇒ 本仓补上去敏。 // 该列本仓**从不写入**(恒 NULL)⇒ 对外行为零差异,纯属兜底。 hidden_fields: &["secretKey"], + child_tables: &[], }; diff --git a/src/tdc/entity/data_interface.rs b/src/tdc/entity/data_interface.rs index 232c320..b2e6b89 100644 --- a/src/tdc/entity/data_interface.rs +++ b/src/tdc/entity/data_interface.rs @@ -21,4 +21,5 @@ pub const SPEC: TableSpec = TableSpec { no_delete: None, frozen_columns: &[], hidden_fields: &[], + child_tables: &[], }; diff --git a/src/tdc/entity/dataset.rs b/src/tdc/entity/dataset.rs index e61cd13..4f51864 100644 --- a/src/tdc/entity/dataset.rs +++ b/src/tdc/entity/dataset.rs @@ -24,4 +24,5 @@ pub const SPEC: TableSpec = TableSpec { no_delete: Some("数据集为只读视图,不支持新增/编辑/删除"), frozen_columns: &[], hidden_fields: &[], + child_tables: &[("fieldRules", "tdc_resource_field"), ("maskRules", "tdc_resource_mask_rule")], }; diff --git a/src/tdc/entity/datasource.rs b/src/tdc/entity/datasource.rs index 0034133..5321eb6 100644 --- a/src/tdc/entity/datasource.rs +++ b/src/tdc/entity/datasource.rs @@ -26,4 +26,5 @@ pub const SPEC: TableSpec = TableSpec { no_delete: None, frozen_columns: &[], hidden_fields: &[], + child_tables: &[], }; diff --git a/src/tdc/entity/delivery_log.rs b/src/tdc/entity/delivery_log.rs index 58353cc..45bbbc6 100644 --- a/src/tdc/entity/delivery_log.rs +++ b/src/tdc/entity/delivery_log.rs @@ -23,4 +23,5 @@ pub const SPEC: TableSpec = TableSpec { no_delete: Some("交付日志是审计证据,不允许删除"), frozen_columns: &[], hidden_fields: &[], + child_tables: &[], }; diff --git a/src/tdc/entity/delivery_task.rs b/src/tdc/entity/delivery_task.rs index 8529e78..6886019 100644 --- a/src/tdc/entity/delivery_task.rs +++ b/src/tdc/entity/delivery_task.rs @@ -45,4 +45,5 @@ pub const SPEC: TableSpec = TableSpec { frozen_columns: DELIVERY_TASK_FROZEN, // 上游 `DeliveryTaskEntity` 对这两个属性标了 `@JsonIgnore`(工作台凭证,2026-10-25 核对)。 hidden_fields: &["devUrl", "devToken"], + child_tables: &[], }; diff --git a/src/tdc/entity/destroy_log.rs b/src/tdc/entity/destroy_log.rs index fccce69..253f5f3 100644 --- a/src/tdc/entity/destroy_log.rs +++ b/src/tdc/entity/destroy_log.rs @@ -23,4 +23,5 @@ pub const SPEC: TableSpec = TableSpec { no_delete: Some("销毁日志是合规存证,不可删除"), frozen_columns: &[], hidden_fields: &[], + child_tables: &[], }; diff --git a/src/tdc/entity/identity.rs b/src/tdc/entity/identity.rs index a0803bb..a3dee5f 100644 --- a/src/tdc/entity/identity.rs +++ b/src/tdc/entity/identity.rs @@ -35,4 +35,5 @@ pub const SPEC: TableSpec = TableSpec { // 上游 `IdentityEntity.f_secret_key` 标了 `@JsonIgnore`(2026-10-25 核对): // 「防 CRUD list/detail 泄露——operator 用 Identity/{id}/RotateSecret 取/重置」。 hidden_fields: &["secretKey"], + child_tables: &[], }; diff --git a/src/tdc/entity/mod.rs b/src/tdc/entity/mod.rs index 758492a..cb96b33 100644 --- a/src/tdc/entity/mod.rs +++ b/src/tdc/entity/mod.rs @@ -90,6 +90,13 @@ pub struct TableSpec { /// hidden 是「**当它不存在**」—— 上游两者对 `f_dev_url` / `f_dev_token` **同时存在** /// (实体 `@JsonIgnore` + 控制器 `changedAuthorityColumn`),本仓照抄。 pub hidden_fields: &'static [&'static str], + /// **子表聚合声明**(上游 `ResourceService.withChildren`)—— + /// `(输出 JSON 键, 子表名)`;**空 = 该实体没有 `/Detail` 聚合体**。 + /// + /// 🔴 引擎**零 `match api_name`** ⇒ 子表由**业务 spec 声明** + /// (v3 spec §2.3.1 C1;与技能 `EntitySpec.creator_fixed` 同一手法)。 + /// 声明顺序 = 输出顺序(上游 `fieldRules` 在前、`maskRules` 在后)。 + pub child_tables: &'static [(&'static str, &'static str)], } /// `DeliveryTask` 的 41 个服务端权威列。 diff --git a/src/tdc/entity/notification.rs b/src/tdc/entity/notification.rs index d966e37..94cce5f 100644 --- a/src/tdc/entity/notification.rs +++ b/src/tdc/entity/notification.rs @@ -26,4 +26,5 @@ pub const SPEC: TableSpec = TableSpec { no_delete: None, frozen_columns: &[], hidden_fields: &[], + child_tables: &[], }; diff --git a/src/tdc/entity/order.rs b/src/tdc/entity/order.rs index 20bdad7..0294ff4 100644 --- a/src/tdc/entity/order.rs +++ b/src/tdc/entity/order.rs @@ -30,4 +30,5 @@ pub const SPEC: TableSpec = TableSpec { no_delete: None, frozen_columns: &[], hidden_fields: &[], + child_tables: &[], }; diff --git a/src/tdc/entity/policy.rs b/src/tdc/entity/policy.rs index 3257b1b..48130a4 100644 --- a/src/tdc/entity/policy.rs +++ b/src/tdc/entity/policy.rs @@ -23,4 +23,5 @@ pub const SPEC: TableSpec = TableSpec { no_delete: None, frozen_columns: &[], hidden_fields: &[], + child_tables: &[], }; diff --git a/src/tdc/entity/policy_check_log.rs b/src/tdc/entity/policy_check_log.rs index 08b99c8..6c94328 100644 --- a/src/tdc/entity/policy_check_log.rs +++ b/src/tdc/entity/policy_check_log.rs @@ -24,4 +24,5 @@ pub const SPEC: TableSpec = TableSpec { no_delete: Some("策略评估流水是审计证据,不允许删除"), frozen_columns: &[], hidden_fields: &[], + child_tables: &[], }; diff --git a/src/tdc/entity/policy_template.rs b/src/tdc/entity/policy_template.rs index cc818e0..277e218 100644 --- a/src/tdc/entity/policy_template.rs +++ b/src/tdc/entity/policy_template.rs @@ -19,4 +19,5 @@ pub const SPEC: TableSpec = TableSpec { no_delete: None, frozen_columns: &[], hidden_fields: &[], + child_tables: &[], }; diff --git a/src/tdc/entity/product.rs b/src/tdc/entity/product.rs index 5f3d5c9..dbfc407 100644 --- a/src/tdc/entity/product.rs +++ b/src/tdc/entity/product.rs @@ -30,4 +30,5 @@ pub const SPEC: TableSpec = TableSpec { no_delete: None, frozen_columns: &[], hidden_fields: &[], + child_tables: &[], }; diff --git a/src/tdc/entity/resource.rs b/src/tdc/entity/resource.rs index 2cabe3e..4e79738 100644 --- a/src/tdc/entity/resource.rs +++ b/src/tdc/entity/resource.rs @@ -29,4 +29,5 @@ pub const SPEC: TableSpec = TableSpec { no_delete: None, frozen_columns: &[], hidden_fields: &[], + child_tables: &[("fieldRules", "tdc_resource_field"), ("maskRules", "tdc_resource_mask_rule")], }; diff --git a/src/tdc/service/crud.rs b/src/tdc/service/crud.rs index 598af61..17f4bd5 100644 --- a/src/tdc/service/crud.rs +++ b/src/tdc/service/crud.rs @@ -687,22 +687,6 @@ pub async fn delete( } } -/// 有子表聚合的实体 —— 上游 `ResourceService.withChildren`。 -/// -/// 🔴 目前**只有资源侧**(`Resource` / `Dataset` 共用 `tdc_resource`)有子表; -/// 其余 16 个实体上游没有 `/Detail` 端点 ⇒ 走 [`detail`] 原样。 -/// -/// 返回 `(输出 JSON 键, 子表名)`;顺序即输出顺序(上游 `fieldRules` 在前、`maskRules` 在后)。 -fn child_tables(spec: &TableSpec) -> &'static [(&'static str, &'static str)] { - match spec.api_name { - "Resource" | "Dataset" => &[ - ("fieldRules", "tdc_resource_field"), - ("maskRules", "tdc_resource_mask_rule"), - ], - _ => &[], - } -} - /// `/Detail` 聚合体的「查无」文案(逐字对齐上游)。 /// /// - `Dataset` ⇒ 「数据集不存在或资源已删除」(上游 `DatasetController#detailOf`,`:142`) @@ -724,7 +708,7 @@ pub async fn detail_aggregate( id: &str, principal: Option<&Principal>, ) -> Response { - let children = child_tables(spec); + let children = spec.child_tables; if children.is_empty() { return detail(state, spec, id, principal).await; } @@ -785,14 +769,14 @@ mod tests { let ds = entity::find("Dataset").unwrap(); let prod = entity::find("Product").unwrap(); assert_eq!( - child_tables(res), + res.child_tables, &[ ("fieldRules", "tdc_resource_field"), ("maskRules", "tdc_resource_mask_rule") ] ); - assert_eq!(child_tables(ds), child_tables(res)); - assert!(child_tables(prod).is_empty()); + assert_eq!(ds.child_tables, res.child_tables); + assert!(prod.child_tables.is_empty()); } /// 🔴 重试耗尽分支:**真的**走到「所有候选都冲突」⇒ 失败文案取自该实体的 `fail_msg`,