From 2c79a61fa93d135d82b38ec828df85150f03fbb4 Mon Sep 17 00:00:00 2001
From: Raod <1130305001@qq.com>
Date: Fri, 3 Sep 2021 16:45:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reportexcel/controller/ReportExcelController.java    | 2 +-
 .../reportexcel/service/impl/ReportExcelServiceImpl.java | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/ReportExcelController.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/ReportExcelController.java
index bf24b9d5..21273693 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/ReportExcelController.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/controller/ReportExcelController.java
@@ -66,7 +66,7 @@ public class ReportExcelController extends GaeaBaseController<ReportExcelParam,
 
         return ResponseBean.builder().code(ResponseCode.SUCCESS_CODE)
                 .data(reportExcelService.exportExcel(reportExcelDto))
-                .message("导出成功，请稍后在下载中心查看").build();
+                .message("导出成功，请稍后在文件管理中查看").build();
     }
 
 //    @PostMapping("/exportPdf")
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/service/impl/ReportExcelServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/service/impl/ReportExcelServiceImpl.java
index e35cdd83..21117400 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/service/impl/ReportExcelServiceImpl.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/service/impl/ReportExcelServiceImpl.java
@@ -132,11 +132,13 @@ public class ReportExcelServiceImpl implements ReportExcelService {
     public Boolean exportExcel(ReportExcelDto reportExcelDto) {
         String reportCode = reportExcelDto.getReportCode();
         String exportType = reportExcelDto.getExportType();
-
-        if (exportType.equals(ExportTypeEnum.GAEA_TEMPLATE_EXCEL)) {
+        logger.error("导出...");
+        if (exportType.equals(ExportTypeEnum.GAEA_TEMPLATE_EXCEL.getCodeValue())) {
+            ReportExcelDto report = detailByReportCode(reportCode);
+            reportExcelDto.setJsonStr(report.getJsonStr());
             String jsonStr = analysisReportData(reportExcelDto);
             List<JSONObject> lists=(List<JSONObject> ) JSON.parse(jsonStr);
-            OutputStream out = null;
+            OutputStream out;
             try {
                 String fileId = UUID.randomUUID().toString();
                 String filePath = dictPath + File.separator + fileId + ".xlsx";
@@ -153,6 +155,7 @@ public class ReportExcelServiceImpl implements ReportExcelService {
                 XlsUtil.exportXlsFile(out, true, lists);
 
                 gaeaFileMapper.insert(gaeaFile);
+                logger.info("导出成功：{}", gaeaFile);
             } catch (IOException e) {
                 logger.error("导出失败", e);
             }