From 81cb17bb9a7da77caf7471ba9c511216a87de5ef Mon Sep 17 00:00:00 2001 From: zhengwr Date: Sun, 14 Jun 2026 19:10:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(script):=20=E6=89=A7=E8=A1=8C=E5=89=8D?= =?UTF-8?q?=E7=BB=99=20item=20=E6=B3=A8=E5=85=A5=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=80=BC=E2=80=94=E2=80=94=E4=BF=AE=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E6=98=BE=E7=A4=BA=E4=B8=B2=E6=AF=94=E8=BE=83=E7=B1=BB?= =?UTF-8?q?=E8=84=9A=E6=9C=AC(=E6=96=87=E4=BB=B6=E5=BD=92=E6=A1=A3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 老 EIP-3 行选中事件传给脚本的 item(grid 行)里枚举列携带的是显示串(如 ISPLACE=「未归档」), 而 loadPOJO().toMap()(poMap)给裸码。改写后脚本据此分工:数值比较走 poMap.get("STATUS"), 显示串比较走 item['ISPLACE'] == "未归档"。EIP4 的 _SEARCH 合成流只把裸码平展进 amis 行 → item['ISPLACE']=0(非「未归档」) → 比较永假 → 文件归档等永不点亮(全库 285 处 item['COL']=="显示串" 同病;全库 0 处 item[COL]==数字,数值比较一律走 poMap)。 修(通用): - EnumDisplayResolver:元数据驱动(SYS_ENTITYATTRIBUTE referenceid IN ENUMERATE/STATUS + enumeratetype → SYS_ENUMERATE codevalue→codedes),就地把 item 枚举列裸码换成显示串。 表名优先入参,否则从 item 的 _ID 主键反推;非数字码/无对应值不覆写(幂等安全); 三层 Caffeine 缓存。 - ScriptExecuteController.executeTemplateRewritten:runWithFacade 前 enrichItem(null,item)。 加 @Autowired 3 参构造 + 兼容 2 参构造(自建 resolver)。 - PoInfoCacheInvalidator:属性变更同步 enumDisplayResolver.evictAll()(与 userColumnResolver 同钩子)。 测试:EnumDisplayResolverTest +5、ScriptExecuteControllerTest +1(枚举注入使按钮点亮)、 PoInfoCacheInvalidatorTest 3 参构造适配。运行时实证:POST /api/script/execute-template 传 ISPLACE:0 → item 富化为「未归档」→ enabled 文件归档;ISPLACE:3 → 「已归档」→ 文件归档 不点亮(控制对照)。浏览器选中未归档新闻行→文件归档点亮可点。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../metadata/flow/EnumDisplayResolver.java | 209 ++++++++++++++++++ .../metadata/perf/PoInfoCacheInvalidator.java | 8 +- .../metadata/web/ScriptExecuteController.java | 20 +- .../flow/EnumDisplayResolverTest.java | 121 ++++++++++ .../perf/PoInfoCacheInvalidatorTest.java | 13 +- .../web/ScriptExecuteControllerTest.java | 42 ++++ 6 files changed, 407 insertions(+), 6 deletions(-) create mode 100644 platform-metadata/src/main/java/com/eip4/platform/metadata/flow/EnumDisplayResolver.java create mode 100644 platform-metadata/src/test/java/com/eip4/platform/metadata/flow/EnumDisplayResolverTest.java diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/flow/EnumDisplayResolver.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/flow/EnumDisplayResolver.java new file mode 100644 index 0000000..4ed2aae --- /dev/null +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/flow/EnumDisplayResolver.java @@ -0,0 +1,209 @@ +package com.eip4.platform.metadata.flow; + +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +import com.github.benmanes.caffeine.cache.Cache; +import com.github.benmanes.caffeine.cache.Caffeine; + +/** + * 枚举列显示值解析器(脚本 item 上下文:onselectedscript 脚本比较枚举显示串而非裸码)。 + * + *

问题:老 EIP-3 系统行选中事件传给脚本的 {@code item}(grid 行)里,枚举列携带的是 + * 显示串(如 ISPLACE=「未归档」),而 {@code loadPOJO().toMap()}({@code poMap})给的是 + * 裸码(0/1/2/3)。改写后脚本据此分工:数值比较走 {@code poMap.get("STATUS")}(裸码), + * 显示串比较走 {@code item['ISPLACE'] == "未归档"}(显示串)。EIP4 的 {@code _SEARCH} 合成流只把 + * 裸码平展进 amis 行,{@code item['ISPLACE']} 遂是 {@code 0}(非「未归档」)→ 比较永假 → 文件归档 + * 等按钮永不点亮(全库 285 处 {@code item['COL'] == "显示串"} 同病)。 + * + *

修:脚本执行前({@code ScriptExecuteController.executeTemplateRewritten})就地把 {@code item} + * 里枚举列的裸码替换为显示串,复刻老系统 {@code item} 语义。仅覆盖枚举列(元数据 + * {@code SYS_ENTITYATTRIBUTE.referenceid IN ('ENUMERATE','STATUS')} + {@code enumeratetype}),引用列/普通列 + * 不动;全库脚本零处用 {@code item['COL'] == <数字>}(数值比较一律走 poMap),故覆写安全。 + * + *

元数据驱动:表名由 {@code item} 里的主键列 {@code

_ID} 反推;列→枚举类型由 + * {@code SYS_ENTITYATTRIBUTE} 查;枚举类型 {@code (codevalue→codedes)} 由 {@code SYS_ENUMERATE} 查。 + * 三层均 Caffeine 缓存,失效跟 {@link UserColumnResolver#evictAll} 同钩子(见 MetaController)。 + */ +@Component +public class EnumDisplayResolver { + + private static final Logger log = LoggerFactory.getLogger(EnumDisplayResolver.class); + + /** 合法标识符(表/列名)守卫:元数据来源,仍防御性校验。 */ + private static final java.util.regex.Pattern IDENT = java.util.regex.Pattern.compile("^[A-Za-z0-9_]+$"); + + private final JdbcTemplate jdbcTemplate; + + /** 源表(大写) → {枚举列名(大写) → 枚举类型id}。空 map 亦缓存,避免重复查元数据。 */ + private final Cache> enumColsByTable = Caffeine.newBuilder() + .maximumSize(2_000) + .build(); + + /** 枚举类型id(大写) → {codevalue字符串 → codedes(显示串)}。 */ + private final Cache> enumValuesByType = Caffeine.newBuilder() + .maximumSize(2_000) + .build(); + + public EnumDisplayResolver(JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; + } + + /** + * 就地把 {@code item} 里枚举列的裸码替换为显示串(复刻老系统 grid 行 item 语义)。 + * + *

表名优先用入参 {@code table}(调用方已知时),否则从 {@code item} 的主键列 {@code

_ID} 反推。 + * 任何步骤失败均静默跳过(绝不影响脚本主执行路径,至多回退到「按钮不点亮」的旧行为)。 + * + * @param table 实体表名(可 null/空 → 从 item 反推) + * @param item 脚本 item 上下文(amis 选中行;就地修改) + */ + public void enrichItem(String table, Map item) { + if (item == null || item.isEmpty()) { + return; + } + String tbl = (table != null && !table.isBlank()) ? table : inferTableFromItem(item); + if (tbl == null) { + return; + } + Map enumCols; + try { + enumCols = enumColumnsForTable(tbl); + } catch (RuntimeException ex) { + log.warn("[ENUM-DISP] 解析枚举列失败 table={}: {} → item 不富化", tbl, ex.getMessage()); + return; + } + if (enumCols.isEmpty()) { + return; + } + // item 的 key 可能是任意大小写;建一个 大写key→原key 映射以就地改回原 key。 + Map upperToRaw = new HashMap<>(); + for (String k : item.keySet()) { + upperToRaw.putIfAbsent(k.toUpperCase(), k); + } + for (Map.Entry e : enumCols.entrySet()) { + String colUpper = e.getKey(); + String rawKey = upperToRaw.get(colUpper); + if (rawKey == null) { + continue; // item 无此列 + } + Object code = item.get(rawKey); + String codeKey = normalizeCode(code); + if (codeKey == null) { + continue; // 空值 / 已是显示串(非数字码)→ 不动 + } + Map valueMap = enumValuesForType(e.getValue()); + String display = valueMap.get(codeKey); + if (display != null && !display.isBlank()) { + item.put(rawKey, display); // 裸码 → 显示串(复刻老系统 item 语义) + } + } + } + + /** 从 item 的主键列 {@code
_ID} 反推表名(取首个匹配 {@code ^[A-Z0-9_]+_ID$} 且去后缀合法的 key)。 */ + private String inferTableFromItem(Map item) { + for (String k : item.keySet()) { + String up = k.toUpperCase(); + if (up.endsWith("_ID") && up.length() > 3) { + String tbl = up.substring(0, up.length() - 3); + // 排除引用列(如 USERSEND_ID/NEWS_ID):只接受其值 == 当前行主键的那一个不易判, + // 但主键列约定为
_ID 且 item 里通常只有一个表的主键;取首个合法标识符即可。 + if (IDENT.matcher(tbl).matches() && !tbl.isBlank()) { + return tbl; + } + } + } + return null; + } + + /** 源表 → {枚举列 → 枚举类型id}。referenceid IN (ENUMERATE,STATUS) 且 enumeratetype 非空的列。 */ + private Map enumColumnsForTable(String table) { + return enumColsByTable.get(table.toUpperCase(), this::queryEnumColumns); + } + + private Map queryEnumColumns(String upperTable) { + Map map = new LinkedHashMap<>(); + try { + List> rows = jdbcTemplate.queryForList( + "SELECT UPPER(ea.columnname) AS col, ea.enumeratetype AS etype " + + "FROM eip3.sys_entityattribute ea " + + "JOIN eip3.sys_entity e ON UPPER(e.sys_entity_id) = UPPER(ea.entityid) " + + "WHERE UPPER(e.tablename) = ? " + + "AND UPPER(ea.referenceid) IN ('ENUMERATE','STATUS') " + + "AND ea.enumeratetype IS NOT NULL AND ea.enumeratetype <> ''", + upperTable); + for (Map r : rows) { + String col = String.valueOf(r.get("col")); + String etype = r.get("etype") == null ? null : String.valueOf(r.get("etype")).trim(); + if (etype != null && !etype.isBlank()) { + map.put(col, etype); + } + } + } catch (org.springframework.dao.DataAccessException ex) { + log.warn("[ENUM-DISP] 解析枚举列失败 table={}: {}", upperTable, ex.getMessage()); + } + return map.isEmpty() ? Collections.emptyMap() : map; + } + + /** 枚举类型id → {codevalue字符串 → codedes}。 */ + private Map enumValuesForType(String enumType) { + return enumValuesByType.get(enumType.toUpperCase(), k -> queryEnumValues(enumType)); + } + + private Map queryEnumValues(String enumType) { + Map map = new LinkedHashMap<>(); + try { + List> rows = jdbcTemplate.queryForList( + "SELECT codevalue, codedes FROM eip3.sys_enumerate " + + "WHERE UPPER(sys_enumeratetype_id) = ? AND isactive = 1 ORDER BY orderasc", + enumType.toUpperCase()); + for (Map r : rows) { + Object cv = r.get("codevalue"); + Object cd = r.get("codedes"); + if (cv != null && cd != null) { + map.put(String.valueOf(cv).trim(), String.valueOf(cd).trim()); + } + } + } catch (org.springframework.dao.DataAccessException ex) { + log.warn("[ENUM-DISP] 加载枚举值失败 type={}: {}", enumType, ex.getMessage()); + } + return map.isEmpty() ? Collections.emptyMap() : map; + } + + /** + * 归一化枚举码为查表 key:仅当值是「整数码」(数字或数字字符串)时返回其整数字符串,否则 null。 + * 非数字(已是显示串/UUID/日期等)→ null(不覆写,幂等安全)。 + */ + private static String normalizeCode(Object code) { + if (code == null) { + return null; + } + if (code instanceof Number n) { + return String.valueOf(n.intValue()); + } + String s = String.valueOf(code).trim(); + if (s.isEmpty()) { + return null; + } + // 允许 "0" / "3" / "3.0" 形态;非纯整数(含中文/字母)→ 不当枚举码处理 + try { + return String.valueOf((int) Double.parseDouble(s)); + } catch (NumberFormatException e) { + return null; + } + } + + /** 失效全部缓存(与 /api/meta/evict 钩子对齐)。 */ + public void evictAll() { + enumColsByTable.invalidateAll(); + enumValuesByType.invalidateAll(); + } +} diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/perf/PoInfoCacheInvalidator.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/perf/PoInfoCacheInvalidator.java index af69b6f..7e4afcc 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/perf/PoInfoCacheInvalidator.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/perf/PoInfoCacheInvalidator.java @@ -5,6 +5,7 @@ import org.springframework.stereotype.Component; import com.dsasp.server.common.dataDic.bean.AbstractPOJOInfo; import com.dsasp.server.common.dataDic.bean.POJOInfo; import com.dsasp.server.dataDic.bean.POInfo; +import com.eip4.platform.metadata.flow.EnumDisplayResolver; import com.eip4.platform.metadata.flow.UserColumnResolver; import com.eip4.platform.metadata.security.IdentifierWhitelist; @@ -25,11 +26,14 @@ public class PoInfoCacheInvalidator { private final IdentifierWhitelist identifierWhitelist; private final UserColumnResolver userColumnResolver; + private final EnumDisplayResolver enumDisplayResolver; public PoInfoCacheInvalidator(IdentifierWhitelist identifierWhitelist, - UserColumnResolver userColumnResolver) { + UserColumnResolver userColumnResolver, + EnumDisplayResolver enumDisplayResolver) { this.identifierWhitelist = identifierWhitelist; this.userColumnResolver = userColumnResolver; + this.enumDisplayResolver = enumDisplayResolver; } /** @@ -59,6 +63,8 @@ public class PoInfoCacheInvalidator { identifierWhitelist.evict(upper); // read-path D1=603:属性变更可能改动列的 referenceid(用户引用与否),同步失效用户引用列缓存 userColumnResolver.evictTable(upper); + // 小修#2:属性变更可能改动列的枚举类型/枚举值 → 失效枚举显示值缓存(粒度小,全量失效即可) + enumDisplayResolver.evictAll(); } /** diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/ScriptExecuteController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/ScriptExecuteController.java index 2078822..587889f 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/ScriptExecuteController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/ScriptExecuteController.java @@ -9,6 +9,7 @@ import javax.script.Bindings; import org.dom4j.Document; import org.dom4j.DocumentHelper; import org.dom4j.Element; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import com.dsasp.server.dataDic.binding.ScriptingEnginesManager; +import com.eip4.platform.metadata.flow.EnumDisplayResolver; import com.eip4.platform.metadata.script.RewrittenScriptStore; import com.eip4.platform.metadata.script.ScriptFacade; @@ -38,10 +40,20 @@ public class ScriptExecuteController { private final JdbcTemplate jdbcTemplate; private final RewrittenScriptStore rewrittenScriptStore; + /** 小修#2:脚本执行前给 item 注入枚举列显示串(复刻老系统 grid 行 item 语义),修 {@code item['ISPLACE']=="未归档"} 类脚本。 */ + private final EnumDisplayResolver enumDisplayResolver; - public ScriptExecuteController(JdbcTemplate jdbcTemplate, RewrittenScriptStore rewrittenScriptStore) { + @Autowired + public ScriptExecuteController(JdbcTemplate jdbcTemplate, RewrittenScriptStore rewrittenScriptStore, + EnumDisplayResolver enumDisplayResolver) { this.jdbcTemplate = jdbcTemplate; this.rewrittenScriptStore = rewrittenScriptStore; + this.enumDisplayResolver = enumDisplayResolver; + } + + /** 兼容旧 2 参构造(单测/旧接线):从 jdbcTemplate 自建枚举显示值解析器。 */ + public ScriptExecuteController(JdbcTemplate jdbcTemplate, RewrittenScriptStore rewrittenScriptStore) { + this(jdbcTemplate, rewrittenScriptStore, new EnumDisplayResolver(jdbcTemplate)); } /** @@ -148,6 +160,12 @@ public class ScriptExecuteController { resp.put("note", "改写后脚本未找到,按无联动处理(no-op): templateId=" + templateId + " seq=" + seq); return resp; } + // 小修#2:脚本执行前把 item 里枚举列的裸码换成显示串(复刻老系统 grid 行 item 语义),使 + // onselectedscript 里 `item['ISPLACE'] == "未归档"` 类显示串比较成立(否则裸码 0 != "未归档" + // → 文件归档等按钮永不点亮)。表名从 item 的
_ID 主键反推;失败静默跳过不影响主路径。 + if (enumDisplayResolver != null) { + enumDisplayResolver.enrichItem(null, item); + } resp.put("templateId", templateId); resp.put("seq", seq); try { diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/flow/EnumDisplayResolverTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/flow/EnumDisplayResolverTest.java new file mode 100644 index 0000000..65c1608 --- /dev/null +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/flow/EnumDisplayResolverTest.java @@ -0,0 +1,121 @@ +package com.eip4.platform.metadata.flow; + +import static org.junit.jupiter.api.Assertions.assertEquals; +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.contains; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.jdbc.core.JdbcTemplate; + +/** + * 小修#2 单测:枚举列显示值解析器(脚本 item 上下文里枚举列裸码 → 显示串)。 + * + *

桩 JdbcTemplate:SYS_ENTITYATTRIBUTE 查回 OA_NEWSMANAGE 的枚举列(ISPLACE→SYS_FILINGUP_STATUS), + * SYS_ENUMERATE 查回 (0→未归档,1→待归档,3→已归档)。验证 enrichItem 就地把 item['ISPLACE']=0 改成「未归档」。 + */ +class EnumDisplayResolverTest { + + private EnumDisplayResolver resolver; + + @BeforeEach + void setUp() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + + // SYS_ENTITYATTRIBUTE:OA_NEWSMANAGE 的枚举列 + lenient().when(jdbc.queryForList(contains("sys_entityattribute"), eq("OA_NEWSMANAGE"))) + .thenReturn(List.of( + Map.of("col", "ISPLACE", "etype", "SYS_FILINGUP_STATUS"), + Map.of("col", "STATUS", "etype", "WFSTATUS"))); + // 其它表无枚举列 + lenient().when(jdbc.queryForList(contains("sys_entityattribute"), eq("NO_SUCH"))) + .thenReturn(List.of()); + + // SYS_ENUMERATE:枚举类型 → (codevalue→codedes) + lenient().when(jdbc.queryForList(contains("sys_enumerate"), eq("SYS_FILINGUP_STATUS"))) + .thenReturn(List.of( + Map.of("codevalue", 0, "codedes", "未归档"), + Map.of("codevalue", 1, "codedes", "待归档"), + Map.of("codevalue", 3, "codedes", "已归档"))); + lenient().when(jdbc.queryForList(contains("sys_enumerate"), eq("WFSTATUS"))) + .thenReturn(List.of( + Map.of("codevalue", 3, "codedes", "审批通过"))); + + resolver = new EnumDisplayResolver(jdbc); + } + + /** 核心:item['ISPLACE']=0(裸码)→「未归档」(显示串),使脚本 item['ISPLACE']=="未归档" 成立。 */ + @Test + void enrichItem_枚举裸码替换为显示串() { + Map item = new LinkedHashMap<>(); + item.put("OA_NEWSMANAGE_ID", "row-1"); + item.put("ISPLACE", 0); + item.put("STATUS", 3); + item.put("TITLE", "某新闻"); // 普通列不动 + + resolver.enrichItem("OA_NEWSMANAGE", item); + + assertEquals("未归档", item.get("ISPLACE"), "ISPLACE 裸码 0 → 显示串「未归档」"); + assertEquals("审批通过", item.get("STATUS"), "STATUS 裸码 3 → 显示串「审批通过」"); + assertEquals("某新闻", item.get("TITLE"), "普通列不动"); + } + + /** 表名可从 item 的

_ID 主键反推(调用方不传 table)。 */ + @Test + void enrichItem_从主键反推表名() { + Map item = new LinkedHashMap<>(); + item.put("OA_NEWSMANAGE_ID", "row-1"); + item.put("ISPLACE", 1); + + resolver.enrichItem(null, item); // 不传 table → 从 OA_NEWSMANAGE_ID 反推 + + assertEquals("待归档", item.get("ISPLACE")); + } + + /** 已是显示串(非数字码)→ 不动(幂等安全,二次富化不破坏)。 */ + @Test + void enrichItem_非数字码不覆写() { + Map item = new LinkedHashMap<>(); + item.put("OA_NEWSMANAGE_ID", "row-1"); + item.put("ISPLACE", "未归档"); // 已是显示串 + + resolver.enrichItem("OA_NEWSMANAGE", item); + + assertEquals("未归档", item.get("ISPLACE"), "已是显示串 → 保持不变"); + } + + /** 枚举码无对应显示值(脏数据)→ 保留原值,不抹成 null。 */ + @Test + void enrichItem_无对应显示值时保留原码() { + Map item = new LinkedHashMap<>(); + item.put("OA_NEWSMANAGE_ID", "row-1"); + item.put("ISPLACE", 2); // SYS_FILINGUP_STATUS 桩未给 code=2 + + resolver.enrichItem("OA_NEWSMANAGE", item); + + assertEquals(2, item.get("ISPLACE"), "无对应显示值 → 保留原码"); + } + + /** 空 item / 无枚举列表 → no-op,不抛。 */ + @Test + void enrichItem_空与无枚举列安全() { + resolver.enrichItem("OA_NEWSMANAGE", null); + resolver.enrichItem("OA_NEWSMANAGE", new LinkedHashMap<>()); + + Map item = new LinkedHashMap<>(); + item.put("NO_SUCH_ID", "x"); + item.put("FOO", 1); + resolver.enrichItem("NO_SUCH", item); + assertEquals(1, item.get("FOO"), "无枚举列 → 不动"); + } +} diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/perf/PoInfoCacheInvalidatorTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/perf/PoInfoCacheInvalidatorTest.java index d0db204..cb2401e 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/perf/PoInfoCacheInvalidatorTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/perf/PoInfoCacheInvalidatorTest.java @@ -12,6 +12,7 @@ import org.junit.jupiter.api.Test; import com.dsasp.server.common.dataDic.bean.AbstractPOJOInfo; import com.dsasp.server.common.dataDic.bean.POJOInfo; +import com.eip4.platform.metadata.flow.EnumDisplayResolver; import com.eip4.platform.metadata.flow.UserColumnResolver; import com.eip4.platform.metadata.security.IdentifierWhitelist; @@ -39,7 +40,8 @@ class PoInfoCacheInvalidatorTest { void 按entityId失效_精确表名时只evict该表() { IdentifierWhitelist whitelist = mock(IdentifierWhitelist.class); UserColumnResolver userResolver = mock(UserColumnResolver.class); - PoInfoCacheInvalidator inv = new PoInfoCacheInvalidator(whitelist, userResolver); + EnumDisplayResolver enumResolver = mock(EnumDisplayResolver.class); + PoInfoCacheInvalidator inv = new PoInfoCacheInvalidator(whitelist, userResolver, enumResolver); inv.evictByEntityId("entity-123", "EIP4PT_ORDER"); @@ -51,7 +53,8 @@ class PoInfoCacheInvalidatorTest { void 按entityId失效_无表名时全量evict() { IdentifierWhitelist whitelist = mock(IdentifierWhitelist.class); UserColumnResolver userResolver = mock(UserColumnResolver.class); - PoInfoCacheInvalidator inv = new PoInfoCacheInvalidator(whitelist, userResolver); + EnumDisplayResolver enumResolver = mock(EnumDisplayResolver.class); + PoInfoCacheInvalidator inv = new PoInfoCacheInvalidator(whitelist, userResolver, enumResolver); inv.evictByEntityId("entity-123", null); @@ -63,7 +66,8 @@ class PoInfoCacheInvalidatorTest { void evict钩子调setChangePOInfo清引擎缓存() throws Exception { IdentifierWhitelist whitelist = mock(IdentifierWhitelist.class); UserColumnResolver userResolver = mock(UserColumnResolver.class); - PoInfoCacheInvalidator inv = new PoInfoCacheInvalidator(whitelist, userResolver); + EnumDisplayResolver enumResolver = mock(EnumDisplayResolver.class); + PoInfoCacheInvalidator inv = new PoInfoCacheInvalidator(whitelist, userResolver, enumResolver); // 预置 id_cache[entityId]→tableName 与 s_cache[tableName],模拟缓存已热 Field idf = AbstractPOJOInfo.class.getDeclaredField("id_cache"); @@ -89,7 +93,8 @@ class PoInfoCacheInvalidatorTest { void 空入参不抛异常() { IdentifierWhitelist whitelist = mock(IdentifierWhitelist.class); UserColumnResolver userResolver = mock(UserColumnResolver.class); - PoInfoCacheInvalidator inv = new PoInfoCacheInvalidator(whitelist, userResolver); + EnumDisplayResolver enumResolver = mock(EnumDisplayResolver.class); + PoInfoCacheInvalidator inv = new PoInfoCacheInvalidator(whitelist, userResolver, enumResolver); inv.evictByTable(null); inv.evictByTable(" "); inv.evictByEntityId(null, null); diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/ScriptExecuteControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/ScriptExecuteControllerTest.java index 53df892..16d532a 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/ScriptExecuteControllerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/ScriptExecuteControllerTest.java @@ -19,6 +19,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.springframework.jdbc.core.JdbcTemplate; +import com.eip4.platform.metadata.flow.EnumDisplayResolver; import com.eip4.platform.metadata.script.RewrittenScriptStore; /** @@ -118,6 +119,47 @@ class ScriptExecuteControllerTest { assertEquals(0, r2.get("commandCount")); } + /** + * 小修#2:执行前 item 枚举裸码 → 显示串,使 onselectedscript 里 {@code item['ISPLACE'] == "未归档"} + * 成立 → 触发 enableButton("文件归档", true)。复刻新闻 ddb75614 文件归档永不点亮根因的修复闭环。 + */ + @SuppressWarnings("unchecked") + @Test + void executeTemplateRewritten_枚举显示值注入使按钮点亮(@TempDir Path root) throws IOException { + // 复刻新闻 seq1 文件归档分支:item['ISPLACE'] 是显示串时点亮文件归档 + writeScript(root, "ddb75614", "1.NO_S3.groovy", + "if (item['ISPLACE'] == \"未归档\") enableButton(\"文件归档\", true);"); + + // 桩 jdbc:ISPLACE→SYS_FILINGUP_STATUS,code 0→未归档 + JdbcTemplate jdbc = mock(JdbcTemplate.class); + org.mockito.Mockito.lenient().when(jdbc.queryForList( + org.mockito.ArgumentMatchers.contains("sys_entityattribute"), + org.mockito.ArgumentMatchers.eq("OA_NEWSMANAGE"))) + .thenReturn(List.of(Map.of("col", "ISPLACE", "etype", "SYS_FILINGUP_STATUS"))); + org.mockito.Mockito.lenient().when(jdbc.queryForList( + org.mockito.ArgumentMatchers.contains("sys_enumerate"), + org.mockito.ArgumentMatchers.eq("SYS_FILINGUP_STATUS"))) + .thenReturn(List.of(Map.of("codevalue", 0, "codedes", "未归档"))); + + ScriptExecuteController c = new ScriptExecuteController( + jdbc, new RewrittenScriptStore(root.toString()), new EnumDisplayResolver(jdbc)); + + Map item = new LinkedHashMap<>(); + item.put("OA_NEWSMANAGE_ID", "row-1"); + item.put("ISPLACE", 0); // 裸码(_SEARCH 合成流平展的真实形态) + Map body = new LinkedHashMap<>(); + body.put("templateId", "ddb75614"); + body.put("seq", 1); + body.put("item", item); + + Map resp = c.executeTemplateRewritten(body); + assertEquals(Boolean.TRUE, resp.get("passed")); + List> cmds = (List>) resp.get("commands"); + assertEquals(1, cmds.size(), "ISPLACE 富化为「未归档」→ 文件归档点亮 enable 指令"); + assertEquals("文件归档", cmds.get(0).get("componentId")); + assertEquals("enabled", cmds.get(0).get("actionType")); + } + @SuppressWarnings("unchecked") @Test void execute_直接执行脚本仍可用(@TempDir Path root) {