diff --git a/platform-ai/pom.xml b/platform-ai/pom.xml index ec89eb4..9e3bd12 100644 --- a/platform-ai/pom.xml +++ b/platform-ai/pom.xml @@ -14,6 +14,7 @@ com.eip4platform-legacy-core com.eip4platform-converter + com.eip4platform-metadata org.springframework.bootspring-boot-starter-web org.springframework.bootspring-boot-starter-jdbc org.springdocspringdoc-openapi-starter-webmvc-ui diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiAgentService.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiAgentService.java index 613ec4c..9b83535 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiAgentService.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiAgentService.java @@ -57,6 +57,10 @@ import com.eip4.platform.ai.model.AiToolDefinition; import com.eip4.platform.ai.model.AiEmployeeDefinition; import com.eip4.platform.ai.store.AiAgentStore; import com.eip4.platform.converter.SchemaGate; +import com.eip4.platform.metadata.schema.PageComponentRegistry; +import com.eip4.platform.metadata.schema.TypedPageSchemaIssue; +import com.eip4.platform.metadata.schema.TypedPageSchemaReport; +import com.eip4.platform.metadata.schema.TypedPageSchemaValidator; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -81,6 +85,7 @@ public class AiAgentService { private final AiAgentRepairExecutor agentRepairExecutor; private final ObjectMapper objectMapper; private final AiToolRegistry toolRegistry; + private final TypedPageSchemaValidator typedSchemaValidator; private static volatile SchemaGate sharedSchemaGate; private volatile SchemaGate schemaGate; @@ -90,13 +95,23 @@ public class AiAgentService { AiSmokeRunner smokeRunner, AiLocalReleaseExecutor localReleaseExecutor, AiAgentRepairExecutor agentRepairExecutor, ObjectMapper objectMapper) { this(store, featureDraftGenerator, smokeRunner, localReleaseExecutor, agentRepairExecutor, - objectMapper, AiToolRegistry.defaults()); + objectMapper, AiToolRegistry.defaults(), + new TypedPageSchemaValidator(objectMapper, PageComponentRegistry.defaults())); } AiAgentService(AiAgentStore store, AiFeatureDraftGenerator featureDraftGenerator, AiSmokeRunner smokeRunner, AiLocalReleaseExecutor localReleaseExecutor, AiAgentRepairExecutor agentRepairExecutor, ObjectMapper objectMapper, AiToolRegistry toolRegistry) { + this(store, featureDraftGenerator, smokeRunner, localReleaseExecutor, agentRepairExecutor, + objectMapper, toolRegistry, + new TypedPageSchemaValidator(objectMapper, PageComponentRegistry.defaults())); + } + + AiAgentService(AiAgentStore store, AiFeatureDraftGenerator featureDraftGenerator, + AiSmokeRunner smokeRunner, AiLocalReleaseExecutor localReleaseExecutor, + AiAgentRepairExecutor agentRepairExecutor, ObjectMapper objectMapper, + AiToolRegistry toolRegistry, TypedPageSchemaValidator typedSchemaValidator) { this.store = store; this.featureDraftGenerator = featureDraftGenerator; this.smokeRunner = smokeRunner; @@ -104,6 +119,9 @@ public class AiAgentService { this.agentRepairExecutor = agentRepairExecutor; this.objectMapper = objectMapper; this.toolRegistry = toolRegistry; + this.typedSchemaValidator = typedSchemaValidator == null + ? new TypedPageSchemaValidator(objectMapper, PageComponentRegistry.defaults()) + : typedSchemaValidator; } public AiTask createTask(String objective) { @@ -704,10 +722,26 @@ public class AiAgentService { } public Map validateSchema(JsonNode schema) { - AiGateResult gate = validateSchemaGate(schema); + AiGateResult schemaGate = validateSchemaGate(schema); + TypedPageSchemaReport typedReport = validateTypedPageSchema(schema); + List typedMessages = typedMessages(typedReport); + List validationErrors = new ArrayList<>(); + validationErrors.addAll(schemaGate.messages()); + validationErrors.addAll(typedMessages); Map resp = new LinkedHashMap<>(); - resp.put("schemaValid", gate.passed()); - resp.put("validationErrors", gate.messages()); + resp.put("valid", schemaGate.passed() && typedReport.valid()); + resp.put("schemaValid", schemaGate.passed()); + resp.put("typedSchemaValid", typedReport.valid()); + resp.put("validationErrors", validationErrors.stream().limit(40).toList()); + resp.put("typedSchemaVersion", typedReport.schemaVersion()); + resp.put("typedSchemaIssues", typedReport.issues().stream().limit(20) + .map(issue -> Map.of( + "path", issue.path(), + "code", issue.code(), + "message", issue.message())) + .toList()); + resp.put("usedComponents", typedReport.usedComponents()); + resp.put("usedActions", typedReport.usedActions()); return resp; } @@ -742,17 +776,44 @@ public class AiAgentService { return new AiGateResult("amis-schema", errors.isEmpty(), errors.stream().limit(20).toList()); } + private AiGateResult validateTypedPageSchemaGate(JsonNode schema) { + TypedPageSchemaReport report = validateTypedPageSchema(schema); + return new AiGateResult("typed-page-schema", report.valid(), typedMessages(report)); + } + + private TypedPageSchemaReport validateTypedPageSchema(JsonNode schema) { + try { + return typedSchemaValidator.validate(schema == null ? "null" : objectMapper.writeValueAsString(schema)); + } catch (JsonProcessingException ex) { + return typedSchemaValidator.validate(""); + } + } + + private static List typedMessages(TypedPageSchemaReport report) { + return report.issues().stream() + .limit(20) + .map(AiAgentService::typedMessage) + .toList(); + } + + private static String typedMessage(TypedPageSchemaIssue issue) { + return issue.path() + " " + issue.code() + ": " + issue.message(); + } + private List validateDraft(AiArtifactType type, String targetId, JsonNode payload) { List gates = new ArrayList<>(); gates.add(requiredFieldsGate(type, targetId, payload)); - gates.add(switch (type) { - case ENTITY -> validateEntityGate(payload); - case PAGE_SCHEMA -> validateSchemaGate(payload); - case SERVICEFLOW -> validateServiceFlowGate(payload); - case MENU -> validateMenuGate(payload); - case TEST -> validateTestGate(payload); - case CODE -> new AiGateResult("code-review-required", true, List.of("代码草稿需后续静态检查/单测门禁")); - }); + switch (type) { + case PAGE_SCHEMA -> { + gates.add(validateSchemaGate(payload)); + gates.add(validateTypedPageSchemaGate(payload)); + } + case ENTITY -> gates.add(validateEntityGate(payload)); + case SERVICEFLOW -> gates.add(validateServiceFlowGate(payload)); + case MENU -> gates.add(validateMenuGate(payload)); + case TEST -> gates.add(validateTestGate(payload)); + case CODE -> gates.add(new AiGateResult("code-review-required", true, List.of("代码草稿需后续静态检查/单测门禁"))); + } return List.copyOf(gates); } @@ -1344,7 +1405,7 @@ public class AiAgentService { INSERT INTO sys_serviceflow (sys_serviceflow_id, displayname, contentxml, entityid, iscontrol, isupdateable, isactive, createtime, updatetime, createby, updateby, version) - VALUES (%s, %s, %s, %s, %d, %d, 1, %d, %d, 'AI_AGENT', 'AI_AGENT', 0) + VALUES (%s, %s, %s::xml, %s, %d, %d, 1, %d, %d, 'AI_AGENT', 'AI_AGENT', 0) ON CONFLICT (sys_serviceflow_id) DO UPDATE SET displayname = EXCLUDED.displayname, contentxml = EXCLUDED.contentxml, diff --git a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java index db3c7e2..8f31bea 100644 --- a/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java +++ b/platform-ai/src/main/java/com/eip4/platform/ai/service/AiLocalReleaseExecutor.java @@ -127,7 +127,7 @@ public class AiLocalReleaseExecutor { INSERT INTO sys_serviceflow (sys_serviceflow_id, displayname, contentxml, entityid, iscontrol, isupdateable, isactive, createtime, updatetime, createby, updateby, version) - VALUES (?, ?, ?, ?, ?, ?, 1, ?, ?, 'AI_AGENT', 'AI_AGENT', 0) + VALUES (?, ?, ?::xml, ?, ?, ?, 1, ?, ?, 'AI_AGENT', 'AI_AGENT', 0) ON CONFLICT (sys_serviceflow_id) DO UPDATE SET displayname = EXCLUDED.displayname, contentxml = EXCLUDED.contentxml, diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiAgentServiceTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiAgentServiceTest.java index d3fbd91..ed82d28 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiAgentServiceTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiAgentServiceTest.java @@ -62,6 +62,43 @@ class AiAgentServiceTest { assertEquals(409, ex.getStatusCode().value()); } + @Test + @DisplayName("页面草稿必须通过 typed 组件注册表门禁") + void typedPageSchemaGateBlocksUnsupportedComponent() throws Exception { + AiAgentService service = newService(); + var task = service.createTask("生成未注册组件页面"); + JsonNode invalid = MAPPER.readTree(""" + {"type":"page","title":"坏页面","body":{"type":"evil-widget"}} + """); + + var draft = service.addDraft(task.id(), "PAGE_SCHEMA", "bad-component-page", invalid, null); + + assertFalse(draft.passed()); + assertTrue(draft.gates().stream().anyMatch(g -> "typed-page-schema".equals(g.name()) && !g.passed())); + assertTrue(draft.gates().stream().flatMap(g -> g.messages().stream()) + .anyMatch(m -> m.contains("UNSUPPORTED_COMPONENT"))); + ResponseStatusException ex = assertThrows(ResponseStatusException.class, + () -> service.createChangeSet(task.id())); + assertEquals(409, ex.getStatusCode().value()); + } + + @Test + @DisplayName("AI schema 校验工具返回 AMIS + typed 双闸结果") + void validateSchemaReturnsCombinedGateReport() throws Exception { + AiAgentService service = newService(); + JsonNode invalid = MAPPER.readTree(""" + {"type":"page","body":{"type":"evil-widget"}} + """); + + Map report = service.validateSchema(invalid); + + assertEquals(false, report.get("valid")); + assertEquals(true, report.get("schemaValid")); + assertEquals(false, report.get("typedSchemaValid")); + assertTrue(report.get("validationErrors").toString().contains("UNSUPPORTED_COMPONENT")); + assertTrue(report.get("typedSchemaIssues").toString().contains("evil-widget")); + } + @Test @DisplayName("不允许空目标或未知产物类型") void validatesInputs() { @@ -115,6 +152,7 @@ class AiAgentServiceTest { assertTrue(deploymentPackage.requiresHumanApproval()); assertTrue(deploymentPackage.sqlStatements().stream().anyMatch(sql -> sql.contains("sys_page_schema"))); assertTrue(deploymentPackage.sqlStatements().stream().anyMatch(sql -> sql.contains("sys_serviceflow"))); + assertTrue(deploymentPackage.sqlStatements().stream().anyMatch(sql -> sql.contains("::xml"))); assertTrue(deploymentPackage.rollbackSqlStatements().stream().anyMatch(sql -> sql.contains("sys_serviceflow"))); assertTrue(deploymentPackage.warnings().stream().anyMatch(w -> w.contains("parentId"))); diff --git a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiLocalReleaseExecutorTest.java b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiLocalReleaseExecutorTest.java index 616d2ff..bc42637 100644 --- a/platform-ai/src/test/java/com/eip4/platform/ai/service/AiLocalReleaseExecutorTest.java +++ b/platform-ai/src/test/java/com/eip4/platform/ai/service/AiLocalReleaseExecutorTest.java @@ -60,6 +60,7 @@ class AiLocalReleaseExecutorTest { assertEquals("PAGE_SCHEMA", results.get(2).artifactType().name()); assertEquals("MENU", results.get(3).artifactType().name()); assertTrue(hasUpdateSql(jdbc, "sys_serviceflow")); + assertTrue(hasUpdateSql(jdbc, "?::xml")); assertTrue(hasUpdateSql(jdbc, "sys_page_schema")); assertTrue(hasUpdateSql(jdbc, "sys_menu")); } diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidator.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidator.java index fd144a4..1a786e4 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidator.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidator.java @@ -65,8 +65,12 @@ public final class TypedPageSchemaValidator { Set usedComponents, Set usedActions) { String componentType = node.path("type").asText(""); if (!componentType.isBlank()) { - usedComponents.add(componentType); - if (!registry.supportsComponent(componentType)) { + boolean registeredComponent = registry.supportsComponent(componentType); + boolean componentCandidate = registeredComponent || isComponentCandidate(path, node); + if (componentCandidate) { + usedComponents.add(componentType); + } + if (componentCandidate && !registeredComponent) { issues.add(new TypedPageSchemaIssue(path + ".type", "UNSUPPORTED_COMPONENT", "组件未注册: " + componentType)); } @@ -84,6 +88,27 @@ public final class TypedPageSchemaValidator { } } + private boolean isComponentCandidate(String path, JsonNode node) { + return "$".equals(path) + || path.endsWith(".body") + || path.contains(".body[") + || path.contains(".columns[") + || path.contains(".buttons[") + || path.contains(".headerToolbar[") + || path.contains(".footerToolbar[") + || path.contains(".tabs[") + || path.contains(".items[") + || node.has("actionType") + || node.has("body") + || node.has("columns") + || node.has("buttons") + || node.has("label") + || node.has("tpl") + || node.has("dialog") + || node.has("drawer") + || node.has("required"); + } + private TypedPageSchemaReport report(List issues, Set usedComponents, Set usedActions) { return new TypedPageSchemaReport(PageComponentRegistry.VERSION, issues.isEmpty(), List.copyOf(issues), diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PageSchemaController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PageSchemaController.java index 3ab7260..f284094 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PageSchemaController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/PageSchemaController.java @@ -10,6 +10,7 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; @@ -73,6 +74,7 @@ public class PageSchemaController { private final PageComponentRegistry componentRegistry; private final TypedPageSchemaValidator typedSchemaValidator; + @Autowired public PageSchemaController(JdbcTemplate jdbcTemplate) { this(jdbcTemplate, PageComponentRegistry.defaults()); } diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidatorTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidatorTest.java index bc8021d..2803f8d 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidatorTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/TypedPageSchemaValidatorTest.java @@ -45,6 +45,23 @@ class TypedPageSchemaValidatorTest { assertTrue(report.issues().get(0).path().contains("$.body.type")); } + @Test + void ignoresNonComponentTypeFieldsInConfigurationObjects() { + TypedPageSchemaReport report = validator.validate(""" + { + "type": "page", + "body": { + "type": "crud", + "api": {"type": "json", "method": "get", "url": "/api/entity/EIP4AI_DEMO/list"} + } + } + """); + + assertTrue(report.valid()); + assertTrue(report.usedComponents().contains("crud")); + assertFalse(report.usedComponents().contains("json")); + } + @Test void rejectsUnsupportedActionForComponent() { TypedPageSchemaReport report = validator.validate(""" diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PageSchemaControllerWiringTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PageSchemaControllerWiringTest.java new file mode 100644 index 0000000..4541c2c --- /dev/null +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/PageSchemaControllerWiringTest.java @@ -0,0 +1,20 @@ +package com.eip4.platform.metadata.web; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.runner.ApplicationContextRunner; +import org.springframework.jdbc.core.JdbcTemplate; + +class PageSchemaControllerWiringTest { + + private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() + .withBean(JdbcTemplate.class, () -> mock(JdbcTemplate.class)) + .withUserConfiguration(PageSchemaController.class); + + @Test + void springUsesJdbcTemplateConstructor() { + contextRunner.run(context -> assertThat(context).hasSingleBean(PageSchemaController.class)); + } +}