diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java b/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java index a35a3b72..37711d01 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java @@ -5,6 +5,7 @@ import com.dxhy.core.model.CommonDTO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -26,6 +27,7 @@ public class MailGatherLogVo extends CommonDTO { private String ocrType; private String errorMsg; private String fileName; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; diff --git a/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java b/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java index 06d31361..cf12afa9 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java +++ b/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java @@ -181,6 +181,8 @@ public class SnEmailGatherTask { Map resultMap = JSONObject.parseObject(body, Map.class); Object status = resultMap.get("status"); if(status != null && "200".equals(String.valueOf(status))){ + gatherLogVo.setFileName(map.get("fileName")); + gatherLogVo.setFileType(map.get("contentType")); buildMsg(gatherLogVo,"0","推送影像票夹成功"); }else { gatherLogVo.setFphm(""); diff --git a/dxhy-sign/pom.xml b/dxhy-sign/pom.xml index 57de7ab7..7d1b45e3 100644 --- a/dxhy-sign/pom.xml +++ b/dxhy-sign/pom.xml @@ -160,7 +160,7 @@ com.alibaba easyexcel-core - 3.1.1 + 3.2.1 diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java index 4d37b10d..2256e482 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java @@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.*; +import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; @@ -156,22 +157,23 @@ public class SignFpqsController extends AbstractController { List excelList = signFpqsService.selectWqsfp(pramsMap); ExcelWriter excelWriter = null; if(excelList != null){ - String fileName = "签收数据导出" + ".xlsx"; ByteArrayOutputStream outputStream = null; try { + String fileName = URLEncoder.encode("签收数据导出", "UTF-8").replaceAll("\\+", "%20"); response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf-8"); - response.setHeader("Content-disposition", "attachment;filename*=utf-8''"+fileName+".xlsx"); - excelWriter = EasyExcel.write(outputStream).build(); - WriteSheet writeSheet = EasyExcel.writerSheet("sheet1").head(QsExcelEntity.class).build(); - excelWriter.write(excelList, writeSheet); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); +// excelWriter = EasyExcel.write(outputStream).build(); +// WriteSheet writeSheet = EasyExcel.writerSheet("sheet").head(QsExcelEntity.class).build(); +// excelWriter.write(excelList, writeSheet); + EasyExcel.write(response.getOutputStream(), QsExcelEntity.class).sheet("sheet").doWrite(excelList); }catch(Exception e){ log.error("签收数据导出,错误日志:{}",e); } finally { // 千万别忘记finish 会帮忙关闭流 -// if (excelWriter != null) { -// excelWriter.close(); -// } + if (excelWriter != null) { + excelWriter.finish(); + } if(outputStream != null){ try { outputStream.close();