项目升级到 Spring Boot 4

RuoYi

2026-03-11 33694fe08298e0b2ba5bbafbdc3a23570cc391cf

 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;

@@ -78,6 +78,11 @@
    public static final String FORMULA_REGEX_STR = "=|-|\\+|@";



    public static final String[] FORMULA_STR = { "=", "-", "+", "@" };



    /**

     * 单元格样式缓存

     */

    private Map<String, CellStyle> cellStyleCache = new HashMap<String, CellStyle>();



    /**

     * Excel sheet最大行数，默认65536

@@ -147,12 +152,12 @@
    /**

     * 对象的子列表方法

     */

    private Map<String, Method> subMethods = new HashMap<>();

    private Map<String, Method> subMethods;



    /**

     * 对象的子列表属性

     */

    private Map<String, List<Field>> subFieldsMap = new HashMap<>();

    private Map<String, List<Field>> subFieldsMap;



    /**

     * 统计列表

@@ -225,7 +230,10 @@
            int titleLastCol = this.fields.size() - 1;

            if (isSubList())

            {

                titleLastCol = titleLastCol + subFieldsMap.values().size() - 1;

                for (List<Field> currentSubFields : subFieldsMap.values())

                {

                    titleLastCol = titleLastCol + currentSubFields.size() - 1;

                }

            }

            Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);

            titleRow.setHeightInPoints(30);

@@ -379,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];

@@ -587,7 +595,6 @@
     * 填充excel数据

     * 

     * @param index 序号

     * @param row 单元格行

     */

    @SuppressWarnings("unchecked")

    public void fillExcelData(int index)

@@ -611,10 +618,10 @@
                    try

                    {

                        Collection<?> subList = (Collection<?>) getTargetValue(vo, field, excel);

                        List<Field> currentSubFields = subFieldsMap.get(field.getName());

                        if (subList != null && !subList.isEmpty())

                        {

                            int subIndex = 0;

                            List<Field> currentSubFields = subFieldsMap.get(field.getName());

                            for (Object subVo : subList)

                            {

                                Row subRow = sheet.getRow(currentRowNum + subIndex);

@@ -631,8 +638,8 @@
                                }

                                subIndex++;

                            }

                            column += currentSubFields.size();

                        }

                        column += currentSubFields.size();

                    }

                    catch (Exception e)

                    {

@@ -973,6 +980,7 @@
    /**

     * 添加单元格

     */

    @SuppressWarnings("deprecation")

    public Cell addCell(Excel attr, Row row, T vo, Field field, int column)

    {

        Cell cell = null;

@@ -1001,7 +1009,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))

@@ -1029,6 +1037,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;

    }



    /**

@@ -1223,7 +1253,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);

        }

@@ -1349,6 +1379,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))