F2-16: 转换器列级渲染映射——枚举/日期/布尔列显示人话

TemplateToAmisConverter.buildColumns() 按 entityId 查询
SYS_ENTITYATTRIBUTE 元数据,注入 amis 列渲染配置:
- DATE → type=date(YYYY-MM-DD)
- TIME → type=datetime(YYYY-MM-DD HH:mm)
- ENUMERATE/STATUS → type=mapping,枚举翻译表从 SYS_ENUMERATE 嵌入
- BOOLEAN → type=mapping({0:否,1:是,false:否,true:是})

覆盖:3147 列命中(12138 总列),875 个模板;
重批 1516 条,闸一 98.2% 不变;单测 33/33;e2e 35/35。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
2026-06-12 00:30:35 +08:00
parent ea6fc747d8
commit 2d8a16eef6
4 changed files with 1248 additions and 877 deletions

View File

@@ -1,6 +1,7 @@
package com.eip4.platform.converter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -121,7 +122,8 @@ public class TemplateToAmisConverter {
// display 可能直接挂 crud,也可能挂 <display> 子元素
Element display = crud.element("display");
List<Map<String, Object>> columns = display != null ? buildColumns(display, result) : new ArrayList<>();
// F2-16:传 entityId 以便 buildColumns 查列元数据注入渲染映射
List<Map<String, Object>> columns = display != null ? buildColumns(display, entityId, result) : new ArrayList<>();
Map<String, Object> filter = buildSearchFilter(crud.element("search"), result);
List<Object> toolbar = buildToolbar(collectButtons(crud), table, result);
@@ -149,6 +151,29 @@ public class TemplateToAmisConverter {
/** display/field → crud columns(含 _DISPLAY__ 翻译列、合计/金额特性)。 */
private List<Map<String, Object>> buildColumns(Element display, ConversionResult result) {
return buildColumns(display, null, result);
}
/**
* F2-16:display/field → crud columns,按实体属性元数据注入日期/枚举/布尔渲染映射。
*
* <p>元数据口径(SYS_ENTITYATTRIBUTE.referenceid):
* <ul>
* <li>{@code DATE} → amis type=date, format=YYYY-MM-DD</li>
* <li>{@code TIME} → amis type=datetime, format=YYYY-MM-DD HH:mm</li>
* <li>{@code ENUMERATE} / {@code STATUS} → amis type=mapping,枚举翻译表从 SYS_ENUMERATE 查库嵌入</li>
* <li>{@code BOOLEAN} → amis type=mapping,{0:否,1:是,false:否,true:是}</li>
* </ul>
* 枚举变更需重批(trade-off:schema 自含,无运行时翻译端点,见 F2-16 报告)。
*
* @param display display 元素
* @param entityId SYS_ENTITY_ID(为 null/空 时跳过元数据查询,保持兼容)
* @param result 转换结果
*/
private List<Map<String, Object>> buildColumns(Element display, String entityId, ConversionResult result) {
// F2-16:按 entityId 预加载该实体所有列的元数据(referenceid + enumeratetype)
Map<String, String[]> colMeta = loadColumnMeta(entityId, result);
List<Map<String, Object>> columns = new ArrayList<>();
for (Element f : display.elements("field")) {
String name = f.attributeValue("name", "");
@@ -171,6 +196,9 @@ public class TemplateToAmisConverter {
col.put("precision", 2);
col.put("prefix", "");
result.note("display@field " + name + " ismoney=true → 列 type=number(precision=2,千分位)");
} else {
// F2-16:未被 ismoney 覆盖时,按元数据注入渲染类型
applyColumnRenderType(col, name, colMeta, result);
}
// 对齐
String align = f.attributeValue("horizontalalignment");
@@ -188,6 +216,113 @@ public class TemplateToAmisConverter {
return columns;
}
/**
* F2-16:加载实体所有列的元数据映射 columnName→[referenceid, enumeratetype]。
* entityId 为空/解析失败时返回空 map(安全降级,不影响已有转换路径)。
*/
private Map<String, String[]> loadColumnMeta(String entityId, ConversionResult result) {
if (entityId == null || entityId.isBlank()
|| entityId.startsWith("UNKNOWN_") || entityId.startsWith("ORPHAN_")) {
return Collections.emptyMap();
}
try {
Map<String, String[]> meta = new LinkedHashMap<>();
jdbcTemplate.query(
"SELECT UPPER(COLUMNNAME), REFERENCEID, ENUMERATETYPE "
+ "FROM SYS_ENTITYATTRIBUTE WHERE ENTITYID=?",
rs -> {
String col = rs.getString(1);
String ref = rs.getString(2);
String enu = rs.getString(3);
if (col != null) {
meta.put(col, new String[]{ref, enu});
}
},
entityId);
return meta;
} catch (Exception e) {
result.note("F2-16 loadColumnMeta entityId=" + entityId + " 失败: " + safeMsg(e) + " → 跳过列渲染映射");
return Collections.emptyMap();
}
}
/**
* F2-16:按列元数据往 col map 注入 amis 渲染配置(type / map)。
* 仅在 col 尚无 "type" 键时写入(ismoney 等已设置的不覆盖)。
*/
private void applyColumnRenderType(Map<String, Object> col, String name,
Map<String, String[]> colMeta, ConversionResult result) {
if (colMeta.isEmpty()) return;
String[] meta = colMeta.get(name.toUpperCase());
if (meta == null) return;
String refId = meta[0];
String enumType = meta[1];
if (refId == null) return;
switch (refId) {
case "DATE" -> {
col.put("type", "date");
col.put("format", "YYYY-MM-DD");
col.put("inputFormat", "YYYY-MM-DDTHH:mm:ss.SSSZ");
result.note("F2-16 display@field " + name + " referenceid=DATE → type=date(YYYY-MM-DD)");
}
case "TIME" -> {
col.put("type", "datetime");
col.put("format", "YYYY-MM-DD HH:mm");
col.put("inputFormat", "YYYY-MM-DDTHH:mm:ss.SSSZ");
result.note("F2-16 display@field " + name + " referenceid=TIME → type=datetime(YYYY-MM-DD HH:mm)");
}
case "ENUMERATE", "STATUS" -> {
if (enumType != null && !enumType.isBlank()) {
Map<String, String> mapping = loadEnumerateMapping(enumType, result);
if (!mapping.isEmpty()) {
col.put("type", "mapping");
col.put("map", mapping);
result.note("F2-16 display@field " + name + " referenceid=" + refId
+ " enumeratetype=" + enumType + " → type=mapping(" + mapping.size() + "项)");
}
}
}
case "BOOLEAN" -> {
Map<String, String> boolMap = new LinkedHashMap<>();
boolMap.put("0", "否");
boolMap.put("1", "是");
boolMap.put("false", "否");
boolMap.put("true", "是");
col.put("type", "mapping");
col.put("map", boolMap);
result.note("F2-16 display@field " + name + " referenceid=BOOLEAN → type=mapping(否/是)");
}
default -> { /* NVARCHAR/CHAR/INTEGER 等普通类型,不注入特殊渲染 */ }
}
}
/**
* F2-16:从 SYS_ENUMERATE 查枚举翻译表,返回 codevalue(字符串)→codedes 映射。
* 枚举变更需重批(schema 自含,无运行时翻译端点——trade-off 见 F2-16 报告)。
*/
private Map<String, String> loadEnumerateMapping(String enumerateType, ConversionResult result) {
try {
Map<String, String> map = new LinkedHashMap<>();
jdbcTemplate.query(
"SELECT CODEVALUE::text, CODEDES FROM SYS_ENUMERATE "
+ "WHERE SYS_ENUMERATETYPE_ID=? AND ISACTIVE=1 ORDER BY ORDERASC, CODEVALUE",
rs -> {
String k = rs.getString(1);
String v = rs.getString(2);
if (k != null && v != null) {
map.put(k, v);
}
},
enumerateType);
return map;
} catch (Exception e) {
result.note("F2-16 loadEnumerateMapping enumeratetype=" + enumerateType
+ " 失败: " + safeMsg(e) + " → 跳过枚举映射");
return Collections.emptyMap();
}
}
/** search/field → filter 表单(uitype 映射经 UiTypeMapper 统一)。 */
private Map<String, Object> buildSearchFilter(Element search, ConversionResult result) {
if (search == null || search.elements("field").isEmpty()) {
@@ -418,7 +553,8 @@ public class TemplateToAmisConverter {
// display → columns(含 ismoney/issummer 合计列)
Element display = report.element("display");
List<Map<String, Object>> columns = display != null ? buildColumns(display, result) : new ArrayList<>();
// F2-16:传 entityId 以便 buildColumns 查列元数据注入渲染映射
List<Map<String, Object>> columns = display != null ? buildColumns(display, entityId, result) : new ArrayList<>();
// 合计列(issummer=true)→ crud footer 合计行 / 列 summary
List<String> sumCols = new ArrayList<>();

View File

@@ -7,10 +7,12 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -19,6 +21,7 @@ import java.util.function.Function;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowCallbackHandler;
/**
* 各段转换规则单测(P4 转换器扩展)。JdbcTemplate 用 Mockito 桩,离线运行——
@@ -369,4 +372,169 @@ class TemplateToAmisConverterTest {
converter.attachScriptOnEvent(schema, "", List.of(1)); // 空 templateId
assertNull(body(schema).get("onEvent"));
}
// ── F2-16 列级渲染映射 ──────────────────────────────────────────────────
/**
* 构造一个 JdbcTemplate mock,使其在 query(sql, RowCallbackHandler, entityId) 时
* 按 rows 参数逐行回调 handler(模拟 SYS_ENTITYATTRIBUTE 查询结果)。
* rows 格式:每个 String[3] = {columnName, referenceId, enumerateType}
*/
private TemplateToAmisConverter converterWithMeta(String[][] attrRows, String[][] enumRows) throws Exception {
JdbcTemplate jdbc = mock(JdbcTemplate.class);
// SYS_ENTITY 解析
lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class)))
.thenReturn("PM_DEMO");
// SYS_ENTITYATTRIBUTE query → 模拟列元数据回调
doAnswer(inv -> {
RowCallbackHandler handler = inv.getArgument(1);
for (String[] row : attrRows) {
ResultSet rs = mock(ResultSet.class);
when(rs.getString(1)).thenReturn(row[0]); // COLUMNNAME
when(rs.getString(2)).thenReturn(row[1]); // REFERENCEID
when(rs.getString(3)).thenReturn(row[2]); // ENUMERATETYPE
handler.processRow(rs);
}
return null;
}).when(jdbc).query(
org.mockito.ArgumentMatchers.contains("SYS_ENTITYATTRIBUTE"),
any(RowCallbackHandler.class),
any(Object[].class));
// SYS_ENUMERATE query → 模拟枚举值回调
doAnswer(inv -> {
RowCallbackHandler handler = inv.getArgument(1);
for (String[] row : enumRows) {
ResultSet rs = mock(ResultSet.class);
when(rs.getString(1)).thenReturn(row[0]); // CODEVALUE
when(rs.getString(2)).thenReturn(row[1]); // CODEDES
handler.processRow(rs);
}
return null;
}).when(jdbc).query(
org.mockito.ArgumentMatchers.contains("SYS_ENUMERATE"),
any(RowCallbackHandler.class),
any(Object[].class));
return new TemplateToAmisConverter(jdbc);
}
@Test
@SuppressWarnings("unchecked")
void f2_16_日期列注入datetime类型() throws Exception {
String[][] attrRows = {
{"SAVETIME", "TIME", null},
{"EXCEPTDATE", "DATE", null},
};
TemplateToAmisConverter c = converterWithMeta(attrRows, new String[0][]);
String xml = "<crud entityid='e1'><display>"
+ "<field name='SAVETIME' text='保存时间'/>"
+ "<field name='EXCEPTDATE' text='例外日期'/>"
+ "<field name='TITLE' text='标题'/>"
+ "</display></crud>";
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
List<Map<String, Object>> cols = (List<Map<String, Object>>) body(r.getSchema()).get("columns");
// SAVETIME → datetime
assertEquals("datetime", cols.get(0).get("type"));
assertEquals("YYYY-MM-DD HH:mm", cols.get(0).get("format"));
// EXCEPTDATE → date
assertEquals("date", cols.get(1).get("type"));
assertEquals("YYYY-MM-DD", cols.get(1).get("format"));
// TITLE → 普通列,无 type
assertNull(cols.get(2).get("type"));
// 台账记录
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("F2-16") && n.contains("SAVETIME")));
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("F2-16") && n.contains("EXCEPTDATE")));
}
@Test
@SuppressWarnings("unchecked")
void f2_16_枚举列注入mapping() throws Exception {
String[][] attrRows = {
{"STATUS", "STATUS", "WFSTATUS"},
{"IMPORTANT", "ENUMERATE", "Important"},
};
String[][] enumRows = {
{"1", "未提交"}, {"2", "处理中"}, {"3", "通过"},
};
TemplateToAmisConverter c = converterWithMeta(attrRows, enumRows);
String xml = "<crud entityid='e1'><display>"
+ "<field name='STATUS' text='审批状态'/>"
+ "<field name='IMPORTANT' text='重要级别'/>"
+ "</display></crud>";
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
List<Map<String, Object>> cols = (List<Map<String, Object>>) body(r.getSchema()).get("columns");
// STATUS → mapping
assertEquals("mapping", cols.get(0).get("type"));
Map<String, String> map0 = (Map<String, String>) cols.get(0).get("map");
assertEquals("未提交", map0.get("1"));
assertEquals("通过", map0.get("3"));
// IMPORTANT → mapping(同一枚举 mock 回调)
assertEquals("mapping", cols.get(1).get("type"));
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("F2-16") && n.contains("STATUS")));
}
@Test
@SuppressWarnings("unchecked")
void f2_16_布尔列注入mapping否是() throws Exception {
String[][] attrRows = {
{"ISSEND", "BOOLEAN", null},
{"ISACTIVE", "BOOLEAN", null},
};
TemplateToAmisConverter c = converterWithMeta(attrRows, new String[0][]);
String xml = "<crud entityid='e1'><display>"
+ "<field name='ISSEND' text='是否已发送'/>"
+ "<field name='ISACTIVE' text='有效'/>"
+ "</display></crud>";
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
List<Map<String, Object>> cols = (List<Map<String, Object>>) body(r.getSchema()).get("columns");
assertEquals("mapping", cols.get(0).get("type"));
Map<String, String> boolMap = (Map<String, String>) cols.get(0).get("map");
assertEquals("否", boolMap.get("0"));
assertEquals("是", boolMap.get("1"));
assertEquals("否", boolMap.get("false"));
assertEquals("是", boolMap.get("true"));
assertEquals("mapping", cols.get(1).get("type"));
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("F2-16") && n.contains("ISSEND")));
}
@Test
@SuppressWarnings("unchecked")
void f2_16_普通列不动_ismoney不覆盖() throws Exception {
String[][] attrRows = {
{"AMT", "DECIMAL", null}, // 普通数值列
{"TITLE", "NVARCHAR", null},
};
TemplateToAmisConverter c = converterWithMeta(attrRows, new String[0][]);
String xml = "<crud entityid='e1'><display>"
+ "<field name='AMT' text='金额' ismoney='true'/>"
+ "<field name='TITLE' text='标题'/>"
+ "</display></crud>";
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
List<Map<String, Object>> cols = (List<Map<String, Object>>) body(r.getSchema()).get("columns");
// ismoney → number(不被 F2-16 覆盖)
assertEquals("number", cols.get(0).get("type"));
assertNull(cols.get(0).get("map"));
// TITLE → 普通列无 type
assertNull(cols.get(1).get("type"));
}
@Test
@SuppressWarnings("unchecked")
void f2_16_entityId为空时安全降级不影响列输出() {
// entityId 为空 → loadColumnMeta 返回空 map → 列照常输出,无 type 注入
String xml = "<crud entityid=''><display>"
+ "<field name='STATUS' text='状态'/>"
+ "</display></crud>";
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
List<Map<String, Object>> cols = (List<Map<String, Object>>) body(r.getSchema()).get("columns");
assertEquals(1, cols.size());
assertEquals("STATUS", cols.get(0).get("name"));
assertNull(cols.get(0).get("type")); // 无元数据,不注入
}
}