_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