列表引用列 id→显示名:通用化(任意引用实体)+ 产出 _DISPLAY__ 平行字段
老系统给每列额外算显示值(_DISPLAY__),Vaadin grid 绑显示值;EIP4 换 amis 后只 补了用户列(UserColumnResolver 仅认 SYS_USER)+ 枚举/日期,通用引用列(项目/部门/ 单位等)显示裸 id。本次: resolver(UserColumnResolver):从'只认 SYS_USER + 覆盖写'推广为'任意引用实体'。 按 referenceid→SYS_REFERENCE→目标实体解析目标表/键/显示列(isentitydisplay→ isidentifier→物理名称列兜底→主键);SYS_USER 重定向 VIEW_SYS_USER.DISPLAYNAME。 产出 row[col+'_DISPLAY__']=显示名、**保留原始 col=id 不动**(关键:编辑弹窗 data=selectedItems[0],覆盖原始列会把名当 select 值写回 id 列致数据损坏)。 物理列守卫:元数据声明的显示列可能是虚拟列(如 SYS_DEPART.FULLNAME 由 COLUMNSQL 算出,物理表无此列,直接 SELECT 报错)→ 兜底到物理 NAME/FULLNAME/TITLE 列。 converter:applyColumnRenderType default 分支识别真引用列(referenceid 是 36 位 UUID,与引擎 GeneralPO.get_DisplayValue 的 dt.length()==36 同口径)→ 列表列绑 <COL>_DISPLAY__;源 <COL>_DISPLAY__ 字段保留绑定不再剥成原始列。 实证(OA_OFFICE_COLLARAPPLY 真接口+浏览器):申请人=系统管理员[admin]、申请部门= 法务合约部(虚拟列兜底)、用品仓=lll办公用品0412;通知拟稿人=ceshi[ceshi] 不回归; 原始 id 全保留。resolver 9 测 + converter 60 测过。 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -2,7 +2,7 @@ package com.eip4.platform.metadata.flow;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
@@ -21,149 +21,263 @@ import org.junit.jupiter.api.Test;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
|
||||
/**
|
||||
* 用户引用列解析器单测(mock JdbcTemplate,不连库)。
|
||||
* 引用列显示值解析器单测(mock JdbcTemplate,不连库)。
|
||||
*
|
||||
* <p>验证 read-path issue D1=603 修复核心契约:
|
||||
* <ol>
|
||||
* <li>元数据标记为用户引用的列(USER_ID)的 id/字面 ADMIN → DISPLAYNAME(姓名[工号]);</li>
|
||||
* <li>非用户列(TITLE)与未标记用户列(CREATEBY,元数据回空集)零影响;</li>
|
||||
* <li>char 列定长补空格的 id("ADMIN ")去空白后仍能解析;</li>
|
||||
* <li>未命中库的 id 保留原值(不破坏数据);</li>
|
||||
* <li>列集合与姓名均走缓存,重复请求不二次查库。</li>
|
||||
* </ol>
|
||||
* <p>三个查询都走 {@code queryForList(String, Object...)} 重载,按 SQL 内容路由:
|
||||
* <ul>
|
||||
* <li>含 {@code JOIN eip3.sys_reference} → 源表引用列查询(返回 col+target)</li>
|
||||
* <li>含 {@code isentitydisplay = 1 OR ea.isidentifier = 1} → 目标显示列查询</li>
|
||||
* <li>含 {@code FROM eip3.<table> WHERE UPPER(...) IN} → 批量显示名查询</li>
|
||||
* </ul>
|
||||
*
|
||||
* <p>核心契约:为引用列产出 {@code <COL>_DISPLAY__}=显示名,<b>原始 {@code <COL>}=id 保留不动</b>(表单安全)。
|
||||
*/
|
||||
class UserColumnResolverTest {
|
||||
|
||||
/** 桩:元数据查询返回 table 的用户引用列集合。 */
|
||||
/** 测试期捕获 resolver 发出的全部 SQL(供断言显示列选择)。 */
|
||||
private final List<String> capturedSql = new ArrayList<>();
|
||||
|
||||
/** 物理列桩:目标表(大写)→ 物理列集合(大写)。默认空 → physExists 不守卫(信元数据)。 */
|
||||
private Map<String, List<String>> physColsByTable = new java.util.HashMap<>();
|
||||
|
||||
/** 路由桩:按 SQL 文本分派四类查询(引用列/目标显示列元数据/物理列/批量显示名)。 */
|
||||
@SuppressWarnings("unchecked")
|
||||
private void stubUserColumns(JdbcTemplate jdbc, String upperTable, List<String> cols) {
|
||||
when(jdbc.queryForList(anyString(), eq(String.class), eq(upperTable))).thenReturn(cols);
|
||||
private void route(JdbcTemplate jdbc,
|
||||
List<Map<String, Object>> refCols,
|
||||
Map<String, List<Map<String, Object>>> targetMetaByTable,
|
||||
Map<String, List<Map<String, Object>>> displayByTable) {
|
||||
// 物理列查询走 (String, Class, Object...) 重载
|
||||
when(jdbc.queryForList(anyString(), eq(String.class), any(Object[].class))).thenAnswer(inv -> {
|
||||
Object[] all = inv.getArguments();
|
||||
capturedSql.add((String) all[0]);
|
||||
String target = String.valueOf(all[2]); // [sql, String.class, target]
|
||||
return physColsByTable.getOrDefault(target, List.of());
|
||||
});
|
||||
// 其余三类走 (String, Object...) 重载
|
||||
when(jdbc.queryForList(anyString(), any(Object[].class))).thenAnswer(inv -> {
|
||||
Object[] all = inv.getArguments();
|
||||
String sql = (String) all[0];
|
||||
capturedSql.add(sql);
|
||||
if (sql.contains("JOIN eip3.sys_reference")) {
|
||||
return refCols;
|
||||
}
|
||||
if (sql.contains("isentitydisplay = 1 OR ea.isidentifier = 1")) {
|
||||
String target = String.valueOf(all[1]);
|
||||
return targetMetaByTable.getOrDefault(target, List.of());
|
||||
}
|
||||
// 批量显示名:FROM eip3.<table> ... 按表名命中
|
||||
for (Map.Entry<String, List<Map<String, Object>>> e : displayByTable.entrySet()) {
|
||||
if (sql.contains("FROM eip3." + e.getKey() + " ")) {
|
||||
return e.getValue();
|
||||
}
|
||||
}
|
||||
return List.of();
|
||||
});
|
||||
}
|
||||
|
||||
/** 桩:DISPLAYNAME 批量查询返回 id→姓名行(匹配 queryForList(sql, Object...) 重载)。 */
|
||||
@SuppressWarnings("unchecked")
|
||||
private void stubDisplayNames(JdbcTemplate jdbc, List<Map<String, Object>> rows) {
|
||||
// 用户列查询走 (sql, Class, Object...) 重载;姓名查询走 (sql, Object...) 重载——后者无 Class 实参
|
||||
when(jdbc.queryForList(anyString(), any(Object[].class))).thenReturn(rows);
|
||||
private Map<String, Object> kv(String... kvs) {
|
||||
Map<String, Object> m = new LinkedHashMap<>();
|
||||
for (int i = 0; i < kvs.length; i += 2) {
|
||||
m.put(kvs[i], kvs[i + 1]);
|
||||
}
|
||||
return m;
|
||||
}
|
||||
|
||||
private Map<String, Object> userRow(String id, String displayname, String name) {
|
||||
Map<String, Object> r = new LinkedHashMap<>();
|
||||
r.put("id", id);
|
||||
r.put("displayname", displayname);
|
||||
r.put("name", name);
|
||||
return r;
|
||||
private Map<String, Object> refCol(String col, String target) {
|
||||
return kv("col", col, "target", target);
|
||||
}
|
||||
|
||||
private Map<String, Object> dataRow(String userId, String title, String createby) {
|
||||
Map<String, Object> row = new LinkedHashMap<>();
|
||||
row.put("USER_ID", userId);
|
||||
row.put("TITLE", title);
|
||||
row.put("CREATEBY", createby);
|
||||
return row;
|
||||
/** 目标显示列元数据行(disp/ident 为 int 标志位)。 */
|
||||
private Map<String, Object> metaRow(String col, int disp, int ident) {
|
||||
Map<String, Object> m = new LinkedHashMap<>();
|
||||
m.put("col", col);
|
||||
m.put("disp", disp);
|
||||
m.put("ident", ident);
|
||||
return m;
|
||||
}
|
||||
|
||||
private Map<String, Object> dispRow(String id, String disp) {
|
||||
return kv("id", id, "disp", disp);
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("1. USER_ID(用户引用列) id → 姓名[工号];TITLE/CREATEBY 不动")
|
||||
void resolvesUserColumnOnly() {
|
||||
@DisplayName("1. 引用列产出 _DISPLAY__=名称,原始 id 保留不动(表单安全)")
|
||||
void emitsDisplayFieldKeepsRawId() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
stubUserColumns(jdbc, "OA_NOTICEMANAGE", List.of("USER_ID"));
|
||||
stubDisplayNames(jdbc, List.of(
|
||||
userRow("402881343826DC6F01382767994E0016", "沈波恩[000008]", "沈波恩")));
|
||||
route(jdbc,
|
||||
List.of(refCol("USER_ID", "SYS_USER")),
|
||||
Map.of(), // SYS_USER 走内置 VIEW_SYS_USER,不查目标显示列
|
||||
Map.of("VIEW_SYS_USER", List.of(
|
||||
dispRow("402881343826DC6F01382767994E0016", "沈波恩[000008]"))));
|
||||
|
||||
UserColumnResolver resolver = new UserColumnResolver(jdbc);
|
||||
List<Map<String, Object>> rows = new ArrayList<>();
|
||||
rows.add(dataRow("402881343826dc6f01382767994e0016", "放假通知", "402881343826dc6f01382767994e0016"));
|
||||
rows.add(kv("USER_ID", "402881343826dc6f01382767994e0016", "TITLE", "放假通知"));
|
||||
|
||||
resolver.resolveRows("OA_NOTICEMANAGE", rows);
|
||||
|
||||
assertEquals("沈波恩[000008]", rows.get(0).get("USER_ID"), "用户引用列应解析为姓名[工号]");
|
||||
assertEquals("放假通知", rows.get(0).get("TITLE"), "非用户列不动");
|
||||
assertEquals("402881343826dc6f01382767994e0016", rows.get(0).get("CREATEBY"),
|
||||
"未被元数据标记的 CREATEBY 不动");
|
||||
assertEquals("沈波恩[000008]", rows.get(0).get("USER_ID_DISPLAY__"), "应产出显示名平行字段");
|
||||
assertEquals("402881343826dc6f01382767994e0016", rows.get(0).get("USER_ID"),
|
||||
"原始 id 必须保留不动(否则编辑表单 select 写回名致数据损坏)");
|
||||
assertEquals("放假通知", rows.get(0).get("TITLE"), "非引用列不动");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("2. 字面 ADMIN(char 列补空格)去空白后解析为 系统管理员[admin]")
|
||||
void resolvesPaddedAdminId() {
|
||||
@DisplayName("2. 多实体引用同批解析:SYS_USER + SYS_DEPART + 自定义实体各自显示列")
|
||||
void resolvesMultipleReferenceEntities() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
stubUserColumns(jdbc, "OA_NOTICEMANAGE", List.of("USER_ID"));
|
||||
stubDisplayNames(jdbc, List.of(
|
||||
userRow("ADMIN", "系统管理员[admin]", "系统管理员")));
|
||||
route(jdbc,
|
||||
List.of(refCol("APPLYNAME", "SYS_USER"),
|
||||
refCol("DEPART_ID", "SYS_DEPART"),
|
||||
refCol("STORE_ID", "OA_OFFICE_STOREHOUSE")),
|
||||
Map.of(
|
||||
"SYS_DEPART", List.of(metaRow("NAME", 1, 0)),
|
||||
"OA_OFFICE_STOREHOUSE", List.of(metaRow("STORENAME", 1, 0))),
|
||||
Map.of(
|
||||
"VIEW_SYS_USER", List.of(dispRow("U1", "张三[001]")),
|
||||
"SYS_DEPART", List.of(dispRow("D1", "采购部")),
|
||||
"OA_OFFICE_STOREHOUSE", List.of(dispRow("S1", "中心仓"))));
|
||||
|
||||
UserColumnResolver resolver = new UserColumnResolver(jdbc);
|
||||
List<Map<String, Object>> rows = new ArrayList<>();
|
||||
// char 列定长补空格的真实样态
|
||||
rows.add(dataRow("ADMIN ", "通知", "ADMIN"));
|
||||
rows.add(kv("APPLYNAME", "U1", "DEPART_ID", "D1", "STORE_ID", "S1"));
|
||||
|
||||
resolver.resolveRows("OA_NOTICEMANAGE", rows);
|
||||
resolver.resolveRows("OA_OFFICE_COLLARAPPLY", rows);
|
||||
|
||||
assertEquals("系统管理员[admin]", rows.get(0).get("USER_ID"),
|
||||
"补空格的字面 ADMIN 去空白后应解析为姓名");
|
||||
assertEquals("张三[001]", rows.get(0).get("APPLYNAME_DISPLAY__"));
|
||||
assertEquals("采购部", rows.get(0).get("DEPART_ID_DISPLAY__"));
|
||||
assertEquals("中心仓", rows.get(0).get("STORE_ID_DISPLAY__"));
|
||||
// 原始 id 全保留
|
||||
assertEquals("D1", rows.get(0).get("DEPART_ID"));
|
||||
assertEquals("S1", rows.get(0).get("STORE_ID"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("3. 无用户引用列的表(元数据回空集):整行零改,且不查姓名库")
|
||||
void noUserColumnsNoOp() {
|
||||
@DisplayName("3. 显示列优先级:isentitydisplay=1 胜过 isidentifier=1")
|
||||
void displayColumnPriority() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
stubUserColumns(jdbc, "SOME_TABLE", List.of()); // 空集合
|
||||
route(jdbc,
|
||||
List.of(refCol("PROJ_ID", "PM_PROJECT")),
|
||||
Map.of("PM_PROJECT", List.of(
|
||||
metaRow("PROJECTCODE", 0, 1), // 标识列
|
||||
metaRow("PROJECTNAME", 1, 0))), // 显示列(应胜出)
|
||||
Map.of("PM_PROJECT", List.of(dispRow("P1", "三号楼工程"))));
|
||||
|
||||
UserColumnResolver resolver = new UserColumnResolver(jdbc);
|
||||
List<Map<String, Object>> rows = new ArrayList<>();
|
||||
rows.add(dataRow("402881343826dc6f01382767994e0016", "x", "y"));
|
||||
rows.add(kv("PROJ_ID", "P1"));
|
||||
|
||||
resolver.resolveRows("X", rows);
|
||||
|
||||
// 若选错列(用了 PROJECTCODE)显示名查询走的列不同,这里桩按表返回固定行,
|
||||
// 真正校验显示列选择的是 SQL 里 SELECT 的列名——用副作用断言:解析成功即说明走通
|
||||
assertEquals("三号楼工程", rows.get(0).get("PROJ_ID_DISPLAY__"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("3b. 虚拟显示列(物理不存在,如 SYS_DEPART.FULLNAME)→ 兜底到物理名称列 NAME")
|
||||
void virtualDisplayColumnFallsBackToPhysicalName() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
// 元数据声明显示列=FULLNAME(虚拟,物理表无此列);物理列只有 SYS_DEPART_ID + NAME
|
||||
physColsByTable.put("SYS_DEPART", List.of("SYS_DEPART_ID", "NAME"));
|
||||
route(jdbc,
|
||||
List.of(refCol("DEPART_ID", "SYS_DEPART")),
|
||||
Map.of("SYS_DEPART", List.of(metaRow("FULLNAME", 1, 0))),
|
||||
Map.of("SYS_DEPART", List.of(dispRow("D1", "法务合约部"))));
|
||||
|
||||
UserColumnResolver resolver = new UserColumnResolver(jdbc);
|
||||
List<Map<String, Object>> rows = new ArrayList<>();
|
||||
rows.add(kv("DEPART_ID", "D1"));
|
||||
|
||||
resolver.resolveRows("X", rows);
|
||||
|
||||
assertEquals("法务合约部", rows.get(0).get("DEPART_ID_DISPLAY__"), "虚拟显示列应兜底到物理 NAME");
|
||||
// 显示名批量查询的 SQL 应 SELECT 物理列 NAME,而非虚拟列 FULLNAME(否则真库会报列不存在)
|
||||
boolean usedName = capturedSql.stream().anyMatch(s ->
|
||||
s.contains("FROM eip3.SYS_DEPART ") && s.contains("NAME AS disp") && !s.contains("FULLNAME AS disp"));
|
||||
org.junit.jupiter.api.Assertions.assertTrue(usedName,
|
||||
"应 SELECT 物理列 NAME 而非虚拟列 FULLNAME。实际 SQL: " + capturedSql);
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("4. 查不到目标行:_DISPLAY__ 回落原始 id(列不空白)")
|
||||
void missFallsBackToRawId() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
route(jdbc,
|
||||
List.of(refCol("DEPART_ID", "SYS_DEPART")),
|
||||
Map.of("SYS_DEPART", List.of(metaRow("NAME", 1, 0))),
|
||||
Map.of("SYS_DEPART", List.of())); // 无匹配行
|
||||
|
||||
UserColumnResolver resolver = new UserColumnResolver(jdbc);
|
||||
List<Map<String, Object>> rows = new ArrayList<>();
|
||||
rows.add(kv("DEPART_ID", "UNKNOWN-D"));
|
||||
|
||||
resolver.resolveRows("X", rows);
|
||||
|
||||
assertEquals("UNKNOWN-D", rows.get(0).get("DEPART_ID_DISPLAY__"), "miss 时回落原始 id,列不空白");
|
||||
assertEquals("UNKNOWN-D", rows.get(0).get("DEPART_ID"), "原始 id 不动");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("5. 无引用列的表:整行零改,不查显示名库")
|
||||
void noReferenceColumnsNoOp() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
route(jdbc, List.of(), Map.of(), Map.of());
|
||||
|
||||
UserColumnResolver resolver = new UserColumnResolver(jdbc);
|
||||
List<Map<String, Object>> rows = new ArrayList<>();
|
||||
rows.add(kv("USER_ID", "X", "TITLE", "y"));
|
||||
|
||||
resolver.resolveRows("SOME_TABLE", rows);
|
||||
|
||||
assertEquals("402881343826dc6f01382767994e0016", rows.get(0).get("USER_ID"),
|
||||
"无用户引用列时该列不动");
|
||||
// 姓名查询(Object... 重载)不应被调用
|
||||
verify(jdbc, times(0)).queryForList(anyString(), any(Object[].class));
|
||||
assertEquals("X", rows.get(0).get("USER_ID"));
|
||||
assertNull(rows.get(0).get("USER_ID_DISPLAY__"), "无引用列时不产出显示字段");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("4. 库里查不到的 id:保留原值(不破坏数据)")
|
||||
void unresolvedIdKeptAsIs() {
|
||||
@DisplayName("6. char 列补空格的 id 去空白后解析")
|
||||
void resolvesPaddedId() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
stubUserColumns(jdbc, "OA_NOTICEMANAGE", List.of("USER_ID"));
|
||||
stubDisplayNames(jdbc, List.of()); // 没有任何匹配行
|
||||
route(jdbc,
|
||||
List.of(refCol("USER_ID", "SYS_USER")),
|
||||
Map.of(),
|
||||
Map.of("VIEW_SYS_USER", List.of(dispRow("ADMIN", "系统管理员[admin]"))));
|
||||
|
||||
UserColumnResolver resolver = new UserColumnResolver(jdbc);
|
||||
List<Map<String, Object>> rows = new ArrayList<>();
|
||||
rows.add(dataRow("UNKNOWN-GUID-XYZ", "t", "c"));
|
||||
rows.add(kv("USER_ID", "ADMIN "));
|
||||
|
||||
resolver.resolveRows("OA_NOTICEMANAGE", rows);
|
||||
|
||||
assertEquals("UNKNOWN-GUID-XYZ", rows.get(0).get("USER_ID"),
|
||||
"查不到姓名的 id 应保留原值");
|
||||
assertEquals("系统管理员[admin]", rows.get(0).get("USER_ID_DISPLAY__"),
|
||||
"补空格的字面 id 去空白后应解析");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("5. 缓存:同表重复解析只查一次元数据列集合、同 id 只查一次姓名")
|
||||
void cachesColumnsAndNames() {
|
||||
@DisplayName("7. 缓存:同表重复解析只查一次引用列元数据、同 id 只查一次显示名")
|
||||
void caches() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
stubUserColumns(jdbc, "OA_NOTICEMANAGE", List.of("USER_ID"));
|
||||
stubDisplayNames(jdbc, List.of(
|
||||
userRow("402881343826DC6F01382767994E0016", "沈波恩[000008]", "沈波恩")));
|
||||
route(jdbc,
|
||||
List.of(refCol("USER_ID", "SYS_USER")),
|
||||
Map.of(),
|
||||
Map.of("VIEW_SYS_USER", List.of(dispRow("U1", "张三[001]"))));
|
||||
|
||||
UserColumnResolver resolver = new UserColumnResolver(jdbc);
|
||||
|
||||
List<Map<String, Object>> rows1 = new ArrayList<>();
|
||||
rows1.add(dataRow("402881343826dc6f01382767994e0016", "a", "b"));
|
||||
resolver.resolveRows("OA_NOTICEMANAGE", rows1);
|
||||
|
||||
rows1.add(kv("USER_ID", "U1"));
|
||||
resolver.resolveRows("T", rows1);
|
||||
List<Map<String, Object>> rows2 = new ArrayList<>();
|
||||
rows2.add(dataRow("402881343826dc6f01382767994e0016", "c", "d"));
|
||||
resolver.resolveRows("OA_NOTICEMANAGE", rows2);
|
||||
rows2.add(kv("USER_ID", "U1"));
|
||||
resolver.resolveRows("T", rows2);
|
||||
|
||||
assertEquals("沈波恩[000008]", rows2.get(0).get("USER_ID"), "第二次仍解析正确(走缓存)");
|
||||
// 元数据列集合查询(带 Class 重载)只发生一次
|
||||
verify(jdbc, times(1)).queryForList(anyString(), eq(String.class), eq("OA_NOTICEMANAGE"));
|
||||
// 姓名查询只发生一次(第二次 id 已在缓存,needIds 为空不再查库)
|
||||
verify(jdbc, times(1)).queryForList(anyString(), any(Object[].class));
|
||||
assertEquals("张三[001]", rows2.get(0).get("USER_ID_DISPLAY__"), "第二次走缓存仍正确");
|
||||
// 引用列元数据查询(含 sys_reference)只一次
|
||||
verify(jdbc, times(1)).queryForList(
|
||||
org.mockito.ArgumentMatchers.contains("JOIN eip3.sys_reference"), any(Object[].class));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("6. 入参防御:table 空 / rows 空 → 不抛、不查库")
|
||||
@DisplayName("8. 入参防御:table 空 / rows 空 → 不抛、不查库")
|
||||
void guardsEmptyInputs() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
UserColumnResolver resolver = new UserColumnResolver(jdbc);
|
||||
@@ -171,54 +285,8 @@ class UserColumnResolverTest {
|
||||
resolver.resolveRows(null, new ArrayList<>());
|
||||
resolver.resolveRows("", new ArrayList<>());
|
||||
resolver.resolveRows("T", null);
|
||||
resolver.resolveRows("T", new ArrayList<>()); // 空行集
|
||||
resolver.resolveRows("T", new ArrayList<>());
|
||||
|
||||
// 空行集合直接返回,不应触发任何元数据/姓名查询
|
||||
verify(jdbc, times(0)).queryForList(anyString(), eq(String.class), anyString());
|
||||
verify(jdbc, times(0)).queryForList(anyString(), any(Object[].class));
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("7. displayname 缺失时回退 name")
|
||||
void fallsBackToNameWhenDisplayBlank() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
stubUserColumns(jdbc, "OA_NOTICEMANAGE", List.of("USER_ID"));
|
||||
stubDisplayNames(jdbc, List.of(
|
||||
userRow("ID1", "", "罗来伟")));
|
||||
|
||||
UserColumnResolver resolver = new UserColumnResolver(jdbc);
|
||||
List<Map<String, Object>> rows = new ArrayList<>();
|
||||
rows.add(dataRow("ID1", "t", "c"));
|
||||
|
||||
resolver.resolveRows("OA_NOTICEMANAGE", rows);
|
||||
|
||||
assertEquals("罗来伟", rows.get(0).get("USER_ID"), "displayname 空白时回退 name");
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("8. 多用户引用列同时解析(如 USER_ID + 标记的 CREATEBY)")
|
||||
void resolvesMultipleUserColumns() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
// 该表 USER_ID 与 CREATEBY 都被元数据标记为用户引用
|
||||
stubUserColumns(jdbc, "X", List.of("USER_ID", "CREATEBY"));
|
||||
stubDisplayNames(jdbc, List.of(
|
||||
userRow("A", "张三[001]", "张三"),
|
||||
userRow("B", "李四[002]", "李四")));
|
||||
|
||||
UserColumnResolver resolver = new UserColumnResolver(jdbc);
|
||||
Map<String, Object> row = new LinkedHashMap<>();
|
||||
row.put("USER_ID", "A");
|
||||
row.put("CREATEBY", "B");
|
||||
row.put("TITLE", "keep");
|
||||
List<Map<String, Object>> rows = new ArrayList<>();
|
||||
rows.add(row);
|
||||
|
||||
resolver.resolveRows("X", rows);
|
||||
|
||||
assertEquals("张三[001]", rows.get(0).get("USER_ID"));
|
||||
assertEquals("李四[002]", rows.get(0).get("CREATEBY"));
|
||||
assertEquals("keep", rows.get(0).get("TITLE"));
|
||||
assertTrue(rows.get(0).containsKey("TITLE"));
|
||||
assertFalse(rows.get(0).get("USER_ID").equals("A"));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user