From 92f8cdc4419df79a706c2afe7ac20cbef254dfb8 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 9 Aug 2021 13:24:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/pub/PubController.java         |  13 +++++++------
 .../main/resources/excel/data_template.xlsx   | Bin 12085 -> 12070 bytes
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java
index a034d63750..8a0c8ae877 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java
@@ -3,7 +3,7 @@ package com.epmet.dataaggre.controller.pub;
 import cn.afterturn.easypoi.entity.vo.TemplateExcelConstants;
 import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import cn.afterturn.easypoi.view.EasypoiTemplateExcelView;
-import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.datastats.form.BaseDataFormDTO;
@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -101,9 +102,9 @@ public class PubController {
      * @return
      */
     @RequestMapping("/exportExcel")
-    public ModelAndView exportExcel(@RequestBody(required = false) BaseDataFormDTO formDTO) throws IOException {
-        String paramStr = "{\"agencyId\":\"7b6f9a9f9f38d5f9fa7ce94a93d6eb28\",\"agencyLevel\":\"city\",\"dateId\":\"20210616\",\"type\":\"thisWeek\",\"agencyName\":\"组织名称\"}";
-        formDTO = JSON.parseObject(paramStr, BaseDataFormDTO.class);
+    public ModelAndView exportExcel(@RequestBody BaseDataFormDTO formDTO) {
+        //String paramStr = "{\"agencyId\":\"7b6f9a9f9f38d5f9fa7ce94a93d6eb28\",\"agencyLevel\":\"city\",\"dateId\":\"20210616\",\"type\":\"thisWeek\",\"agencyName\":\"组织名称\"}";
+        //formDTO = JSON.parseObject(paramStr, BaseDataFormDTO.class);
         Map<String, Object> mapData = new HashMap<>();
         mapData.put("collectData", dataStatsService.getBaseStatsData(formDTO));
         mapData.put("subWorkFactList", dataStatsService.getSubWorkFact(formDTO));
@@ -120,13 +121,13 @@ public class PubController {
         log.info("exportExcel templatePath:"+templatePath);
 
         ModelAndView mv = new ModelAndView(new EasypoiTemplateExcelView());
-        mv.addObject(TemplateExcelConstants.FILE_NAME, "数据导出-");
+        mv.addObject(TemplateExcelConstants.FILE_NAME, DateUtils.format(new Date(),DateUtils.DATE_TIME_NO_SPLIT));
         TemplateExportParams templateExportParams = new TemplateExportParams(templatePath);
         Integer[] integers = {0,1,2,3};
         templateExportParams.setSheetNum(integers);
         mv.addObject(TemplateExcelConstants.PARAMS, templateExportParams);
         mv.addObject(TemplateExcelConstants.MAP_DATA, mapData);
-        log.info("excelExport  build wb cost:{}",System.currentTimeMillis()-start);
+        log.info("excelExport cost:{}",System.currentTimeMillis()-start);
         return mv;
     }
     private String getSearchTimeStr(String type){
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/excel/data_template.xlsx b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/excel/data_template.xlsx
index 9b2c0c94d981cc9098b268023d5a4b60d8551c79..af7104be3259cf76061860da0220c35eb9b5f781 100644
GIT binary patch
delta 2476
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

delta 2504
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
J8vWO>e*-;EZ`S|-