auto(1dc9423ac708): session end @ 2026-06-11T12:12:47 (+1f)

This commit is contained in:
ssw committed 2026-06-11 12:12:49 +08:00
1 parent fd75311d25
commit 04b8467b55
1 file changed
+134
@@ -45,6 +45,7 @@ import java.util.concurrent.Callable;
FormCommand.ImportCommand.class,
FormCommand.ValidateCommand.class,
FormCommand.FixColumnDataCommand.class,
FormCommand.E2ESmokeCommand.class,
})
public class FormCommand implements Callable<Integer> {
@@ -266,6 +267,15 @@ public class FormCommand implements Callable<Integer> {
// 表已存在时忽略 (JNPF 返回 "already exists" 但不报错)
out.append("=== pre-create table ===\n ⚠️ ").append(e.getMessage()).append(" (可能表已存在,继续)\n");
}
// Phase 1.5: 字段对齐 (v12 新增, 盲点 30 修复)
// 即使表已存在, 也要检查 formData 字段 vs dm table 实际字段, 缺失的自动 ALTER
try {
String alignResult = ensureFormTableAlignment(tableName, parsedFields, dbLinkId);
out.append("\n=== align columns (盲点 30 自动修复) ===\n").append(alignResult).append("\n");
} catch (Exception e) {
out.append("\n=== align columns ===\n ⚠️ ").append(e.getMessage()).append(" (字段对齐失败,继续)\n");
}
}
// Phase 2: POST form with full tables JSON
@@ -1633,4 +1643,128 @@ public class FormCommand implements Callable<Integer> {
return modified;
}
}
// ======================== e2e-smoke (v12 新增, 盲点 21/29 固化) ========================
/**
* E2E smoke 测试: 自动构造合规 body 调用 /api/visualdev/OnlineDev/{formId}
* 修复:
* - 盲点 21: data 字段是 JSON 字符串(不是 dict)
* - 盲点 29: datePicker 字段值用毫秒数(不是 "YYYY-MM-DD" 字符串)
* 用法: dacli form e2e-smoke --formId=<id> --menuId=<id> [--fields=JSON]
*/
@Command(name = "e2e-smoke",
description = "E2E smoke: 自动构造合规 body 调用 OnlineDev API (盲点 21/29 修复)",
mixinStandardHelpOptions = true)
static class E2ESmokeCommand implements Callable<Integer> {
@Option(names = {"--formId"}, required = true, description = "表单 ID")
private String formId;
@Option(names = {"--menuId"}, description = "菜单 ID (从菜单列表查)")
private String menuId;
@Option(names = {"--fields"}, description = "自定义字段值 JSON 字符串 (默认从 formData 自动生成 sample)")
private String customFieldsJson;
@Option(names = {"--dbLinkId"}, defaultValue = "", description = "数据源 ID (默认从 token 读)")
private String dbLinkIdArg;
@Override
public Integer call() throws Exception {
Map<String, String> m = new HashMap<>();
if (!dbLinkIdArg.isEmpty()) m.put("dbLinkId", dbLinkIdArg);
String linkId = DacliKit.getDbLinkId(m, "dbLinkId");
ObjectMapper om = new ObjectMapper();
StringBuilder out = new StringBuilder();
out.append("=== E2E smoke (盲点 21/29 自动修复) ===\n");
out.append(" formId=").append(formId).append("\n");
if (menuId != null) out.append(" menuId=").append(menuId).append("\n");
// 1. 拿 formData 字段列表
String formInfoJson = DacliKit.doGet("/api/visualdev/Base/" + formId);
JsonNode formInfo = om.readTree(formInfoJson).path("data");
String formDataStr = formInfo.path("formData").asText("{}");
JsonNode formData = om.readTree(formDataStr);
JsonNode fields = formData.path("fields");
// 2. 构造 sample data (v12 修复: datePicker 用毫秒数)
Map<String, Object> sampleData = new LinkedHashMap<>();
if (customFieldsJson != null && !customFieldsJson.isEmpty()) {
// 用用户自定义字段值
sampleData = om.readValue(customFieldsJson, Map.class);
out.append(" 字段值: 自定义\n");
} else {
// 自动从 formData.fields 生成 sample
long tsMs = System.currentTimeMillis();
for (JsonNode f : fields) {
String vmodel = f.path("__vModel__").asText("");
if (vmodel.isEmpty() || vmodel.startsWith("f_")) {
// 系统字段或主表字段才填
if (vmodel.startsWith("f_") && !vmodel.equals("f_id") && !vmodel.equals("f_tenant_id")) {
String jnpfKey = f.path("__config__").path("jnpfKey").asText("");
Object val = sampleValueForJnpfKey(jnpfKey, vmodel, tsMs);
if (val != null) sampleData.put(vmodel, val);
}
}
}
out.append(" 字段值: 自动生成 (").append(sampleData.size()).append(" 字段)\n");
}
// 3. 构造合规 body (盲点 21 修复: data 字段是 JSON 字符串)
String dataJson = om.writeValueAsString(sampleData);
Map<String, Object> body = new LinkedHashMap<>();
if (menuId != null) body.put("menuId", menuId);
body.put("data", dataJson); // ← 关键: data 是 JSON 字符串, 不是 dict!
out.append(" body.data 长度: ").append(dataJson.length()).append(" chars\n");
// 4. POST
String resp = DacliKit.doPost("/api/visualdev/OnlineDev/" + formId, body);
out.append("\n=== POST response ===\n").append(resp).append("\n");
JsonNode respJson = om.readTree(resp);
int code = respJson.path("code").asInt(0);
if (code == 200) {
out.append("\n✅ PASS: 盲点 21/29 修复有效, E2E smoke 写入成功\n");
out.append(" newId: ").append(respJson.path("data").path("id").asText("?")).append("\n");
System.out.println(out);
return 0;
} else {
out.append("\n❌ FAIL: code=").append(code).append(", msg=").append(respJson.path("msg").asText("?")).append("\n");
out.append(" 诊断: 400 + NPE in swapDatetime → datePicker 字段用了字符串 → 检查 sampleData\n");
out.append(" 诊断: 400 + 'Unknown column' → form/dm 字段未对齐 → 跑 dacli dm table --table=... 检查\n");
out.append(" 诊断: 400 + '请在数据库中添加对应的数据表' → 表未建 → 跑 dacli dm create --table=...\n");
System.out.println(out);
return 1;
}
}
/**
* 根据 jnpfKey 类型生成 sample 值
* v12 关键修复: datePicker 用毫秒数(盲点 29)
*/
private static Object sampleValueForJnpfKey(String jnpfKey, String vmodel, long tsMs) {
switch (jnpfKey) {
case "datePicker":
return String.valueOf(tsMs); // 毫秒数(不是 "YYYY-MM-DD")
case "input":
case "textarea":
return "smoke_" + vmodel;
case "select":
case "radio":
return "1";
case "userSelect":
case "currOrganize":
case "currPosition":
return "admin";
case "relationForm":
return ""; // 关联字段需要 menuId 内已有数据, 留空 (v10.6.3 修复)
case "switch":
return "1";
case "number":
return 1;
case "checkbox":
return "1,2";
default:
return null; // 不填未知类型
}
}
}
}