From 9db35ced9edc0ca26b50fc60a8ff26988355bc29 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 23 Jul 2024 14:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=9F=BA=E7=A1=80=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=9A=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BA=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81pdf/word/excel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../imes/module/report/api/template/ReportTemplateApi.java | 2 +-
 .../api/template/dto/ReportTemplateGenerateReqDTO.java     | 4 ++++
 .../admin/template/ReportTemplateController.java           | 7 ++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/api/template/ReportTemplateApi.java b/cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/api/template/ReportTemplateApi.java
index da559c190..4d556e147 100644
--- a/cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/api/template/ReportTemplateApi.java
+++ b/cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/api/template/ReportTemplateApi.java
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 public interface ReportTemplateApi {
     String PREFIX = ApiConstants.PREFIX + "/template";
 
-    @PostMapping(value = PREFIX + "/excel")
+    @PostMapping(value = PREFIX + "/export")
     @Operation(summary = "下载模板excel")
     Response excel(@RequestBody ReportTemplateGenerateReqDTO reqDTO);
 }
diff --git a/cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/api/template/dto/ReportTemplateGenerateReqDTO.java b/cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/api/template/dto/ReportTemplateGenerateReqDTO.java
index 0297253d4..b4595eae0 100644
--- a/cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/api/template/dto/ReportTemplateGenerateReqDTO.java
+++ b/cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/api/template/dto/ReportTemplateGenerateReqDTO.java
@@ -19,4 +19,8 @@ public class ReportTemplateGenerateReqDTO {
 
     @Schema(description = "参数集合")
     private Map<String, Object> params;
+
+    @Schema(description = "生成文件类型，pdf/word/excel")
+    @NotNull(message = "生成文件类型不能为空")
+    private String producerType;
 }
diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java
index 877aafd5d..0f4dec631 100644
--- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java
+++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java
@@ -93,15 +93,16 @@ public class ReportTemplateController {
         return success(templateService.preview(pageParametersVO));
     }
 
-    @PostMapping("/template/excel")
+    @PostMapping("/template/export")
     @Operation(summary = "模板导出")
     @PreAuthorize("@ss.hasPermission('report:template:query')")
-    public void generateExcel(@RequestBody ReportTemplateGenerateReqDTO reqDTO, HttpServletResponse response) {
+    public void generateTemplate(@Valid @RequestBody ReportTemplateGenerateReqDTO reqDTO, HttpServletResponse response) {
         OutputStream out = null;
         try {
             Report report = templateService.generateReport(reqDTO);
             out = response.getOutputStream();
-            ExportUtils.export(out, report, ProducerEnum.EXCEL);
+            ProducerEnum p = ProducerEnum.valueOf(reqDTO.getProducerType().toUpperCase());
+            ExportUtils.export(out, report, p);
         } catch (Exception ex) {
             log.error("[generateExcel] 报表模板生成excel异常", ex);
         } finally {