From 156471d638e76f9662c0318bd6ba16280413aaa2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 09 Mar 2026 15:12:11 +0800
Subject: [PATCH] 优化Excel自定义格式样式重复创建问题
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java | 101 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 72 insertions(+), 29 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 86fc612..9489351 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
@@ -80,6 +80,11 @@
public static final String[] FORMULA_STR = { "=", "-", "+", "@" };
/**
+ * 单元格样式缓存
+ */
+ private Map<String, CellStyle> cellStyleCache = new HashMap<String, CellStyle>();
+
+ /**
* Excel sheet最大行数，默认65536
*/
public static final int sheetSize = 65536;
@@ -147,12 +152,12 @@
/**
* 对象的子列表方法
*/
- private Method subMethod;
+ private Map<String, Method> subMethods;
/**
* 对象的子列表属性
*/
- private List<Field> subFields;
+ private Map<String, List<Field>> subFieldsMap;
/**
* 统计列表
@@ -225,7 +230,10 @@
int titleLastCol = this.fields.size() - 1;
if (isSubList())
{
- titleLastCol = titleLastCol + subFields.size() - 1;
+ for (List<Field> currentSubFields : subFieldsMap.values())
+ {
+ titleLastCol = titleLastCol + currentSubFields.size() - 1;
+ }
}
Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);
titleRow.setHeightInPoints(30);
@@ -245,16 +253,17 @@
{
Row subRow = sheet.createRow(rownum);
int column = 0;
- int subFieldSize = subFields != null ? subFields.size() : 0;
for (Object[] objects : fields)
{
Field field = (Field) objects[0];
Excel attr = (Excel) objects[1];
+ CellStyle cellStyle = styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor()));
if (Collection.class.isAssignableFrom(field.getType()))
{
Cell cell = subRow.createCell(column);
cell.setCellValue(attr.name());
- cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
+ cell.setCellStyle(cellStyle);
+ int subFieldSize = subFieldsMap != null ? subFieldsMap.get(field.getName()).size() : 0;
if (subFieldSize > 1)
{
CellRangeAddress cellAddress = new CellRangeAddress(rownum, rownum, column, column + subFieldSize - 1);
@@ -266,7 +275,7 @@
{
Cell cell = subRow.createCell(column++);
cell.setCellValue(attr.name());
- cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
+ cell.setCellStyle(cellStyle);
}
}
rownum++;
@@ -338,17 +347,17 @@
Map<String, Integer> cellMap = new HashMap<String, Integer>();
// 获取表头
Row heard = sheet.getRow(titleNum);
- for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
+ if (heard == null)
+ {
+ throw new UtilException("文件标题行为空，请检查Excel文件格式");
+ }
+ for (int i = 0; i < heard.getLastCellNum(); i++)
{
Cell cell = heard.getCell(i);
if (StringUtils.isNotNull(cell))
{
String value = this.getCellValue(heard, i).toString();
cellMap.put(value, i);
- }
- else
- {
- cellMap.put(null, i);
}
}
// 有数据时才处理 得到类的所有field.
@@ -562,7 +571,8 @@
Excel excel = (Excel) os[1];
if (Collection.class.isAssignableFrom(field.getType()))
{
- for (Field subField : subFields)
+ List<Field> currentSubFields = subFieldsMap.get(field.getName());
+ for (Field subField : currentSubFields)
{
Excel subExcel = subField.getAnnotation(Excel.class);
this.createHeadCell(subExcel, row, column++);
@@ -575,7 +585,7 @@
}
if (Type.EXPORT.equals(type))
{
- fillExcelData(index, row);
+ fillExcelData(index);
addStatisticsRow();
}
}
@@ -585,10 +595,9 @@
* 填充excel数据
*
* @param index 序号
- * @param row 单元格行
*/
@SuppressWarnings("unchecked")
- public void fillExcelData(int index, Row row)
+ public void fillExcelData(int index)
{
int startNo = index * sheetSize;
int endNo = Math.min(startNo + sheetSize, list.size());
@@ -596,7 +605,7 @@
for (int i = startNo; i < endNo; i++)
{
- row = sheet.createRow(currentRowNum);
+ Row row = sheet.createRow(currentRowNum);
T vo = (T) list.get(i);
int column = 0;
int maxSubListSize = getCurrentMaxSubListSize(vo);
@@ -609,6 +618,7 @@
try
{
Collection<?> subList = (Collection<?>) getTargetValue(vo, field, excel);
+ List<Field> currentSubFields = subFieldsMap.get(field.getName());
if (subList != null && !subList.isEmpty())
{
int subIndex = 0;
@@ -621,15 +631,15 @@
}
int subColumn = column;
- for (Field subField : subFields)
+ for (Field subField : currentSubFields)
{
Excel subExcel = subField.getAnnotation(Excel.class);
addCell(subExcel, subRow, (T) subVo, subField, subColumn++);
}
subIndex++;
}
- column += subFields.size();
}
+ column += currentSubFields.size();
}
catch (Exception e)
{
@@ -982,7 +992,7 @@
{
// 创建cell
cell = row.createCell(column);
- if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())
+ if (isSubListValue(vo) && getListCellValue(vo) > 1 && attr.needMerge())
{
if (subMergedLastRowNum >= subMergedFirstRowNum)
{
@@ -998,7 +1008,7 @@
String separator = attr.separator();
if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
{
- cell.getCellStyle().setDataFormat(this.wb.getCreationHelper().createDataFormat().getFormat(dateFormat));
+ cell.setCellStyle(createCellStyle(cell.getCellStyle(), dateFormat));
cell.setCellValue(parseDateToStr(dateFormat, value));
}
else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
@@ -1026,6 +1036,28 @@
log.error("导出Excel失败{}", e);
}
return cell;
+ }
+
+ /**
+ * 使用自定义格式，同时避免样式污染
+ *
+ * @param cellStyle 从此样式复制
+ * @param format 格式匹配的字符串
+ * @return 格式化后CellStyle对象
+ */
+ private CellStyle createCellStyle(CellStyle cellStyle, String format)
+ {
+ String key = cellStyle.getIndex() + "|" + format;
+ CellStyle cached = cellStyleCache.get(key);
+ if (cached != null)
+ {
+ return cached;
+ }
+ CellStyle style = wb.createCellStyle();
+ style.cloneStyleFrom(cellStyle);
+ style.setDataFormat(wb.getCreationHelper().createDataFormat().getFormat(format));
+ cellStyleCache.put(key, style);
+ return style;
}
/**
@@ -1346,6 +1378,8 @@
{
List<Object[]> fields = new ArrayList<Object[]>();
List<Field> tempFields = new ArrayList<>();
+ subFieldsMap = new HashMap<>();
+ subMethods = new HashMap<>();
tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
if (StringUtils.isNotEmpty(includeFields))
@@ -1393,10 +1427,11 @@
}
if (Collection.class.isAssignableFrom(field.getType()))
{
- subMethod = getSubMethod(field.getName(), clazz);
+ String fieldName = field.getName();
+ subMethods.put(fieldName, getSubMethod(fieldName, clazz));
ParameterizedType pt = (ParameterizedType) field.getGenericType();
Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];
- this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);
+ subFieldsMap.put(fieldName, FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class));
}
}
@@ -1591,7 +1626,7 @@
*/
public boolean isSubList()
{
- return StringUtils.isNotNull(subFields) && subFields.size() > 0;
+ return !StringUtils.isEmpty(subFieldsMap);
}
/**
@@ -1599,24 +1634,32 @@
*/
public boolean isSubListValue(T vo)
{
- return StringUtils.isNotNull(subFields) && subFields.size() > 0 && StringUtils.isNotNull(getListCellValue(vo)) && getListCellValue(vo).size() > 0;
+ return !StringUtils.isEmpty(subFieldsMap) && getListCellValue(vo) > 0;
}
/**
* 获取集合的值
*/
- public Collection<?> getListCellValue(Object obj)
+ public int getListCellValue(Object obj)
{
- Object value;
+ Collection<?> value;
+ int max = 0;
try
{
- value = subMethod.invoke(obj, new Object[] {});
+ for (String s : subMethods.keySet())
+ {
+ value = (Collection<?>) subMethods.get(s).invoke(obj);
+ if (value.size() > max)
+ {
+ max = value.size();
+ }
+ }
}
catch (Exception e)
{
- return new ArrayList<Object>();
+ return 0;
}
- return (Collection<?>) value;
+ return max;
}
/**
--
Gitblit v1.9.3