Merge remote-tracking branch 'origin/release' into release

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;
 

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("");

dxhy-sign/pom.xml

@@ -160,7 +160,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel-core</artifactId>
-            <version>3.1.1</version>
+            <version>3.2.1</version>
         </dependency>
     </dependencies>
     <build>

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<QsExcelEntity> 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");
+                response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
-                excelWriter = EasyExcel.write(outputStream).build();
+//                excelWriter = EasyExcel.write(outputStream).build();
-                WriteSheet writeSheet = EasyExcel.writerSheet("sheet1").head(QsExcelEntity.class).build();
+//                WriteSheet writeSheet = EasyExcel.writerSheet("sheet").head(QsExcelEntity.class).build();
-                excelWriter.write(excelList, writeSheet);
+//                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) {
+                if (excelWriter != null) {
-//                    excelWriter.close();
+                    excelWriter.finish();
-//                }
+                }
                 if(outputStream != null){
                     try {
                         outputStream.close();