From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题(不含物料颜色字段)
---
yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
index f4f17ec..fc9995e 100644
--- a/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
+++ b/yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/util/ExcelUtils.java
@@ -1,9 +1,11 @@
package cn.iocoder.yudao.framework.excel.core.util;
+import cn.idev.excel.ExcelWriter;
import cn.idev.excel.FastExcelFactory;
import cn.idev.excel.converters.longconverter.LongStringConverter;
import cn.iocoder.yudao.framework.common.util.http.HttpUtils;
import cn.iocoder.yudao.framework.excel.core.handler.ColumnWidthMatchStyleStrategy;
+import cn.iocoder.yudao.framework.excel.core.handler.DateAsTextCellWriteHandler;
import cn.iocoder.yudao.framework.excel.core.handler.SelectSheetWriteHandler;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.multipart.MultipartFile;
@@ -15,7 +17,7 @@
/**
* Excel 宸ュ叿绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
*/
public class ExcelUtils {
@@ -33,17 +35,53 @@
public static <T> void write(HttpServletResponse response, String filename, String sheetName,
Class<T> head, List<T> data) throws IOException {
// 杈撳嚭 Excel
- FastExcelFactory.write(response.getOutputStream(), head)
+ ExcelWriter excelWriter = FastExcelFactory.write(response.getOutputStream(), head)
.autoCloseStream(false) // 涓嶈鑷姩鍏抽棴锛屼氦缁� Servlet 鑷繁澶勭悊
.registerWriteHandler(new ColumnWidthMatchStyleStrategy()) // 鍩轰簬 column 闀垮害锛岃嚜鍔ㄩ�傞厤銆傛渶澶� 255 瀹藉害
.registerWriteHandler(new SelectSheetWriteHandler(head)) // 鍩轰簬鍥哄畾 sheet 瀹炵幇涓嬫媺妗�
.registerConverter(new LongStringConverter()) // 閬垮厤 Long 绫诲瀷涓㈠け绮惧害
- .sheet(sheetName).doWrite(data);
+ .build();
+ try {
+ excelWriter.write(data, FastExcelFactory.writerSheet(sheetName).build());
+ } finally {
+ // finish() 灏� workbook 鍐欏叆鍒� response 杈撳嚭娴�
+ excelWriter.finish();
+ // close() 瑙﹀彂 dispose() 娓呯悊涓存椂鏂囦欢锛�
+ // POI SXSSFWorkbook.dispose() 鍙兘杈撳嚭 WARN "Failed to dispose sheet"锛�
+ // 杩欐槸 POI 宸茬煡闂锛堜复鏃舵枃浠舵竻鐞嗘椂 BufferedWriter 宸插叧闂級锛屼笉褰卞搷瀵煎嚭缁撴灉
+ excelWriter.close();
+ }
// 璁剧疆 header 鍜� contentType銆傚啓鍦ㄦ渶鍚庣殑鍘熷洜鏄紝閬垮厤鎶ラ敊鏃讹紝鍝嶅簲 contentType 宸茬粡琚慨鏀逛簡
response.addHeader("Content-Disposition", "attachment;filename=" + HttpUtils.encodeUtf8(filename));
response.setContentType("application/vnd.ms-excel;charset=UTF-8");
}
+ /**
+ * 杈撳嚭 Excel 妯℃澘锛堟棩鏈熸寜鏂囨湰娓叉煋锛�
+ *
+ * <p>涓� {@link #write} 鐨勫尯鍒細棰濆娉ㄥ唽浜� {@link DateAsTextCellWriteHandler}锛�
+ * 鎶� LocalDate / LocalDateTime 鍐欐垚 yyyy-MM-dd 鏂囨湰锛岃�屼笉鏄� Excel 鏃ユ湡搴忓垪鍙枫��
+ * 浠呯敤浜庛�屼笅杞藉鍏ユā鏉裤�嶏紝瀵煎叆瑙f瀽浠嶈蛋 {@link #read}锛屼笉鍙楀奖鍝嶃��</p>
+ */
+ public static <T> void writeTemplate(HttpServletResponse response, String filename, String sheetName,
+ Class<T> head, List<T> data) throws IOException {
+ ExcelWriter excelWriter = FastExcelFactory.write(response.getOutputStream(), head)
+ .autoCloseStream(false)
+ .registerWriteHandler(new ColumnWidthMatchStyleStrategy())
+ .registerWriteHandler(new SelectSheetWriteHandler(head))
+ .registerWriteHandler(new DateAsTextCellWriteHandler())
+ .registerConverter(new LongStringConverter())
+ .build();
+ try {
+ excelWriter.write(data, FastExcelFactory.writerSheet(sheetName).build());
+ } finally {
+ excelWriter.finish();
+ excelWriter.close();
+ }
+ response.addHeader("Content-Disposition", "attachment;filename=" + HttpUtils.encodeUtf8(filename));
+ response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+ }
+
public static <T> List<T> read(MultipartFile file, Class<T> head) throws IOException {
// 鍙傝�� https://t.zsxq.com/zM77F 甯栧瓙锛屽鍔� try 澶勭悊锛屽吋瀹� windows 鍦烘櫙
try (InputStream inputStream = file.getInputStream()) {
--
Gitblit v1.9.3