From 265eefc7607f8e9bc6aaa4ff40adf615141ab3cb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 22 八月 2024 10:47:39 +0800
Subject: [PATCH] 代码合并

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
index f60dca5..e0ee588 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -9,6 +9,7 @@
 import com.ruoyi.chargingPile.api.dto.ApplyChargingQuery;
 import com.ruoyi.chargingPile.api.dto.ApplyChargingRemarkDto;
 import com.ruoyi.chargingPile.api.model.TApplyChargingPile;
+import com.ruoyi.chargingPile.dto.TApplyChargingPileExportDto;
 import com.ruoyi.chargingPile.service.TApplyChargingPileService;
 import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.domain.R;
@@ -19,6 +20,7 @@
 import com.ruoyi.common.security.service.TokenService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.codec.CharEncoding;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -26,7 +28,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.net.URL;
 import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -96,13 +100,22 @@
         try {
             List<TApplyChargingPile> list = applyChargingPileService.lambdaQuery().list();
 
+            List<TApplyChargingPileExportDto> exportDtos =new ArrayList<>();
+            for (TApplyChargingPile tApplyChargingPile : list) {
+                TApplyChargingPileExportDto applyChargingPileExportDto = new TApplyChargingPileExportDto();
+                BeanUtils.copyProperties(tApplyChargingPile,applyChargingPileExportDto);
+                applyChargingPileExportDto.setImage(new URL("https://img-blog.csdnimg.cn/direct/c11088e1790049a5b84a0fda21a271b1.png"));
+                exportDtos.add(applyChargingPileExportDto);
+
+            }
+
             // excel模板封装
             ExcelWriterBuilder excelWriterBuilder = EasyExcelFactory.write(response.getOutputStream());
             InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream("template/" +"充电桩申请记录" + ".xlsx");
             // 自动释放资源
             try (ExcelWriter excelWriter = excelWriterBuilder.withTemplate(stream).build()) {
                 WriteSheet writeSheet = EasyExcelFactory.writerSheet().build();
-                excelWriter.fill(list, writeSheet);
+                excelWriter.fill(exportDtos, writeSheet);
                 excelWriter.finish();
             } catch (Exception e) {
                 return R.fail("excel导出失败!");

--
Gitblit v1.7.1