From 05e2bc7d8c842caceef537f304f3ad5c12d7424f Mon Sep 17 00:00:00 2001 From: ssw Date: Thu, 11 Jun 2026 23:45:26 +0800 Subject: [PATCH] =?UTF-8?q?v13-f1=20Task=201.19:=2011=20=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=88=97=20builder=20(system=20=E5=AD=90=E7=9B=AE=E5=BD=95,=20?= =?UTF-8?q?=E5=90=AB=20f=5Fflow=5F*=20=E7=9B=B2=E7=82=B9=2015/16=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 11 系统列 (含复合 PK f_id/f_tenant_id): f_id, f_tenant_id, f_flow_task_id, f_flow_id, f_flow_state, f_sort_code, f_create_user, f_create_time, f_modify_user, f_modify_time, f_description - 权威源: DmCommand.ensureRuntimeColumns v10.6.3 (v10.6 实战盲点 15/16 修复) - 字段 JSON 含 8 必填 (JNPF DbFieldForm v10.5 fail-fast): field/fieldName/dataType/dataLength/primaryKey/allowNull/identity/autoIncrement - f_tenant_id defaultValue='000000', f_sort_code defaultValue='0' - 公开 API: buildSystemColumn(枚举/字符串), buildAllSystemColumns(), isSystemColumn(), getSystemColumnCount() - 不是 FieldBuilder SPI, 不需 META-INF/services 注册 - 4 @Test (basic/allColumns/flowColumns/dumpToFile) 4/4 PASS - 全集 128/128 PASS (32 builder × 4 test) --- scripts/SystemColumnBuilder-output.json | 1 + .../builder/system/SystemColumnBuilder.java | 199 ++++++++++++++++++ .../system/SystemColumnBuilderTest.java | 156 ++++++++++++++ 3 files changed, 356 insertions(+) create mode 100644 scripts/SystemColumnBuilder-output.json create mode 100644 ssw-dacli/src/main/java/ssw/dacli/form/builder/system/SystemColumnBuilder.java create mode 100644 ssw-dacli/src/test/java/ssw/dacli/form/builder/system/SystemColumnBuilderTest.java diff --git a/scripts/SystemColumnBuilder-output.json b/scripts/SystemColumnBuilder-output.json new file mode 100644 index 0000000..f0f0ce0 --- /dev/null +++ b/scripts/SystemColumnBuilder-output.json @@ -0,0 +1 @@ +[{"field":"f_id","fieldName":"主键ID","dataType":"varchar","dataLength":"50","primaryKey":1,"allowNull":0,"identity":0,"autoIncrement":0},{"field":"f_tenant_id","fieldName":"租户ID","dataType":"varchar","dataLength":"50","primaryKey":1,"allowNull":0,"identity":0,"autoIncrement":0,"defaultValue":"000000"},{"field":"f_flow_task_id","fieldName":"流程任务ID","dataType":"varchar","dataLength":"50","primaryKey":0,"allowNull":1,"identity":0,"autoIncrement":0},{"field":"f_flow_id","fieldName":"流程实例ID","dataType":"varchar","dataLength":"50","primaryKey":0,"allowNull":1,"identity":0,"autoIncrement":0},{"field":"f_flow_state","fieldName":"流程状态","dataType":"int","dataLength":"11","primaryKey":0,"allowNull":1,"identity":0,"autoIncrement":0},{"field":"f_sort_code","fieldName":"排序","dataType":"varchar","dataLength":"50","primaryKey":0,"allowNull":1,"identity":0,"autoIncrement":0,"defaultValue":"0"},{"field":"f_create_user","fieldName":"创建人","dataType":"varchar","dataLength":"50","primaryKey":0,"allowNull":1,"identity":0,"autoIncrement":0},{"field":"f_create_time","fieldName":"创建时间","dataType":"varchar","dataLength":"50","primaryKey":0,"allowNull":1,"identity":0,"autoIncrement":0},{"field":"f_modify_user","fieldName":"修改人","dataType":"varchar","dataLength":"50","primaryKey":0,"allowNull":1,"identity":0,"autoIncrement":0},{"field":"f_modify_time","fieldName":"修改时间","dataType":"varchar","dataLength":"50","primaryKey":0,"allowNull":1,"identity":0,"autoIncrement":0},{"field":"f_description","fieldName":"描述","dataType":"varchar","dataLength":"500","primaryKey":0,"allowNull":1,"identity":0,"autoIncrement":0}] \ No newline at end of file diff --git a/ssw-dacli/src/main/java/ssw/dacli/form/builder/system/SystemColumnBuilder.java b/ssw-dacli/src/main/java/ssw/dacli/form/builder/system/SystemColumnBuilder.java new file mode 100644 index 0000000..1b40891 --- /dev/null +++ b/ssw-dacli/src/main/java/ssw/dacli/form/builder/system/SystemColumnBuilder.java @@ -0,0 +1,199 @@ +package ssw.dacli.form.builder.system; + +import com.fasterxml.jackson.databind.ObjectMapper; +import java.util.*; + +/** + * v13 业务表 11 系统列 builder (Task 1.19). + * + *

JNPF 所有 form 业务表必须有这 11 列系统列 (含复合 PK), JNPF runtime SQL 硬编码引用, + * 缺任一 → POST /api/visualdev/OnlineDev/{id} 返 400 "Table has no primary key" + * 或 POST /api/visualdev/OnlineDev/{id}/List 返 total=0 (JNPF 吞 SQL 异常). + * + *

11 列清单 (权威源: {@code DmCommand.ensureRuntimeColumns} v10.6.3 + 实战盲点 13/15/16/18): + *

    + *
  1. {@code f_id} - 主键 ID, varchar(50), PK=1, allowNull=0
  2. + *
  3. {@code f_tenant_id} - 租户 ID (多租户), varchar(50), PK=1, allowNull=0, default='000000'
  4. + *
  5. {@code f_flow_task_id} - 流程任务 ID (Flowable), varchar(50), 盲点 15 P0 修复
  6. + *
  7. {@code f_flow_id} - 流程定义 ID, varchar(50), 盲点 16 P1 修复 (List API where f_flow_id is null)
  8. + *
  9. {@code f_flow_state} - 流程状态 (0=草稿/1=审批中/2=通过/3=驳回), int(11)
  10. + *
  11. {@code f_sort_code} - 排序码, varchar(50), default '0'
  12. + *
  13. {@code f_create_user} - 创建人, varchar(50)
  14. + *
  15. {@code f_create_time} - 创建时间, varchar(50)
  16. + *
  17. {@code f_modify_user} - 最后修改人, varchar(50)
  18. + *
  19. {@code f_modify_time} - 最后修改时间, varchar(50)
  20. + *
  21. {@code f_description} - 描述/备注, varchar(500)
  22. + *
+ * + *

字段 JSON 格式 (8 字段 JNPF DbFieldForm 必填, v10.5 fail-fast 校验): + *

+ * {
+ *   "field": "f_id",
+ *   "fieldName": "主键ID",
+ *   "dataType": "varchar",
+ *   "dataLength": "50",
+ *   "primaryKey": 1,
+ *   "allowNull": 0,
+ *   "identity": 0,
+ *   "autoIncrement": 0,
+ *   "defaultValue": null
+ * }
+ * 
+ * + *

注意: 本类不是 FieldBuilder SPI, 不需注册到 META-INF/services. + * dacli dm create 内部 {@code DmCommand.ensureRuntimeColumns} 已静默补这些列, + * 本类作为对外文档化 + 反查验证 + 单元测试 fixture用, 供: + *

+ * + *

字段顺序: 按 v10.6.3 DmCommand 实战顺序 (复合 PK → flow 3 列 → 审计 5 列 → 描述), + * 保证 baseline 比对 0 误差. + */ +public class SystemColumnBuilder { + private static final ObjectMapper mapper = new ObjectMapper(); + + /** + * 系统列定义 (权威源: DmCommand.ensureRuntimeColumns 11 列). + * 顺序: 复合 PK (2) → flow (3) → 审计 (5) → 描述 (1) = 11 列. + * + *

数组维度: {field, fieldName, dataType, dataLength, primaryKey, allowNull, defaultValue}. + * identity/autoIncrement 恒为 0 (JNPF 业务表 PK 用雪花 ID, 非自增). + */ + private static final String[][] SYSTEM_COLUMNS = { + // v10.6.3 候选 J: 复合 PK (f_id 主键 + f_tenant_id 多租户) + {"f_id", "主键ID", "varchar", "50", "1", "0", null}, + {"f_tenant_id", "租户ID", "varchar", "50", "1", "0", "000000"}, + // v10.6 盲点 15 (P0): JNPF runtime INSERT SQL 硬编码引用 + {"f_flow_task_id", "流程任务ID", "varchar", "50", "0", "1", null}, + // v10.6 盲点 16 (P1): JNPF runtime LIST SQL "where f_flow_id is null" 硬编码引用 + {"f_flow_id", "流程实例ID", "varchar", "50", "0", "1", null}, + // v10.6 盲点 15/16 配套: 流程状态 (0=草稿/1=审批中/2=通过/3=驳回) + {"f_flow_state", "流程状态", "int", "11", "0", "1", null}, + // 排序 / 审计 / 描述 (JNPF runtime 通用期望) + {"f_sort_code", "排序", "varchar", "50", "0", "1", "0"}, + {"f_create_user", "创建人", "varchar", "50", "0", "1", null}, + {"f_create_time", "创建时间", "varchar", "50", "0", "1", null}, + {"f_modify_user", "修改人", "varchar", "50", "0", "1", null}, + {"f_modify_time", "修改时间", "varchar", "50", "0", "1", null}, + {"f_description", "描述", "varchar", "500", "0", "1", null}, + }; + + /** 系统列枚举 (供 buildSystemColumn 索引 + 测试 fixture 命名查找). */ + public enum SystemColumnType { + F_ID("f_id"), + F_TENANT_ID("f_tenant_id"), + F_FLOW_TASK_ID("f_flow_task_id"), + F_FLOW_ID("f_flow_id"), + F_FLOW_STATE("f_flow_state"), + F_SORT_CODE("f_sort_code"), + F_CREATE_USER("f_create_user"), + F_CREATE_TIME("f_create_time"), + F_MODIFY_USER("f_modify_user"), + F_MODIFY_TIME("f_modify_time"), + F_DESCRIPTION("f_description"); + + public final String field; + SystemColumnType(String field) { this.field = field; } + } + + /** + * 生成单列 JSON (按 SystemColumnType 枚举). + * + * @param type 系统列类型 + * @return JSON 字符串 (8 字段, JNPF DbFieldForm 必填) + */ + public String buildSystemColumn(SystemColumnType type) { + for (String[] sys : SYSTEM_COLUMNS) { + if (sys[0].equals(type.field)) { + return buildColumnJson(sys); + } + } + throw new IllegalArgumentException("Unknown system column: " + type); + } + + /** + * 生成单列 JSON (按字段名查找, 大小写不敏感). + * + * @param fieldName 字段名 (如 "f_id" / "F_Id" / "f_tenant_id") + * @return JSON 字符串 + * @throws IllegalArgumentException 字段名不在 11 系统列清单中 + */ + public String buildSystemColumn(String fieldName) { + for (String[] sys : SYSTEM_COLUMNS) { + if (sys[0].equalsIgnoreCase(fieldName)) { + return buildColumnJson(sys); + } + } + throw new IllegalArgumentException("Unknown system column: " + fieldName + + " (expected one of f_id, f_tenant_id, f_flow_task_id, f_flow_id, f_flow_state, " + + "f_sort_code, f_create_user, f_create_time, f_modify_user, f_modify_time, f_description)"); + } + + /** + * 批量生成 11 系统列 JSON 数组 (供 dacli dm create fields fixture 用). + * + * @return JSON 数组字符串, 含全部 11 列定义 (按 v10.6.3 实战顺序) + */ + public String buildAllSystemColumns() { + try { + List jsonList = new ArrayList<>(SYSTEM_COLUMNS.length); + for (String[] sys : SYSTEM_COLUMNS) { + jsonList.add(buildColumnJson(sys)); + } + return "[" + String.join(",", jsonList) + "]"; + } catch (Exception e) { + throw new RuntimeException("SystemColumnBuilder.buildAllSystemColumns failed: " + e.getMessage(), e); + } + } + + /** + * 内部方法: 把 sysCol 数组转 JSON 字符串. + * + *

8 字段 (JNPF DbFieldForm 必填, v10.5 fail-fast 校验): + * field / fieldName / dataType / dataLength / primaryKey / allowNull / identity / autoIncrement. + * 第 9 字段 defaultValue 可选 (仅 f_tenant_id='000000' / f_sort_code='0' 显式设). + */ + private String buildColumnJson(String[] sysCol) { + try { + Map col = new LinkedHashMap<>(); + col.put("field", sysCol[0]); + col.put("fieldName", sysCol[1]); + col.put("dataType", sysCol[2]); + col.put("dataLength", sysCol[3]); + col.put("primaryKey", Integer.parseInt(sysCol[4])); + col.put("allowNull", Integer.parseInt(sysCol[5])); + col.put("identity", 0); // 业务表 PK 用雪花 ID, 非自增 + col.put("autoIncrement", 0); // 同上 + // defaultValue 可选 (v10.5 NPE 防御: null 值不输出, 避免 JNPF 误判) + if (sysCol[6] != null) { + col.put("defaultValue", sysCol[6]); + } + return mapper.writeValueAsString(col); + } catch (Exception e) { + throw new RuntimeException("buildColumnJson failed for " + sysCol[0] + ": " + e.getMessage(), e); + } + } + + /** 公开 11 系统列数量, 供测试断言 (验证定义完整度). */ + public static int getSystemColumnCount() { + return SYSTEM_COLUMNS.length; + } + + /** + * 检查字段名是否在 11 系统列清单中 (大小写不敏感). + * 供 dacli form fix / e2e-smoke 校验 baseline 表用. + * + * @param fieldName 字段名 + * @return true=系统列, false=非系统列 + */ + public static boolean isSystemColumn(String fieldName) { + if (fieldName == null) return false; + for (String[] sys : SYSTEM_COLUMNS) { + if (sys[0].equalsIgnoreCase(fieldName)) return true; + } + return false; + } +} diff --git a/ssw-dacli/src/test/java/ssw/dacli/form/builder/system/SystemColumnBuilderTest.java b/ssw-dacli/src/test/java/ssw/dacli/form/builder/system/SystemColumnBuilderTest.java new file mode 100644 index 0000000..2ca6ac1 --- /dev/null +++ b/ssw-dacli/src/test/java/ssw/dacli/form/builder/system/SystemColumnBuilderTest.java @@ -0,0 +1,156 @@ +package ssw.dacli.form.builder.system; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; +import java.nio.file.*; +import java.util.*; + +/** + * v13 Task 1.19 — SystemColumnBuilder 单元测试 (4 用例). + * + *

校验关键结构 (11 系统列 / 复合 PK / flow 3 列 / 8 字段必填 / 顺序) 与 baseline DmCommand.ensureRuntimeColumns 对齐. + * dumpToFile 把 11 系统列 JSON 数组写到 scripts/SystemColumnBuilder-output.json 供人工目检. + */ +public class SystemColumnBuilderTest { + + private static final ObjectMapper M = new ObjectMapper(); + + @Test + public void testBasic() throws Exception { + // 1) 验证 F_ID 单列 + String json = new SystemColumnBuilder().buildSystemColumn(SystemColumnBuilder.SystemColumnType.F_ID); + var parsed = M.readTree(json); + + // 8 必填字段 (v10.5 fail-fast 校验) + assertEquals("f_id", parsed.get("field").asText()); + assertEquals("主键ID", parsed.get("fieldName").asText()); + assertEquals("varchar", parsed.get("dataType").asText()); + assertEquals("50", parsed.get("dataLength").asText()); + assertEquals(1, parsed.get("primaryKey").asInt(), "f_id must be PK=1"); + assertEquals(0, parsed.get("allowNull").asInt(), "f_id must be NOT NULL"); + assertEquals(0, parsed.get("identity").asInt()); + assertEquals(0, parsed.get("autoIncrement").asInt()); + // f_id 无 defaultValue (null, JNPF 雪花 ID) + + // 2) 验证按字符串名查找 (大小写不敏感) + String json2 = new SystemColumnBuilder().buildSystemColumn("F_TENANT_ID"); + var parsed2 = M.readTree(json2); + assertEquals("f_tenant_id", parsed2.get("field").asText()); + assertEquals(1, parsed2.get("primaryKey").asInt(), "f_tenant_id must be PK=1 (composite PK)"); + assertEquals(0, parsed2.get("allowNull").asInt()); + assertEquals("000000", parsed2.get("defaultValue").asText(), "f_tenant_id default '000000'"); + + // 3) 验证未知字段名抛异常 (fail-fast) + assertThrows(IllegalArgumentException.class, () -> { + new SystemColumnBuilder().buildSystemColumn("f_unknown_col"); + }); + } + + @Test + public void testAllColumns() throws Exception { + String jsonArray = new SystemColumnBuilder().buildAllSystemColumns(); + var parsed = M.readTree(jsonArray); + + // 数组长度 = 11 (v10.6.3 实战 11 列) + assertTrue(parsed.isArray(), "buildAllSystemColumns must return JSON array"); + assertEquals(11, parsed.size(), "must have 11 system columns, actual: " + parsed.size()); + assertEquals(11, SystemColumnBuilder.getSystemColumnCount(), "getSystemColumnCount must be 11"); + + // 验证顺序 (v10.6.3 DmCommand 实战顺序: 复合 PK → flow 3 → 审计 5 → 描述) + assertEquals("f_id", parsed.get(0).get("field").asText()); + assertEquals("f_tenant_id", parsed.get(1).get("field").asText()); + assertEquals("f_flow_task_id", parsed.get(2).get("field").asText()); + assertEquals("f_flow_id", parsed.get(3).get("field").asText()); + assertEquals("f_flow_state", parsed.get(4).get("field").asText()); + assertEquals("f_sort_code", parsed.get(5).get("field").asText()); + assertEquals("f_create_user", parsed.get(6).get("field").asText()); + assertEquals("f_create_time", parsed.get(7).get("field").asText()); + assertEquals("f_modify_user", parsed.get(8).get("field").asText()); + assertEquals("f_modify_time", parsed.get(9).get("field").asText()); + assertEquals("f_description", parsed.get(10).get("field").asText()); + + // 验证 isSystemColumn 助手 + assertTrue(SystemColumnBuilder.isSystemColumn("f_id")); + assertTrue(SystemColumnBuilder.isSystemColumn("F_TENANT_ID"), "case-insensitive"); + assertTrue(SystemColumnBuilder.isSystemColumn("f_flow_task_id")); + assertFalse(SystemColumnBuilder.isSystemColumn("f_name"), "业务字段非系统列"); + assertFalse(SystemColumnBuilder.isSystemColumn("f_amount"), "业务字段非系统列"); + assertFalse(SystemColumnBuilder.isSystemColumn(null)); + } + + @Test + public void testFlowColumns() throws Exception { + // 验证 v10.6 盲点 15 (P0) + 盲点 16 (P1) 修复的 3 个 flow 系统列 + // 盲点 15: JNPF runtime INSERT SQL 硬编码 f_flow_task_id + // 盲点 16: JNPF runtime LIST SQL "where f_flow_id is null" 硬编码 + SystemColumnBuilder b = new SystemColumnBuilder(); + + // 1) f_flow_task_id (盲点 15) + var flowTaskId = M.readTree(b.buildSystemColumn("f_flow_task_id")); + assertEquals("f_flow_task_id", flowTaskId.get("field").asText()); + assertEquals("流程任务ID", flowTaskId.get("fieldName").asText()); + assertEquals("varchar", flowTaskId.get("dataType").asText()); + assertEquals("50", flowTaskId.get("dataLength").asText()); + assertEquals(0, flowTaskId.get("primaryKey").asInt(), "flow 列非主键"); + assertEquals(1, flowTaskId.get("allowNull").asInt(), "flow 列 nullable"); + + // 2) f_flow_id (盲点 16) + var flowId = M.readTree(b.buildSystemColumn("f_flow_id")); + assertEquals("f_flow_id", flowId.get("field").asText()); + assertEquals("流程实例ID", flowId.get("fieldName").asText()); + assertEquals("varchar", flowId.get("dataType").asText()); + assertEquals("50", flowId.get("dataLength").asText()); + assertEquals(0, flowId.get("primaryKey").asInt()); + assertEquals(1, flowId.get("allowNull").asInt()); + + // 3) f_flow_state (状态: 0=草稿/1=审批中/2=通过/3=驳回) + var flowState = M.readTree(b.buildSystemColumn("f_flow_state")); + assertEquals("f_flow_state", flowState.get("field").asText()); + assertEquals("流程状态", flowState.get("fieldName").asText()); + assertEquals("int", flowState.get("dataType").asText()); + assertEquals("11", flowState.get("dataLength").asText()); + assertEquals(0, flowState.get("primaryKey").asInt()); + assertEquals(1, flowState.get("allowNull").asInt()); + + // 4) 验证 3 列同时出现在 buildAllSystemColumns() 中 (顺序 2/3/4) + String allJson = b.buildAllSystemColumns(); + var all = M.readTree(allJson); + assertEquals("f_flow_task_id", all.get(2).get("field").asText()); + assertEquals("f_flow_id", all.get(3).get("field").asText()); + assertEquals("f_flow_state", all.get(4).get("field").asText()); + } + + @Test + public void testDumpToFile() throws Exception { + // 工具方法: 写入 scripts/SystemColumnBuilder-output.json (含完整 11 系统列) + String jsonArray = new SystemColumnBuilder().buildAllSystemColumns(); + + Path out = Paths.get("../scripts/SystemColumnBuilder-output.json"); + Files.createDirectories(out.getParent()); + Files.writeString(out, jsonArray); + assertTrue(Files.exists(out)); + assertTrue(Files.size(out) > 500, "output file should have content (>500 bytes for 11 columns)"); + + // 再次读取验证 + var parsed = M.readTree(Files.readString(out)); + assertTrue(parsed.isArray()); + assertEquals(11, parsed.size()); + + // 验证第一行是 f_id (PK=1) + assertEquals("f_id", parsed.get(0).get("field").asText()); + assertEquals(1, parsed.get(0).get("primaryKey").asInt()); + + // 验证 f_tenant_id 是复合 PK + 默认 '000000' + assertEquals("f_tenant_id", parsed.get(1).get("field").asText()); + assertEquals(1, parsed.get(1).get("primaryKey").asInt()); + assertEquals("000000", parsed.get(1).get("defaultValue").asText()); + + // 验证 8 必填字段都在 (抽样 f_flow_task_id) + var flowTask = parsed.get(2); + for (String key : new String[]{"field", "fieldName", "dataType", "dataLength", + "primaryKey", "allowNull", "identity", "autoIncrement"}) { + assertNotNull(flowTask.get(key), "f_flow_task_id must have " + key); + } + } +}