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:
@@ -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<>();
|
||||
|
||||
Reference in New Issue
Block a user