自动识别json对象白名单配置范围缩小

RuoYi

2025-08-09 2e009841cab2a22be9bea4833b197446da4643b7

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java

@@ -73,6 +73,8 @@
{

    private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);



    public static final String SEPARATOR = ",";



    public static final String FORMULA_REGEX_STR = "=|-|\\+|@";



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

@@ -158,11 +160,6 @@
    private Map<Integer, Double> statistics = new HashMap<Integer, Double>();



    /**

     * 数字格式

     */

    private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00");



    /**

     * 实体对象

     */

    public Class<T> clazz;

@@ -225,8 +222,6 @@
    {

        if (StringUtils.isNotEmpty(title))

        {

            subMergedFirstRowNum++;

            subMergedLastRowNum++;

            int titleLastCol = this.fields.size() - 1;

            if (isSubList())

            {

@@ -237,7 +232,7 @@
            Cell titleCell = titleRow.createCell(0);

            titleCell.setCellStyle(styles.get("title"));

            titleCell.setCellValue(title);

            sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), titleRow.getRowNum(), titleLastCol));

            sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), 0, titleLastCol));

        }

    }



@@ -248,23 +243,31 @@
    {

        if (isSubList())

        {

            subMergedFirstRowNum++;

            subMergedLastRowNum++;

            Row subRow = sheet.createRow(rownum);

            int excelNum = 0;

            int column = 0;

            int subFieldSize = subFields != null ? subFields.size() : 0;

            for (Object[] objects : fields)

            {

                Field field = (Field) objects[0];

                Excel attr = (Excel) objects[1];

                Cell headCell1 = subRow.createCell(excelNum);

                headCell1.setCellValue(attr.name());

                headCell1.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));

                excelNum++;

            }

            int headFirstRow = excelNum - 1;

            int headLastRow = headFirstRow + subFields.size() - 1;

            if (headLastRow > headFirstRow)

            {

                sheet.addMergedRegion(new CellRangeAddress(rownum, rownum, headFirstRow, headLastRow));

                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())));

                    if (subFieldSize > 1)

                    {

                        CellRangeAddress cellAddress = new CellRangeAddress(rownum, rownum, column, column + subFieldSize - 1);

                        sheet.addMergedRegion(cellAddress);

                    }

                    column += subFieldSize;

                }

                else

                {

                    Cell cell = subRow.createCell(column++);

                    cell.setCellValue(attr.name());

                    cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));

                }

            }

            rownum++;

        }

@@ -278,10 +281,22 @@
     */

    public List<T> importExcel(InputStream is)

    {

        return importExcel(is, 0);

    }



    /**

     * 对excel表单默认第一个索引名转换成list

     * 
     * @param is 输入流

     * @param titleNum 标题占用行数

     * @return 转换后集合

     */

    public List<T> importExcel(InputStream is, int titleNum)

    {

        List<T> list = null;

        try

        {

            list = importExcel(is, 0);

            list = importExcel(StringUtils.EMPTY, is, titleNum);

        }

        catch (Exception e)

        {

@@ -293,18 +308,6 @@
            IOUtils.closeQuietly(is);

        }

        return list;

    }



    /**

     * 对excel表单默认第一个索引名转换成list

     * 
     * @param is 输入流

     * @param titleNum 标题占用行数

     * @return 转换后集合

     */

    public List<T> importExcel(InputStream is, int titleNum) throws Exception

    {

        return importExcel(StringUtils.EMPTY, is, titleNum);

    }



    /**

@@ -384,7 +387,7 @@
                    if (String.class == fieldType)

                    {

                        String s = Convert.toStr(val);

                        if (StringUtils.endsWith(s, ".0"))

                        if (s.matches("^\\d+\\.0$"))

                        {

                            val = StringUtils.substringBefore(s, ".0");

                        }

@@ -589,64 +592,91 @@
    {

        int startNo = index * sheetSize;

        int endNo = Math.min(startNo + sheetSize, list.size());

        int rowNo = (1 + rownum) - startNo;

        int currentRowNum = rownum + 1; // 从标题行后开始



        for (int i = startNo; i < endNo; i++)

        {

            rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo;

            row = sheet.createRow(rowNo);

            // 得到导出对象.

            row = sheet.createRow(currentRowNum);

            T vo = (T) list.get(i);

            Collection<?> subList = null;

            if (isSubList())

            {

                if (isSubListValue(vo))

                {

                    subList = getListCellValue(vo);

                    subMergedLastRowNum = subMergedLastRowNum + subList.size();

                }

                else

                {

                    subMergedFirstRowNum++;

                    subMergedLastRowNum++;

                }

            }

            int column = 0;

            int maxSubListSize = getCurrentMaxSubListSize(vo);

            for (Object[] os : fields)

            {

                Field field = (Field) os[0];

                Excel excel = (Excel) os[1];

                if (Collection.class.isAssignableFrom(field.getType()) && StringUtils.isNotNull(subList))

                if (Collection.class.isAssignableFrom(field.getType()))

                {

                    boolean subFirst = false;

                    for (Object obj : subList)

                    try

                    {

                        if (subFirst)

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

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

                        {

                            rowNo++;

                            row = sheet.createRow(rowNo);

                        }

                        List<Field> subFields = FieldUtils.getFieldsListWithAnnotation(obj.getClass(), Excel.class);

                        int subIndex = 0;

                        for (Field subField : subFields)

                        {

                            if (subField.isAnnotationPresent(Excel.class))

                            int subIndex = 0;

                            for (Object subVo : subList)

                            {

                                subField.setAccessible(true);

                                Excel attr = subField.getAnnotation(Excel.class);

                                this.addCell(attr, row, (T) obj, subField, column + subIndex);

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

                                if (subRow == null)

                                {

                                    subRow = sheet.createRow(currentRowNum + subIndex);

                                }



                                int subColumn = column;

                                for (Field subField : subFields)

                                {

                                    Excel subExcel = subField.getAnnotation(Excel.class);

                                    addCell(subExcel, subRow, (T) subVo, subField, subColumn++);

                                }

                                subIndex++;

                            }

                            subIndex++;

                            column += subFields.size();

                        }

                        subFirst = true;

                    }

                    this.subMergedFirstRowNum = this.subMergedFirstRowNum + subList.size();

                    catch (Exception e)

                    {

                        log.error("填充集合数据失败", e);

                    }

                }

                else

                {

                    this.addCell(excel, row, vo, field, column++);

                    // 创建单元格并设置值

                    addCell(excel, row, vo, field, column);

                    if (maxSubListSize > 1 && excel.needMerge())

                    {

                        sheet.addMergedRegion(new CellRangeAddress(currentRowNum, currentRowNum + maxSubListSize - 1, column, column));

                    }

                    column++;

                }

            }

            currentRowNum += maxSubListSize;

        }

    }



    /**

     * 获取子列表最大数

     */

    private int getCurrentMaxSubListSize(T vo)

    {

        int maxSubListSize = 1;

        for (Object[] os : fields)

        {

            Field field = (Field) os[0];

            if (Collection.class.isAssignableFrom(field.getType()))

            {

                try

                {

                    Collection<?> subList = (Collection<?>) getTargetValue(vo, field, (Excel) os[1]);

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

                    {

                        maxSubListSize = Math.max(maxSubListSize, subList.size());

                    }

                }

                catch (Exception e)

                {

                    log.error("获取集合大小失败", e);

                }

            }

        }

        return maxSubListSize;

    }



    /**

@@ -691,6 +721,7 @@
        style = wb.createCellStyle();

        style.setAlignment(HorizontalAlignment.CENTER);

        style.setVerticalAlignment(VerticalAlignment.CENTER);

        style.setDataFormat(dataFormat.getFormat("######0.00"));

        Font totalFont = wb.createFont();

        totalFont.setFontName("Arial");

        totalFont.setFontHeightInPoints((short) 10);

@@ -781,7 +812,7 @@
     */

    public void annotationDataStyles(Map<String, CellStyle> styles, Field field, Excel excel)

    {

        String key = StringUtils.format("data_{}_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor(), excel.cellType());

        String key = StringUtils.format("data_{}_{}_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor(), excel.cellType(), excel.wrapText());

        if (!styles.containsKey(key))

        {

            CellStyle style = wb.createCellStyle();

@@ -797,6 +828,7 @@
            style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());

            style.setFillPattern(FillPatternType.SOLID_FOREGROUND);

            style.setFillForegroundColor(excel.backgroundColor().getIndex());

            style.setWrapText(excel.wrapText());

            Font dataFont = wb.createFont();

            dataFont.setFontName("Arial");

            dataFont.setFontHeightInPoints((short) 10);

@@ -825,7 +857,7 @@
        if (isSubList())

        {

            // 填充默认样式，防止合并单元格样式失效

            sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType())));

            sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType(), attr.wrapText())));

            if (attr.needMerge())

            {

                sheet.addMergedRegion(new CellRangeAddress(rownum - 1, rownum, column, column));

@@ -952,10 +984,12 @@
                cell = row.createCell(column);

                if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())

                {

                    CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column);

                    sheet.addMergedRegion(cellAddress);

                    if (subMergedLastRowNum >= subMergedFirstRowNum)

                    {

                        sheet.addMergedRegion(new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column));

                    }

                }

                cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType())));

                cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType(), attr.wrapText())));



                // 用于读取对象中的属性

                Object value = getTargetValue(vo, field, attr);

@@ -964,6 +998,7 @@
                String separator = attr.separator();

                if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))

                {

                    cell.getCellStyle().setDataFormat(this.wb.getCreationHelper().createDataFormat().getFormat(dateFormat));

                    cell.setCellValue(parseDateToStr(dateFormat, value));

                }

                else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))

@@ -1093,7 +1128,7 @@
    public static String convertByExp(String propertyValue, String converterExp, String separator)

    {

        StringBuilder propertyString = new StringBuilder();

        String[] convertSource = converterExp.split(",");

        String[] convertSource = converterExp.split(SEPARATOR);

        for (String item : convertSource)

        {

            String[] itemArray = item.split("=");

@@ -1130,7 +1165,7 @@
    public static String reverseByExp(String propertyValue, String converterExp, String separator)

    {

        StringBuilder propertyString = new StringBuilder();

        String[] convertSource = converterExp.split(",");

        String[] convertSource = converterExp.split(SEPARATOR);

        for (String item : convertSource)

        {

            String[] itemArray = item.split("=");

@@ -1218,7 +1253,7 @@
            {

                cell = row.createCell(key);

                cell.setCellStyle(styles.get("total"));

                cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));

                cell.setCellValue(statistics.get(key));

            }

            statistics.clear();

        }

@@ -1235,6 +1270,7 @@
     */

    private Object getTargetValue(T vo, Field field, Excel excel) throws Exception

    {

        field.setAccessible(true);

        Object o = field.get(vo);

        if (StringUtils.isNotEmpty(excel.targetAttr()))

        {

@@ -1335,7 +1371,6 @@
            Excel attr = field.getAnnotation(Excel.class);

            if (attr != null && (attr.type() == Type.ALL || attr.type() == type))

            {

                field.setAccessible(true);

                fields.add(new Object[] { field, attr });

            }

            if (Collection.class.isAssignableFrom(field.getType()))

@@ -1359,7 +1394,6 @@
                    if (ArrayUtils.contains(this.includeFields, field.getName() + "." + attr.targetAttr())

                            && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))

                    {

                        field.setAccessible(true);

                        fields.add(new Object[] { field, attr });

                    }

                }

@@ -1368,7 +1402,6 @@
                    if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr())

                            && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))

                    {

                        field.setAccessible(true);

                        fields.add(new Object[] { field, attr });

                    }

                }