From 397971378357db417763bd388c25cdeeaed5d33c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 17 Apr 2026 14:47:43 +0800
Subject: [PATCH] 用户密码支持自定义配置规则
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
index 9489351..1320e8b 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
@@ -19,7 +19,7 @@
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.RegExUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
@@ -387,7 +387,7 @@
Object val = this.getCellValue(row, entry.getKey());
// 如果不存在实例则新建.
- entity = (entity == null ? clazz.newInstance() : entity);
+ entity = (entity == null ? clazz.getDeclaredConstructor().newInstance() : entity);
// 从map中得到对应列的field.
Field field = (Field) entry.getValue()[0];
Excel attr = (Excel) entry.getValue()[1];
@@ -500,6 +500,82 @@
response.setCharacterEncoding("utf-8");
this.init(list, sheetName, title, Type.EXPORT);
exportExcel(response);
+ }
+
+ /**
+ * 多 Sheet 导出 —— 将多个不同类型的数据集合写入同一 Excel，直接输出到 HttpServletResponse
+ *
+ * @param response HTTP 响应
+ * @param sheets Sheet 描述列表
+ */
+ public static void exportMultiSheet(HttpServletResponse response, List<ExcelSheet<?>> sheets)
+ {
+ if (sheets == null || sheets.isEmpty())
+ {
+ return;
+ }
+ SXSSFWorkbook wb = buildWorkbook(sheets);
+ try
+ {
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ wb.write(response.getOutputStream());
+ }
+ catch (Exception e)
+ {
+ log.error("多Sheet导出Excel异常{}", e.getMessage());
+ }
+ finally
+ {
+ IOUtils.closeQuietly(wb);
+ }
+ }
+
+ /**
+ * 构建多 Sheet Workbook —— 创建 SXSSFWorkbook 并将所有 Sheet 数据写入
+ *
+ * @param sheets Sheet 描述列表
+ * @return 已写入所有 Sheet 数据的 SXSSFWorkbook
+ */
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ private static SXSSFWorkbook buildWorkbook(List<ExcelSheet<?>> sheets)
+ {
+ SXSSFWorkbook wb = new SXSSFWorkbook(500);
+ for (ExcelSheet<?> excelSheet : sheets)
+ {
+ ExcelUtil util = new ExcelUtil(excelSheet.getClazz());
+ util.initWithWorkbook(wb, excelSheet.getList(), excelSheet.getSheetName(), excelSheet.getTitle());
+ util.writeSheet();
+ }
+ return wb;
+ }
+
+ /**
+ * 使用外部传入的 Workbook 初始化（多 Sheet 导出专用）
+ * 与 init() 的区别：不新建 Workbook，而是在已有 wb 上追加新 Sheet
+ *
+ * @param wb 已有工作簿
+ * @param list 数据集合
+ * @param sheetName Sheet 名称
+ * @param title 大标题（可为空）
+ */
+ public void initWithWorkbook(SXSSFWorkbook wb, List<T> list, String sheetName, String title)
+ {
+ if (list == null)
+ {
+ list = new ArrayList<T>();
+ }
+ this.list = list;
+ this.sheetName = sheetName;
+ this.title = title != null ? title : "";
+ this.type = Type.EXPORT;
+ this.rownum = 0;
+ this.wb = wb;
+ this.sheet = wb.createSheet(sheetName);
+ createExcelField();
+ this.styles = createStyles(wb);
+ createTitle();
+ createSubHead();
}
/**
@@ -980,6 +1056,7 @@
/**
* 添加单元格
*/
+ @SuppressWarnings("deprecation")
public Cell addCell(Excel attr, Row row, T vo, Field field, int column)
{
Cell cell = null;
@@ -1252,7 +1329,7 @@
{
try
{
- Object instance = excel.handler().newInstance();
+ Object instance = excel.handler().getDeclaredConstructor().newInstance();
Method formatMethod = excel.handler().getMethod("format", new Class[] { Object.class, String[].class, Cell.class, Workbook.class });
value = formatMethod.invoke(instance, value, excel.args(), cell, this.wb);
}
--
Gitblit v1.9.3