P4-1 转换器线:扩 EDITFORM/主子表/树/选择窗/<report> 段 + 全量 1516 模板批量转换双闸分级
转换器扩展(platform-converter,PoC crud 三段种子上): - 按 XML 根元素分派 crud/form/tree/report/group;ConversionResult+Grade 三级分级 - EDITFORM:form pageid 解析 view_page 取字段;主子表 EditGrid/FormEditGrid→input-table(子列取自 editgridtemplate) - 树:type=3 声明式→input-tree、type=4 引用式→flex(tree+crud) - 选择窗 SelectDialog/MultiSelectDialog→select+source(非 amis picker:picker 不在 6.13 schema 表单项 oneOf,闸一会拒) - <report> A 类:crud+合计行(issummer→summaryFields)+金额列(ismoney→number);selectservice→/api/flow;JOR/图表降级标注 - UiTypeMapper 统一 uitype 映射;每决策登记映射台账(全量约 1.6 万条) - 孤儿模板(entityid 非法/空 xml)旁路标记不崩(手册 §7.4) 批量+双闸(BatchConvertCli,可独立 CLI 跑批,只读连库+5435 ceshi 库硬守门): - 闸一 SchemaGate(宽松语义预处理抽出,与 AmisSchemaController 共享):通过 98.2%(1489/1516) - 闸二 playwright+本地 amis SDK 渲染冒烟,每类型抽≥5:25/25 全过 - 产物 转换产物/(schema/*.json + 分级清单.csv + 闸二结果.json) - 失败 27 个全为空 xml 孤儿模板(库内数据问题,非转换器缺陷) 新坑进手册 §8.3(picker 不在表单项 oneOf,用 select+source) §8.4(闸二大 schema 经端点拉避 HTTP 431) 单测 24 个;全 reactor mvn test+ArchUnit 绿 报告 platform-converter/P4批量转换报告.md Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -4,7 +4,6 @@ import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
@@ -12,26 +11,24 @@ import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import com.eip4.platform.converter.SchemaGate;
|
||||
import com.eip4.platform.converter.TemplateToAmisConverter;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.networknt.schema.JsonSchema;
|
||||
import com.networknt.schema.JsonSchemaFactory;
|
||||
import com.networknt.schema.SpecVersion;
|
||||
import com.networknt.schema.ValidationMessage;
|
||||
|
||||
/**
|
||||
* WS2:模板 XML → amis schema 转换 + 官方 schema.json(draft-07)机器校验闭环。
|
||||
* /api/poc/amis-schema 返回转换后的页面 schema(amis SDK 直接渲染)
|
||||
* /api/poc/amis-validate 转换 + 经 amis-schema-6.13.0.json 校验,返回映射台账与校验结果
|
||||
*
|
||||
* <p>闸一校验(宽松语义预处理)已抽到 platform-converter 的 {@link SchemaGate},本类与 P4 批量 CLI
|
||||
* 共享同一份口径(手册 §8.1「所有 ajv 校验处都需此预处理」)。
|
||||
*/
|
||||
@RestController
|
||||
public class AmisSchemaController {
|
||||
|
||||
private final TemplateToAmisConverter converter;
|
||||
private final JdbcTemplate jdbcTemplate;
|
||||
private final ObjectMapper mapper = new ObjectMapper();
|
||||
private volatile JsonSchema amisSchema;
|
||||
private final SchemaGate schemaGate = new SchemaGate();
|
||||
|
||||
public AmisSchemaController(TemplateToAmisConverter converter, JdbcTemplate jdbcTemplate) {
|
||||
this.converter = converter;
|
||||
@@ -48,14 +45,12 @@ public class AmisSchemaController {
|
||||
List<String> notes = new ArrayList<>();
|
||||
Map<String, Object> schema = converter.convert(loadXml(template), notes);
|
||||
|
||||
JsonNode node = mapper.valueToTree(schema);
|
||||
Set<ValidationMessage> errors = officialSchema().validate(node);
|
||||
List<String> errors = schemaGate.validate(schema);
|
||||
|
||||
Map<String, Object> resp = new LinkedHashMap<>();
|
||||
resp.put("template", template);
|
||||
resp.put("schemaValid", errors.isEmpty());
|
||||
resp.put("validationErrors", errors.stream()
|
||||
.map(ValidationMessage::getMessage).limit(20).collect(Collectors.toList()));
|
||||
resp.put("validationErrors", errors.stream().limit(20).collect(Collectors.toList()));
|
||||
resp.put("mappingNotes", notes);
|
||||
resp.put("schema", schema);
|
||||
return resp;
|
||||
@@ -64,11 +59,10 @@ public class AmisSchemaController {
|
||||
/** 校验任意 amis 页面 schema(WS5:AI 生成的 schema 走这里过闸)。 */
|
||||
@org.springframework.web.bind.annotation.PostMapping("/api/poc/validate-schema")
|
||||
public Map<String, Object> validateSchema(@org.springframework.web.bind.annotation.RequestBody JsonNode schema) throws Exception {
|
||||
Set<ValidationMessage> errors = officialSchema().validate(schema);
|
||||
List<String> errors = schemaGate.validate(schema);
|
||||
Map<String, Object> resp = new LinkedHashMap<>();
|
||||
resp.put("schemaValid", errors.isEmpty());
|
||||
resp.put("validationErrors", errors.stream()
|
||||
.map(ValidationMessage::getMessage).limit(20).collect(Collectors.toList()));
|
||||
resp.put("validationErrors", errors.stream().limit(20).collect(Collectors.toList()));
|
||||
return resp;
|
||||
}
|
||||
|
||||
@@ -78,36 +72,4 @@ public class AmisSchemaController {
|
||||
String.class, template)
|
||||
.get(0);
|
||||
}
|
||||
|
||||
private JsonSchema officialSchema() throws Exception {
|
||||
if (amisSchema == null) {
|
||||
synchronized (this) {
|
||||
if (amisSchema == null) {
|
||||
JsonNode schemaNode = mapper.readTree(
|
||||
getClass().getResourceAsStream("/amis-schema-6.13.0.json"));
|
||||
// amis 官方 schema 大量使用 {"$ref":..., "additionalProperties":true} 的
|
||||
// 兄弟键覆盖写法——这是 VSCode/Monaco 的宽松合并语义;严格 draft-07 下
|
||||
// 兄弟键被忽略,被引用定义里的 additionalProperties:false 会拒绝一切输入。
|
||||
// 预处理:全局剥除 additionalProperties:false,保留类型/必填/结构校验。
|
||||
// 边界:未知渲染器类型无法被识别(schema 含 Loose 宽松分支,属设计内)。
|
||||
stripStrictAdditionalProperties(schemaNode);
|
||||
amisSchema = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7)
|
||||
.getSchema(schemaNode);
|
||||
}
|
||||
}
|
||||
}
|
||||
return amisSchema;
|
||||
}
|
||||
|
||||
private static void stripStrictAdditionalProperties(JsonNode node) {
|
||||
if (node instanceof com.fasterxml.jackson.databind.node.ObjectNode obj) {
|
||||
JsonNode ap = obj.get("additionalProperties");
|
||||
if (ap != null && ap.isBoolean() && !ap.asBoolean()) {
|
||||
obj.remove("additionalProperties");
|
||||
}
|
||||
obj.properties().forEach(e -> stripStrictAdditionalProperties(e.getValue()));
|
||||
} else if (node instanceof com.fasterxml.jackson.databind.node.ArrayNode arr) {
|
||||
arr.forEach(AmisSchemaController::stripStrictAdditionalProperties);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user