diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/MetaController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/MetaController.java index 02dbf6f..8ab365c 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/MetaController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/MetaController.java @@ -89,6 +89,12 @@ public class MetaController { entityMap.put("TABLENAME", table); entityMap.put("NAME", String.valueOf(req.getOrDefault("name", table))); entityMap.put("DESCRIPTION", resolveDescription(req)); + // 所属分类:调用方指定 entitytype(SYS_ENTITYTYPE.id) 时覆盖克隆源(SYS_USERGROUP)的分类, + // 否则保留克隆值(向后兼容)。建模器应传入正确分类,避免新实体误归到「用户组」分类。 + Object entityType = req.get("entitytype"); + if (entityType != null && !String.valueOf(entityType).isBlank()) { + entityMap.put("ENTITYTYPE", String.valueOf(entityType).trim()); + } GeneralPOJO newEntity = (GeneralPOJO) dataDicService.save(entityMap, ctx); String entityId = newEntity.get_ID(); @@ -183,6 +189,24 @@ public class MetaController { return resp; } + @Operation(summary = "实体分类目录:列出 SYS_ENTITYTYPE(供建模器「所属分类」选择器)") + @GetMapping("/api/meta/entity-types") + public Map entityTypes() { + List> data = jdbcTemplate.query( + "SELECT TRIM(SYS_ENTITYTYPE_ID) AS ID, NAME FROM SYS_ENTITYTYPE " + + "WHERE ISACTIVE=1 ORDER BY NAME", + (rs, i) -> { + Map m = new LinkedHashMap<>(); + m.put("id", rs.getString("ID")); + m.put("name", rs.getString("NAME")); + return m; + }); + Map resp = new LinkedHashMap<>(); + resp.put("status", 0); + resp.put("data", data); + return resp; + } + @Operation(summary = "列出某表的列(类型/显示名)并标出引用列目标表与显示列(建模器/recipe 用)") @GetMapping("/api/meta/entity/{table}/attributes") public Map attributes(@PathVariable String table) { diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/MetaCatalogControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/MetaCatalogControllerTest.java index 148f5e1..a2cc9a9 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/MetaCatalogControllerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/MetaCatalogControllerTest.java @@ -125,4 +125,23 @@ class MetaCatalogControllerTest { assertEquals("string", title.get("type")); assertTrue(title.get("referenceTable") == null); } + + @Test + @DisplayName("entityTypes() 返回 SYS_ENTITYTYPE 分类目录 {id,name}(建模器「所属分类」数据源)") + void entityTypesReturnsCatalog() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + Map row = new LinkedHashMap<>(); + row.put("id", "t-1"); + row.put("name", "OA 办公"); + when(jdbc.query(contains("SYS_ENTITYTYPE"), (RowMapper) org.mockito.ArgumentMatchers.any())) + .thenReturn(List.of(row)); + + Map resp = newController(jdbc).entityTypes(); + + assertEquals(0, resp.get("status")); + List> data = (List>) resp.get("data"); + assertEquals(1, data.size()); + assertEquals("t-1", data.get(0).get("id")); + assertEquals("OA 办公", data.get(0).get("name")); + } }