diff --git a/ssw-dacli/src/main/java/ssw/dacli/FormCommand.java b/ssw-dacli/src/main/java/ssw/dacli/FormCommand.java index 4c0ad4f..2a06def 100644 --- a/ssw-dacli/src/main/java/ssw/dacli/FormCommand.java +++ b/ssw-dacli/src/main/java/ssw/dacli/FormCommand.java @@ -13,10 +13,12 @@ import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.UUID; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.concurrent.Callable; /** @@ -187,7 +189,7 @@ public class FormCommand implements Callable { @Option(names = {"--dbLinkId"}, description = "数据源 ID (default=主库)", defaultValue = "") private String dbLinkIdArg; - @Option(names = {"--autoTable"}, description = "是否自动建表 (默认启用,用 --no-autoTable 禁用)", defaultValue = "true") + @Option(names = {"--autoTable"}, description = "是否自动建表 (默认启用,用 --no-autoTable 禁用)", defaultValue = "true", fallbackValue = "true") private boolean autoTable; @Option(names = {"--autoRelease"}, description = "是否自动发布 (默认 false,需显式 --autoRelease=true 或留空由 fallbackValue=true)", defaultValue = "false", fallbackValue = "true") @@ -1644,6 +1646,103 @@ public class FormCommand implements Callable { } } + // ======================== 表单与表字段自动对齐 (v12 新增, 盲点 30 修复) ======================== + /** + * 对比 formData 业务字段 vs dm table 实际字段, 缺失的自动 ALTER (盲点 30)。 + * 流程: + * 1. GET /api/system/DataModel/{linkId}/Table/{tableName} 拿实际字段 + * 2. 提取字段名集合 + * 3. 对比 formData 业务字段 + * 4. 缺失字段构建 DbTableFieldDTO → PUT /api/system/DataModel/{linkId}/addFields + * v11 实战痛点: form --fields 含 select/radio 字段 (如 f_space_type), 但 dm create 只建了 input 字段, + * INSERT SQL 报 "Unknown column 'f_space_type'" → 修复: 字段自动补齐 + */ + private static String ensureFormTableAlignment(String tableName, + List> formFields, + String dbLinkId) throws Exception { + ObjectMapper om = new ObjectMapper(); + StringBuilder log = new StringBuilder(); + log.append(" table: ").append(tableName).append("\n"); + + // 1. 拿实际表字段 + String tableInfoJson = DacliKit.doGet("/api/system/DataModel/" + dbLinkId + "/Table/" + tableName); + JsonNode tableInfo = om.readTree(tableInfoJson); + if (tableInfo.path("code").asInt(0) != 200) { + log.append(" ⚠️ 拿不到表结构, 跳过对齐: ").append(tableInfo.path("msg").asText("?")).append("\n"); + return log.toString(); + } + + Set actualFields = new HashSet<>(); + for (JsonNode f : tableInfo.path("data").path("tableFieldList")) { + String fn = f.path("field").asText(null); + if (fn != null) actualFields.add(fn); + } + log.append(" 实际表字段: ").append(actualFields.size()).append(" 个\n"); + + // 2. 收集 form 业务字段 + Set formFieldSet = new HashSet<>(); + List> missingFields = new ArrayList<>(); + for (Map f : formFields) { + String fn = (String) f.get("field"); + if (fn == null) continue; + if (FormBuilder.isSystemField(fn)) continue; // 跳过 9 系统列 + formFieldSet.add(fn); + if (!actualFields.contains(fn)) { + missingFields.add(f); + } + } + log.append(" form 业务字段: ").append(formFieldSet.size()).append(" 个\n"); + log.append(" 缺失字段: ").append(missingFields.size()).append(" 个\n"); + + if (missingFields.isEmpty()) { + log.append(" ✅ 字段已对齐, 无需 ALTER\n"); + return log.toString(); + } + + // 3. 构建 addFields payload + Map tableInfoMap = new LinkedHashMap<>(); + tableInfoMap.put("table", tableName); + tableInfoMap.put("tableName", tableName); + tableInfoMap.put("newTable", tableName); + + List> addFieldList = new ArrayList<>(); + int idx = actualFields.size(); // 索引续接 + for (Map f : missingFields) { + String fn = (String) f.get("field"); + String dataType = FormBuilder.mapJnpfKeyToDataType((String) f.getOrDefault("jnpfKey", "input")); + String dataLength = FormBuilder.mapJnpfKeyToDataLength((String) f.getOrDefault("jnpfKey", "input")); + + Map ff = new LinkedHashMap<>(); + ff.put("field", fn); + ff.put("fieldName", f.getOrDefault("fieldName", fn)); + ff.put("dataType", dataType); + ff.put("dataLength", dataLength); + ff.put("primaryKey", 0); + ff.put("allowNull", 1); // ALTER 加列默认允许 NULL + ff.put("autoIncrement", 0); + ff.put("identity", 0); + ff.put("index", String.valueOf(idx++)); + addFieldList.add(ff); + log.append(" + 添加: ").append(fn).append(" (").append(dataType).append(")\n"); + } + + Map addPayload = new LinkedHashMap<>(); + addPayload.put("tableInfo", tableInfoMap); + addPayload.put("tableFieldList", addFieldList); + + // 4. PUT addFields + String addResp = DacliKit.doPut("/api/system/DataModel/" + dbLinkId + "/addFields", addPayload); + log.append(" addFields response: ").append(addResp).append("\n"); + + JsonNode addJson = om.readTree(addResp); + if (addJson.path("code").asInt(0) == 200) { + log.append(" ✅ 盲点 30 修复成功, ").append(missingFields.size()).append(" 字段已补齐\n"); + } else { + log.append(" ❌ addFields 失败: ").append(addJson.path("msg").asText("?")).append("\n"); + } + return log.toString(); + } + // ======================== e2e-smoke (v12 新增, 盲点 21/29 固化) ======================== /** * E2E smoke 测试: 自动构造合规 body 调用 /api/visualdev/OnlineDev/{formId}