导出文件名

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){