From 994b40dd2d36c9ba4bc0b531b0d4b0f81e41e44e Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Wed, 28 May 2025 15:20:46 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BApdf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/impl/BusinessAlertServiceImpl.java | 2 +- .../business/src/main/resources/templates/pdfAlert.ftl | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java index 10a5cd1..b06c473 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java @@ -902,7 +902,7 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { FreemarkerUtil.renderTplFileToWord("预警导出.docx","alert.ftl",resultMap,response); } else if (bo.getExportType().equalsIgnoreCase("pdf")) { try { - HtmlConvertPdfHelper.htmlConvertPDF(resultMap,"pdfAlert.ftl"); + HtmlConvertPdfHelper.renderTplFileToPDF("预警导出.pdf","pdfAlert.ftl",resultMap,response); } catch (Exception e) { log.error(e.getMessage(),e); } diff --git a/dk-modules/business/src/main/resources/templates/pdfAlert.ftl b/dk-modules/business/src/main/resources/templates/pdfAlert.ftl index 7cc75f2..2e9d77d 100644 --- a/dk-modules/business/src/main/resources/templates/pdfAlert.ftl +++ b/dk-modules/business/src/main/resources/templates/pdfAlert.ftl @@ -85,12 +85,12 @@ 后期影像 - 前期影像1 - 前期影像2 + 前期影像1 + 前期影像2 - 后期影像1 - 后期影像2 + 后期影像1 + 后期影像2