Excel导入导出支持多图片

RuoYi

2025-04-25 79c4711f638585951c4fc4cdfd689736bebb7ddf

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

@@ -39,6 +39,7 @@
import org.apache.poi.ss.usermodel.CellStyle;

import org.apache.poi.ss.usermodel.CellType;

import org.apache.poi.ss.usermodel.ClientAnchor;

import org.apache.poi.ss.usermodel.DataFormat;

import org.apache.poi.ss.usermodel.DataValidation;

import org.apache.poi.ss.usermodel.DataValidationConstraint;

import org.apache.poi.ss.usermodel.DataValidationHelper;

@@ -94,9 +95,16 @@
{

    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 = { "=", "-", "+", "@" };



    /**

     * 用于dictType属性数据存储，避免重复查缓存

     */

    public Map<String, String> sysDictMap = new HashMap<String, String>();



    /**

     * Excel sheet最大行数，默认65536

@@ -189,6 +197,11 @@
    public Class<T> clazz;



    /**

     * 需要显示列属性

     */

    public String[] includeFields;



    /**

     * 需要排除列属性

     */

    public String[] excludeFields;

@@ -199,10 +212,19 @@
    }



    /**

     * 仅在Excel中显示列属性

     *

     * @param fields 列属性名 示例[单个"name"/多个"id","name"]

     */

    public void showColumn(String... fields)

    {

        this.includeFields = fields;

    }



    /**

     * 隐藏Excel中列属性

     *

     * @param fields 列属性名 示例[单个"name"/多个"id","name"]

     * @throws Exception

     */

    public void hideColumn(String... fields)

    {

@@ -232,8 +254,6 @@
    {

        if (StringUtils.isNotEmpty(title))

        {

            subMergedFirstRowNum++;

            subMergedLastRowNum++;

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

            if (isSubList())

            {

@@ -244,7 +264,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));

        }

    }



@@ -255,23 +275,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++;

        }

@@ -283,7 +311,7 @@
     * @param is 输入流

     * @return 转换后集合

     */

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

    public List<T> importExcel(InputStream is)

    {

        return importExcel(is, 0);

    }

@@ -295,9 +323,23 @@
     * @param titleNum 标题占用行数

     * @return 转换后集合

     */

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

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

    {

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

        List<T> list = null;

        try

        {

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

        }

        catch (Exception e)

        {

            log.error("导入Excel异常{}", e.getMessage());

            throw new UtilException(e.getMessage());

        }

        finally

        {

            IOUtils.closeQuietly(is);

        }

        return list;

    }



    /**

@@ -320,7 +362,7 @@
            throw new IOException("文件sheet不存在");

        }

        boolean isXSSFWorkbook = !(wb instanceof HSSFWorkbook);

        Map<String, PictureData> pictures;

        Map<String, List<PictureData>> pictures = null;

        if (isXSSFWorkbook)

        {

            pictures = getSheetPictures07((XSSFSheet) sheet, (XSSFWorkbook) wb);

@@ -331,7 +373,6 @@
        }

        // 获取最后一个非空行的行下标，比如总行数为n，则返回的为n-1

        int rows = sheet.getLastRowNum();



        if (rows > 0)

        {

            // 定义一个map用于存放excel列的序号和field.

@@ -446,30 +487,34 @@
                        {

                            propertyName = field.getName() + "." + attr.targetAttr();

                        }

                        else if (StringUtils.isNotEmpty(attr.readConverterExp()))

                        if (StringUtils.isNotEmpty(attr.readConverterExp()))

                        {

                            val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());

                        }

                        else if (StringUtils.isNotEmpty(attr.dictType()))

                        {

                            val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator());

                            if (!sysDictMap.containsKey(attr.dictType() + val))

                            {

                                String dictValue = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator());

                                sysDictMap.put(attr.dictType() + val, dictValue);

                            }

                            val = sysDictMap.get(attr.dictType() + val);

                        }

                        else if (!attr.handler().equals(ExcelHandlerAdapter.class))

                        {

                            val = dataFormatHandlerAdapter(val, attr);

                            val = dataFormatHandlerAdapter(val, attr, null);

                        }

                        else if (ColumnType.IMAGE == attr.cellType() && StringUtils.isNotEmpty(pictures))

                        {

                            PictureData image = pictures.get(row.getRowNum() + "_" + entry.getKey());

                            if (image == null)

                            StringBuilder propertyString = new StringBuilder();

                            List<PictureData> images = pictures.get(row.getRowNum() + "_" + entry.getKey());

                            for (PictureData picture : images)

                            {

                                val = "";

                                byte[] data = picture.getData();

                                String fileName = FileUtils.writeImportBytes(data);

                                propertyString.append(fileName).append(SEPARATOR);

                            }

                            else

                            {

                                byte[] data = image.getData();

                                val = FileUtils.writeImportBytes(data);

                            }

                            val = StringUtils.stripEnd(propertyString.toString(), SEPARATOR);

                        }

                        ReflectUtils.invokeSetter(entity, propertyName, val);

                    }

@@ -687,64 +732,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;

    }



    /**

@@ -765,6 +837,8 @@
        titleFont.setFontHeightInPoints((short) 16);

        titleFont.setBold(true);

        style.setFont(titleFont);

        DataFormat dataFormat = wb.createDataFormat();

        style.setDataFormat(dataFormat.getFormat("@"));

        styles.put("title", style);



        style = wb.createCellStyle();

@@ -827,6 +901,9 @@
                headerFont.setBold(true);

                headerFont.setColor(excel.headerColor().index);

                style.setFont(headerFont);

                // 设置表格头单元格文本形式

                DataFormat dataFormat = wb.createDataFormat();

                style.setDataFormat(dataFormat.getFormat("@"));

                headerStyles.put(key, style);

            }

        }

@@ -844,32 +921,65 @@
        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();

        for (Object[] os : fields)

        {

            Field field = (Field) os[0];

            Excel excel = (Excel) os[1];

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

            if (!styles.containsKey(key))

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

            {

                CellStyle style = wb.createCellStyle();

                style.setAlignment(excel.align());

                style.setVerticalAlignment(VerticalAlignment.CENTER);

                style.setBorderRight(BorderStyle.THIN);

                style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());

                style.setBorderLeft(BorderStyle.THIN);

                style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());

                style.setBorderTop(BorderStyle.THIN);

                style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());

                style.setBorderBottom(BorderStyle.THIN);

                style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());

                style.setFillPattern(FillPatternType.SOLID_FOREGROUND);

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

                Font dataFont = wb.createFont();

                dataFont.setFontName("Arial");

                dataFont.setFontHeightInPoints((short) 10);

                dataFont.setColor(excel.color().index);

                style.setFont(dataFont);

                styles.put(key, style);

                ParameterizedType pt = (ParameterizedType) field.getGenericType();

                Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];

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

                for (Field subField : subFields)

                {

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

                    annotationDataStyles(styles, subField, subExcel);

                }

            }

            else

            {

                annotationDataStyles(styles, field, excel);

            }

        }

        return styles;

    }



    /**

     * 根据Excel注解创建表格列样式

     * 
     * @param styles 自定义样式列表

     * @param field  属性列信息

     * @param excel  注解信息

     */

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

    {

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

        if (!styles.containsKey(key))

        {

            CellStyle style = wb.createCellStyle();

            style.setAlignment(excel.align());

            style.setVerticalAlignment(VerticalAlignment.CENTER);

            style.setBorderRight(BorderStyle.THIN);

            style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());

            style.setBorderLeft(BorderStyle.THIN);

            style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());

            style.setBorderTop(BorderStyle.THIN);

            style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());

            style.setBorderBottom(BorderStyle.THIN);

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

            dataFont.setColor(excel.color().index);

            style.setFont(dataFont);

            if (ColumnType.TEXT == excel.cellType())

            {

                DataFormat dataFormat = wb.createDataFormat();

                style.setDataFormat(dataFormat.getFormat("@"));

            }

            styles.put(key, style);

        }

    }



    /**

@@ -886,7 +996,7 @@
        if (isSubList())

        {

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

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

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

@@ -904,7 +1014,7 @@
     */

    public void setCellVo(Object value, Excel attr, Cell cell)

    {

        if (ColumnType.STRING == attr.cellType())

        if (ColumnType.STRING == attr.cellType() || ColumnType.TEXT == attr.cellType())

        {

            String cellValue = Convert.toStr(value);

            // 对于任何以表达式触发字符 =-+@开头的单元格，直接使用tab字符作为前缀，防止CSV注入。

@@ -928,12 +1038,15 @@
        else if (ColumnType.IMAGE == attr.cellType())

        {

            ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1), cell.getRow().getRowNum() + 1);

            String imagePath = Convert.toStr(value);

            if (StringUtils.isNotEmpty(imagePath))

            String propertyValue = Convert.toStr(value);

            if (StringUtils.isNotEmpty(propertyValue))

            {

                byte[] data = ImageUtils.getImage(imagePath);

                getDrawingPatriarch(cell.getSheet()).createPicture(anchor,

                        cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));

                List<String> imagePaths = StringUtils.str2List(propertyValue, SEPARATOR);

                for (String imagePath : imagePaths)

                {

                    byte[] data = ImageUtils.getImage(imagePath);

                    getDrawingPatriarch(cell.getSheet()).createPicture(anchor, cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));

                }

            }

        }

    }

@@ -981,17 +1094,28 @@
            // 设置列宽

            sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));

        }

        if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0)

        if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0 || attr.comboReadDict())

        {

            if (attr.combo().length > 15 || StringUtils.join(attr.combo()).length() > 255)

            String[] comboArray = attr.combo();

            if (attr.comboReadDict())

            {

                if (!sysDictMap.containsKey("combo_" + attr.dictType()))

                {

                    String labels = DictUtils.getDictLabels(attr.dictType());

                    sysDictMap.put("combo_" + attr.dictType(), labels);

                }

                String val = sysDictMap.get("combo_" + attr.dictType());

                comboArray = StringUtils.split(val, DictUtils.SEPARATOR);

            }

            if (comboArray.length > 15 || StringUtils.join(comboArray).length() > 255)

            {

                // 如果下拉数大于15或字符串长度大于255，则使用一个新sheet存储，避免生成的模板下拉值获取不到

                setXSSFValidationWithHidden(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);

                setXSSFValidationWithHidden(sheet, comboArray, attr.prompt(), 1, 100, column, column);

            }

            else

            {

                // 提示信息或只能选择不能输入的列内容.

                setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);

                setPromptOrValidation(sheet, comboArray, attr.prompt(), 1, 100, column, column);

            }

        }

    }

@@ -1013,10 +1137,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())));

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



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

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

@@ -1026,6 +1152,7 @@
                String dictType = attr.dictType();

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

@@ -1034,7 +1161,12 @@
                }

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

                {

                    cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator));

                    if (!sysDictMap.containsKey(dictType + value))

                    {

                        String lable = convertDictByExp(Convert.toStr(value), dictType, separator);

                        sysDictMap.put(dictType + value, lable);

                    }

                    cell.setCellValue(sysDictMap.get(dictType + value));

                }

                else if (value instanceof BigDecimal && -1 != attr.scale())

                {

@@ -1042,7 +1174,7 @@
                }

                else if (!attr.handler().equals(ExcelHandlerAdapter.class))

                {

                    cell.setCellValue(dataFormatHandlerAdapter(value, attr));

                    cell.setCellValue(dataFormatHandlerAdapter(value, attr, cell));

                }

                else

                {

@@ -1159,7 +1291,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("=");

@@ -1196,7 +1328,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("=");

@@ -1255,13 +1387,13 @@
     * @param excel 数据注解

     * @return

     */

    public String dataFormatHandlerAdapter(Object value, Excel excel)

    public String dataFormatHandlerAdapter(Object value, Excel excel, Cell cell)

    {

        try

        {

            Object instance = excel.handler().newInstance();

            Method formatMethod = excel.handler().getMethod("format", new Class[] { Object.class, String[].class });

            value = formatMethod.invoke(instance, value, excel.args());

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

        }

        catch (Exception e)

        {

@@ -1321,8 +1453,7 @@
     */

    public String encodingFilename(String filename)

    {

        filename = UUID.randomUUID() + "_" + filename + ".xlsx";

        return filename;

        return UUID.randomUUID() + "_" + filename + ".xlsx";

    }



    /**

@@ -1352,6 +1483,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()))

        {

@@ -1411,45 +1543,83 @@
        List<Field> tempFields = new ArrayList<>();

        tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));

        tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));

        for (Field field : tempFields)

        if (StringUtils.isNotEmpty(includeFields))

        {

            if (!ArrayUtils.contains(this.excludeFields, field.getName()))

            for (Field field : tempFields)

            {

                // 单注解

                if (field.isAnnotationPresent(Excel.class))

                if (ArrayUtils.contains(this.includeFields, field.getName()) || field.isAnnotationPresent(Excels.class))

                {

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

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

                    addField(fields, field);

                }

            }

        }

        else if (StringUtils.isNotEmpty(excludeFields))

        {

            for (Field field : tempFields)

            {

                if (!ArrayUtils.contains(this.excludeFields, field.getName()))

                {

                    addField(fields, field);

                }

            }

        }

        else

        {

            for (Field field : tempFields)

            {

                addField(fields, field);

            }

        }

        return fields;

    }



    /**

     * 添加字段信息

     */

    public void addField(List<Object[]> fields, Field field)

    {

        // 单注解

        if (field.isAnnotationPresent(Excel.class))

        {

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

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

            {

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

            }

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

            {

                subMethod = getSubMethod(field.getName(), clazz);

                ParameterizedType pt = (ParameterizedType) field.getGenericType();

                Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];

                this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);

            }

        }



        // 多注解

        if (field.isAnnotationPresent(Excels.class))

        {

            Excels attrs = field.getAnnotation(Excels.class);

            Excel[] excels = attrs.value();

            for (Excel attr : excels)

            {

                if (StringUtils.isNotEmpty(includeFields))

                {

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

                    }

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

                    {

                        subMethod = getSubMethod(field.getName(), clazz);

                        ParameterizedType pt = (ParameterizedType) field.getGenericType();

                        Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];

                        this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);

                    }

                }



                // 多注解

                if (field.isAnnotationPresent(Excels.class))

                else

                {

                    Excels attrs = field.getAnnotation(Excels.class);

                    Excel[] excels = attrs.value();

                    for (Excel attr : excels)

                    if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr())

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

                    {

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

                        {

                            field.setAccessible(true);

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

                        }

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

                    }

                }

            }

        }

        return fields;

    }



    /**

@@ -1584,30 +1754,24 @@
     * @param workbook 工作簿对象

     * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData

     */

    public static Map<String, PictureData> getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook)

    public static Map<String, List<PictureData>> getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook)

    {

        Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();

        Map<String, List<PictureData>> sheetIndexPicMap = new HashMap<>();

        List<HSSFPictureData> pictures = workbook.getAllPictures();

        if (!pictures.isEmpty())

        if (!pictures.isEmpty() && sheet.getDrawingPatriarch() != null)

        {

            for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren())

            {

                HSSFClientAnchor anchor = (HSSFClientAnchor) shape.getAnchor();

                if (shape instanceof HSSFPicture)

                {

                    HSSFPicture pic = (HSSFPicture) shape;

                    int pictureIndex = pic.getPictureIndex() - 1;

                    HSSFPictureData picData = pictures.get(pictureIndex);

                    HSSFClientAnchor anchor = (HSSFClientAnchor) pic.getAnchor();

                    String picIndex = anchor.getRow1() + "_" + anchor.getCol1();

                    sheetIndexPicMap.put(picIndex, picData);

                    sheetIndexPicMap.computeIfAbsent(picIndex, k -> new ArrayList<>()).add(pic.getPictureData());

                }

            }

            return sheetIndexPicMap;

        }

        else

        {

            return sheetIndexPicMap;

        }

        return sheetIndexPicMap;

    }



    /**

@@ -1617,16 +1781,15 @@
     * @param workbook 工作簿对象

     * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData

     */

    public static Map<String, PictureData> getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook)

    public static Map<String, List<PictureData>> getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook)

    {

        Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();

        Map<String, List<PictureData>> sheetIndexPicMap = new HashMap<>();

        for (POIXMLDocumentPart dr : sheet.getRelations())

        {

            if (dr instanceof XSSFDrawing)

            {

                XSSFDrawing drawing = (XSSFDrawing) dr;

                List<XSSFShape> shapes = drawing.getShapes();

                for (XSSFShape shape : shapes)

                for (XSSFShape shape : drawing.getShapes())

                {

                    if (shape instanceof XSSFPicture)

                    {

@@ -1634,7 +1797,7 @@
                        XSSFClientAnchor anchor = pic.getPreferredSize();

                        CTMarker ctMarker = anchor.getFrom();

                        String picIndex = ctMarker.getRow() + "_" + ctMarker.getCol();

                        sheetIndexPicMap.put(picIndex, pic.getPictureData());

                        sheetIndexPicMap.computeIfAbsent(picIndex, k -> new ArrayList<>()).add(pic.getPictureData());

                    }

                }

            }