diff --git a/docs/plans/2026-06-25-报表迁移-JOR引擎重宿主-design.md b/docs/plans/2026-06-25-报表迁移-JOR引擎重宿主-design.md index e950c48..7233edf 100644 --- a/docs/plans/2026-06-25-报表迁移-JOR引擎重宿主-design.md +++ b/docs/plans/2026-06-25-报表迁移-JOR引擎重宿主-design.md @@ -58,4 +58,5 @@ EIP3 `ReportExporter` 的真实通道(`jor/jatools/server/ReportExporter.java`): - 当前转换器把这 4 张走「图表→数据表」降级,crud 指向 `/api/flow/..._PRJCHART` 的 **GET**(被拒)→ 实为一张加载不出数据的破表。 - **faithful 迁移所需(独立特性)**:①能 POST 取数的图表端点;②把流结果映射成 amis `chart`(ECharts option)——但**图表类型/系列映射在老客户端代码里**(模板 XML 只有 `ischart`+`selectservice`+display,无图表定义),且**每张形状不同**,难用一套通用启发式覆盖;③出图保真还须**完整客户库**(dev 缺源数据)。仅 4 张、低优先,需产品定夺图表口径后再做。 -- **仍剩余**:`reportviewer.jsp` 钻取链接改 EIP4 路由、完整客户库数据对账(eip4dev 部分库,源表/视图缺→渲布局但空数据,非引擎问题)。 +- **钻取链接改 EIP4 路由已做**(2026-06-25):JOR 模板 `reportviewer.jsp?xmluuid=<目标报表ID>&PARAM=${PARAM}…` 经 jatools `HtmlExport` 渲成 ``(jar 内已确认 `]+)` → `/api/report/render/$1?format=html`(其余查询参原样保留,目标报表新标签渲出;目标自身钻取链接亦被同一步递归改写)。短路(无 `reportviewer.jsp` 子串原样返回,302/339 报表跳过正则);`replaceAll(Function)` 字面量拼接防 `$/\` 注入。**全 37 张 drill 报表 xmluuid 恒为首参**(评审实证全语料)。坑:钻取行落在报表明细行,eip4dev 缺源数据 → dev 渲不出 drill 链接,**点击直通须完整客户库验**;改写经 6 单测(真发射格式/裸&/多处/短路/null)+ jar 发射证实 + live 正常报表 round-trip 无损。 +- **仍剩余**:完整客户库数据对账(eip4dev 部分库,源表/视图缺→渲布局但空数据,非引擎问题)、B 类图表(§7)。 diff --git a/platform-report/src/main/java/com/eip4/platform/report/ReportService.java b/platform-report/src/main/java/com/eip4/platform/report/ReportService.java index 1087f53..482b5bd 100644 --- a/platform-report/src/main/java/com/eip4/platform/report/ReportService.java +++ b/platform-report/src/main/java/com/eip4/platform/report/ReportService.java @@ -8,6 +8,7 @@ import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.Map; +import java.util.regex.Pattern; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -120,6 +121,12 @@ public class ReportService { case PDF -> job.printAsPDF(out); case XLS -> job.printAsXLS(out); } + if (fmt == Format.HTML) { + // JOR 钻取链接 指向已失效的老 JSP → + // 改写为 EIP4 渲染路由 /api/report/render/X?format=html(目标报表在新标签渲出)。 + String rewritten = rewriteDrillLinks(out.toString(StandardCharsets.UTF_8)); + return rewritten.getBytes(StandardCharsets.UTF_8); + } return out.toByteArray(); } catch (RuntimeException e) { throw e; @@ -130,6 +137,23 @@ public class ReportService { } } + /** + * JOR 钻取链接 {@code reportviewer.jsp?xmluuid=<目标报表ID>&...} → EIP4 渲染路由 + * {@code /api/report/render/<目标报表ID>?format=html}(其余查询参原样保留;目标 id 后以 {@code &}/引号/ + * 空白/尖括号为界)。仅作用于 HTML 输出;无该子串时短路原样返回。纯函数,便于单测。 + */ + private static final Pattern DRILL_LINK = + Pattern.compile("reportviewer\\.jsp\\?xmluuid=([^&'\"\\s<>]+)"); + + static String rewriteDrillLinks(String html) { + if (html == null || !html.contains("reportviewer.jsp")) { + return html; + } + // 用 Function 形式 replaceAll:返回串按字面量拼接(不解释 $ / \),即便目标 id 含特殊字符也不会破坏替换。 + return DRILL_LINK.matcher(html) + .replaceAll(m -> "/api/report/render/" + m.group(1) + "?format=html"); + } + private static void deleteQuietly(File dir) { if (dir == null || !dir.exists()) { return; diff --git a/platform-report/src/test/java/com/eip4/platform/report/ReportDrillLinkRewriteTest.java b/platform-report/src/test/java/com/eip4/platform/report/ReportDrillLinkRewriteTest.java new file mode 100644 index 0000000..3f5c131 --- /dev/null +++ b/platform-report/src/test/java/com/eip4/platform/report/ReportDrillLinkRewriteTest.java @@ -0,0 +1,71 @@ +package com.eip4.platform.report; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +/** + * JOR 钻取链接改写的纯逻辑单测。 + * + *

JOR 模板的 {@code reportviewer.jsp?xmluuid=<目标报表ID>&PARAM=${PARAM}...} + * 经 jatools {@code HtmlExport} 渲成 {@code } + * (jar 内已确认 {@code 人工"; + String out = ReportService.rewriteDrillLinks(html); + assertTrue(out.contains( + "href='/api/report/render/19482910-7cf7-44fe-9612-bc9859bfe9d9?format=html" + + "&PROJECTID=P1&MREPORTINTERVALID=9'"), out); + assertFalse(out.contains("reportviewer.jsp"), out); + // target/锚文本不动 + assertTrue(out.contains("target='_blank'") && out.contains(">人工"), out); + } + + @Test + void rewrites_link_without_params() { + String html = "x"; + String out = ReportService.rewriteDrillLinks(html); + assertTrue(out.contains("href='/api/report/render/abcd1234-0000-1111-2222-333344445555?format=html'"), out); + } + + @Test + void rewrites_all_occurrences() { + String html = "a reportviewer.jsp?xmluuid=11111111-1111-1111-1111-111111111111&X=1 b " + + "reportviewer.jsp?xmluuid=22222222-2222-2222-2222-222222222222 c"; + String out = ReportService.rewriteDrillLinks(html); + assertTrue(out.contains("/api/report/render/11111111-1111-1111-1111-111111111111?format=html&X=1"), out); + assertTrue(out.contains("/api/report/render/22222222-2222-2222-2222-222222222222?format=html"), out); + assertFalse(out.contains("reportviewer.jsp"), out); + } + + @Test + void rewrites_with_bare_ampersand_separator() { + // 防御引擎可能发射裸 & 分隔(非 &):char-class 须在 & 处停止捕获 id + String html = "x reportviewer.jsp?xmluuid=55555555-5555-5555-5555-555555555555&PROJECTID=P"; + String out = ReportService.rewriteDrillLinks(html); + assertTrue(out.contains("/api/report/render/55555555-5555-5555-5555-555555555555?format=html&PROJECTID=P"), out); + assertFalse(out.contains("reportviewer.jsp"), out); + } + + @Test + void no_drill_links_returns_same_instance() { + String html = "
合计
"; + assertSame(html, ReportService.rewriteDrillLinks(html), "无钻取链接应原样返回(短路)"); + } + + @Test + void null_safe() { + assertEquals(null, ReportService.rewriteDrillLinks(null)); + } +}