From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index f242d8c..813fc97 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -3,6 +3,7 @@
import cn.hutool.core.util.IdUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.ruoyi.common.convert.ExcelBigNumberConvert;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUtils;
@@ -11,14 +12,12 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
import java.util.List;
/**
* Excel鐩稿叧澶勭悊
*
- * @author ruoyi
+ * @author Lion Li
*/
public class ExcelUtil {
@@ -29,7 +28,7 @@
* @return 杞崲鍚庨泦鍚�
*/
public static <T> List<T> importExcel(InputStream is, Class<T> clazz) {
- return EasyExcel.read(is).autoCloseStream(false).sheet().doReadSync();
+ return EasyExcel.read(is).head(clazz).autoCloseStream(false).sheet().doReadSync();
}
/**
@@ -43,15 +42,15 @@
try {
String filename = encodingFilename(sheetName);
response.reset();
- response.addHeader("Access-Control-Allow-Origin", "*");
- response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
- FileUtils.setAttachmentResponseHeader(response, URLEncoder.encode(filename, StandardCharsets.UTF_8.toString()));
+ FileUtils.setAttachmentResponseHeader(response, filename);
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8");
ServletOutputStream os = response.getOutputStream();
EasyExcel.write(os, clazz)
.autoCloseStream(false)
// 鑷姩閫傞厤
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ // 澶ф暟鍊艰嚜鍔ㄨ浆鎹� 闃叉澶辩湡
+ .registerConverter(new ExcelBigNumberConvert())
.sheet(sheetName).doWrite(list);
} catch (IOException e) {
throw new RuntimeException("瀵煎嚭Excel寮傚父");
--
Gitblit v1.9.3