From eb41baf336689cce9344e95c1bf1b0c702fc77d5 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 09 十一月 2022 17:21:42 +0800
Subject: [PATCH] 违规检索和对导出进行封装

---
 ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java |   35 +++++++++++++++--------------------
 1 files changed, 15 insertions(+), 20 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 c8b1904..5cd81d7 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
@@ -11,6 +11,7 @@
 import com.ycl.entity.equipment.EquipmentBayonet;
 import com.ycl.service.dict.IDataDictionaryService;
 import com.ycl.service.equipment.IEquipmentBayonetService;
+import com.ycl.utils.EasyExcelUtils;
 import com.ycl.vo.equipment.EquipmentBayonetVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -83,7 +84,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,23 +92,17 @@
         Page<EquipmentBayonet> equipmentBayonetPage = new Page<>();
         equipmentBayonetPage.setCurrent(current);
         equipmentBayonetPage.setSize(size);
-        response.setContentType("application/vnd.ms-excel");
-        response.setCharacterEncoding("utf-8");
-        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
-                        .page(equipmentBayonetPage, new LambdaQueryWrapper<EquipmentBayonet>()
-                                .like(StringUtils.isNotBlank(bayonetName), EquipmentBayonet::getBayonetName, bayonetName))
-                        .getRecords()
-                        .stream()
-                        .map(item -> {
-                            EquipmentBayonetVO equipmentBayonetVO = new EquipmentBayonetVO();
-                            BeanUtils.copyProperties(item, equipmentBayonetVO);
-                            equipmentBayonetVO.setFrontEndType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getFrontEndType())).getName());
-                            equipmentBayonetVO.setInOutCityType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getInOutCityType())).getName());
-                            return equipmentBayonetVO;
-                        }).collect(Collectors.toList()));
+        EasyExcelUtils.export(response,"鏁版嵁",EquipmentBayonetVO.class,iEquipmentBayonetService
+                .page(equipmentBayonetPage, new LambdaQueryWrapper<EquipmentBayonet>()
+                        .like(StringUtils.isNotBlank(bayonetName), EquipmentBayonet::getBayonetName, bayonetName))
+                .getRecords()
+                .stream()
+                .map(item -> {
+                    EquipmentBayonetVO equipmentBayonetVO = new EquipmentBayonetVO();
+                    BeanUtils.copyProperties(item, equipmentBayonetVO);
+                    equipmentBayonetVO.setFrontEndType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getFrontEndType())).getName());
+                    equipmentBayonetVO.setInOutCityType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getInOutCityType())).getName());
+                    return equipmentBayonetVO;
+                }).collect(Collectors.toList()));
     }
-
-}
+}
\ No newline at end of file

--
Gitblit v1.8.0