From 9969bea2a8c1eab64c12a51a2d24d65e5b6c0dd0 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 24 十月 2022 18:12:41 +0800
Subject: [PATCH] 日志导出乱码 日志查询导出 代码重构

---
 ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
index 21ba024..c8b1904 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
@@ -21,8 +21,8 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.net.URLEncoder;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.stream.Collectors;
 
 /**
@@ -68,14 +68,14 @@
 
     @PostMapping("/addition")
     @ApiOperation("娣诲姞")
-    @LogSave(operationType = "鍗″彛绠$悊",contain = "娣诲姞鍗″彛")
+    @LogSave(operationType = "鍗″彛绠$悊", contain = "娣诲姞鍗″彛")
     public CommonResult add(@RequestBody EquipmentBayonet equipmentBayonet) {
         return CommonResult.success(iEquipmentBayonetService.save(equipmentBayonet));
     }
 
     @PutMapping("/modification")
     @ApiOperation("淇敼")
-    @LogSave(operationType = "鍗″彛绠$悊",contain = "淇敼鍗″彛")
+    @LogSave(operationType = "鍗″彛绠$悊", contain = "淇敼鍗″彛")
     public CommonResult modify(@RequestBody EquipmentBayonet equipmentBayonet) {
         return CommonResult.success(iEquipmentBayonetService.updateById(equipmentBayonet));
     }
@@ -83,7 +83,7 @@
     @GetMapping("/export")
     @ApiOperation("瀵煎嚭")
     @SneakyThrows
-    @LogSave(operationType = "鍗″彛绠$悊",contain = "鍒犻櫎鍗″彛")
+    @LogSave(operationType = "鍗″彛绠$悊", contain = "鍒犻櫎鍗″彛")
     public void export(HttpServletResponse response,
                        @RequestParam(required = false) Integer size,
                        @RequestParam(required = false) Integer current,
@@ -91,17 +91,9 @@
         Page<EquipmentBayonet> equipmentBayonetPage = new Page<>();
         equipmentBayonetPage.setCurrent(current);
         equipmentBayonetPage.setSize(size);
-        StringBuilder fileName = new StringBuilder();
-        fileName.append(LocalDateTime.now().getYear())
-                .append("-")
-                .append(LocalDateTime.now().getMonthValue())
-                .append("-")
-                .append(LocalDateTime.now().getDayOfMonth())
-                .append("鍗″彛鏁版嵁");
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
-        String file = URLEncoder.encode(fileName.toString(), "UTF-8").replaceAll("\\+", "%20");
-        response.setHeader("Content-disposition", "attachment;filename=" + file + ".xlsx");
+        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + ".xlsx");
         EasyExcel.write(response.getOutputStream(), EquipmentBayonetVO.class)
                 .sheet("鏁版嵁")
                 .doWrite(iEquipmentBayonetService

--
Gitblit v1.8.0