From a147f714622322e48245331751b513cae07b72f9 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Tue, 26 Oct 2021 10:40:25 +0800 Subject: [PATCH 01/12] =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8D=E5=86=99=E5=85=A5?= =?UTF-8?q?=E7=9A=84=E6=80=A7=E8=83=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/context/WriteContextImpl.java | 11 ++--- .../alibaba/excel/util/WriteHandlerUtils.java | 43 +++++++++++-------- .../executor/AbstractExcelWriteExecutor.java | 9 ++-- .../write/executor/ExcelWriteAddExecutor.java | 33 ++++++++------ .../impl/FillStyleCellWriteHandler.java | 5 +-- update.md | 3 ++ 6 files changed, 60 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/alibaba/excel/context/WriteContextImpl.java b/src/main/java/com/alibaba/excel/context/WriteContextImpl.java index f31705f7..1c3727bf 100644 --- a/src/main/java/com/alibaba/excel/context/WriteContextImpl.java +++ b/src/main/java/com/alibaba/excel/context/WriteContextImpl.java @@ -228,9 +228,9 @@ public class WriteContextImpl implements WriteContext { + newRowIndex; i++, relativeRowIndex++) { WriteHandlerUtils.beforeRowCreate(this, newRowIndex, relativeRowIndex, Boolean.TRUE); Row row = WorkBookUtil.createRow(writeSheetHolder.getSheet(), i); - WriteHandlerUtils.afterRowCreate(this, row, relativeRowIndex, Boolean.TRUE); + WriteHandlerUtils.afterRowCreate(this, row, i, relativeRowIndex, Boolean.TRUE); addOneRowOfHeadDataToExcel(row, excelWriteHeadProperty.getHeadMap(), relativeRowIndex); - WriteHandlerUtils.afterRowDispose(this, row, relativeRowIndex, Boolean.TRUE); + WriteHandlerUtils.afterRowDispose(this, row, i, relativeRowIndex, Boolean.TRUE); } } @@ -254,13 +254,14 @@ public class WriteContextImpl implements WriteContext { Cell cell = row.createCell(columnIndex); - WriteHandlerUtils.afterCellCreate(this, cell, head, relativeRowIndex, Boolean.TRUE, excelContentProperty); + WriteHandlerUtils.afterCellCreate(this, cell, row, head, columnIndex, relativeRowIndex, Boolean.TRUE, + excelContentProperty); WriteCellData writeCellData = new WriteCellData<>(head.getHeadNameList().get(relativeRowIndex)); cell.setCellValue(writeCellData.getStringValue()); - WriteHandlerUtils.afterCellDispose(this, writeCellData, cell, head, relativeRowIndex, Boolean.TRUE, - excelContentProperty); + WriteHandlerUtils.afterCellDispose(this, writeCellData, cell, row, head, columnIndex, relativeRowIndex, + Boolean.TRUE, excelContentProperty); } } diff --git a/src/main/java/com/alibaba/excel/util/WriteHandlerUtils.java b/src/main/java/com/alibaba/excel/util/WriteHandlerUtils.java index 78ce8d8e..1ea362b0 100644 --- a/src/main/java/com/alibaba/excel/util/WriteHandlerUtils.java +++ b/src/main/java/com/alibaba/excel/util/WriteHandlerUtils.java @@ -133,16 +133,16 @@ public class WriteHandlerUtils { } } - public static void afterCellCreate(WriteContext writeContext, Cell cell, Head head, Integer relativeRowIndex, - Boolean isHead, ExcelContentProperty excelContentProperty) { + public static void afterCellCreate(WriteContext writeContext, Cell cell, Row row, Head head, + Integer columnIndex, Integer relativeRowIndex, Boolean isHead, ExcelContentProperty excelContentProperty) { List handlerList = writeContext.currentWriteHolder().writeHandlerMap().get(CellWriteHandler.class); if (handlerList == null || handlerList.isEmpty()) { return; } CellWriteHandlerContext context = new CellWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), - writeContext.writeSheetHolder(), writeContext.writeTableHolder(), cell.getRow(), cell, - cell.getColumnIndex(), relativeRowIndex, head, null, null, isHead, excelContentProperty); + writeContext.writeSheetHolder(), writeContext.writeTableHolder(), row, cell, columnIndex, relativeRowIndex, + head, null, null, isHead, excelContentProperty); for (WriteHandler writeHandler : handlerList) { if (writeHandler instanceof CellWriteHandler) { ((CellWriteHandler)writeHandler).afterCellCreate(context); @@ -150,8 +150,9 @@ public class WriteHandlerUtils { } } - public static void afterCellDataConverted(WriteContext writeContext, WriteCellData cellData, Cell cell, - Head head, Integer relativeRowIndex, Boolean isHead, ExcelContentProperty excelContentProperty) { + public static void afterCellDataConverted(WriteContext writeContext, WriteCellData cellData, Cell cell, Row row, + Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead, + ExcelContentProperty excelContentProperty) { List handlerList = writeContext.currentWriteHolder().writeHandlerMap().get(CellWriteHandler.class); if (handlerList == null || handlerList.isEmpty()) { @@ -159,8 +160,8 @@ public class WriteHandlerUtils { } List> cellDataList = cellData == null ? null : ListUtils.newArrayList(cellData); CellWriteHandlerContext context = new CellWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), - writeContext.writeSheetHolder(), writeContext.writeTableHolder(), cell.getRow(), cell, - cell.getColumnIndex(), relativeRowIndex, head, cellDataList, cellData, isHead, excelContentProperty); + writeContext.writeSheetHolder(), writeContext.writeTableHolder(), row, cell, + columnIndex, relativeRowIndex, head, cellDataList, cellData, isHead, excelContentProperty); for (WriteHandler writeHandler : handlerList) { if (writeHandler instanceof CellWriteHandler) { ((CellWriteHandler)writeHandler).afterCellDataConverted(context); @@ -168,14 +169,17 @@ public class WriteHandlerUtils { } } - public static void afterCellDispose(WriteContext writeContext, WriteCellData cellData, Cell cell, Head head, - Integer relativeRowIndex, Boolean isHead, ExcelContentProperty excelContentProperty) { + public static void afterCellDispose(WriteContext writeContext, WriteCellData cellData, Cell cell, Row row, + Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead, + ExcelContentProperty excelContentProperty) { List> cellDataList = cellData == null ? null : ListUtils.newArrayList(cellData); - afterCellDispose(writeContext, cellDataList, cell, head, relativeRowIndex, isHead, excelContentProperty); + afterCellDispose(writeContext, cellDataList, cell, row, head, columnIndex, relativeRowIndex, isHead, + excelContentProperty); } public static void afterCellDispose(WriteContext writeContext, List> cellDataList, Cell cell, - Head head, Integer relativeRowIndex, Boolean isHead, ExcelContentProperty excelContentProperty) { + Row row, Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead, + ExcelContentProperty excelContentProperty) { List handlerList = writeContext.currentWriteHolder().writeHandlerMap().get(CellWriteHandler.class); if (handlerList == null || handlerList.isEmpty()) { @@ -186,8 +190,8 @@ public class WriteHandlerUtils { cellData = cellDataList.get(0); } CellWriteHandlerContext context = new CellWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), - writeContext.writeSheetHolder(), writeContext.writeTableHolder(), cell.getRow(), cell, - cell.getColumnIndex(), relativeRowIndex, head, cellDataList, cellData, isHead, excelContentProperty); + writeContext.writeSheetHolder(), writeContext.writeTableHolder(), row, cell, columnIndex, relativeRowIndex, + head, cellDataList, cellData, isHead, excelContentProperty); for (WriteHandler writeHandler : handlerList) { if (writeHandler instanceof CellWriteHandler) { ((CellWriteHandler)writeHandler).afterCellDispose(context); @@ -210,13 +214,14 @@ public class WriteHandlerUtils { } } - public static void afterRowCreate(WriteContext writeContext, Row row, Integer relativeRowIndex, Boolean isHead) { + public static void afterRowCreate(WriteContext writeContext, Row row, Integer rowIndex, Integer relativeRowIndex, + Boolean isHead) { List handlerList = writeContext.currentWriteHolder().writeHandlerMap().get(RowWriteHandler.class); if (handlerList == null || handlerList.isEmpty()) { return; } RowWriteHandlerContext context = new RowWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), - writeContext.writeSheetHolder(), writeContext.writeTableHolder(), row.getRowNum(), row, relativeRowIndex, + writeContext.writeSheetHolder(), writeContext.writeTableHolder(), rowIndex, row, relativeRowIndex, isHead); for (WriteHandler writeHandler : handlerList) { if (writeHandler instanceof RowWriteHandler) { @@ -225,14 +230,14 @@ public class WriteHandlerUtils { } } - public static void afterRowDispose(WriteContext writeContext, Row row, Integer relativeRowIndex, Boolean isHead) { + public static void afterRowDispose(WriteContext writeContext, Row row, Integer rowIndex, Integer relativeRowIndex, + Boolean isHead) { List handlerList = writeContext.currentWriteHolder().writeHandlerMap().get(RowWriteHandler.class); if (handlerList == null || handlerList.isEmpty()) { return; } RowWriteHandlerContext context = new RowWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), - writeContext.writeSheetHolder(), writeContext.writeTableHolder(), row.getRowNum(), row, relativeRowIndex, - isHead); + writeContext.writeSheetHolder(), writeContext.writeTableHolder(), rowIndex, row, relativeRowIndex, isHead); for (WriteHandler writeHandler : handlerList) { if (writeHandler instanceof RowWriteHandler) { ((RowWriteHandler)writeHandler).afterRowDispose(context); diff --git a/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java b/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java index 597d94de..7c94e178 100644 --- a/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java @@ -32,6 +32,7 @@ import org.apache.poi.ss.usermodel.Comment; import org.apache.poi.ss.usermodel.CreationHelper; import org.apache.poi.ss.usermodel.Drawing; import org.apache.poi.ss.usermodel.Hyperlink; +import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.xssf.usermodel.XSSFClientAnchor; @@ -48,16 +49,16 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { } protected WriteCellData converterAndSet(WriteHolder currentWriteHolder, Class clazz, - CellDataTypeEnum targetType, Cell cell, Object value, ExcelContentProperty excelContentProperty, Head head, - Integer relativeRowIndex, int rowIndex, int columnIndex) { + CellDataTypeEnum targetType, Cell cell, Row row, Object value, ExcelContentProperty excelContentProperty, + Head head, Integer relativeRowIndex, int rowIndex, int columnIndex) { boolean needTrim = value != null && (value instanceof String && currentWriteHolder.globalConfiguration() .getAutoTrim()); if (needTrim) { value = ((String)value).trim(); } WriteCellData cellData = convert(currentWriteHolder, clazz, targetType, cell, value, excelContentProperty); - WriteHandlerUtils.afterCellDataConverted(writeContext, cellData, cell, head, relativeRowIndex, Boolean.FALSE, - excelContentProperty); + WriteHandlerUtils.afterCellDataConverted(writeContext, cellData, cell, row, head, columnIndex, relativeRowIndex, + Boolean.FALSE, excelContentProperty); // Fill in picture information fillImage(cell, cellData.getImageDataList()); diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java index bdfea49e..db0f7247 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java @@ -66,7 +66,7 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { } WriteHandlerUtils.beforeRowCreate(writeContext, rowIndex, relativeRowIndex, Boolean.FALSE); Row row = WorkBookUtil.createRow(writeContext.writeSheetHolder().getSheet(), rowIndex); - WriteHandlerUtils.afterRowCreate(writeContext, row, relativeRowIndex, Boolean.FALSE); + WriteHandlerUtils.afterRowCreate(writeContext, row, rowIndex, relativeRowIndex, Boolean.FALSE); if (oneRowData instanceof Collection) { addBasicTypeToExcel(new CollectionRowData((Collection)oneRowData), row, rowIndex, relativeRowIndex); @@ -75,7 +75,7 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { } else { addJavaObjectToExcel(oneRowData, row, rowIndex, relativeRowIndex, sortedAllFiledMap); } - WriteHandlerUtils.afterRowDispose(writeContext, row, relativeRowIndex, Boolean.FALSE); + WriteHandlerUtils.afterRowDispose(writeContext, row, rowIndex, relativeRowIndex, Boolean.FALSE); } private void addBasicTypeToExcel(RowData oneRowData, Row row, int rowIndex, int relativeRowIndex) { @@ -117,12 +117,14 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { WriteHandlerUtils.beforeCellCreate(writeContext, row, head, columnIndex, relativeRowIndex, Boolean.FALSE, excelContentProperty); Cell cell = WorkBookUtil.createCell(row, columnIndex); - WriteHandlerUtils.afterCellCreate(writeContext, cell, head, relativeRowIndex, Boolean.FALSE, + WriteHandlerUtils.afterCellCreate(writeContext, cell, row, head, columnIndex, relativeRowIndex, Boolean.FALSE, excelContentProperty); Object value = oneRowData.get(dataIndex); WriteCellData cellData = converterAndSet(writeContext.currentWriteHolder(), - FieldUtils.getFieldClass(value), null, cell, value, null, head, relativeRowIndex, rowIndex, columnIndex); - WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, head, relativeRowIndex, Boolean.FALSE, + FieldUtils.getFieldClass(value), null, cell, row, value, null, head, relativeRowIndex, + rowIndex, columnIndex); + WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, row, head, columnIndex, relativeRowIndex, + Boolean.FALSE, excelContentProperty); } @@ -147,12 +149,14 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { WriteHandlerUtils.beforeCellCreate(writeContext, row, head, columnIndex, relativeRowIndex, Boolean.FALSE, excelContentProperty); Cell cell = WorkBookUtil.createCell(row, columnIndex); - WriteHandlerUtils.afterCellCreate(writeContext, cell, head, relativeRowIndex, Boolean.FALSE, + WriteHandlerUtils.afterCellCreate(writeContext, cell, row, head, columnIndex, relativeRowIndex, + Boolean.FALSE, excelContentProperty); Object value = beanMap.get(name); WriteCellData cellData = converterAndSet(currentWriteHolder, head.getField().getType(), - null, cell, value, excelContentProperty, head, relativeRowIndex, rowIndex, columnIndex); - WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, head, relativeRowIndex, Boolean.FALSE, + null, cell, row, value, excelContentProperty, head, relativeRowIndex, rowIndex, columnIndex); + WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, row, head, columnIndex, + relativeRowIndex, Boolean.FALSE, excelContentProperty); beanMapHandledSet.add(name); maxCellIndex = Math.max(maxCellIndex, columnIndex); @@ -181,14 +185,17 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { excelContentProperty); // fix https://github.com/alibaba/easyexcel/issues/1870 // If there is data, it is written to the next cell - Cell cell = WorkBookUtil.createCell(row, maxCellIndex++); - WriteHandlerUtils.afterCellCreate(writeContext, cell, null, relativeRowIndex, Boolean.FALSE, + Cell cell = WorkBookUtil.createCell(row, maxCellIndex); + WriteHandlerUtils.afterCellCreate(writeContext, cell, row, null, maxCellIndex, relativeRowIndex, + Boolean.FALSE, excelContentProperty); WriteCellData cellData = converterAndSet(currentWriteHolder, - FieldUtils.getFieldClass(beanMap, filedName, value), null, cell, value, null, null, relativeRowIndex, - rowIndex, maxCellIndex); - WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, null, relativeRowIndex, Boolean.FALSE, + FieldUtils.getFieldClass(beanMap, filedName, value), null, cell, row, value, null, null, + relativeRowIndex, rowIndex, maxCellIndex); + WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, row, null, maxCellIndex, relativeRowIndex, + Boolean.FALSE, excelContentProperty); + maxCellIndex++; } } diff --git a/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java b/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java index c8116b4d..819da9b1 100644 --- a/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java +++ b/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java @@ -6,7 +6,6 @@ import com.alibaba.excel.constant.OrderConstant; import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.write.handler.CellWriteHandler; import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; -import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import lombok.extern.slf4j.Slf4j; @@ -41,8 +40,8 @@ public class FillStyleCellWriteHandler implements CellWriteHandler { if (writeCellStyle == null && originCellStyle == null) { return; } - WriteWorkbookHolder writeWorkbookHolder = context.getWriteWorkbookHolder(); - context.getCell().setCellStyle(writeWorkbookHolder.createCellStyle(writeCellStyle, originCellStyle)); + //WriteWorkbookHolder writeWorkbookHolder = context.getWriteWorkbookHolder(); + //context.getCell().setCellStyle(writeWorkbookHolder.createCellStyle(writeCellStyle, originCellStyle)); } } diff --git a/update.md b/update.md index fdec0ee3..6cc837de 100644 --- a/update.md +++ b/update.md @@ -1,3 +1,6 @@ +# 3.0.2 +* 修复写入的性能问题 + # 3.0.1 * 升级到正式版 * 修复填充样式可能丢失的问题 [Issue #2124](https://github.com/alibaba/easyexcel/issues/2124) From f43ed9307125819907a9ce03f53ff71ae90a32fc Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Tue, 26 Oct 2021 14:55:39 +0800 Subject: [PATCH 02/12] =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8D=E5=86=99=E5=85=A5?= =?UTF-8?q?=E7=9A=84=E6=80=A7=E8=83=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/context/WriteContextImpl.java | 69 +++-- .../excel/converters/ConverterKeyBuild.java | 47 +-- .../converters/DefaultConverterLoader.java | 11 +- .../exception/ExcelDataConvertException.java | 4 +- .../ExcelWriteDataConvertException.java | 32 +++ .../excel/metadata/AbstractHolder.java | 5 +- .../excel/metadata/ConfigurationHolder.java | 5 +- .../excel/metadata/data/WriteCellData.java | 5 - .../alibaba/excel/util/ConverterUtils.java | 5 +- .../alibaba/excel/util/WriteHandlerUtils.java | 269 ++++++++---------- .../executor/AbstractExcelWriteExecutor.java | 178 +++++++----- .../write/executor/ExcelWriteAddExecutor.java | 93 +++--- .../executor/ExcelWriteFillExecutor.java | 88 ++++-- .../context/CellWriteHandlerContext.java | 58 +++- .../context/RowWriteHandlerContext.java | 8 + .../context/SheetWriteHandlerContext.java | 12 + .../context/WorkbookWriteHandlerContext.java | 13 + .../impl/FillStyleCellWriteHandler.java | 10 +- .../metadata/holder/AbstractWriteHolder.java | 1 + .../metadata/holder/WriteSheetHolder.java | 2 - .../metadata/holder/WriteWorkbookHolder.java | 6 + 21 files changed, 559 insertions(+), 362 deletions(-) create mode 100644 src/main/java/com/alibaba/excel/exception/ExcelWriteDataConvertException.java diff --git a/src/main/java/com/alibaba/excel/context/WriteContextImpl.java b/src/main/java/com/alibaba/excel/context/WriteContextImpl.java index 1c3727bf..7ee3b2c9 100644 --- a/src/main/java/com/alibaba/excel/context/WriteContextImpl.java +++ b/src/main/java/com/alibaba/excel/context/WriteContextImpl.java @@ -15,10 +15,15 @@ import com.alibaba.excel.support.ExcelTypeEnum; import com.alibaba.excel.util.ClassUtils; import com.alibaba.excel.util.DateUtils; import com.alibaba.excel.util.FileUtils; +import com.alibaba.excel.util.ListUtils; import com.alibaba.excel.util.NumberDataFormatterUtils; import com.alibaba.excel.util.StringUtils; import com.alibaba.excel.util.WorkBookUtil; import com.alibaba.excel.util.WriteHandlerUtils; +import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; +import com.alibaba.excel.write.handler.context.RowWriteHandlerContext; +import com.alibaba.excel.write.handler.context.SheetWriteHandlerContext; +import com.alibaba.excel.write.handler.context.WorkbookWriteHandlerContext; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.WriteTable; import com.alibaba.excel.write.metadata.WriteWorkbook; @@ -83,13 +88,16 @@ public class WriteContextImpl implements WriteContext { LOGGER.debug("Begin to Initialization 'WriteContextImpl'"); } initCurrentWorkbookHolder(writeWorkbook); - WriteHandlerUtils.beforeWorkbookCreate(this); + + WorkbookWriteHandlerContext workbookWriteHandlerContext = WriteHandlerUtils.createWorkbookWriteHandlerContext( + this); + WriteHandlerUtils.beforeWorkbookCreate(workbookWriteHandlerContext); try { WorkBookUtil.createWorkBook(writeWorkbookHolder); } catch (Exception e) { throw new ExcelGenerateException("Create workbook failure", e); } - WriteHandlerUtils.afterWorkbookCreate(this); + WriteHandlerUtils.afterWorkbookCreate(workbookWriteHandlerContext); if (LOGGER.isDebugEnabled()) { LOGGER.debug("Initialization 'WriteContextImpl' complete"); } @@ -118,8 +126,10 @@ public class WriteContextImpl implements WriteContext { initCurrentSheetHolder(writeSheet); // Workbook handler need to supplementary execution - WriteHandlerUtils.beforeWorkbookCreate(this, true); - WriteHandlerUtils.afterWorkbookCreate(this, true); + WorkbookWriteHandlerContext workbookWriteHandlerContext = WriteHandlerUtils.createWorkbookWriteHandlerContext( + this, true); + WriteHandlerUtils.beforeWorkbookCreate(workbookWriteHandlerContext, true); + WriteHandlerUtils.afterWorkbookCreate(workbookWriteHandlerContext, true); // Initialization current sheet initSheet(writeType); @@ -162,7 +172,8 @@ public class WriteContextImpl implements WriteContext { } private void initSheet(WriteTypeEnum writeType) { - WriteHandlerUtils.beforeSheetCreate(this); + SheetWriteHandlerContext sheetWriteHandlerContext = WriteHandlerUtils.createSheetWriteHandlerContext(this); + WriteHandlerUtils.beforeSheetCreate(sheetWriteHandlerContext); Sheet currentSheet; try { if (writeSheetHolder.getSheetNo() != null) { @@ -192,7 +203,7 @@ public class WriteContextImpl implements WriteContext { currentSheet = createSheet(); } writeSheetHolder.setSheet(currentSheet); - WriteHandlerUtils.afterSheetCreate(this); + WriteHandlerUtils.afterSheetCreate(sheetWriteHandlerContext); if (WriteTypeEnum.ADD.equals(writeType)) { // Initialization head initHead(writeSheetHolder.excelWriteHeadProperty()); @@ -226,11 +237,17 @@ public class WriteContextImpl implements WriteContext { } for (int relativeRowIndex = 0, i = newRowIndex; i < excelWriteHeadProperty.getHeadRowNumber() + newRowIndex; i++, relativeRowIndex++) { - WriteHandlerUtils.beforeRowCreate(this, newRowIndex, relativeRowIndex, Boolean.TRUE); + + RowWriteHandlerContext rowWriteHandlerContext = WriteHandlerUtils.createRowWriteHandlerContext(this, + newRowIndex, relativeRowIndex, Boolean.TRUE); + WriteHandlerUtils.beforeRowCreate(rowWriteHandlerContext); + Row row = WorkBookUtil.createRow(writeSheetHolder.getSheet(), i); - WriteHandlerUtils.afterRowCreate(this, row, i, relativeRowIndex, Boolean.TRUE); - addOneRowOfHeadDataToExcel(row, excelWriteHeadProperty.getHeadMap(), relativeRowIndex); - WriteHandlerUtils.afterRowDispose(this, row, i, relativeRowIndex, Boolean.TRUE); + rowWriteHandlerContext.setRow(row); + + WriteHandlerUtils.afterRowCreate(rowWriteHandlerContext); + addOneRowOfHeadDataToExcel(row, i, excelWriteHeadProperty.getHeadMap(), relativeRowIndex); + WriteHandlerUtils.afterRowDispose(rowWriteHandlerContext); } } @@ -242,26 +259,29 @@ public class WriteContextImpl implements WriteContext { } } - private void addOneRowOfHeadDataToExcel(Row row, Map headMap, int relativeRowIndex) { + private void addOneRowOfHeadDataToExcel(Row row, Integer rowIndex, Map headMap, + int relativeRowIndex) { for (Map.Entry entry : headMap.entrySet()) { Head head = entry.getValue(); int columnIndex = entry.getKey(); ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(null, currentWriteHolder.excelWriteHeadProperty().getHeadClazz(), head.getFieldName()); - WriteHandlerUtils.beforeCellCreate(this, row, head, columnIndex, relativeRowIndex, Boolean.TRUE, - excelContentProperty); + CellWriteHandlerContext cellWriteHandlerContext = WriteHandlerUtils.createCellWriteHandlerContext(this, row, + rowIndex, head, columnIndex, relativeRowIndex, Boolean.TRUE, excelContentProperty); + WriteHandlerUtils.beforeCellCreate(cellWriteHandlerContext); Cell cell = row.createCell(columnIndex); + cellWriteHandlerContext.setCell(cell); - WriteHandlerUtils.afterCellCreate(this, cell, row, head, columnIndex, relativeRowIndex, Boolean.TRUE, - excelContentProperty); + WriteHandlerUtils.afterCellCreate(cellWriteHandlerContext); WriteCellData writeCellData = new WriteCellData<>(head.getHeadNameList().get(relativeRowIndex)); cell.setCellValue(writeCellData.getStringValue()); + cellWriteHandlerContext.setCellDataList(ListUtils.newArrayList(writeCellData)); + cellWriteHandlerContext.setFirstCellData(writeCellData); - WriteHandlerUtils.afterCellDispose(this, writeCellData, cell, row, head, columnIndex, relativeRowIndex, - Boolean.TRUE, excelContentProperty); + WriteHandlerUtils.afterCellDispose(cellWriteHandlerContext); } } @@ -289,10 +309,15 @@ public class WriteContextImpl implements WriteContext { initCurrentTableHolder(writeTable); // Workbook and sheet handler need to supplementary execution - WriteHandlerUtils.beforeWorkbookCreate(this, true); - WriteHandlerUtils.afterWorkbookCreate(this, true); - WriteHandlerUtils.beforeSheetCreate(this, true); - WriteHandlerUtils.afterSheetCreate(this, true); + WorkbookWriteHandlerContext workbookWriteHandlerContext = WriteHandlerUtils.createWorkbookWriteHandlerContext( + this, true); + WriteHandlerUtils.beforeWorkbookCreate(workbookWriteHandlerContext, true); + WriteHandlerUtils.afterWorkbookCreate(workbookWriteHandlerContext, true); + + SheetWriteHandlerContext sheetWriteHandlerContext = WriteHandlerUtils.createSheetWriteHandlerContext(this, + true); + WriteHandlerUtils.beforeSheetCreate(sheetWriteHandlerContext, true); + WriteHandlerUtils.afterSheetCreate(sheetWriteHandlerContext, true); initHead(writeTableHolder.excelWriteHeadProperty()); } @@ -332,7 +357,7 @@ public class WriteContextImpl implements WriteContext { return; } finished = true; - WriteHandlerUtils.afterWorkbookDispose(this); + WriteHandlerUtils.afterWorkbookDispose(writeWorkbookHolder.getWorkbookWriteHandlerContext()); if (writeWorkbookHolder == null) { return; } diff --git a/src/main/java/com/alibaba/excel/converters/ConverterKeyBuild.java b/src/main/java/com/alibaba/excel/converters/ConverterKeyBuild.java index f1068591..5fe8f0bc 100644 --- a/src/main/java/com/alibaba/excel/converters/ConverterKeyBuild.java +++ b/src/main/java/com/alibaba/excel/converters/ConverterKeyBuild.java @@ -5,6 +5,9 @@ import java.util.Map; import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.util.MapUtils; +import lombok.AllArgsConstructor; +import lombok.Data; + /** * Converter unique key.Consider that you can just use class as the key. * @@ -12,33 +15,35 @@ import com.alibaba.excel.util.MapUtils; */ public class ConverterKeyBuild { - private static final Map BOXING_MAP = MapUtils.newHashMap(); + private static final Map, Class> BOXING_MAP = MapUtils.newHashMap(); static { - BOXING_MAP.put(int.class.getName(), Integer.class.getName()); - BOXING_MAP.put(byte.class.getName(), Byte.class.getName()); - BOXING_MAP.put(long.class.getName(), Long.class.getName()); - BOXING_MAP.put(double.class.getName(), Double.class.getName()); - BOXING_MAP.put(float.class.getName(), Float.class.getName()); - BOXING_MAP.put(char.class.getName(), Character.class.getName()); - BOXING_MAP.put(short.class.getName(), Short.class.getName()); - BOXING_MAP.put(boolean.class.getName(), Boolean.class.getName()); + BOXING_MAP.put(int.class, Integer.class); + BOXING_MAP.put(byte.class, Byte.class); + BOXING_MAP.put(long.class, Long.class); + BOXING_MAP.put(double.class, Double.class); + BOXING_MAP.put(float.class, Float.class); + BOXING_MAP.put(char.class, Character.class); + BOXING_MAP.put(short.class, Short.class); + BOXING_MAP.put(boolean.class, Boolean.class); } - public static String buildKey(Class clazz) { - String className = clazz.getName(); - String boxingClassName = BOXING_MAP.get(clazz.getName()); - if (boxingClassName == null) { - return className; + public static ConverterKey buildKey(Class clazz) { + Class boxingClass = BOXING_MAP.get(clazz); + if (boxingClass != null) { + return new ConverterKey(boxingClass, null); } - return boxingClassName; + return new ConverterKey(clazz, null); } - public static String buildKey(Class clazz, CellDataTypeEnum cellDataTypeEnum) { - String key = buildKey(clazz); - if (cellDataTypeEnum == null) { - return key; - } - return key + "-" + cellDataTypeEnum; + public static ConverterKey buildKey(Class clazz, CellDataTypeEnum cellDataTypeEnum) { + return new ConverterKey(clazz, cellDataTypeEnum); + } + + @Data + @AllArgsConstructor + public static class ConverterKey { + private Class clazz; + private CellDataTypeEnum cellDataTypeEnum; } } diff --git a/src/main/java/com/alibaba/excel/converters/DefaultConverterLoader.java b/src/main/java/com/alibaba/excel/converters/DefaultConverterLoader.java index fda84b84..ac2dd8dc 100644 --- a/src/main/java/com/alibaba/excel/converters/DefaultConverterLoader.java +++ b/src/main/java/com/alibaba/excel/converters/DefaultConverterLoader.java @@ -2,6 +2,7 @@ package com.alibaba.excel.converters; import java.util.Map; +import com.alibaba.excel.converters.ConverterKeyBuild.ConverterKey; import com.alibaba.excel.converters.bigdecimal.BigDecimalBooleanConverter; import com.alibaba.excel.converters.bigdecimal.BigDecimalNumberConverter; import com.alibaba.excel.converters.bigdecimal.BigDecimalStringConverter; @@ -52,8 +53,8 @@ import com.alibaba.excel.util.MapUtils; * @author Jiaju Zhuang */ public class DefaultConverterLoader { - private static Map> defaultWriteConverter; - private static Map> allConverter; + private static Map> defaultWriteConverter; + private static Map> allConverter; static { initDefaultWriteConverter(); @@ -153,7 +154,7 @@ public class DefaultConverterLoader { * * @return */ - public static Map> loadDefaultWriteConverter() { + public static Map> loadDefaultWriteConverter() { return defaultWriteConverter; } @@ -171,7 +172,7 @@ public class DefaultConverterLoader { * * @return */ - public static Map> loadDefaultReadConverter() { + public static Map> loadDefaultReadConverter() { return loadAllConverter(); } @@ -180,7 +181,7 @@ public class DefaultConverterLoader { * * @return */ - public static Map> loadAllConverter() { + public static Map> loadAllConverter() { return allConverter; } diff --git a/src/main/java/com/alibaba/excel/exception/ExcelDataConvertException.java b/src/main/java/com/alibaba/excel/exception/ExcelDataConvertException.java index 1cb9c934..1e56a200 100644 --- a/src/main/java/com/alibaba/excel/exception/ExcelDataConvertException.java +++ b/src/main/java/com/alibaba/excel/exception/ExcelDataConvertException.java @@ -32,7 +32,7 @@ public class ExcelDataConvertException extends RuntimeException { */ private ExcelContentProperty excelContentProperty; - public ExcelDataConvertException(Integer rowIndex, Integer columnIndex, CellData cellData, + public ExcelDataConvertException(Integer rowIndex, Integer columnIndex, CellData cellData, ExcelContentProperty excelContentProperty, String message) { super(message); this.rowIndex = rowIndex; @@ -41,7 +41,7 @@ public class ExcelDataConvertException extends RuntimeException { this.excelContentProperty = excelContentProperty; } - public ExcelDataConvertException(Integer rowIndex, Integer columnIndex, CellData cellData, + public ExcelDataConvertException(Integer rowIndex, Integer columnIndex, CellData cellData, ExcelContentProperty excelContentProperty, String message, Throwable cause) { super(message, cause); this.rowIndex = rowIndex; diff --git a/src/main/java/com/alibaba/excel/exception/ExcelWriteDataConvertException.java b/src/main/java/com/alibaba/excel/exception/ExcelWriteDataConvertException.java new file mode 100644 index 00000000..9f9a2e4a --- /dev/null +++ b/src/main/java/com/alibaba/excel/exception/ExcelWriteDataConvertException.java @@ -0,0 +1,32 @@ +package com.alibaba.excel.exception; + +import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; + +import lombok.Data; + +/** + * Data convert exception + * + * @author Jiaju Zhuang + */ +@Data +public class ExcelWriteDataConvertException extends ExcelDataConvertException { + /** + * handler. + */ + private CellWriteHandlerContext cellWriteHandlerContext; + + public ExcelWriteDataConvertException(CellWriteHandlerContext cellWriteHandlerContext, String message) { + super(cellWriteHandlerContext.getRowIndex(), cellWriteHandlerContext.getColumnIndex(), + cellWriteHandlerContext.getFirstCellData(), cellWriteHandlerContext.getExcelContentProperty(), message); + this.cellWriteHandlerContext = cellWriteHandlerContext; + } + + public ExcelWriteDataConvertException(CellWriteHandlerContext cellWriteHandlerContext, String message, + Throwable cause) { + super(cellWriteHandlerContext.getRowIndex(), cellWriteHandlerContext.getColumnIndex(), + cellWriteHandlerContext.getFirstCellData(), cellWriteHandlerContext.getExcelContentProperty(), message, + cause); + this.cellWriteHandlerContext = cellWriteHandlerContext; + } +} diff --git a/src/main/java/com/alibaba/excel/metadata/AbstractHolder.java b/src/main/java/com/alibaba/excel/metadata/AbstractHolder.java index 735a0623..828f38e7 100644 --- a/src/main/java/com/alibaba/excel/metadata/AbstractHolder.java +++ b/src/main/java/com/alibaba/excel/metadata/AbstractHolder.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.converters.ConverterKeyBuild.ConverterKey; import lombok.Data; import lombok.NoArgsConstructor; @@ -38,7 +39,7 @@ public abstract class AbstractHolder implements ConfigurationHolder { *

* Write key: */ - private Map> converterMap; + private Map> converterMap; public AbstractHolder(BasicParameter basicParameter, AbstractHolder prentAbstractHolder) { this.newInitialization = Boolean.TRUE; @@ -81,7 +82,7 @@ public abstract class AbstractHolder implements ConfigurationHolder { } @Override - public Map> converterMap() { + public Map> converterMap() { return getConverterMap(); } diff --git a/src/main/java/com/alibaba/excel/metadata/ConfigurationHolder.java b/src/main/java/com/alibaba/excel/metadata/ConfigurationHolder.java index ee4d7edf..e842466d 100644 --- a/src/main/java/com/alibaba/excel/metadata/ConfigurationHolder.java +++ b/src/main/java/com/alibaba/excel/metadata/ConfigurationHolder.java @@ -3,9 +3,9 @@ package com.alibaba.excel.metadata; import java.util.Map; import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.converters.ConverterKeyBuild.ConverterKey; /** - * * Get the corresponding holder * * @author Jiaju Zhuang @@ -13,7 +13,6 @@ import com.alibaba.excel.converters.Converter; public interface ConfigurationHolder extends Holder { /** - * * Record whether it's new or from cache * * @return Record whether it's new or from cache @@ -32,5 +31,5 @@ public interface ConfigurationHolder extends Holder { * * @return Converter */ - Map> converterMap(); + Map> converterMap(); } diff --git a/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java b/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java index 5a3487bf..a988703a 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java @@ -8,7 +8,6 @@ import java.util.List; import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.util.ListUtils; -import com.alibaba.excel.write.metadata.fill.AnalysisCell; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import lombok.Data; @@ -56,10 +55,6 @@ public class WriteCellData extends CellData { */ private CellStyle originCellStyle; - /** - * Only in the case of the fill is not null - */ - private AnalysisCell analysisCell; public WriteCellData(String stringValue) { this(CellDataTypeEnum.STRING, stringValue); diff --git a/src/main/java/com/alibaba/excel/util/ConverterUtils.java b/src/main/java/com/alibaba/excel/util/ConverterUtils.java index b666be6e..2a30c57c 100644 --- a/src/main/java/com/alibaba/excel/util/ConverterUtils.java +++ b/src/main/java/com/alibaba/excel/util/ConverterUtils.java @@ -8,6 +8,7 @@ import java.util.Map; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.converters.ConverterKeyBuild; +import com.alibaba.excel.converters.ConverterKeyBuild.ConverterKey; import com.alibaba.excel.converters.NullableObjectConverter; import com.alibaba.excel.converters.ReadConverterContext; import com.alibaba.excel.enums.CellDataTypeEnum; @@ -80,7 +81,7 @@ public class ConverterUtils { * @return */ public static Object convertToJavaObject(ReadCellData cellData, Field field, - ExcelContentProperty contentProperty, Map> converterMap, AnalysisContext context, + ExcelContentProperty contentProperty, Map> converterMap, AnalysisContext context, Integer rowIndex, Integer columnIndex) { Class clazz; if (field == null) { @@ -126,7 +127,7 @@ public class ConverterUtils { * @return */ private static Object doConvertToJavaObject(ReadCellData cellData, Class clazz, - ExcelContentProperty contentProperty, Map> converterMap, AnalysisContext context, + ExcelContentProperty contentProperty, Map> converterMap, AnalysisContext context, Integer rowIndex, Integer columnIndex) { Converter converter = null; if (contentProperty != null) { diff --git a/src/main/java/com/alibaba/excel/util/WriteHandlerUtils.java b/src/main/java/com/alibaba/excel/util/WriteHandlerUtils.java index 1ea362b0..cb04b956 100644 --- a/src/main/java/com/alibaba/excel/util/WriteHandlerUtils.java +++ b/src/main/java/com/alibaba/excel/util/WriteHandlerUtils.java @@ -5,7 +5,6 @@ import java.util.Map; import com.alibaba.excel.context.WriteContext; import com.alibaba.excel.metadata.Head; -import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.write.handler.CellWriteHandler; import com.alibaba.excel.write.handler.RowWriteHandler; @@ -18,7 +17,6 @@ import com.alibaba.excel.write.handler.context.SheetWriteHandlerContext; import com.alibaba.excel.write.handler.context.WorkbookWriteHandlerContext; import org.apache.commons.collections4.CollectionUtils; -import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; /** @@ -30,222 +28,205 @@ public class WriteHandlerUtils { private WriteHandlerUtils() {} - public static void beforeWorkbookCreate(WriteContext writeContext) { - beforeWorkbookCreate(writeContext, false); + public static WorkbookWriteHandlerContext createWorkbookWriteHandlerContext(WriteContext writeContext) { + return createWorkbookWriteHandlerContext(writeContext, false); } - public static void beforeWorkbookCreate(WriteContext writeContext, boolean runOwn) { + public static WorkbookWriteHandlerContext createWorkbookWriteHandlerContext(WriteContext writeContext, + boolean runOwn) { List handlerList = getHandlerList(writeContext, WorkbookWriteHandler.class, runOwn); - if (handlerList == null || handlerList.isEmpty()) { - return; + WorkbookWriteHandlerContext context = new WorkbookWriteHandlerContext(writeContext, null, null, null); + if (runOwn) { + context.setOwnHandlerList(handlerList); + } else { + context.setHandlerList(handlerList); + } + writeContext.writeWorkbookHolder().setWorkbookWriteHandlerContext(context); + return context; + } + + public static void beforeWorkbookCreate(WorkbookWriteHandlerContext context) { + beforeWorkbookCreate(context, false); + } + + public static void beforeWorkbookCreate(WorkbookWriteHandlerContext context, boolean runOwn) { + List handlerList; + if (runOwn) { + handlerList = context.getOwnHandlerList(); + } else { + handlerList = context.getHandlerList(); } - WorkbookWriteHandlerContext context = new WorkbookWriteHandlerContext(writeContext, null); - for (WriteHandler writeHandler : handlerList) { - if (writeHandler instanceof WorkbookWriteHandler) { + if (CollectionUtils.isNotEmpty(handlerList)) { + for (WriteHandler writeHandler : handlerList) { ((WorkbookWriteHandler)writeHandler).beforeWorkbookCreate(context); } } } - public static void afterWorkbookCreate(WriteContext writeContext) { - afterWorkbookCreate(writeContext, false); + public static void afterWorkbookCreate(WorkbookWriteHandlerContext context) { + afterWorkbookCreate(context, false); } - public static void afterWorkbookCreate(WriteContext writeContext, boolean runOwn) { - List handlerList = getHandlerList(writeContext, WorkbookWriteHandler.class, runOwn); - if (handlerList == null || handlerList.isEmpty()) { - return; + public static void afterWorkbookCreate(WorkbookWriteHandlerContext context, boolean runOwn) { + List handlerList; + if (runOwn) { + handlerList = context.getOwnHandlerList(); + } else { + handlerList = context.getHandlerList(); } - WorkbookWriteHandlerContext context = new WorkbookWriteHandlerContext(writeContext, - writeContext.writeWorkbookHolder()); - for (WriteHandler writeHandler : handlerList) { - if (writeHandler instanceof WorkbookWriteHandler) { + if (CollectionUtils.isNotEmpty(handlerList)) { + for (WriteHandler writeHandler : handlerList) { ((WorkbookWriteHandler)writeHandler).afterWorkbookCreate(context); } } } - public static void afterWorkbookDispose(WriteContext writeContext) { - List handlerList = - writeContext.currentWriteHolder().writeHandlerMap().get(WorkbookWriteHandler.class); - if (handlerList == null || handlerList.isEmpty()) { - return; - } - WorkbookWriteHandlerContext context = new WorkbookWriteHandlerContext(writeContext, - writeContext.writeWorkbookHolder()); - for (WriteHandler writeHandler : handlerList) { - if (writeHandler instanceof WorkbookWriteHandler) { + public static void afterWorkbookDispose(WorkbookWriteHandlerContext context) { + List handlerList = context.getHandlerList(); + if (CollectionUtils.isNotEmpty(handlerList)) { + for (WriteHandler writeHandler : handlerList) { ((WorkbookWriteHandler)writeHandler).afterWorkbookDispose(context); } } } - public static void beforeSheetCreate(WriteContext writeContext) { - beforeSheetCreate(writeContext, false); + public static SheetWriteHandlerContext createSheetWriteHandlerContext(WriteContext writeContext) { + return createSheetWriteHandlerContext(writeContext, false); } - public static void beforeSheetCreate(WriteContext writeContext, boolean runOwn) { + public static SheetWriteHandlerContext createSheetWriteHandlerContext(WriteContext writeContext, boolean runOwn) { List handlerList = getHandlerList(writeContext, SheetWriteHandler.class, runOwn); - if (handlerList == null || handlerList.isEmpty()) { - return; - } SheetWriteHandlerContext context = new SheetWriteHandlerContext(writeContext, - writeContext.writeWorkbookHolder(), writeContext.writeSheetHolder()); - for (WriteHandler writeHandler : handlerList) { - if (writeHandler instanceof SheetWriteHandler) { + writeContext.writeWorkbookHolder(), writeContext.writeSheetHolder(), null, null); + if (runOwn) { + context.setOwnHandlerList(handlerList); + } else { + context.setHandlerList(handlerList); + } + return context; + } + + public static void beforeSheetCreate(SheetWriteHandlerContext context) { + beforeSheetCreate(context, false); + } + + public static void beforeSheetCreate(SheetWriteHandlerContext context, boolean runOwn) { + List handlerList; + if (runOwn) { + handlerList = context.getOwnHandlerList(); + } else { + handlerList = context.getHandlerList(); + } + if (CollectionUtils.isNotEmpty(handlerList)) { + for (WriteHandler writeHandler : handlerList) { ((SheetWriteHandler)writeHandler).beforeSheetCreate(context); } } } - public static void afterSheetCreate(WriteContext writeContext) { - afterSheetCreate(writeContext, false); + public static void afterSheetCreate(SheetWriteHandlerContext context) { + afterSheetCreate(context, false); } - public static void afterSheetCreate(WriteContext writeContext, boolean runOwn) { - List handlerList = getHandlerList(writeContext, SheetWriteHandler.class, runOwn); - if (handlerList == null || handlerList.isEmpty()) { - return; + public static void afterSheetCreate(SheetWriteHandlerContext context, boolean runOwn) { + List handlerList; + if (runOwn) { + handlerList = context.getOwnHandlerList(); + } else { + handlerList = context.getHandlerList(); } - SheetWriteHandlerContext context = new SheetWriteHandlerContext(writeContext, - writeContext.writeWorkbookHolder(), writeContext.writeSheetHolder()); - for (WriteHandler writeHandler : handlerList) { - if (writeHandler instanceof SheetWriteHandler) { + if (CollectionUtils.isNotEmpty(handlerList)) { + for (WriteHandler writeHandler : handlerList) { ((SheetWriteHandler)writeHandler).afterSheetCreate(context); } } } - public static void beforeCellCreate(WriteContext writeContext, Row row, Head head, Integer columnIndex, - Integer relativeRowIndex, Boolean isHead, ExcelContentProperty excelContentProperty) { - List handlerList = - writeContext.currentWriteHolder().writeHandlerMap().get(CellWriteHandler.class); - if (handlerList == null || handlerList.isEmpty()) { - return; - } - CellWriteHandlerContext context = new CellWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), - writeContext.writeSheetHolder(), writeContext.writeTableHolder(), row, null, columnIndex, relativeRowIndex, - head, null, null, isHead, excelContentProperty); - for (WriteHandler writeHandler : handlerList) { - if (writeHandler instanceof CellWriteHandler) { + public static CellWriteHandlerContext createCellWriteHandlerContext(WriteContext writeContext, Row row, + Integer rowIndex, Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead, + ExcelContentProperty excelContentProperty) { + List handlerList = writeContext.currentWriteHolder().writeHandlerMap().get( + CellWriteHandler.class); + return new CellWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), + writeContext.writeSheetHolder(), writeContext.writeTableHolder(), row, rowIndex, null, columnIndex, + relativeRowIndex, head, null, null, isHead, excelContentProperty, handlerList); + } + + public static void beforeCellCreate(CellWriteHandlerContext context) { + List handlerList = context.getHandlerList(); + if (CollectionUtils.isNotEmpty(handlerList)) { + for (WriteHandler writeHandler : handlerList) { ((CellWriteHandler)writeHandler).beforeCellCreate(context); } } } - public static void afterCellCreate(WriteContext writeContext, Cell cell, Row row, Head head, - Integer columnIndex, Integer relativeRowIndex, Boolean isHead, ExcelContentProperty excelContentProperty) { - List handlerList = - writeContext.currentWriteHolder().writeHandlerMap().get(CellWriteHandler.class); - if (handlerList == null || handlerList.isEmpty()) { - return; - } - CellWriteHandlerContext context = new CellWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), - writeContext.writeSheetHolder(), writeContext.writeTableHolder(), row, cell, columnIndex, relativeRowIndex, - head, null, null, isHead, excelContentProperty); - for (WriteHandler writeHandler : handlerList) { - if (writeHandler instanceof CellWriteHandler) { + public static void afterCellCreate(CellWriteHandlerContext context) { + List handlerList = context.getHandlerList(); + if (CollectionUtils.isNotEmpty(handlerList)) { + for (WriteHandler writeHandler : handlerList) { ((CellWriteHandler)writeHandler).afterCellCreate(context); } } } - public static void afterCellDataConverted(WriteContext writeContext, WriteCellData cellData, Cell cell, Row row, - Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead, - ExcelContentProperty excelContentProperty) { - List handlerList = - writeContext.currentWriteHolder().writeHandlerMap().get(CellWriteHandler.class); - if (handlerList == null || handlerList.isEmpty()) { - return; - } - List> cellDataList = cellData == null ? null : ListUtils.newArrayList(cellData); - CellWriteHandlerContext context = new CellWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), - writeContext.writeSheetHolder(), writeContext.writeTableHolder(), row, cell, - columnIndex, relativeRowIndex, head, cellDataList, cellData, isHead, excelContentProperty); - for (WriteHandler writeHandler : handlerList) { - if (writeHandler instanceof CellWriteHandler) { + public static void afterCellDataConverted(CellWriteHandlerContext context) { + List handlerList = context.getHandlerList(); + if (CollectionUtils.isNotEmpty(handlerList)) { + for (WriteHandler writeHandler : handlerList) { ((CellWriteHandler)writeHandler).afterCellDataConverted(context); } } } - public static void afterCellDispose(WriteContext writeContext, WriteCellData cellData, Cell cell, Row row, - Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead, - ExcelContentProperty excelContentProperty) { - List> cellDataList = cellData == null ? null : ListUtils.newArrayList(cellData); - afterCellDispose(writeContext, cellDataList, cell, row, head, columnIndex, relativeRowIndex, isHead, - excelContentProperty); - } - - public static void afterCellDispose(WriteContext writeContext, List> cellDataList, Cell cell, - Row row, Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead, - ExcelContentProperty excelContentProperty) { - List handlerList = - writeContext.currentWriteHolder().writeHandlerMap().get(CellWriteHandler.class); - if (handlerList == null || handlerList.isEmpty()) { - return; - } - WriteCellData cellData = null; - if (CollectionUtils.isNotEmpty(cellDataList)) { - cellData = cellDataList.get(0); - } - CellWriteHandlerContext context = new CellWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), - writeContext.writeSheetHolder(), writeContext.writeTableHolder(), row, cell, columnIndex, relativeRowIndex, - head, cellDataList, cellData, isHead, excelContentProperty); - for (WriteHandler writeHandler : handlerList) { - if (writeHandler instanceof CellWriteHandler) { + public static void afterCellDispose(CellWriteHandlerContext context) { + List handlerList = context.getHandlerList(); + if (CollectionUtils.isNotEmpty(handlerList)) { + for (WriteHandler writeHandler : handlerList) { ((CellWriteHandler)writeHandler).afterCellDispose(context); } } } - public static void beforeRowCreate(WriteContext writeContext, Integer rowIndex, Integer relativeRowIndex, - Boolean isHead) { - List handlerList = writeContext.currentWriteHolder().writeHandlerMap().get(RowWriteHandler.class); - if (handlerList == null || handlerList.isEmpty()) { - return; - } - RowWriteHandlerContext context = new RowWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), - writeContext.writeSheetHolder(), writeContext.writeTableHolder(), rowIndex, null, relativeRowIndex, isHead); - for (WriteHandler writeHandler : handlerList) { - if (writeHandler instanceof RowWriteHandler) { + public static RowWriteHandlerContext createRowWriteHandlerContext(WriteContext writeContext, Integer rowIndex, + Integer relativeRowIndex, Boolean isHead) { + List handlerList = writeContext.currentWriteHolder().writeHandlerMap().get( + RowWriteHandler.class); + return new RowWriteHandlerContext(writeContext, + writeContext.writeWorkbookHolder(), + writeContext.writeSheetHolder(), writeContext.writeTableHolder(), rowIndex, null, relativeRowIndex, + isHead, handlerList); + } + + public static void beforeRowCreate(RowWriteHandlerContext context) { + List handlerList = context.getHandlerList(); + if (CollectionUtils.isNotEmpty(handlerList)) { + for (WriteHandler writeHandler : handlerList) { ((RowWriteHandler)writeHandler).beforeRowCreate(context); } } } - public static void afterRowCreate(WriteContext writeContext, Row row, Integer rowIndex, Integer relativeRowIndex, - Boolean isHead) { - List handlerList = writeContext.currentWriteHolder().writeHandlerMap().get(RowWriteHandler.class); - if (handlerList == null || handlerList.isEmpty()) { - return; - } - RowWriteHandlerContext context = new RowWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), - writeContext.writeSheetHolder(), writeContext.writeTableHolder(), rowIndex, row, relativeRowIndex, - isHead); - for (WriteHandler writeHandler : handlerList) { - if (writeHandler instanceof RowWriteHandler) { + public static void afterRowCreate(RowWriteHandlerContext context) { + List handlerList = context.getHandlerList(); + if (CollectionUtils.isNotEmpty(handlerList)) { + for (WriteHandler writeHandler : handlerList) { ((RowWriteHandler)writeHandler).afterRowCreate(context); } } } - public static void afterRowDispose(WriteContext writeContext, Row row, Integer rowIndex, Integer relativeRowIndex, - Boolean isHead) { - List handlerList = writeContext.currentWriteHolder().writeHandlerMap().get(RowWriteHandler.class); - if (handlerList == null || handlerList.isEmpty()) { - return; - } - RowWriteHandlerContext context = new RowWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), - writeContext.writeSheetHolder(), writeContext.writeTableHolder(), rowIndex, row, relativeRowIndex, isHead); - for (WriteHandler writeHandler : handlerList) { - if (writeHandler instanceof RowWriteHandler) { + public static void afterRowDispose(RowWriteHandlerContext context) { + List handlerList = context.getHandlerList(); + if (CollectionUtils.isNotEmpty(handlerList)) { + for (WriteHandler writeHandler : handlerList) { ((RowWriteHandler)writeHandler).afterRowDispose(context); } } } - private static List getHandlerList(WriteContext writeContext, Class clazz, + private static List getHandlerList(WriteContext writeContext, Class clazz, boolean runOwn) { Map, List> writeHandlerMap; if (runOwn) { diff --git a/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java b/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java index 7c94e178..9d10ca1e 100644 --- a/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java @@ -8,8 +8,7 @@ import com.alibaba.excel.converters.ConverterKeyBuild; import com.alibaba.excel.converters.NullableObjectConverter; import com.alibaba.excel.converters.WriteConverterContext; import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.exception.ExcelDataConvertException; -import com.alibaba.excel.metadata.Head; +import com.alibaba.excel.exception.ExcelWriteDataConvertException; import com.alibaba.excel.metadata.data.CommentData; import com.alibaba.excel.metadata.data.FormulaData; import com.alibaba.excel.metadata.data.HyperlinkData; @@ -19,10 +18,11 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.support.ExcelTypeEnum; import com.alibaba.excel.util.DateUtils; import com.alibaba.excel.util.FileTypeUtils; +import com.alibaba.excel.util.ListUtils; import com.alibaba.excel.util.StyleUtil; import com.alibaba.excel.util.WorkBookUtil; import com.alibaba.excel.util.WriteHandlerUtils; -import com.alibaba.excel.write.metadata.holder.WriteHolder; +import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.hssf.usermodel.HSSFClientAnchor; @@ -32,8 +32,8 @@ import org.apache.poi.ss.usermodel.Comment; import org.apache.poi.ss.usermodel.CreationHelper; import org.apache.poi.ss.usermodel.Drawing; import org.apache.poi.ss.usermodel.Hyperlink; -import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFClientAnchor; /** @@ -48,124 +48,140 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { this.writeContext = writeContext; } - protected WriteCellData converterAndSet(WriteHolder currentWriteHolder, Class clazz, - CellDataTypeEnum targetType, Cell cell, Row row, Object value, ExcelContentProperty excelContentProperty, - Head head, Integer relativeRowIndex, int rowIndex, int columnIndex) { - boolean needTrim = value != null && (value instanceof String && currentWriteHolder.globalConfiguration() - .getAutoTrim()); - if (needTrim) { - value = ((String)value).trim(); - } - WriteCellData cellData = convert(currentWriteHolder, clazz, targetType, cell, value, excelContentProperty); - WriteHandlerUtils.afterCellDataConverted(writeContext, cellData, cell, row, head, columnIndex, relativeRowIndex, - Boolean.FALSE, excelContentProperty); + /** + * Transform the data and then to set into the cell + * + * @param cellWriteHandlerContext context + * @return + */ + protected void converterAndSet(CellWriteHandlerContext cellWriteHandlerContext) { + + WriteCellData cellData = convert(cellWriteHandlerContext); + cellWriteHandlerContext.setCellDataList(ListUtils.newArrayList(cellData)); + cellWriteHandlerContext.setFirstCellData(cellData); + + WriteHandlerUtils.afterCellDataConverted(cellWriteHandlerContext); // Fill in picture information - fillImage(cell, cellData.getImageDataList()); + fillImage(cellWriteHandlerContext, cellData.getImageDataList()); // Fill in comment information - fillComment(cell, cellData.getCommentData()); + fillComment(cellWriteHandlerContext, cellData.getCommentData()); // Fill in hyper link information - fillHyperLink(cell, cellData.getHyperlinkData()); + fillHyperLink(cellWriteHandlerContext, cellData.getHyperlinkData()); // Fill in formula information - fillFormula(cell, cellData.getFormulaData()); + fillFormula(cellWriteHandlerContext, cellData.getFormulaData()); // Fill index - cellData.setRowIndex(rowIndex); - cellData.setColumnIndex(columnIndex); + cellData.setRowIndex(cellWriteHandlerContext.getRowIndex()); + cellData.setColumnIndex(cellWriteHandlerContext.getColumnIndex()); if (cellData.getType() == null) { cellData.setType(CellDataTypeEnum.EMPTY); } + Cell cell = cellWriteHandlerContext.getCell(); switch (cellData.getType()) { case STRING: cell.setCellValue(cellData.getStringValue()); - return cellData; + return; case BOOLEAN: cell.setCellValue(cellData.getBooleanValue()); - return cellData; + return; case NUMBER: cell.setCellValue(cellData.getNumberValue().doubleValue()); - return cellData; + return; case DATE: cell.setCellValue(cellData.getDateValue()); - return cellData; + return; case RICH_TEXT_STRING: cell.setCellValue(StyleUtil .buildRichTextString(writeContext.writeWorkbookHolder(), cellData.getRichTextStringDataValue())); - return cellData; + return; case EMPTY: - return cellData; + return; default: - throw new ExcelDataConvertException(cell.getRow().getRowNum(), cell.getColumnIndex(), cellData, - excelContentProperty, "Not supported data:" + value + " return type:" + cell.getCellType() - + "at row:" + cell.getRow().getRowNum()); + throw new ExcelWriteDataConvertException(cellWriteHandlerContext, + "Not supported data:" + cellWriteHandlerContext.getOriginalValue() + " return type:" + + cellData.getType() + + "at row:" + cellWriteHandlerContext.getRowIndex()); } } - private void fillFormula(Cell cell, FormulaData formulaData) { + private void fillFormula(CellWriteHandlerContext cellWriteHandlerContext, FormulaData formulaData) { if (formulaData == null) { return; } + Cell cell = cellWriteHandlerContext.getCell(); if (formulaData.getFormulaValue() != null) { cell.setCellFormula(formulaData.getFormulaValue()); } } - private void fillHyperLink(Cell cell, HyperlinkData hyperlinkData) { + private void fillHyperLink(CellWriteHandlerContext cellWriteHandlerContext, HyperlinkData hyperlinkData) { if (hyperlinkData == null) { return; } - CreationHelper helper = cell.getSheet().getWorkbook().getCreationHelper(); + Integer rowIndex = cellWriteHandlerContext.getRowIndex(); + Integer columnIndex = cellWriteHandlerContext.getColumnIndex(); + Workbook workbook = cellWriteHandlerContext.getWriteWorkbookHolder().getWorkbook(); + Cell cell = cellWriteHandlerContext.getCell(); + + CreationHelper helper = workbook.getCreationHelper(); Hyperlink hyperlink = helper.createHyperlink(StyleUtil.getHyperlinkType(hyperlinkData.getHyperlinkType())); hyperlink.setAddress(hyperlinkData.getAddress()); - hyperlink.setFirstRow(StyleUtil.getCellCoordinate(cell.getRow().getRowNum(), hyperlinkData.getFirstRowIndex(), + hyperlink.setFirstRow(StyleUtil.getCellCoordinate(rowIndex, hyperlinkData.getFirstRowIndex(), hyperlinkData.getRelativeFirstRowIndex())); - hyperlink.setFirstColumn(StyleUtil.getCellCoordinate(cell.getColumnIndex(), hyperlinkData.getFirstColumnIndex(), + hyperlink.setFirstColumn(StyleUtil.getCellCoordinate(columnIndex, hyperlinkData.getFirstColumnIndex(), hyperlinkData.getRelativeFirstColumnIndex())); - hyperlink.setLastRow(StyleUtil.getCellCoordinate(cell.getRow().getRowNum(), hyperlinkData.getLastRowIndex(), + hyperlink.setLastRow(StyleUtil.getCellCoordinate(rowIndex, hyperlinkData.getLastRowIndex(), hyperlinkData.getRelativeLastRowIndex())); - hyperlink.setLastColumn(StyleUtil.getCellCoordinate(cell.getColumnIndex(), hyperlinkData.getLastColumnIndex(), + hyperlink.setLastColumn(StyleUtil.getCellCoordinate(columnIndex, hyperlinkData.getLastColumnIndex(), hyperlinkData.getRelativeLastColumnIndex())); cell.setHyperlink(hyperlink); } - private void fillComment(Cell cell, CommentData commentData) { + private void fillComment(CellWriteHandlerContext cellWriteHandlerContext, CommentData commentData) { if (commentData == null) { return; } ClientAnchor anchor; + Integer rowIndex = cellWriteHandlerContext.getRowIndex(); + Integer columnIndex = cellWriteHandlerContext.getColumnIndex(); + Sheet sheet = cellWriteHandlerContext.getWriteSheetHolder().getSheet(); + Cell cell = cellWriteHandlerContext.getCell(); + if (writeContext.writeWorkbookHolder().getExcelType() == ExcelTypeEnum.XLSX) { anchor = new XSSFClientAnchor(StyleUtil.getCoordinate(commentData.getLeft()), StyleUtil.getCoordinate(commentData.getTop()), StyleUtil.getCoordinate(commentData.getRight()), StyleUtil.getCoordinate(commentData.getBottom()), - StyleUtil.getCellCoordinate(cell.getColumnIndex(), commentData.getFirstColumnIndex(), + StyleUtil.getCellCoordinate(columnIndex, commentData.getFirstColumnIndex(), commentData.getRelativeFirstColumnIndex()), - StyleUtil.getCellCoordinate(cell.getRow().getRowNum(), commentData.getFirstRowIndex(), + StyleUtil.getCellCoordinate(rowIndex, commentData.getFirstRowIndex(), commentData.getRelativeFirstRowIndex()), - StyleUtil.getCellCoordinate(cell.getColumnIndex(), commentData.getLastColumnIndex(), + StyleUtil.getCellCoordinate(columnIndex, commentData.getLastColumnIndex(), commentData.getRelativeLastColumnIndex()) + 1, - StyleUtil.getCellCoordinate(cell.getRow().getRowNum(), commentData.getLastRowIndex(), + StyleUtil.getCellCoordinate(rowIndex, commentData.getLastRowIndex(), commentData.getRelativeLastRowIndex()) + 1); } else { anchor = new HSSFClientAnchor(StyleUtil.getCoordinate(commentData.getLeft()), StyleUtil.getCoordinate(commentData.getTop()), StyleUtil.getCoordinate(commentData.getRight()), StyleUtil.getCoordinate(commentData.getBottom()), - (short)StyleUtil.getCellCoordinate(cell.getColumnIndex(), commentData.getFirstColumnIndex(), + (short)StyleUtil.getCellCoordinate(columnIndex, commentData.getFirstColumnIndex(), commentData.getRelativeFirstColumnIndex()), - StyleUtil.getCellCoordinate(cell.getRow().getRowNum(), commentData.getFirstRowIndex(), + StyleUtil.getCellCoordinate(rowIndex, commentData.getFirstRowIndex(), commentData.getRelativeFirstRowIndex()), - (short)(StyleUtil.getCellCoordinate(cell.getColumnIndex(), commentData.getLastColumnIndex(), + (short)(StyleUtil.getCellCoordinate(columnIndex, commentData.getLastColumnIndex(), commentData.getRelativeLastColumnIndex()) + 1), - StyleUtil.getCellCoordinate(cell.getRow().getRowNum(), commentData.getLastRowIndex(), + StyleUtil.getCellCoordinate(rowIndex, commentData.getLastRowIndex(), commentData.getRelativeLastRowIndex()) + 1); } - Comment comment = cell.getSheet().createDrawingPatriarch().createCellComment(anchor); + + Comment comment = sheet.createDrawingPatriarch().createCellComment(anchor); if (commentData.getRichTextStringData() != null) { comment.setString( StyleUtil.buildRichTextString(writeContext.writeWorkbookHolder(), commentData.getRichTextStringData())); @@ -176,18 +192,22 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { cell.setCellComment(comment); } - protected void fillImage(Cell cell, List imageDataList) { + protected void fillImage(CellWriteHandlerContext cellWriteHandlerContext, List imageDataList) { if (CollectionUtils.isEmpty(imageDataList)) { return; } - Sheet sheet = cell.getSheet(); + Integer rowIndex = cellWriteHandlerContext.getRowIndex(); + Integer columnIndex = cellWriteHandlerContext.getColumnIndex(); + Sheet sheet = cellWriteHandlerContext.getWriteSheetHolder().getSheet(); + Workbook workbook = cellWriteHandlerContext.getWriteWorkbookHolder().getWorkbook(); + Drawing drawing = sheet.getDrawingPatriarch(); if (drawing == null) { drawing = sheet.createDrawingPatriarch(); } CreationHelper helper = sheet.getWorkbook().getCreationHelper(); for (ImageData imageData : imageDataList) { - int index = sheet.getWorkbook().addPicture(imageData.getImage(), + int index = workbook.addPicture(imageData.getImage(), FileTypeUtils.getImageTypeFormat(imageData.getImage())); ClientAnchor anchor = helper.createClientAnchor(); if (imageData.getTop() != null) { @@ -202,13 +222,13 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { if (imageData.getLeft() != null) { anchor.setDx1(StyleUtil.getCoordinate(imageData.getLeft())); } - anchor.setRow1(StyleUtil.getCellCoordinate(cell.getRow().getRowNum(), imageData.getFirstRowIndex(), + anchor.setRow1(StyleUtil.getCellCoordinate(rowIndex, imageData.getFirstRowIndex(), imageData.getRelativeFirstRowIndex())); - anchor.setCol1(StyleUtil.getCellCoordinate(cell.getColumnIndex(), imageData.getFirstColumnIndex(), + anchor.setCol1(StyleUtil.getCellCoordinate(columnIndex, imageData.getFirstColumnIndex(), imageData.getRelativeFirstColumnIndex())); - anchor.setRow2(StyleUtil.getCellCoordinate(cell.getRow().getRowNum(), imageData.getLastRowIndex(), + anchor.setRow2(StyleUtil.getCellCoordinate(rowIndex, imageData.getLastRowIndex(), imageData.getRelativeLastRowIndex()) + 1); - anchor.setCol2(StyleUtil.getCellCoordinate(cell.getColumnIndex(), imageData.getLastColumnIndex(), + anchor.setCol2(StyleUtil.getCellCoordinate(columnIndex, imageData.getLastColumnIndex(), imageData.getRelativeLastColumnIndex()) + 1); if (imageData.getAnchorType() != null) { anchor.setAnchorType(imageData.getAnchorType().getValue()); @@ -217,17 +237,16 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { } } - protected WriteCellData convert(WriteHolder currentWriteHolder, Class clazz, CellDataTypeEnum targetType, - Cell cell, Object value, ExcelContentProperty excelContentProperty) { + protected WriteCellData convert(CellWriteHandlerContext cellWriteHandlerContext) { // This means that the user has defined the data. - if (clazz == WriteCellData.class) { - if (value == null) { + if (cellWriteHandlerContext.getOriginalFieldClass() == WriteCellData.class) { + if (cellWriteHandlerContext.getOriginalValue() == null) { return new WriteCellData<>(CellDataTypeEnum.EMPTY); } - WriteCellData cellDataValue = (WriteCellData)value; + WriteCellData cellDataValue = (WriteCellData)cellWriteHandlerContext.getOriginalValue(); if (cellDataValue.getType() != null) { // Configuration information may not be read here - fillProperty(cellDataValue, excelContentProperty); + fillProperty(cellDataValue, cellWriteHandlerContext.getExcelContentProperty()); return cellDataValue; } else { @@ -236,8 +255,7 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { return cellDataValue; } } - WriteCellData cellDataReturn = doConvert(currentWriteHolder, cellDataValue.getData().getClass(), - targetType, cell, cellDataValue.getData(), excelContentProperty); + WriteCellData cellDataReturn = doConvert(cellWriteHandlerContext); if (cellDataValue.getImageDataList() != null) { cellDataReturn.setImageDataList(cellDataValue.getImageDataList()); @@ -257,7 +275,7 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { } return cellDataReturn; } - return doConvert(currentWriteHolder, clazz, targetType, cell, value, excelContentProperty); + return doConvert(cellWriteHandlerContext); } private void fillProperty(WriteCellData cellDataValue, ExcelContentProperty excelContentProperty) { @@ -281,8 +299,9 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { } } - private WriteCellData doConvert(WriteHolder currentWriteHolder, Class clazz, CellDataTypeEnum targetType, - Cell cell, Object value, ExcelContentProperty excelContentProperty) { + private WriteCellData doConvert(CellWriteHandlerContext cellWriteHandlerContext) { + ExcelContentProperty excelContentProperty = cellWriteHandlerContext.getExcelContentProperty(); + Converter converter = null; if (excelContentProperty != null) { converter = excelContentProperty.getConverter(); @@ -290,31 +309,34 @@ public abstract class AbstractExcelWriteExecutor implements ExcelWriteExecutor { if (converter == null) { // csv is converted to string by default if (writeContext.writeWorkbookHolder().getExcelType() == ExcelTypeEnum.CSV) { - targetType = CellDataTypeEnum.STRING; + cellWriteHandlerContext.setTargetCellDataType(CellDataTypeEnum.STRING); } - converter = currentWriteHolder.converterMap().get(ConverterKeyBuild.buildKey(clazz, targetType)); + converter = writeContext.currentWriteHolder().converterMap().get( + ConverterKeyBuild.buildKey(cellWriteHandlerContext.getOriginalFieldClass(), + cellWriteHandlerContext.getTargetCellDataType())); } - if (value == null && !(converter instanceof NullableObjectConverter)) { + if (cellWriteHandlerContext.getOriginalValue() == null && !(converter instanceof NullableObjectConverter)) { return new WriteCellData<>(CellDataTypeEnum.EMPTY); } if (converter == null) { - throw new ExcelDataConvertException(cell.getRow().getRowNum(), cell.getColumnIndex(), - new WriteCellData<>(CellDataTypeEnum.EMPTY), excelContentProperty, - "Can not find 'Converter' support class " + clazz.getSimpleName() + "."); + throw new ExcelWriteDataConvertException(cellWriteHandlerContext, + "Can not find 'Converter' support class " + cellWriteHandlerContext.getOriginalFieldClass() + .getSimpleName() + "."); } WriteCellData cellData; try { cellData = ((Converter)converter).convertToExcelData( - new WriteConverterContext<>(value, excelContentProperty, writeContext)); + new WriteConverterContext<>(cellWriteHandlerContext.getOriginalValue(), excelContentProperty, + writeContext)); } catch (Exception e) { - throw new ExcelDataConvertException(cell.getRow().getRowNum(), cell.getColumnIndex(), - new WriteCellData<>(CellDataTypeEnum.EMPTY), excelContentProperty, - "Convert data:" + value + " error, at row:" + cell.getRow().getRowNum(), e); + throw new ExcelWriteDataConvertException(cellWriteHandlerContext, + "Convert data:" + cellWriteHandlerContext.getOriginalValue() + " error, at row:" + + cellWriteHandlerContext.getRowIndex(), e); } if (cellData == null || cellData.getType() == null) { - throw new ExcelDataConvertException(cell.getRow().getRowNum(), cell.getColumnIndex(), - new WriteCellData<>(CellDataTypeEnum.EMPTY), excelContentProperty, - "Convert data:" + value + " return null, at row:" + cell.getRow().getRowNum()); + throw new ExcelWriteDataConvertException(cellWriteHandlerContext, + "Convert data:" + cellWriteHandlerContext.getOriginalValue() + " return null, at row:" + + cellWriteHandlerContext.getRowIndex()); } return cellData; } diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java index db0f7247..ffb8844c 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java @@ -11,13 +11,14 @@ import java.util.TreeMap; import com.alibaba.excel.context.WriteContext; import com.alibaba.excel.enums.HeadKindEnum; import com.alibaba.excel.metadata.Head; -import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.util.BeanMapUtils; import com.alibaba.excel.util.ClassUtils; import com.alibaba.excel.util.FieldUtils; import com.alibaba.excel.util.WorkBookUtil; import com.alibaba.excel.util.WriteHandlerUtils; +import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; +import com.alibaba.excel.write.handler.context.RowWriteHandlerContext; import com.alibaba.excel.write.metadata.CollectionRowData; import com.alibaba.excel.write.metadata.MapRowData; import com.alibaba.excel.write.metadata.RowData; @@ -64,9 +65,14 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { if (oneRowData == null) { return; } - WriteHandlerUtils.beforeRowCreate(writeContext, rowIndex, relativeRowIndex, Boolean.FALSE); + RowWriteHandlerContext rowWriteHandlerContext = WriteHandlerUtils.createRowWriteHandlerContext(writeContext, + rowIndex, relativeRowIndex, Boolean.FALSE); + WriteHandlerUtils.beforeRowCreate(rowWriteHandlerContext); + Row row = WorkBookUtil.createRow(writeContext.writeSheetHolder().getSheet(), rowIndex); - WriteHandlerUtils.afterRowCreate(writeContext, row, rowIndex, relativeRowIndex, Boolean.FALSE); + rowWriteHandlerContext.setRow(row); + + WriteHandlerUtils.afterRowCreate(rowWriteHandlerContext); if (oneRowData instanceof Collection) { addBasicTypeToExcel(new CollectionRowData((Collection)oneRowData), row, rowIndex, relativeRowIndex); @@ -75,7 +81,8 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { } else { addJavaObjectToExcel(oneRowData, row, rowIndex, relativeRowIndex, sortedAllFiledMap); } - WriteHandlerUtils.afterRowDispose(writeContext, row, rowIndex, relativeRowIndex, Boolean.FALSE); + + WriteHandlerUtils.afterRowDispose(rowWriteHandlerContext); } private void addBasicTypeToExcel(RowData oneRowData, Row row, int rowIndex, int relativeRowIndex) { @@ -114,25 +121,28 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), head == null ? null : head.getFieldName()); - WriteHandlerUtils.beforeCellCreate(writeContext, row, head, columnIndex, relativeRowIndex, Boolean.FALSE, - excelContentProperty); + CellWriteHandlerContext cellWriteHandlerContext = WriteHandlerUtils.createCellWriteHandlerContext(writeContext, + row, rowIndex, head, columnIndex, relativeRowIndex, Boolean.FALSE, excelContentProperty); + WriteHandlerUtils.beforeCellCreate(cellWriteHandlerContext); + Cell cell = WorkBookUtil.createCell(row, columnIndex); - WriteHandlerUtils.afterCellCreate(writeContext, cell, row, head, columnIndex, relativeRowIndex, Boolean.FALSE, - excelContentProperty); - Object value = oneRowData.get(dataIndex); - WriteCellData cellData = converterAndSet(writeContext.currentWriteHolder(), - FieldUtils.getFieldClass(value), null, cell, row, value, null, head, relativeRowIndex, - rowIndex, columnIndex); - WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, row, head, columnIndex, relativeRowIndex, - Boolean.FALSE, - excelContentProperty); + cellWriteHandlerContext.setCell(cell); + + WriteHandlerUtils.afterCellCreate(cellWriteHandlerContext); + + cellWriteHandlerContext.setOriginalValue(oneRowData.get(dataIndex)); + cellWriteHandlerContext.setOriginalFieldClass( + FieldUtils.getFieldClass(cellWriteHandlerContext.getOriginalValue())); + converterAndSet(cellWriteHandlerContext); + + WriteHandlerUtils.afterCellDispose(cellWriteHandlerContext); } private void addJavaObjectToExcel(Object oneRowData, Row row, int rowIndex, int relativeRowIndex, Map sortedAllFiledMap) { WriteHolder currentWriteHolder = writeContext.currentWriteHolder(); BeanMap beanMap = BeanMapUtils.create(oneRowData); - Set beanMapHandledSet = new HashSet(); + Set beanMapHandledSet = new HashSet<>(); int maxCellIndex = -1; // If it's a class it needs to be cast by type if (HeadKindEnum.CLASS.equals(writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadKind())) { @@ -144,20 +154,25 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { if (!beanMap.containsKey(name)) { continue; } + ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(beanMap, currentWriteHolder.excelWriteHeadProperty().getHeadClazz(), name); - WriteHandlerUtils.beforeCellCreate(writeContext, row, head, columnIndex, relativeRowIndex, - Boolean.FALSE, excelContentProperty); - Cell cell = WorkBookUtil.createCell(row, columnIndex); - WriteHandlerUtils.afterCellCreate(writeContext, cell, row, head, columnIndex, relativeRowIndex, - Boolean.FALSE, - excelContentProperty); - Object value = beanMap.get(name); - WriteCellData cellData = converterAndSet(currentWriteHolder, head.getField().getType(), - null, cell, row, value, excelContentProperty, head, relativeRowIndex, rowIndex, columnIndex); - WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, row, head, columnIndex, - relativeRowIndex, Boolean.FALSE, + CellWriteHandlerContext cellWriteHandlerContext = WriteHandlerUtils.createCellWriteHandlerContext( + writeContext, row, rowIndex, head, columnIndex, relativeRowIndex, Boolean.FALSE, excelContentProperty); + WriteHandlerUtils.beforeCellCreate(cellWriteHandlerContext); + + Cell cell = WorkBookUtil.createCell(row, columnIndex); + cellWriteHandlerContext.setCell(cell); + + WriteHandlerUtils.afterCellCreate(cellWriteHandlerContext); + + cellWriteHandlerContext.setOriginalValue(beanMap.get(name)); + cellWriteHandlerContext.setOriginalFieldClass(head.getField().getType()); + converterAndSet(cellWriteHandlerContext); + + WriteHandlerUtils.afterCellDispose(cellWriteHandlerContext); + beanMapHandledSet.add(name); maxCellIndex = Math.max(maxCellIndex, columnIndex); } @@ -181,20 +196,22 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { Object value = beanMap.get(filedName); ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(beanMap, currentWriteHolder.excelWriteHeadProperty().getHeadClazz(), filedName); - WriteHandlerUtils.beforeCellCreate(writeContext, row, null, maxCellIndex, relativeRowIndex, Boolean.FALSE, - excelContentProperty); + CellWriteHandlerContext cellWriteHandlerContext = WriteHandlerUtils.createCellWriteHandlerContext( + writeContext, row, rowIndex, null, maxCellIndex, relativeRowIndex, Boolean.FALSE, excelContentProperty); + WriteHandlerUtils.beforeCellCreate(cellWriteHandlerContext); + // fix https://github.com/alibaba/easyexcel/issues/1870 // If there is data, it is written to the next cell Cell cell = WorkBookUtil.createCell(row, maxCellIndex); - WriteHandlerUtils.afterCellCreate(writeContext, cell, row, null, maxCellIndex, relativeRowIndex, - Boolean.FALSE, - excelContentProperty); - WriteCellData cellData = converterAndSet(currentWriteHolder, - FieldUtils.getFieldClass(beanMap, filedName, value), null, cell, row, value, null, null, - relativeRowIndex, rowIndex, maxCellIndex); - WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, row, null, maxCellIndex, relativeRowIndex, - Boolean.FALSE, - excelContentProperty); + cellWriteHandlerContext.setCell(cell); + + WriteHandlerUtils.afterCellCreate(cellWriteHandlerContext); + + cellWriteHandlerContext.setOriginalValue(value); + cellWriteHandlerContext.setOriginalFieldClass(FieldUtils.getFieldClass(beanMap, filedName, value)); + converterAndSet(cellWriteHandlerContext); + + WriteHandlerUtils.afterCellDispose(cellWriteHandlerContext); maxCellIndex++; } } diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java index 2fb755a7..3eb49f2b 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java @@ -24,6 +24,8 @@ import com.alibaba.excel.util.ListUtils; import com.alibaba.excel.util.MapUtils; import com.alibaba.excel.util.StringUtils; import com.alibaba.excel.util.WriteHandlerUtils; +import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; +import com.alibaba.excel.write.handler.context.RowWriteHandlerContext; import com.alibaba.excel.write.metadata.fill.AnalysisCell; import com.alibaba.excel.write.metadata.fill.FillConfig; import com.alibaba.excel.write.metadata.fill.FillWrapper; @@ -189,8 +191,11 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { } else { dataMap = BeanMapUtils.create(oneRowData); } - WriteSheetHolder writeSheetHolder = writeContext.writeSheetHolder(); for (AnalysisCell analysisCell : analysisCellList) { + CellWriteHandlerContext cellWriteHandlerContext = WriteHandlerUtils.createCellWriteHandlerContext( + writeContext, null, analysisCell.getRowIndex(), null, analysisCell.getColumnIndex(), + relativeRowIndex, Boolean.FALSE, ExcelContentProperty.EMPTY); + if (analysisCell.getOnlyOneVariable()) { String variable = analysisCell.getVariableList().get(0); if (!dataMap.containsKey(variable)) { @@ -199,12 +204,14 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { Object value = dataMap.get(variable); ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(dataMap, writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), variable); - Cell cell = getOneCell(analysisCell, fillConfig, excelContentProperty); + cellWriteHandlerContext.setExcelContentProperty(excelContentProperty); + + createCell(analysisCell, fillConfig, cellWriteHandlerContext); + cellWriteHandlerContext.setOriginalValue(value); + cellWriteHandlerContext.setOriginalFieldClass(FieldUtils.getFieldClass(dataMap, variable, value)); - WriteCellData cellData = converterAndSet(writeSheetHolder, - FieldUtils.getFieldClass(dataMap, variable, value), null, cell, value, excelContentProperty, null, - relativeRowIndex, analysisCell.getRowIndex(), analysisCell.getColumnIndex()); - cellData.setAnalysisCell(analysisCell); + converterAndSet(cellWriteHandlerContext); + WriteCellData cellData = cellWriteHandlerContext.getFirstCellData(); // Restyle if (fillConfig.getAutoStyle()) { @@ -212,14 +219,15 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { .map(collectionFieldStyleMap -> collectionFieldStyleMap.get(analysisCell)) .ifPresent(cellData::setOriginCellStyle); } - - WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, null, relativeRowIndex, Boolean.FALSE, - excelContentProperty); } else { StringBuilder cellValueBuild = new StringBuilder(); int index = 0; List> cellDataList = new ArrayList<>(); - Cell cell = getOneCell(analysisCell, fillConfig, ExcelContentProperty.EMPTY); + + cellWriteHandlerContext.setExcelContentProperty(ExcelContentProperty.EMPTY); + + createCell(analysisCell, fillConfig, cellWriteHandlerContext); + Cell cell = cellWriteHandlerContext.getCell(); for (String variable : analysisCell.getVariableList()) { cellValueBuild.append(analysisCell.getPrepareDataList().get(index++)); @@ -229,11 +237,14 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { Object value = dataMap.get(variable); ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(dataMap, writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), variable); - WriteCellData cellData = convert(writeSheetHolder, - FieldUtils.getFieldClass(dataMap, variable, value), CellDataTypeEnum.STRING, cell, value, - excelContentProperty); - cellData.setAnalysisCell(analysisCell); + cellWriteHandlerContext.setOriginalValue(value); + cellWriteHandlerContext.setOriginalFieldClass(FieldUtils.getFieldClass(dataMap, variable, value)); + cellWriteHandlerContext.setExcelContentProperty(excelContentProperty); + cellWriteHandlerContext.setTargetCellDataType(CellDataTypeEnum.STRING); + + WriteCellData cellData = convert(cellWriteHandlerContext); cellDataList.add(cellData); + CellDataTypeEnum type = cellData.getType(); if (type != null) { switch (type) { @@ -253,6 +264,10 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { } cellValueBuild.append(analysisCell.getPrepareDataList().get(index)); cell.setCellValue(cellValueBuild.toString()); + cellWriteHandlerContext.setCellDataList(cellDataList); + if (CollectionUtils.isNotEmpty(cellDataList)) { + cellWriteHandlerContext.setFirstCellData(cellDataList.get(0)); + } // Restyle if (fillConfig.getAutoStyle()) { @@ -260,10 +275,8 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { .map(collectionFieldStyleMap -> collectionFieldStyleMap.get(analysisCell)) .ifPresent(cell::setCellStyle); } - - WriteHandlerUtils.afterCellDispose(writeContext, cellDataList, cell, null, relativeRowIndex, - Boolean.FALSE, ExcelContentProperty.EMPTY); } + WriteHandlerUtils.afterCellDispose(cellWriteHandlerContext); } } @@ -278,11 +291,14 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { return relativeRowIndex; } - private Cell getOneCell(AnalysisCell analysisCell, FillConfig fillConfig, - ExcelContentProperty excelContentProperty) { + private void createCell(AnalysisCell analysisCell, FillConfig fillConfig, + CellWriteHandlerContext cellWriteHandlerContext) { Sheet cachedSheet = writeContext.writeSheetHolder().getCachedSheet(); if (WriteTemplateAnalysisCellTypeEnum.COMMON.equals(analysisCell.getCellType())) { - return cachedSheet.getRow(analysisCell.getRowIndex()).getCell(analysisCell.getColumnIndex()); + Row row = cachedSheet.getRow(analysisCell.getRowIndex()); + cellWriteHandlerContext.setRow(row); + Cell cell = row.getCell(analysisCell.getColumnIndex()); + cellWriteHandlerContext.setCell(cell); } Sheet sheet = writeContext.writeSheetHolder().getSheet(); @@ -319,31 +335,38 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { throw new ExcelGenerateException("The wrong direction."); } - Row row = createRowIfNecessary(sheet, cachedSheet, lastRowIndex, fillConfig, analysisCell, isOriginalCell); - Cell cell = createCellIfNecessary(row, lastColumnIndex, excelContentProperty); + Row row = createRowIfNecessary(sheet, cachedSheet, lastRowIndex, fillConfig, analysisCell, isOriginalCell, + cellWriteHandlerContext); + cellWriteHandlerContext.setRow(row); + + cellWriteHandlerContext.setRowIndex(lastRowIndex); + cellWriteHandlerContext.setColumnIndex(lastColumnIndex); + Cell cell = createCellIfNecessary(row, lastColumnIndex, cellWriteHandlerContext); + cellWriteHandlerContext.setCell(cell); if (isOriginalCell) { Map collectionFieldStyleMap = collectionFieldStyleCache.computeIfAbsent( currentUniqueDataFlag, key -> MapUtils.newHashMap()); collectionFieldStyleMap.put(analysisCell, cell.getCellStyle()); } - return cell; } - private Cell createCellIfNecessary(Row row, Integer lastColumnIndex, ExcelContentProperty excelContentProperty) { + private Cell createCellIfNecessary(Row row, Integer lastColumnIndex, + CellWriteHandlerContext cellWriteHandlerContext) { Cell cell = row.getCell(lastColumnIndex); if (cell != null) { return cell; } - WriteHandlerUtils.beforeCellCreate(writeContext, row, null, lastColumnIndex, null, Boolean.FALSE, - excelContentProperty); + WriteHandlerUtils.beforeCellCreate(cellWriteHandlerContext); cell = row.createCell(lastColumnIndex); - WriteHandlerUtils.afterCellCreate(writeContext, cell, null, null, Boolean.FALSE, excelContentProperty); + cellWriteHandlerContext.setCell(cell); + + WriteHandlerUtils.afterCellCreate(cellWriteHandlerContext); return cell; } private Row createRowIfNecessary(Sheet sheet, Sheet cachedSheet, Integer lastRowIndex, FillConfig fillConfig, - AnalysisCell analysisCell, boolean isOriginalCell) { + AnalysisCell analysisCell, boolean isOriginalCell, CellWriteHandlerContext cellWriteHandlerContext) { Row row = sheet.getRow(lastRowIndex); if (row != null) { checkRowHeight(analysisCell, fillConfig, isOriginalCell, row); @@ -351,7 +374,10 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { } row = cachedSheet.getRow(lastRowIndex); if (row == null) { - WriteHandlerUtils.beforeRowCreate(writeContext, lastRowIndex, null, Boolean.FALSE); + RowWriteHandlerContext rowWriteHandlerContext = WriteHandlerUtils.createRowWriteHandlerContext(writeContext, + lastRowIndex, null, Boolean.FALSE); + WriteHandlerUtils.beforeRowCreate(rowWriteHandlerContext); + if (fillConfig.getForceNewRow()) { row = cachedSheet.createRow(lastRowIndex); } else { @@ -364,8 +390,10 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { row = cachedSheet.createRow(lastRowIndex); } } + rowWriteHandlerContext.setRow(row); checkRowHeight(analysisCell, fillConfig, isOriginalCell, row); - WriteHandlerUtils.afterRowCreate(writeContext, row, null, Boolean.FALSE); + + WriteHandlerUtils.afterRowCreate(rowWriteHandlerContext); } else { checkRowHeight(analysisCell, fillConfig, isOriginalCell, row); } diff --git a/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java index 27530f6f..d585db93 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java @@ -3,14 +3,16 @@ package com.alibaba.excel.write.handler.context; import java.util.List; import com.alibaba.excel.context.WriteContext; +import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.metadata.property.ExcelContentProperty; +import com.alibaba.excel.write.handler.WriteHandler; +import com.alibaba.excel.write.handler.impl.FillStyleCellWriteHandler; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteTableHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; -import lombok.AllArgsConstructor; import lombok.Data; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -21,7 +23,6 @@ import org.apache.poi.ss.usermodel.Row; * @author Jiaju Zhuang */ @Data -@AllArgsConstructor public class CellWriteHandlerContext { /** * write context @@ -43,6 +44,10 @@ public class CellWriteHandlerContext { * row */ private Row row; + /** + * index + */ + private Integer rowIndex; /** * cell */ @@ -78,4 +83,53 @@ public class CellWriteHandlerContext { * Field annotation configuration information. */ private ExcelContentProperty excelContentProperty; + + /** + * The value of the original + */ + private Object originalValue; + + /** + * The original field type + */ + private Class originalFieldClass; + + /** + * Target cell data type + */ + private CellDataTypeEnum targetCellDataType; + + /** + * Ignore the filling pattern and the {@code FillStyleCellWriteHandler} will not work. + * + * @see FillStyleCellWriteHandler + */ + private Boolean ignoreFillStyle; + + /** + * handler + */ + private List handlerList; + + public CellWriteHandlerContext(WriteContext writeContext, + WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder, + WriteTableHolder writeTableHolder, Row row, Integer rowIndex, Cell cell, Integer columnIndex, + Integer relativeRowIndex, Head headData, List> cellDataList, WriteCellData firstCellData, + Boolean head, ExcelContentProperty excelContentProperty, List handlerList) { + this.writeContext = writeContext; + this.writeWorkbookHolder = writeWorkbookHolder; + this.writeSheetHolder = writeSheetHolder; + this.writeTableHolder = writeTableHolder; + this.row = row; + this.rowIndex = rowIndex; + this.cell = cell; + this.columnIndex = columnIndex; + this.relativeRowIndex = relativeRowIndex; + this.headData = headData; + this.cellDataList = cellDataList; + this.firstCellData = firstCellData; + this.head = head; + this.excelContentProperty = excelContentProperty; + this.handlerList = handlerList; + } } diff --git a/src/main/java/com/alibaba/excel/write/handler/context/RowWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/RowWriteHandlerContext.java index 6578d3a2..cf3f79e6 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/RowWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/RowWriteHandlerContext.java @@ -1,6 +1,9 @@ package com.alibaba.excel.write.handler.context; +import java.util.List; + import com.alibaba.excel.context.WriteContext; +import com.alibaba.excel.write.handler.WriteHandler; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteTableHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; @@ -49,4 +52,9 @@ public class RowWriteHandlerContext { * Nullable.It is null in the case of fill data. */ private Boolean head; + + /** + * handler + */ + private List handlerList; } diff --git a/src/main/java/com/alibaba/excel/write/handler/context/SheetWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/SheetWriteHandlerContext.java index c1164eb0..17401bd8 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/SheetWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/SheetWriteHandlerContext.java @@ -1,6 +1,9 @@ package com.alibaba.excel.write.handler.context; +import java.util.List; + import com.alibaba.excel.context.WriteContext; +import com.alibaba.excel.write.handler.WriteHandler; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; @@ -27,4 +30,13 @@ public class SheetWriteHandlerContext { * sheet */ private WriteSheetHolder writeSheetHolder; + + /** + * handler + */ + private List handlerList; + /** + * handler + */ + private List ownHandlerList; } diff --git a/src/main/java/com/alibaba/excel/write/handler/context/WorkbookWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/WorkbookWriteHandlerContext.java index f955d4bf..032f21c6 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/WorkbookWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/WorkbookWriteHandlerContext.java @@ -1,6 +1,9 @@ package com.alibaba.excel.write.handler.context; +import java.util.List; + import com.alibaba.excel.context.WriteContext; +import com.alibaba.excel.write.handler.WriteHandler; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; import lombok.AllArgsConstructor; @@ -22,4 +25,14 @@ public class WorkbookWriteHandlerContext { * workbook */ private WriteWorkbookHolder writeWorkbookHolder; + + /** + * handler + */ + private List handlerList; + + /** + * handler + */ + private List ownHandlerList; } diff --git a/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java b/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java index 819da9b1..eeae8e89 100644 --- a/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java +++ b/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java @@ -1,15 +1,13 @@ package com.alibaba.excel.write.handler.impl; -import java.util.List; - import com.alibaba.excel.constant.OrderConstant; import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.util.BooleanUtils; import com.alibaba.excel.write.handler.CellWriteHandler; import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.ss.usermodel.CellStyle; /** @@ -27,12 +25,12 @@ public class FillStyleCellWriteHandler implements CellWriteHandler { @Override public void afterCellDispose(CellWriteHandlerContext context) { - List> cellDataList = context.getCellDataList(); - if (CollectionUtils.size(cellDataList) != 1) { + if (BooleanUtils.isTrue(context.getIgnoreFillStyle())) { return; } + WriteCellData cellData = context.getFirstCellData(); - if (cellData.getAnalysisCell() != null && !cellData.getAnalysisCell().getOnlyOneVariable()) { + if (cellData == null) { return; } WriteCellStyle writeCellStyle = cellData.getWriteCellStyle(); diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java index 5059894a..2961efc0 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java @@ -430,4 +430,5 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ public boolean automaticMergeHead() { return getAutomaticMergeHead(); } + } diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteSheetHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteSheetHolder.java index 580eeb97..ede60eab 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteSheetHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteSheetHolder.java @@ -9,9 +9,7 @@ import com.alibaba.excel.util.StringUtils; import com.alibaba.excel.write.metadata.WriteSheet; import lombok.Data; -import lombok.Getter; import lombok.NoArgsConstructor; -import lombok.Setter; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.xssf.streaming.SXSSFSheet; diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java index 374b5b7a..ef619196 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java @@ -19,6 +19,7 @@ import com.alibaba.excel.util.FileUtils; import com.alibaba.excel.util.IoUtils; import com.alibaba.excel.util.MapUtils; import com.alibaba.excel.util.StyleUtil; +import com.alibaba.excel.write.handler.context.WorkbookWriteHandlerContext; import com.alibaba.excel.write.metadata.WriteWorkbook; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.metadata.style.WriteFont; @@ -143,6 +144,11 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { */ private Map dataFormatMap; + /** + * handler context + */ + private WorkbookWriteHandlerContext workbookWriteHandlerContext; + public WriteWorkbookHolder(WriteWorkbook writeWorkbook) { super(writeWorkbook, null); this.writeWorkbook = writeWorkbook; From 4ea45e6e5c7657ee75ed45911a9cf3855c9e538b Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Tue, 26 Oct 2021 15:52:16 +0800 Subject: [PATCH 03/12] =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8D=E5=86=99=E5=85=A5?= =?UTF-8?q?=E7=9A=84=E6=80=A7=E8=83=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/write/handler/impl/FillStyleCellWriteHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java b/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java index eeae8e89..d3680e24 100644 --- a/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java +++ b/src/main/java/com/alibaba/excel/write/handler/impl/FillStyleCellWriteHandler.java @@ -5,6 +5,7 @@ import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.util.BooleanUtils; import com.alibaba.excel.write.handler.CellWriteHandler; import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; +import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import lombok.extern.slf4j.Slf4j; @@ -38,8 +39,8 @@ public class FillStyleCellWriteHandler implements CellWriteHandler { if (writeCellStyle == null && originCellStyle == null) { return; } - //WriteWorkbookHolder writeWorkbookHolder = context.getWriteWorkbookHolder(); - //context.getCell().setCellStyle(writeWorkbookHolder.createCellStyle(writeCellStyle, originCellStyle)); + WriteWorkbookHolder writeWorkbookHolder = context.getWriteWorkbookHolder(); + context.getCell().setCellStyle(writeWorkbookHolder.createCellStyle(writeCellStyle, originCellStyle)); } } From 031fefde92300094ea286913f923d8a77e88797a Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 29 Oct 2021 16:30:20 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=BB=E5=86=99?= =?UTF-8?q?=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/v07/handlers/CellTagHandler.java | 18 +- .../excel/context/WriteContextImpl.java | 7 +- .../listener/ModelBuildEventListener.java | 4 +- .../holder/xlsx/XlsxReadWorkbookHolder.java | 50 ++--- .../com/alibaba/excel/util/PositionUtils.java | 61 ++---- .../alibaba/excel/util/WriteHandlerUtils.java | 203 +++++++----------- .../write/executor/ExcelWriteAddExecutor.java | 6 +- .../executor/ExcelWriteFillExecutor.java | 10 +- .../chain/CellHandlerExecutionChain.java | 63 ++++++ .../chain/RowHandlerExecutionChain.java | 56 +++++ .../chain/SheetHandlerExecutionChain.java | 48 +++++ .../chain/WorkbookHandlerExecutionChain.java | 57 +++++ .../context/CellWriteHandlerContext.java | 9 +- .../context/RowWriteHandlerContext.java | 8 - .../context/SheetWriteHandlerContext.java | 12 -- .../context/WorkbookWriteHandlerContext.java | 13 -- .../metadata/holder/AbstractWriteHolder.java | 183 ++++++++++------ .../write/metadata/holder/WriteHolder.java | 18 -- .../metadata/holder/WriteWorkbookHolder.java | 11 +- .../easyexcel/test/temp/Lock2Test.java | 17 ++ 20 files changed, 501 insertions(+), 353 deletions(-) create mode 100644 src/main/java/com/alibaba/excel/write/handler/chain/CellHandlerExecutionChain.java create mode 100644 src/main/java/com/alibaba/excel/write/handler/chain/RowHandlerExecutionChain.java create mode 100644 src/main/java/com/alibaba/excel/write/handler/chain/SheetHandlerExecutionChain.java create mode 100644 src/main/java/com/alibaba/excel/write/handler/chain/WorkbookHandlerExecutionChain.java diff --git a/src/main/java/com/alibaba/excel/analysis/v07/handlers/CellTagHandler.java b/src/main/java/com/alibaba/excel/analysis/v07/handlers/CellTagHandler.java index a6fd5340..9d8e4736 100644 --- a/src/main/java/com/alibaba/excel/analysis/v07/handlers/CellTagHandler.java +++ b/src/main/java/com/alibaba/excel/analysis/v07/handlers/CellTagHandler.java @@ -2,19 +2,15 @@ package com.alibaba.excel.analysis.v07.handlers; import java.math.BigDecimal; -import com.alibaba.excel.constant.BuiltinFormats; import com.alibaba.excel.constant.ExcelXmlConstants; import com.alibaba.excel.context.xlsx.XlsxReadContext; import com.alibaba.excel.enums.CellDataTypeEnum; -import com.alibaba.excel.metadata.data.DataFormatData; import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.read.metadata.holder.xlsx.XlsxReadSheetHolder; import com.alibaba.excel.util.BooleanUtils; import com.alibaba.excel.util.PositionUtils; import com.alibaba.excel.util.StringUtils; -import org.apache.poi.xssf.model.StylesTable; -import org.apache.poi.xssf.usermodel.XSSFCellStyle; import org.xml.sax.Attributes; /** @@ -51,17 +47,9 @@ public class CellTagHandler extends AbstractXlsxTagHandler { } else { dateFormatIndexInteger = Integer.parseInt(dateFormatIndex); } - StylesTable stylesTable = xlsxReadContext.xlsxReadWorkbookHolder().getStylesTable(); - if (stylesTable == null) { - return; - } - XSSFCellStyle xssfCellStyle = stylesTable.getStyleAt(dateFormatIndexInteger); - short dataFormat = xssfCellStyle.getDataFormat(); - DataFormatData dataFormatData = new DataFormatData(); - dataFormatData.setIndex(dataFormat); - dataFormatData.setFormat(BuiltinFormats.getBuiltinFormat(dataFormat, - xssfCellStyle.getDataFormatString(), xlsxReadSheetHolder.getGlobalConfiguration().getLocale())); - xlsxReadSheetHolder.getTempCellData().setDataFormatData(dataFormatData); + + xlsxReadSheetHolder.getTempCellData().setDataFormatData( + xlsxReadContext.xlsxReadWorkbookHolder().dataFormatData(dateFormatIndexInteger)); } @Override diff --git a/src/main/java/com/alibaba/excel/context/WriteContextImpl.java b/src/main/java/com/alibaba/excel/context/WriteContextImpl.java index 7ee3b2c9..db892989 100644 --- a/src/main/java/com/alibaba/excel/context/WriteContextImpl.java +++ b/src/main/java/com/alibaba/excel/context/WriteContextImpl.java @@ -127,7 +127,7 @@ public class WriteContextImpl implements WriteContext { // Workbook handler need to supplementary execution WorkbookWriteHandlerContext workbookWriteHandlerContext = WriteHandlerUtils.createWorkbookWriteHandlerContext( - this, true); + this); WriteHandlerUtils.beforeWorkbookCreate(workbookWriteHandlerContext, true); WriteHandlerUtils.afterWorkbookCreate(workbookWriteHandlerContext, true); @@ -310,12 +310,11 @@ public class WriteContextImpl implements WriteContext { // Workbook and sheet handler need to supplementary execution WorkbookWriteHandlerContext workbookWriteHandlerContext = WriteHandlerUtils.createWorkbookWriteHandlerContext( - this, true); + this); WriteHandlerUtils.beforeWorkbookCreate(workbookWriteHandlerContext, true); WriteHandlerUtils.afterWorkbookCreate(workbookWriteHandlerContext, true); - SheetWriteHandlerContext sheetWriteHandlerContext = WriteHandlerUtils.createSheetWriteHandlerContext(this, - true); + SheetWriteHandlerContext sheetWriteHandlerContext = WriteHandlerUtils.createSheetWriteHandlerContext(this); WriteHandlerUtils.beforeSheetCreate(sheetWriteHandlerContext, true); WriteHandlerUtils.afterSheetCreate(sheetWriteHandlerContext, true); diff --git a/src/main/java/com/alibaba/excel/read/listener/ModelBuildEventListener.java b/src/main/java/com/alibaba/excel/read/listener/ModelBuildEventListener.java index 7ba8b88f..5c8bf4bb 100644 --- a/src/main/java/com/alibaba/excel/read/listener/ModelBuildEventListener.java +++ b/src/main/java/com/alibaba/excel/read/listener/ModelBuildEventListener.java @@ -91,7 +91,6 @@ public class ModelBuildEventListener implements ReadListener headMap = excelReadHeadProperty.getHeadMap(); - Map map = MapUtils.newHashMapWithExpectedSize(headMap.size()); BeanMap dataMap = BeanMapUtils.create(resultModel); for (Map.Entry entry : headMap.entrySet()) { Integer index = entry.getKey(); @@ -105,10 +104,9 @@ public class ModelBuildEventListener implements ReadListener dataFormatDataCache; public XlsxReadWorkbookHolder(ReadWorkbook readWorkbook) { super(readWorkbook); @@ -41,27 +52,18 @@ public class XlsxReadWorkbookHolder extends ReadWorkbookHolder { setExcelType(ExcelTypeEnum.XLSX); } - public OPCPackage getOpcPackage() { - return opcPackage; + public DataFormatData dataFormatData(int dateFormatIndexInteger) { + return dataFormatDataCache.computeIfAbsent(dateFormatIndexInteger, key -> { + DataFormatData dataFormatData = new DataFormatData(); + if (stylesTable == null) { + return null; + } + XSSFCellStyle xssfCellStyle = stylesTable.getStyleAt(dateFormatIndexInteger); + dataFormatData.setIndex(xssfCellStyle.getDataFormat()); + dataFormatData.setFormat(BuiltinFormats.getBuiltinFormat(dataFormatData.getIndex(), + xssfCellStyle.getDataFormatString(), globalConfiguration().getLocale())); + return dataFormatData; + }); } - public void setOpcPackage(OPCPackage opcPackage) { - this.opcPackage = opcPackage; - } - - public String getSaxParserFactoryName() { - return saxParserFactoryName; - } - - public void setSaxParserFactoryName(String saxParserFactoryName) { - this.saxParserFactoryName = saxParserFactoryName; - } - - public StylesTable getStylesTable() { - return stylesTable; - } - - public void setStylesTable(StylesTable stylesTable) { - this.stylesTable = stylesTable; - } } diff --git a/src/main/java/com/alibaba/excel/util/PositionUtils.java b/src/main/java/com/alibaba/excel/util/PositionUtils.java index 48c5cde5..fe7e5d4e 100644 --- a/src/main/java/com/alibaba/excel/util/PositionUtils.java +++ b/src/main/java/com/alibaba/excel/util/PositionUtils.java @@ -1,11 +1,7 @@ package com.alibaba.excel.util; -import java.util.Locale; -import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.poi.ss.util.CellReference; - /** * @author jipengfei */ @@ -18,14 +14,6 @@ public class PositionUtils { private PositionUtils() {} - public static int getRowByRowTagt(String rowTagt) { - int row = 0; - if (rowTagt != null) { - row = Integer.parseInt(rowTagt) - 1; - } - return row; - } - public static int getRowByRowTagt(String rowTagt, Integer before) { int row; if (rowTagt != null) { @@ -37,47 +25,40 @@ public class PositionUtils { } return before + 1; } - } public static int getRow(String currentCellIndex) { - if (currentCellIndex != null) { - int plingPos = currentCellIndex.lastIndexOf(SHEET_NAME_DELIMITER); - String cell = currentCellIndex.substring(plingPos + 1).toUpperCase(Locale.ROOT); - Matcher matcher = CELL_REF_PATTERN.matcher(cell); - if (!matcher.matches()) { - throw new IllegalArgumentException("Invalid CellReference: " + currentCellIndex); + if (currentCellIndex == null) { + return -1; + } + int firstNumber = currentCellIndex.length() - 1; + for (; firstNumber >= 0; firstNumber--) { + char c = currentCellIndex.charAt(firstNumber); + if (c < '0' || c > '9') { + break; } - String row = matcher.group(2); - return Integer.parseInt(row) - 1; } - return -1; + return Integer.parseUnsignedInt(currentCellIndex.substring(firstNumber + 1)) - 1; } public static int getCol(String currentCellIndex, Integer before) { - if (currentCellIndex != null) { - int plingPos = currentCellIndex.lastIndexOf(SHEET_NAME_DELIMITER); - String cell = currentCellIndex.substring(plingPos + 1).toUpperCase(Locale.ROOT); - Matcher matcher = CELL_REF_PATTERN.matcher(cell); - if (!matcher.matches()) { - throw new IllegalArgumentException("Invalid CellReference: " + currentCellIndex); - } - String col = matcher.group(1); - - if (col.length() > 0 && col.charAt(0) == REDUNDANT_CHARACTERS) { - col = col.substring(1); - } - if (col.length() == 0) { - return -1; - } else { - return CellReference.convertColStringToIndex(col); - } - } else { + if (currentCellIndex == null) { if (before == null) { before = -1; } return before + 1; } + int firstNumber = currentCellIndex.charAt(0) == REDUNDANT_CHARACTERS ? 1 : 0; + int col = 0; + for (; firstNumber < currentCellIndex.length(); firstNumber++) { + char c = currentCellIndex.charAt(firstNumber); + boolean isNotLetter = c == REDUNDANT_CHARACTERS || (c >= '0' && c <= '9'); + if (isNotLetter) { + break; + } + col = col * 26 + Character.toUpperCase(c) - 'A' + 1; + } + return col - 1; } } diff --git a/src/main/java/com/alibaba/excel/util/WriteHandlerUtils.java b/src/main/java/com/alibaba/excel/util/WriteHandlerUtils.java index cb04b956..062bfdc7 100644 --- a/src/main/java/com/alibaba/excel/util/WriteHandlerUtils.java +++ b/src/main/java/com/alibaba/excel/util/WriteHandlerUtils.java @@ -1,22 +1,19 @@ package com.alibaba.excel.util; -import java.util.List; -import java.util.Map; - import com.alibaba.excel.context.WriteContext; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.property.ExcelContentProperty; -import com.alibaba.excel.write.handler.CellWriteHandler; -import com.alibaba.excel.write.handler.RowWriteHandler; -import com.alibaba.excel.write.handler.SheetWriteHandler; -import com.alibaba.excel.write.handler.WorkbookWriteHandler; -import com.alibaba.excel.write.handler.WriteHandler; +import com.alibaba.excel.write.handler.chain.CellHandlerExecutionChain; +import com.alibaba.excel.write.handler.chain.RowHandlerExecutionChain; +import com.alibaba.excel.write.handler.chain.SheetHandlerExecutionChain; +import com.alibaba.excel.write.handler.chain.WorkbookHandlerExecutionChain; import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; import com.alibaba.excel.write.handler.context.RowWriteHandlerContext; import com.alibaba.excel.write.handler.context.SheetWriteHandlerContext; import com.alibaba.excel.write.handler.context.WorkbookWriteHandlerContext; +import com.alibaba.excel.write.metadata.holder.AbstractWriteHolder; -import org.apache.commons.collections4.CollectionUtils; +import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Row; /** @@ -24,23 +21,14 @@ import org.apache.poi.ss.usermodel.Row; * * @author Jiaju Zhuang */ +@Slf4j public class WriteHandlerUtils { private WriteHandlerUtils() {} public static WorkbookWriteHandlerContext createWorkbookWriteHandlerContext(WriteContext writeContext) { - return createWorkbookWriteHandlerContext(writeContext, false); - } - - public static WorkbookWriteHandlerContext createWorkbookWriteHandlerContext(WriteContext writeContext, - boolean runOwn) { - List handlerList = getHandlerList(writeContext, WorkbookWriteHandler.class, runOwn); - WorkbookWriteHandlerContext context = new WorkbookWriteHandlerContext(writeContext, null, null, null); - if (runOwn) { - context.setOwnHandlerList(handlerList); - } else { - context.setHandlerList(handlerList); - } + WorkbookWriteHandlerContext context = new WorkbookWriteHandlerContext(writeContext, + writeContext.writeWorkbookHolder()); writeContext.writeWorkbookHolder().setWorkbookWriteHandlerContext(context); return context; } @@ -50,16 +38,9 @@ public class WriteHandlerUtils { } public static void beforeWorkbookCreate(WorkbookWriteHandlerContext context, boolean runOwn) { - List handlerList; - if (runOwn) { - handlerList = context.getOwnHandlerList(); - } else { - handlerList = context.getHandlerList(); - } - if (CollectionUtils.isNotEmpty(handlerList)) { - for (WriteHandler writeHandler : handlerList) { - ((WorkbookWriteHandler)writeHandler).beforeWorkbookCreate(context); - } + WorkbookHandlerExecutionChain workbookHandlerExecutionChain = getWorkbookHandlerExecutionChain(context, runOwn); + if (workbookHandlerExecutionChain != null) { + workbookHandlerExecutionChain.beforeWorkbookCreate(context); } } @@ -68,42 +49,32 @@ public class WriteHandlerUtils { } public static void afterWorkbookCreate(WorkbookWriteHandlerContext context, boolean runOwn) { - List handlerList; + WorkbookHandlerExecutionChain workbookHandlerExecutionChain = getWorkbookHandlerExecutionChain(context, runOwn); + if (workbookHandlerExecutionChain != null) { + workbookHandlerExecutionChain.afterWorkbookCreate(context); + } + } + + private static WorkbookHandlerExecutionChain getWorkbookHandlerExecutionChain(WorkbookWriteHandlerContext context, + boolean runOwn) { + AbstractWriteHolder abstractWriteHolder = (AbstractWriteHolder)context.getWriteContext().currentWriteHolder(); if (runOwn) { - handlerList = context.getOwnHandlerList(); + return abstractWriteHolder.getOwnWorkbookHandlerExecutionChain(); } else { - handlerList = context.getHandlerList(); - } - if (CollectionUtils.isNotEmpty(handlerList)) { - for (WriteHandler writeHandler : handlerList) { - ((WorkbookWriteHandler)writeHandler).afterWorkbookCreate(context); - } + return abstractWriteHolder.getWorkbookHandlerExecutionChain(); } } public static void afterWorkbookDispose(WorkbookWriteHandlerContext context) { - List handlerList = context.getHandlerList(); - if (CollectionUtils.isNotEmpty(handlerList)) { - for (WriteHandler writeHandler : handlerList) { - ((WorkbookWriteHandler)writeHandler).afterWorkbookDispose(context); - } + WorkbookHandlerExecutionChain workbookHandlerExecutionChain = getWorkbookHandlerExecutionChain(context, false); + if (workbookHandlerExecutionChain != null) { + workbookHandlerExecutionChain.afterWorkbookDispose(context); } } public static SheetWriteHandlerContext createSheetWriteHandlerContext(WriteContext writeContext) { - return createSheetWriteHandlerContext(writeContext, false); - } - - public static SheetWriteHandlerContext createSheetWriteHandlerContext(WriteContext writeContext, boolean runOwn) { - List handlerList = getHandlerList(writeContext, SheetWriteHandler.class, runOwn); - SheetWriteHandlerContext context = new SheetWriteHandlerContext(writeContext, - writeContext.writeWorkbookHolder(), writeContext.writeSheetHolder(), null, null); - if (runOwn) { - context.setOwnHandlerList(handlerList); - } else { - context.setHandlerList(handlerList); - } - return context; + return new SheetWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), + writeContext.writeSheetHolder()); } public static void beforeSheetCreate(SheetWriteHandlerContext context) { @@ -111,16 +82,9 @@ public class WriteHandlerUtils { } public static void beforeSheetCreate(SheetWriteHandlerContext context, boolean runOwn) { - List handlerList; - if (runOwn) { - handlerList = context.getOwnHandlerList(); - } else { - handlerList = context.getHandlerList(); - } - if (CollectionUtils.isNotEmpty(handlerList)) { - for (WriteHandler writeHandler : handlerList) { - ((SheetWriteHandler)writeHandler).beforeSheetCreate(context); - } + SheetHandlerExecutionChain sheetHandlerExecutionChain = getSheetHandlerExecutionChain(context, runOwn); + if (sheetHandlerExecutionChain != null) { + sheetHandlerExecutionChain.beforeSheetCreate(context); } } @@ -129,111 +93,90 @@ public class WriteHandlerUtils { } public static void afterSheetCreate(SheetWriteHandlerContext context, boolean runOwn) { - List handlerList; + SheetHandlerExecutionChain sheetHandlerExecutionChain = getSheetHandlerExecutionChain(context, runOwn); + if (sheetHandlerExecutionChain != null) { + sheetHandlerExecutionChain.afterSheetCreate(context); + } + } + + private static SheetHandlerExecutionChain getSheetHandlerExecutionChain(SheetWriteHandlerContext context, + boolean runOwn) { + AbstractWriteHolder abstractWriteHolder = (AbstractWriteHolder)context.getWriteContext().currentWriteHolder(); if (runOwn) { - handlerList = context.getOwnHandlerList(); + return abstractWriteHolder.getOwnSheetHandlerExecutionChain(); } else { - handlerList = context.getHandlerList(); - } - if (CollectionUtils.isNotEmpty(handlerList)) { - for (WriteHandler writeHandler : handlerList) { - ((SheetWriteHandler)writeHandler).afterSheetCreate(context); - } + return abstractWriteHolder.getSheetHandlerExecutionChain(); } } public static CellWriteHandlerContext createCellWriteHandlerContext(WriteContext writeContext, Row row, Integer rowIndex, Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead, ExcelContentProperty excelContentProperty) { - List handlerList = writeContext.currentWriteHolder().writeHandlerMap().get( - CellWriteHandler.class); return new CellWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), writeContext.writeSheetHolder(), writeContext.writeTableHolder(), row, rowIndex, null, columnIndex, - relativeRowIndex, head, null, null, isHead, excelContentProperty, handlerList); + relativeRowIndex, head, null, null, isHead, excelContentProperty); } public static void beforeCellCreate(CellWriteHandlerContext context) { - List handlerList = context.getHandlerList(); - if (CollectionUtils.isNotEmpty(handlerList)) { - for (WriteHandler writeHandler : handlerList) { - ((CellWriteHandler)writeHandler).beforeCellCreate(context); - } + CellHandlerExecutionChain cellHandlerExecutionChain = ((AbstractWriteHolder)context.getWriteContext() + .currentWriteHolder()).getCellHandlerExecutionChain(); + if (cellHandlerExecutionChain != null) { + cellHandlerExecutionChain.beforeCellCreate(context); } } public static void afterCellCreate(CellWriteHandlerContext context) { - List handlerList = context.getHandlerList(); - if (CollectionUtils.isNotEmpty(handlerList)) { - for (WriteHandler writeHandler : handlerList) { - ((CellWriteHandler)writeHandler).afterCellCreate(context); - } + CellHandlerExecutionChain cellHandlerExecutionChain = ((AbstractWriteHolder)context.getWriteContext() + .currentWriteHolder()).getCellHandlerExecutionChain(); + if (cellHandlerExecutionChain != null) { + cellHandlerExecutionChain.afterCellCreate(context); } } public static void afterCellDataConverted(CellWriteHandlerContext context) { - List handlerList = context.getHandlerList(); - if (CollectionUtils.isNotEmpty(handlerList)) { - for (WriteHandler writeHandler : handlerList) { - ((CellWriteHandler)writeHandler).afterCellDataConverted(context); - } + CellHandlerExecutionChain cellHandlerExecutionChain = ((AbstractWriteHolder)context.getWriteContext() + .currentWriteHolder()).getCellHandlerExecutionChain(); + if (cellHandlerExecutionChain != null) { + cellHandlerExecutionChain.afterCellDataConverted(context); } } public static void afterCellDispose(CellWriteHandlerContext context) { - List handlerList = context.getHandlerList(); - if (CollectionUtils.isNotEmpty(handlerList)) { - for (WriteHandler writeHandler : handlerList) { - ((CellWriteHandler)writeHandler).afterCellDispose(context); - } + CellHandlerExecutionChain cellHandlerExecutionChain = ((AbstractWriteHolder)context.getWriteContext() + .currentWriteHolder()).getCellHandlerExecutionChain(); + if (cellHandlerExecutionChain != null) { + cellHandlerExecutionChain.afterCellDispose(context); } } public static RowWriteHandlerContext createRowWriteHandlerContext(WriteContext writeContext, Integer rowIndex, Integer relativeRowIndex, Boolean isHead) { - List handlerList = writeContext.currentWriteHolder().writeHandlerMap().get( - RowWriteHandler.class); - return new RowWriteHandlerContext(writeContext, - writeContext.writeWorkbookHolder(), - writeContext.writeSheetHolder(), writeContext.writeTableHolder(), rowIndex, null, relativeRowIndex, - isHead, handlerList); + return new RowWriteHandlerContext(writeContext, writeContext.writeWorkbookHolder(), + writeContext.writeSheetHolder(), writeContext.writeTableHolder(), rowIndex, null, relativeRowIndex, isHead); } public static void beforeRowCreate(RowWriteHandlerContext context) { - List handlerList = context.getHandlerList(); - if (CollectionUtils.isNotEmpty(handlerList)) { - for (WriteHandler writeHandler : handlerList) { - ((RowWriteHandler)writeHandler).beforeRowCreate(context); - } + RowHandlerExecutionChain rowHandlerExecutionChain = ((AbstractWriteHolder)context.getWriteContext() + .currentWriteHolder()).getRowHandlerExecutionChain(); + if (rowHandlerExecutionChain != null) { + rowHandlerExecutionChain.beforeRowCreate(context); } } public static void afterRowCreate(RowWriteHandlerContext context) { - List handlerList = context.getHandlerList(); - if (CollectionUtils.isNotEmpty(handlerList)) { - for (WriteHandler writeHandler : handlerList) { - ((RowWriteHandler)writeHandler).afterRowCreate(context); - } + RowHandlerExecutionChain rowHandlerExecutionChain = ((AbstractWriteHolder)context.getWriteContext() + .currentWriteHolder()).getRowHandlerExecutionChain(); + if (rowHandlerExecutionChain != null) { + rowHandlerExecutionChain.afterRowCreate(context); } } public static void afterRowDispose(RowWriteHandlerContext context) { - List handlerList = context.getHandlerList(); - if (CollectionUtils.isNotEmpty(handlerList)) { - for (WriteHandler writeHandler : handlerList) { - ((RowWriteHandler)writeHandler).afterRowDispose(context); - } + RowHandlerExecutionChain rowHandlerExecutionChain = ((AbstractWriteHolder)context.getWriteContext() + .currentWriteHolder()).getRowHandlerExecutionChain(); + if (rowHandlerExecutionChain != null) { + rowHandlerExecutionChain.afterRowDispose(context); } } - private static List getHandlerList(WriteContext writeContext, Class clazz, - boolean runOwn) { - Map, List> writeHandlerMap; - if (runOwn) { - writeHandlerMap = writeContext.currentWriteHolder().ownWriteHandlerMap(); - } else { - writeHandlerMap = writeContext.currentWriteHolder().writeHandlerMap(); - } - return writeHandlerMap.get(clazz); - } } diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java index ffb8844c..0bb4007c 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java @@ -142,6 +142,8 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { Map sortedAllFiledMap) { WriteHolder currentWriteHolder = writeContext.currentWriteHolder(); BeanMap beanMap = BeanMapUtils.create(oneRowData); + // Bean the contains of the Map Key method with poor performance,So to create a keySet here + Set beanKeySet = new HashSet<>(beanMap.keySet()); Set beanMapHandledSet = new HashSet<>(); int maxCellIndex = -1; // If it's a class it needs to be cast by type @@ -151,7 +153,7 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { int columnIndex = entry.getKey(); Head head = entry.getValue(); String name = head.getFieldName(); - if (!beanMap.containsKey(name)) { + if (!beanKeySet.contains(name)) { continue; } @@ -188,7 +190,7 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor { for (Map.Entry entry : sortedAllFiledMap.entrySet()) { Field field = entry.getValue(); String filedName = FieldUtils.resolveCglibFieldName(field); - boolean uselessData = !beanMap.containsKey(filedName) || beanMapHandledSet.contains(filedName) + boolean uselessData = !beanKeySet.contains(filedName) || beanMapHandledSet.contains(filedName) || ignoreMap.containsKey(filedName); if (uselessData) { continue; diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java index 3eb49f2b..97b8928e 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java @@ -185,12 +185,14 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { if (CollectionUtils.isEmpty(analysisCellList) || oneRowData == null) { return; } - Map dataMap; + Map dataMap; if (oneRowData instanceof Map) { - dataMap = (Map)oneRowData; + dataMap = (Map)oneRowData; } else { dataMap = BeanMapUtils.create(oneRowData); } + Set dataKeySet = new HashSet(dataMap.keySet()); + for (AnalysisCell analysisCell : analysisCellList) { CellWriteHandlerContext cellWriteHandlerContext = WriteHandlerUtils.createCellWriteHandlerContext( writeContext, null, analysisCell.getRowIndex(), null, analysisCell.getColumnIndex(), @@ -198,7 +200,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { if (analysisCell.getOnlyOneVariable()) { String variable = analysisCell.getVariableList().get(0); - if (!dataMap.containsKey(variable)) { + if (!dataKeySet.contains(variable)) { continue; } Object value = dataMap.get(variable); @@ -231,7 +233,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { for (String variable : analysisCell.getVariableList()) { cellValueBuild.append(analysisCell.getPrepareDataList().get(index++)); - if (!dataMap.containsKey(variable)) { + if (!dataKeySet.contains(variable)) { continue; } Object value = dataMap.get(variable); diff --git a/src/main/java/com/alibaba/excel/write/handler/chain/CellHandlerExecutionChain.java b/src/main/java/com/alibaba/excel/write/handler/chain/CellHandlerExecutionChain.java new file mode 100644 index 00000000..4826d6bc --- /dev/null +++ b/src/main/java/com/alibaba/excel/write/handler/chain/CellHandlerExecutionChain.java @@ -0,0 +1,63 @@ +package com.alibaba.excel.write.handler.chain; + +import com.alibaba.excel.write.handler.CellWriteHandler; +import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; + +import lombok.Data; + +/** + * Execute the cell handler chain + * + * @author Jiaju Zhuang + */ +@Data +public class CellHandlerExecutionChain { + /** + * next chain + */ + private CellHandlerExecutionChain next; + /** + * handler + */ + private CellWriteHandler handler; + + public CellHandlerExecutionChain(CellWriteHandler handler) { + this.handler = handler; + } + + public void beforeCellCreate(CellWriteHandlerContext context) { + this.handler.beforeCellCreate(context); + if (this.next != null) { + this.next.beforeCellCreate(context); + } + } + + public void afterCellCreate(CellWriteHandlerContext context) { + this.handler.afterCellCreate(context); + if (this.next != null) { + this.next.afterCellCreate(context); + } + } + + public void afterCellDataConverted(CellWriteHandlerContext context) { + this.handler.afterCellDataConverted(context); + if (this.next != null) { + this.next.afterCellDataConverted(context); + } + } + + public void afterCellDispose(CellWriteHandlerContext context) { + this.handler.afterCellDispose(context); + if (this.next != null) { + this.next.afterCellDispose(context); + } + } + + public void addLast(CellWriteHandler handler) { + CellHandlerExecutionChain context = this; + while (context.next != null) { + context = context.next; + } + context.next = new CellHandlerExecutionChain(handler); + } +} diff --git a/src/main/java/com/alibaba/excel/write/handler/chain/RowHandlerExecutionChain.java b/src/main/java/com/alibaba/excel/write/handler/chain/RowHandlerExecutionChain.java new file mode 100644 index 00000000..872afa8a --- /dev/null +++ b/src/main/java/com/alibaba/excel/write/handler/chain/RowHandlerExecutionChain.java @@ -0,0 +1,56 @@ +package com.alibaba.excel.write.handler.chain; + +import com.alibaba.excel.write.handler.RowWriteHandler; +import com.alibaba.excel.write.handler.context.RowWriteHandlerContext; + +import lombok.Data; + +/** + * Execute the row handler chain + * + * @author Jiaju Zhuang + */ +@Data +public class RowHandlerExecutionChain { + /** + * next chain + */ + private RowHandlerExecutionChain next; + /** + * handler + */ + private RowWriteHandler handler; + + public RowHandlerExecutionChain(RowWriteHandler handler) { + this.handler = handler; + } + + public void beforeRowCreate(RowWriteHandlerContext context) { + this.handler.beforeRowCreate(context); + if (this.next != null) { + this.next.beforeRowCreate(context); + } + } + + public void afterRowCreate(RowWriteHandlerContext context) { + this.handler.afterRowCreate(context); + if (this.next != null) { + this.next.afterRowCreate(context); + } + } + + public void afterRowDispose(RowWriteHandlerContext context) { + this.handler.afterRowDispose(context); + if (this.next != null) { + this.next.afterRowDispose(context); + } + } + + public void addLast(RowWriteHandler handler) { + RowHandlerExecutionChain context = this; + while (context.next != null) { + context = context.next; + } + context.next = new RowHandlerExecutionChain(handler); + } +} diff --git a/src/main/java/com/alibaba/excel/write/handler/chain/SheetHandlerExecutionChain.java b/src/main/java/com/alibaba/excel/write/handler/chain/SheetHandlerExecutionChain.java new file mode 100644 index 00000000..56770496 --- /dev/null +++ b/src/main/java/com/alibaba/excel/write/handler/chain/SheetHandlerExecutionChain.java @@ -0,0 +1,48 @@ +package com.alibaba.excel.write.handler.chain; + +import com.alibaba.excel.write.handler.SheetWriteHandler; +import com.alibaba.excel.write.handler.context.SheetWriteHandlerContext; + +import lombok.Data; + +/** + * Execute the sheet handler chain + * + * @author Jiaju Zhuang + */ +@Data +public class SheetHandlerExecutionChain { + /** + * next chain + */ + private SheetHandlerExecutionChain next; + /** + * handler + */ + private SheetWriteHandler handler; + + public SheetHandlerExecutionChain(SheetWriteHandler handler) { + this.handler = handler; + } + + public void beforeSheetCreate(SheetWriteHandlerContext context) { + this.handler.beforeSheetCreate(context); + if (this.next != null) { + this.next.beforeSheetCreate(context); + } + } + + public void afterSheetCreate(SheetWriteHandlerContext context) { + this.handler.afterSheetCreate(context); + if (this.next != null) { + this.next.afterSheetCreate(context); + } + } + public void addLast(SheetWriteHandler handler) { + SheetHandlerExecutionChain context = this; + while (context.next != null) { + context = context.next; + } + context.next = new SheetHandlerExecutionChain(handler); + } +} diff --git a/src/main/java/com/alibaba/excel/write/handler/chain/WorkbookHandlerExecutionChain.java b/src/main/java/com/alibaba/excel/write/handler/chain/WorkbookHandlerExecutionChain.java new file mode 100644 index 00000000..c7dacbb4 --- /dev/null +++ b/src/main/java/com/alibaba/excel/write/handler/chain/WorkbookHandlerExecutionChain.java @@ -0,0 +1,57 @@ +package com.alibaba.excel.write.handler.chain; + +import com.alibaba.excel.write.handler.WorkbookWriteHandler; +import com.alibaba.excel.write.handler.context.WorkbookWriteHandlerContext; + +import lombok.Data; + +/** + * Execute the workbook handler chain + * + * @author Jiaju Zhuang + */ +@Data +public class WorkbookHandlerExecutionChain { + /** + * next chain + */ + private WorkbookHandlerExecutionChain next; + + /** + * handler + */ + private WorkbookWriteHandler handler; + + public WorkbookHandlerExecutionChain(WorkbookWriteHandler handler) { + this.handler = handler; + } + + public void beforeWorkbookCreate(WorkbookWriteHandlerContext context) { + this.handler.beforeWorkbookCreate(context); + if (this.next != null) { + this.next.beforeWorkbookCreate(context); + } + } + + public void afterWorkbookCreate(WorkbookWriteHandlerContext context) { + this.handler.afterWorkbookCreate(context); + if (this.next != null) { + this.next.afterWorkbookCreate(context); + } + } + + public void afterWorkbookDispose(WorkbookWriteHandlerContext context) { + this.handler.afterWorkbookDispose(context); + if (this.next != null) { + this.next.afterWorkbookDispose(context); + } + } + + public void addLast(WorkbookWriteHandler handler) { + WorkbookHandlerExecutionChain context = this; + while (context.next != null) { + context = context.next; + } + context.next = new WorkbookHandlerExecutionChain(handler); + } +} diff --git a/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java index d585db93..bd6b1930 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java @@ -7,7 +7,6 @@ import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.data.WriteCellData; import com.alibaba.excel.metadata.property.ExcelContentProperty; -import com.alibaba.excel.write.handler.WriteHandler; import com.alibaba.excel.write.handler.impl.FillStyleCellWriteHandler; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteTableHolder; @@ -106,16 +105,11 @@ public class CellWriteHandlerContext { */ private Boolean ignoreFillStyle; - /** - * handler - */ - private List handlerList; - public CellWriteHandlerContext(WriteContext writeContext, WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Integer rowIndex, Cell cell, Integer columnIndex, Integer relativeRowIndex, Head headData, List> cellDataList, WriteCellData firstCellData, - Boolean head, ExcelContentProperty excelContentProperty, List handlerList) { + Boolean head, ExcelContentProperty excelContentProperty) { this.writeContext = writeContext; this.writeWorkbookHolder = writeWorkbookHolder; this.writeSheetHolder = writeSheetHolder; @@ -130,6 +124,5 @@ public class CellWriteHandlerContext { this.firstCellData = firstCellData; this.head = head; this.excelContentProperty = excelContentProperty; - this.handlerList = handlerList; } } diff --git a/src/main/java/com/alibaba/excel/write/handler/context/RowWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/RowWriteHandlerContext.java index cf3f79e6..6578d3a2 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/RowWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/RowWriteHandlerContext.java @@ -1,9 +1,6 @@ package com.alibaba.excel.write.handler.context; -import java.util.List; - import com.alibaba.excel.context.WriteContext; -import com.alibaba.excel.write.handler.WriteHandler; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteTableHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; @@ -52,9 +49,4 @@ public class RowWriteHandlerContext { * Nullable.It is null in the case of fill data. */ private Boolean head; - - /** - * handler - */ - private List handlerList; } diff --git a/src/main/java/com/alibaba/excel/write/handler/context/SheetWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/SheetWriteHandlerContext.java index 17401bd8..c1164eb0 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/SheetWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/SheetWriteHandlerContext.java @@ -1,9 +1,6 @@ package com.alibaba.excel.write.handler.context; -import java.util.List; - import com.alibaba.excel.context.WriteContext; -import com.alibaba.excel.write.handler.WriteHandler; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; @@ -30,13 +27,4 @@ public class SheetWriteHandlerContext { * sheet */ private WriteSheetHolder writeSheetHolder; - - /** - * handler - */ - private List handlerList; - /** - * handler - */ - private List ownHandlerList; } diff --git a/src/main/java/com/alibaba/excel/write/handler/context/WorkbookWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/WorkbookWriteHandlerContext.java index 032f21c6..f955d4bf 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/WorkbookWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/WorkbookWriteHandlerContext.java @@ -1,9 +1,6 @@ package com.alibaba.excel.write.handler.context; -import java.util.List; - import com.alibaba.excel.context.WriteContext; -import com.alibaba.excel.write.handler.WriteHandler; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; import lombok.AllArgsConstructor; @@ -25,14 +22,4 @@ public class WorkbookWriteHandlerContext { * workbook */ private WriteWorkbookHolder writeWorkbookHolder; - - /** - * handler - */ - private List handlerList; - - /** - * handler - */ - private List ownHandlerList; } diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java index 2961efc0..cc4b2f21 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java @@ -15,7 +15,6 @@ import com.alibaba.excel.converters.ConverterKeyBuild; import com.alibaba.excel.converters.DefaultConverterLoader; import com.alibaba.excel.enums.HeadKindEnum; import com.alibaba.excel.event.NotRepeatExecutor; -import com.alibaba.excel.event.Order; import com.alibaba.excel.metadata.AbstractHolder; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.property.ExcelContentProperty; @@ -28,6 +27,10 @@ import com.alibaba.excel.write.handler.RowWriteHandler; import com.alibaba.excel.write.handler.SheetWriteHandler; import com.alibaba.excel.write.handler.WorkbookWriteHandler; import com.alibaba.excel.write.handler.WriteHandler; +import com.alibaba.excel.write.handler.chain.CellHandlerExecutionChain; +import com.alibaba.excel.write.handler.chain.RowHandlerExecutionChain; +import com.alibaba.excel.write.handler.chain.SheetHandlerExecutionChain; +import com.alibaba.excel.write.handler.chain.WorkbookHandlerExecutionChain; import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; import com.alibaba.excel.write.merge.LoopMergeStrategy; import com.alibaba.excel.write.merge.OnceAbsoluteMergeStrategy; @@ -62,15 +65,6 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ * Excel head property */ private ExcelWriteHeadProperty excelWriteHeadProperty; - /** - * Write handler - */ - private Map, List> writeHandlerMap; - /** - * Own write handler.Created in the sheet in the workbook interceptors will not be executed because the workbook to - * create an event long past. So when initializing sheet, supplementary workbook event. - */ - private Map, List> ownWriteHandlerMap; /** * Use the default style.Default is true. */ @@ -97,6 +91,43 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ */ private Collection includeColumnFieldNames; + /** + * Write handler + */ + private List writeHandlerList; + + /** + * Execute the workbook handler chain + * Created in the sheet in the workbook interceptors will not be executed because the workbook to + * create an event long past. So when initializing sheet, supplementary workbook event. + */ + public WorkbookHandlerExecutionChain ownWorkbookHandlerExecutionChain; + /** + * Execute the sheet handler chain + * Created in the sheet in the workbook interceptors will not be executed because the workbook to + * create an event long past. So when initializing sheet, supplementary workbook event. + */ + public SheetHandlerExecutionChain ownSheetHandlerExecutionChain; + + /** + * Execute the workbook handler chain + */ + public WorkbookHandlerExecutionChain workbookHandlerExecutionChain; + /** + * Execute the sheet handler chain + */ + public SheetHandlerExecutionChain sheetHandlerExecutionChain; + + /** + * Execute the row handler chain + */ + public RowHandlerExecutionChain rowHandlerExecutionChain; + + /** + * Execute the cell handler chain + */ + public CellHandlerExecutionChain cellHandlerExecutionChain; + public AbstractWriteHolder(WriteBasicParameter writeBasicParameter, AbstractWriteHolder parentAbstractWriteHolder) { super(writeBasicParameter, parentAbstractWriteHolder); @@ -169,7 +200,7 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ this.excelWriteHeadProperty = new ExcelWriteHeadProperty(this, getClazz(), getHead()); // Set writeHandlerMap - List handlerList = new ArrayList(); + List handlerList = new ArrayList<>(); // Initialization Annotation initAnnotationConfig(handlerList, writeBasicParameter); @@ -178,16 +209,16 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ && !writeBasicParameter.getCustomWriteHandlerList().isEmpty()) { handlerList.addAll(writeBasicParameter.getCustomWriteHandlerList()); } + sortAndClearUpHandler(handlerList, true); - this.ownWriteHandlerMap = sortAndClearUpHandler(handlerList); - - Map, List> parentWriteHandlerMap = null; if (parentAbstractWriteHolder != null) { - parentWriteHandlerMap = parentAbstractWriteHolder.getWriteHandlerMap(); + if (CollectionUtils.isNotEmpty(parentAbstractWriteHolder.getWriteHandlerList())) { + handlerList.addAll(parentAbstractWriteHolder.getWriteHandlerList()); + } } else { handlerList.addAll(DefaultWriteHandlerLoader.loadDefaultHandler(useDefaultStyle)); } - this.writeHandlerMap = sortAndClearUpAllHandler(handlerList, parentWriteHandlerMap); + sortAndClearUpHandler(handlerList, false); // Set converterMap if (parentAbstractWriteHolder == null) { @@ -229,7 +260,7 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ } //if (hasStyle) { - dealStyle(handlerList); + dealStyle(handlerList); //} dealRowHigh(handlerList); @@ -310,38 +341,22 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ handlerList.add(columnWidthStyleStrategy); } - protected Map, List> sortAndClearUpAllHandler( - List handlerList, Map, List> parentHandlerMap) { - // add - if (parentHandlerMap != null) { - List parentWriteHandler = parentHandlerMap.get(WriteHandler.class); - if (!CollectionUtils.isEmpty(parentWriteHandler)) { - handlerList.addAll(parentWriteHandler); - } - } - return sortAndClearUpHandler(handlerList); - } - - protected Map, List> sortAndClearUpHandler( - List handlerList) { + protected void sortAndClearUpHandler(List handlerList, boolean runOwn) { // sort - Map> orderExcelWriteHandlerMap = new TreeMap>(); + Map> orderExcelWriteHandlerMap = new TreeMap<>(); for (WriteHandler handler : handlerList) { - int order = Integer.MIN_VALUE; - if (handler instanceof Order) { - order = ((Order)handler).order(); - } + int order = handler.order(); if (orderExcelWriteHandlerMap.containsKey(order)) { orderExcelWriteHandlerMap.get(order).add(handler); } else { - List tempHandlerList = new ArrayList(); + List tempHandlerList = new ArrayList<>(); tempHandlerList.add(handler); orderExcelWriteHandlerMap.put(order, tempHandlerList); } } // clean up - Set alreadyExistedHandlerSet = new HashSet(); - List cleanUpHandlerList = new ArrayList(); + Set alreadyExistedHandlerSet = new HashSet<>(); + List cleanUpHandlerList = new ArrayList<>(); for (Map.Entry> entry : orderExcelWriteHandlerMap.entrySet()) { for (WriteHandler handler : entry.getValue()) { if (handler instanceof NotRepeatExecutor) { @@ -354,30 +369,74 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ cleanUpHandlerList.add(handler); } } - // classify - Map, List> result = - new HashMap, List>(16); - result.put(WriteHandler.class, new ArrayList()); - result.put(WorkbookWriteHandler.class, new ArrayList()); - result.put(SheetWriteHandler.class, new ArrayList()); - result.put(RowWriteHandler.class, new ArrayList()); - result.put(CellWriteHandler.class, new ArrayList()); + + // build chain + if (!runOwn) { + this.writeHandlerList = new ArrayList<>(); + } for (WriteHandler writeHandler : cleanUpHandlerList) { - if (writeHandler instanceof CellWriteHandler) { - result.get(CellWriteHandler.class).add(writeHandler); + buildChain(writeHandler, runOwn); + } + } + + protected void buildChain(WriteHandler writeHandler, boolean runOwn) { + if (writeHandler instanceof CellWriteHandler) { + if (!runOwn) { + if (cellHandlerExecutionChain == null) { + cellHandlerExecutionChain = new CellHandlerExecutionChain((CellWriteHandler)writeHandler); + } else { + cellHandlerExecutionChain.addLast((CellWriteHandler)writeHandler); + } + this.writeHandlerList.add(writeHandler); } - if (writeHandler instanceof RowWriteHandler) { - result.get(RowWriteHandler.class).add(writeHandler); + return; + } + if (writeHandler instanceof RowWriteHandler) { + if (!runOwn) { + if (rowHandlerExecutionChain == null) { + rowHandlerExecutionChain = new RowHandlerExecutionChain((RowWriteHandler)writeHandler); + } else { + rowHandlerExecutionChain.addLast((RowWriteHandler)writeHandler); + } + this.writeHandlerList.add(writeHandler); } - if (writeHandler instanceof SheetWriteHandler) { - result.get(SheetWriteHandler.class).add(writeHandler); + return; + } + if (writeHandler instanceof SheetWriteHandler) { + if (!runOwn) { + if (sheetHandlerExecutionChain == null) { + sheetHandlerExecutionChain = new SheetHandlerExecutionChain((SheetWriteHandler)writeHandler); + } else { + sheetHandlerExecutionChain.addLast((SheetWriteHandler)writeHandler); + } + this.writeHandlerList.add(writeHandler); + } else { + if (ownSheetHandlerExecutionChain == null) { + ownSheetHandlerExecutionChain = new SheetHandlerExecutionChain((SheetWriteHandler)writeHandler); + } else { + ownSheetHandlerExecutionChain.addLast((SheetWriteHandler)writeHandler); + } } - if (writeHandler instanceof WorkbookWriteHandler) { - result.get(WorkbookWriteHandler.class).add(writeHandler); + return; + } + if (writeHandler instanceof WorkbookWriteHandler) { + if (!runOwn) { + if (workbookHandlerExecutionChain == null) { + workbookHandlerExecutionChain = new WorkbookHandlerExecutionChain( + (WorkbookWriteHandler)writeHandler); + } else { + workbookHandlerExecutionChain.addLast((WorkbookWriteHandler)writeHandler); + } + this.writeHandlerList.add(writeHandler); + } else { + if (ownWorkbookHandlerExecutionChain == null) { + ownWorkbookHandlerExecutionChain = new WorkbookHandlerExecutionChain( + (WorkbookWriteHandler)writeHandler); + } else { + ownWorkbookHandlerExecutionChain.addLast((WorkbookWriteHandler)writeHandler); + } } - result.get(WriteHandler.class).add(writeHandler); } - return result; } @Override @@ -406,16 +465,6 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ return getExcelWriteHeadProperty(); } - @Override - public Map, List> writeHandlerMap() { - return getWriteHandlerMap(); - } - - @Override - public Map, List> ownWriteHandlerMap() { - return getOwnWriteHandlerMap(); - } - @Override public boolean needHead() { return getNeedHead(); diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteHolder.java index 4896b034..77f3c14f 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteHolder.java @@ -1,10 +1,6 @@ package com.alibaba.excel.write.metadata.holder; -import java.util.List; -import java.util.Map; - import com.alibaba.excel.metadata.ConfigurationHolder; -import com.alibaba.excel.write.handler.WriteHandler; import com.alibaba.excel.write.property.ExcelWriteHeadProperty; /** @@ -21,20 +17,6 @@ public interface WriteHolder extends ConfigurationHolder { */ ExcelWriteHeadProperty excelWriteHeadProperty(); - /** - * What handler does the currently operated cell need to execute - * - * @return - */ - Map, List> writeHandlerMap(); - - /** - * create your own write handler. - * - * @return - */ - Map, List> ownWriteHandlerMap(); - /** * Is to determine if a field needs to be ignored * diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java index ef619196..100e59a1 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java @@ -259,8 +259,6 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { if (writeCellStyle == null) { return originCellStyle; } - WriteCellStyle tempWriteCellStyle = new WriteCellStyle(); - WriteCellStyle.merge(writeCellStyle, tempWriteCellStyle); short styleIndex = -1; Font originFont = null; @@ -277,14 +275,17 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { Map cellStyleMap = cellStyleIndexMap.computeIfAbsent(styleIndex, key -> MapUtils.newHashMap()); - CellStyle cellStyle = cellStyleMap.get(tempWriteCellStyle); + CellStyle cellStyle = cellStyleMap.get(writeCellStyle); if (cellStyle != null) { return cellStyle; } if (log.isDebugEnabled()) { - log.info("create new style:{},{}", tempWriteCellStyle, originCellStyle); + log.info("create new style:{},{}", writeCellStyle, originCellStyle); } - cellStyle = StyleUtil.buildCellStyle(workbook, originCellStyle, writeCellStyle); + WriteCellStyle tempWriteCellStyle = new WriteCellStyle(); + WriteCellStyle.merge(writeCellStyle, tempWriteCellStyle); + + cellStyle = StyleUtil.buildCellStyle(workbook, originCellStyle, tempWriteCellStyle); Short dataFormat = createDataFormat(tempWriteCellStyle.getDataFormatData(), useCache); if (dataFormat != null) { cellStyle.setDataFormat(dataFormat); diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java b/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java index 3082362a..8c9badfe 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java @@ -8,6 +8,7 @@ import java.util.List; import com.alibaba.easyexcel.test.demo.write.DemoData; import com.alibaba.easyexcel.test.util.TestFileUtil; import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.util.PositionUtils; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.metadata.style.WriteFont; import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; @@ -147,4 +148,20 @@ public class Lock2Test { Thread.sleep(500 * 1000); } + @Test + public void test335() throws Exception { + + + LOGGER.info("reslut:{}", PositionUtils.getCol("A10",null)); + LOGGER.info("reslut:{}", PositionUtils.getRow("A10")); + LOGGER.info("reslut:{}", PositionUtils.getCol("AB10",null)); + LOGGER.info("reslut:{}", PositionUtils.getRow("AB10")); + + //LOGGER.info("reslut:{}", PositionUtils2.getCol("A10",null)); + //LOGGER.info("reslut:{}", PositionUtils2.getRow("A10")); + //LOGGER.info("reslut:{}", PositionUtils2.getCol("AB10",null)); + //LOGGER.info("reslut:{}", PositionUtils2.getRow("AB10")); + } + + } From b9da1ade4474b5ab4f87707014a5018c2b48ce11 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 29 Oct 2021 17:23:40 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=BB=E5=86=99?= =?UTF-8?q?=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../holder/xlsx/XlsxReadWorkbookHolder.java | 2 + .../com/alibaba/excel/util/ClassUtils.java | 27 +++---- .../executor/ExcelWriteFillExecutor.java | 74 +++++++++---------- .../test/core/large/LargeDataTest.java | 3 +- 4 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadWorkbookHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadWorkbookHolder.java index 9415fed8..24ff8503 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadWorkbookHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadWorkbookHolder.java @@ -9,6 +9,7 @@ import com.alibaba.excel.metadata.data.DataFormatData; import com.alibaba.excel.read.metadata.ReadWorkbook; import com.alibaba.excel.read.metadata.holder.ReadWorkbookHolder; import com.alibaba.excel.support.ExcelTypeEnum; +import com.alibaba.excel.util.MapUtils; import lombok.Data; import org.apache.poi.openxml4j.opc.OPCPackage; @@ -50,6 +51,7 @@ public class XlsxReadWorkbookHolder extends ReadWorkbookHolder { super(readWorkbook); this.saxParserFactoryName = readWorkbook.getXlsxSAXParserFactoryName(); setExcelType(ExcelTypeEnum.XLSX); + dataFormatDataCache = MapUtils.newHashMap(); } public DataFormatData dataFormatData(int dateFormatIndexInteger) { diff --git a/src/main/java/com/alibaba/excel/util/ClassUtils.java b/src/main/java/com/alibaba/excel/util/ClassUtils.java index 9020d56c..8c7dd6b4 100644 --- a/src/main/java/com/alibaba/excel/util/ClassUtils.java +++ b/src/main/java/com/alibaba/excel/util/ClassUtils.java @@ -31,6 +31,8 @@ import com.alibaba.excel.metadata.property.NumberFormatProperty; import com.alibaba.excel.metadata.property.StyleProperty; import com.alibaba.excel.write.metadata.holder.WriteHolder; +import lombok.AllArgsConstructor; +import lombok.Data; import net.sf.cglib.beans.BeanMap; /** @@ -51,7 +53,7 @@ public class ClassUtils { /** * The cache configuration information for each of the class */ - public static final Map CONTENT_CACHE = new ConcurrentHashMap<>(); + public static final Map CONTENT_CACHE = new ConcurrentHashMap<>(); /** * Calculate the configuration information for the class @@ -117,20 +119,8 @@ public class ClassUtils { } } - private static String buildKey(Class clazz, Class headClass, String fieldName) { - String key = ""; - if (clazz != null) { - key += clazz.getName(); - } - key += "-"; - if (headClass != null) { - key += headClass.getName(); - } - key += "-"; - if (fieldName != null) { - key += fieldName; - } - return key; + private static ContentPropertyKey buildKey(Class clazz, Class headClass, String fieldName) { + return new ContentPropertyKey(clazz, headClass, fieldName); } private static Map declaredFieldContentMap(Class clazz) { @@ -413,4 +403,11 @@ public class ClassUtils { } } + @Data + @AllArgsConstructor + public static class ContentPropertyKey { + private Class clazz; + private Class headClass; + private String fieldName; + } } diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java index 97b8928e..331c4989 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java @@ -7,6 +7,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.Set; @@ -31,6 +32,8 @@ import com.alibaba.excel.write.metadata.fill.FillConfig; import com.alibaba.excel.write.metadata.fill.FillWrapper; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; +import lombok.AllArgsConstructor; +import lombok.Data; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.hssf.usermodel.PoiUtils; import org.apache.poi.ss.usermodel.Cell; @@ -55,29 +58,30 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { /** * Fields to replace in the template */ - private final Map> templateAnalysisCache = MapUtils.newHashMap(); + private final Map> templateAnalysisCache = MapUtils.newHashMap(); /** * Collection fields to replace in the template */ - private final Map> templateCollectionAnalysisCache = MapUtils.newHashMap(); + private final Map> templateCollectionAnalysisCache = MapUtils.newHashMap(); /** * Style cache for collection fields */ - private final Map> collectionFieldStyleCache = MapUtils.newHashMap(); + private final Map> collectionFieldStyleCache + = MapUtils.newHashMap(); /** * Row height cache for collection */ - private final Map collectionRowHeightCache = MapUtils.newHashMap(); + private final Map collectionRowHeightCache = MapUtils.newHashMap(); /** * Last index cache for collection fields */ - private final Map> collectionLastIndexCache = MapUtils.newHashMap(); + private final Map> collectionLastIndexCache = MapUtils.newHashMap(); - private final Map relativeRowIndexMap = MapUtils.newHashMap(); + private final Map relativeRowIndexMap = MapUtils.newHashMap(); /** * The unique data encoding for this fill */ - private String currentUniqueDataFlag; + private UniqueDataFlagKey currentUniqueDataFlag; public ExcelWriteFillExecutor(WriteContext writeContext) { super(writeContext); @@ -161,15 +165,16 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { sheet.shiftRows(maxRowIndex + 1, lastRowIndex, number, true, false); // The current data is greater than unity rowindex increase - String tablePrefix = tablePrefix(currentUniqueDataFlag); - increaseRowIndex(templateAnalysisCache, number, maxRowIndex, tablePrefix); - increaseRowIndex(templateCollectionAnalysisCache, number, maxRowIndex, tablePrefix); + increaseRowIndex(templateAnalysisCache, number, maxRowIndex); + increaseRowIndex(templateCollectionAnalysisCache, number, maxRowIndex); } - private void increaseRowIndex(Map> templateAnalysisCache, int number, int maxRowIndex, - String tablePrefix) { - for (Map.Entry> entry : templateAnalysisCache.entrySet()) { - if (!tablePrefix.equals(tablePrefix(entry.getKey()))) { + private void increaseRowIndex(Map> templateAnalysisCache, int number, + int maxRowIndex) { + for (Map.Entry> entry : templateAnalysisCache.entrySet()) { + UniqueDataFlagKey uniqueDataFlagKey = entry.getKey(); + if (!Objects.equals(currentUniqueDataFlag.getSheetNo(), uniqueDataFlagKey.getSheetNo()) || !Objects.equals( + currentUniqueDataFlag.getSheetName(), uniqueDataFlagKey.getSheetName())) { continue; } for (AnalysisCell analysisCell : entry.getValue()) { @@ -191,7 +196,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { } else { dataMap = BeanMapUtils.create(oneRowData); } - Set dataKeySet = new HashSet(dataMap.keySet()); + Set dataKeySet = new HashSet<>(dataMap.keySet()); for (AnalysisCell analysisCell : analysisCellList) { CellWriteHandlerContext cellWriteHandlerContext = WriteHandlerUtils.createCellWriteHandlerContext( @@ -337,8 +342,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { throw new ExcelGenerateException("The wrong direction."); } - Row row = createRowIfNecessary(sheet, cachedSheet, lastRowIndex, fillConfig, analysisCell, isOriginalCell, - cellWriteHandlerContext); + Row row = createRowIfNecessary(sheet, cachedSheet, lastRowIndex, fillConfig, analysisCell, isOriginalCell); cellWriteHandlerContext.setRow(row); cellWriteHandlerContext.setRowIndex(lastRowIndex); @@ -368,7 +372,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { } private Row createRowIfNecessary(Sheet sheet, Sheet cachedSheet, Integer lastRowIndex, FillConfig fillConfig, - AnalysisCell analysisCell, boolean isOriginalCell, CellWriteHandlerContext cellWriteHandlerContext) { + AnalysisCell analysisCell, boolean isOriginalCell) { Row row = sheet.getRow(lastRowIndex); if (row != null) { checkRowHeight(analysisCell, fillConfig, isOriginalCell, row); @@ -419,13 +423,13 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { } } - private List readTemplateData(Map> analysisCache) { + private List readTemplateData(Map> analysisCache) { List analysisCellList = analysisCache.get(currentUniqueDataFlag); if (analysisCellList != null) { return analysisCellList; } Sheet sheet = writeContext.writeSheetHolder().getCachedSheet(); - Map> firstRowCache = MapUtils.newHashMapWithExpectedSize(8); + Map> firstRowCache = MapUtils.newHashMapWithExpectedSize(8); for (int i = 0; i <= sheet.getLastRowNum(); i++) { Row row = sheet.getRow(i); if (row == null) { @@ -455,7 +459,8 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { * @param firstRowCache first row cache * @return Returns the data that the cell needs to replace */ - private String prepareData(Cell cell, int rowIndex, int columnIndex, Map> firstRowCache) { + private String prepareData(Cell cell, int rowIndex, int columnIndex, + Map> firstRowCache) { if (!CellType.STRING.equals(cell.getCellType())) { return null; } @@ -538,7 +543,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { } private String dealAnalysisCell(AnalysisCell analysisCell, String value, int rowIndex, int lastPrepareDataIndex, - int length, Map> firstRowCache, StringBuilder preparedData) { + int length, Map> firstRowCache, StringBuilder preparedData) { if (analysisCell != null) { if (lastPrepareDataIndex == length) { analysisCell.getPrepareDataList().add(StringUtils.EMPTY); @@ -546,7 +551,8 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { analysisCell.getPrepareDataList().add(convertPrepareData(value.substring(lastPrepareDataIndex))); analysisCell.setOnlyOneVariable(Boolean.FALSE); } - String uniqueDataFlag = uniqueDataFlag(writeContext.writeSheetHolder(), analysisCell.getPrefix()); + UniqueDataFlagKey uniqueDataFlag = uniqueDataFlag(writeContext.writeSheetHolder(), + analysisCell.getPrefix()); if (WriteTemplateAnalysisCellTypeEnum.COMMON.equals(analysisCell.getCellType())) { List analysisCellList = templateAnalysisCache.computeIfAbsent(uniqueDataFlag, key -> ListUtils.newArrayList()); @@ -590,21 +596,15 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { return prepareData; } - private String uniqueDataFlag(WriteSheetHolder writeSheetHolder, String wrapperName) { - String prefix; - if (writeSheetHolder.getSheetNo() != null) { - prefix = writeSheetHolder.getSheetNo().toString(); - } else { - prefix = writeSheetHolder.getSheetName(); - } - if (StringUtils.isEmpty(wrapperName)) { - return prefix + "-"; - } - return prefix + "-" + wrapperName; + private UniqueDataFlagKey uniqueDataFlag(WriteSheetHolder writeSheetHolder, String wrapperName) { + return new UniqueDataFlagKey(writeSheetHolder.getSheetNo(), writeSheetHolder.getSheetName(), wrapperName); } - private String tablePrefix(String uniqueDataFlag) { - return uniqueDataFlag.substring(0, uniqueDataFlag.indexOf("-") + 1); + @Data + @AllArgsConstructor + public static class UniqueDataFlagKey { + private Integer sheetNo; + private String sheetName; + private String wrapperName; } - } diff --git a/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java index 3da8500d..c34990fc 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java @@ -46,7 +46,8 @@ public class LargeDataTest { } @Test - public void t01Read() { + public void t01Read() throws Exception{ + Thread.sleep(10*1000L); long start = System.currentTimeMillis(); EasyExcel.read(TestFileUtil.getPath() + "large" + File.separator + "large07.xlsx", LargeData.class, new LargeDataListener()).headRowNumber(2).sheet().doRead(); From 059bb9bfb7f4108f77ce07108a54fffbb70a34c0 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 29 Oct 2021 17:29:35 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=BB=E5=86=99?= =?UTF-8?q?=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/analysis/v07/XlsxSaxAnalyser.java | 6 ++-- .../holder/xlsx/XlsxReadSheetHolder.java | 35 ++----------------- 2 files changed, 6 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java b/src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java index 329f5250..ea8b87b1 100644 --- a/src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java +++ b/src/main/java/com/alibaba/excel/analysis/v07/XlsxSaxAnalyser.java @@ -86,9 +86,9 @@ public class XlsxSaxAnalyser implements ExcelReadExecutor { // set style table setStylesTable(xlsxReadWorkbookHolder, xssfReader); - sheetList = new ArrayList(); - sheetMap = new HashMap(); - commentsTableMap = new HashMap(); + sheetList = new ArrayList<>(); + sheetMap = new HashMap<>(); + commentsTableMap = new HashMap<>(); XSSFReader.SheetIterator ite = (XSSFReader.SheetIterator)xssfReader.getSheetsData(); int index = 0; if (!ite.hasNext()) { diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadSheetHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadSheetHolder.java index 46b92818..b29ba455 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadSheetHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadSheetHolder.java @@ -7,11 +7,14 @@ import com.alibaba.excel.read.metadata.ReadSheet; import com.alibaba.excel.read.metadata.holder.ReadSheetHolder; import com.alibaba.excel.read.metadata.holder.ReadWorkbookHolder; +import lombok.Data; + /** * sheet holder * * @author Jiaju Zhuang */ +@Data public class XlsxReadSheetHolder extends ReadSheetHolder { /** * Record the label of the current operation to prevent NPE. @@ -34,36 +37,4 @@ public class XlsxReadSheetHolder extends ReadSheetHolder { super(readSheet, readWorkbookHolder); this.tagDeque = new LinkedList(); } - - public Deque getTagDeque() { - return tagDeque; - } - - public void setTagDeque(Deque tagDeque) { - this.tagDeque = tagDeque; - } - - public Integer getColumnIndex() { - return columnIndex; - } - - public void setColumnIndex(Integer columnIndex) { - this.columnIndex = columnIndex; - } - - public StringBuilder getTempData() { - return tempData; - } - - public void setTempData(StringBuilder tempData) { - this.tempData = tempData; - } - - public StringBuilder getTempFormula() { - return tempFormula; - } - - public void setTempFormula(StringBuilder tempFormula) { - this.tempFormula = tempFormula; - } } From e33afa6c0fc19fd564003c8401adddb3eacd4b89 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 29 Oct 2021 19:22:19 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=BB=E5=86=99?= =?UTF-8?q?=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- img/readme/large.png | Bin 5424 -> 58751 bytes pom.xml | 2 +- .../excel/metadata/format/DataFormatter.java | 5 +++-- .../test/core/large/LargeDataTest.java | 19 +++++++++++++----- update.md | 2 +- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 660af477..f0ce3ad6 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ EasyExcel # JAVA解析Excel工具EasyExcel Java解析、生成Excel比较有名的框架有Apache poi、jxl。但他们都存在一个严重的问题就是非常的耗内存，poi有一套SAX模式的API可以一定程度的解决一些内存溢出的问题，但POI还是有一些缺陷，比如07版Excel解压缩以及解压后存储都是在内存中完成的，内存消耗依然很大。easyexcel重写了poi对07版Excel的解析，一个3M的excel用POI sax解析依然需要100M左右内存，改用easyexcel可以降低到几M，并且再大的excel也不会出现内存溢出；03版依赖POI的sax模式，在上层做了模型转换的封装，让使用者更加简单方便 -## 64M内存1分钟内读取75M(46W行25列)的Excel +## 64M内存20秒内读取75M(46W行25列)的Excel（3.0.2+版本） 当然还有极速模式能更快，但是内存占用会在100M多一点 ![img](img/readme/large.png) @@ -41,7 +41,7 @@ Java解析、生成Excel比较有名的框架有Apache poi、jxl。但他们都 com.alibaba easyexcel - 3.0.1 + 3.0.2 ``` diff --git a/img/readme/large.png b/img/readme/large.png index 04195a10bfef90fc51c71d2bcb55cd654710461e..48223c56939bf8ccd0b96b906d978d3769dd129a 100644 GIT binary patch literal 58751 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%0A0cQvb>e=|+PJTx7F~YVhu-v#51+lIp&g>_Z=x;Z zG~94m5i&ON!8B3#T_mHR;Jcd$oW(-Plp@&^C1?ZSJB={M04aya@iyI{Dj?cH8$r&k zdCEAZFzaq{F%qz>XJ;!H2p4&-{gOc^f)ik?94sM1#I%e8fndSWy*kpk`3n3$>hRb{n^=R;&gd9NL^ezOr>Hr zhl(}LF+p3I5zByQm6pk#({|1%pv5A$1vlmY;Pm+a z6xw<~hyn$@^QmV9Y`f5QTF`d-5qyIDTiE@-Z#iqkW#VkTIRtfYbB3$CXt>cCegqmLSx^595l0t4uXt3z({KFU_ zOsP>$uqaZ)|h3tq?N=NX#W!H^{yq!ZP=t9A_l08{{anV%<7X1{bZH zeNvPUUK9!`fuJ^v*Ove=qZoIw)HR-fyJ)Cw!`h>Sy4+o5JQ*|^VsGXgdX8D~!<@$* z=-0ja)2(RREyXSp01*Kb3@1u9{S7om^g82tYC7+R(}sY$TA+u8AXrd9B$JCkC0iDM z!r8p#(HSbtW~aGnr)~8-_P}?#kFVFE5_v+lj%9F1FwR~Frm~mlxYx(%` z>2=ror9MJ}wi^bGv9;-HX^tFP3V5}GiIKrb69R&~J6r0kuWoI2It!w}tZi-}(m;tx z#YG4j;)!d#NbfU_!J58aZ*k$()y^@6WT500H_w^nysJkHdYBJ-`CI+5BtP;eEU&CI z^6vV|!g8Nuh|^-Ji^GG;$%Xk=#PW>c4y{xwiw=26B{ytJeb)99kaMg4^f3elE49)$ zhya?c1-@;*kk$Ela1795|HBN>XbMeL#ND4*B|aGC|g3G1N`jgGkL#@Uq!yGKtRyvwfWZ4B7g zf8|Y&dGxD4{`%Xvc0b_lenp!Ck8Lo&oY!u+NZ=4ui{X|iBCajEMO*Y;*X@vr#i>8I zp0&0Zy6NqK6sT4)U2&qR_3(ODOTjQZ|#%VED~Xsv8#)7y3KEGsd*K`9k0rpvmRpDl;nwqmTVq;dIAA~k!yEO6_87P;-eA)H=Mbl@%;frqm_Vy~fn%)V8muYa6^s!mV&q{Ee5==>?^LB$&FQQnrQ)X|Yt_6h*P% z&Q2p`py}$3n_xRc+r2{DsRy3XLmNbBllGp*0V)}7&$!B5J8*JHRA32&_L(<7=8=zm z(VO3Ob~oD&9&Gn7+DI91rj+&5ZnjPGPRm}X8)EDgwa-|~+G1eWCC)C6WvyQ<3f%Ne z9H5}LYl1E{#&IKyq0NRxcLsK9##~ULj3@RSEY;K5zy@x4L>VWV#lj^9SJCDR)8vs^ zDCapkP%0L=hKZZV_I5a%53C!8>2(KU$>p@~GK*?04+)7dmrYlq$l-}=32`FX-k#O2 z4Rm%k+;jj*c>{%f;D(iIH%!s2?d7MpxO^h^ok09$!|k-r&O6CrZdSr0T^pU|CTFfW z0MTM*Vr)D7Ml318F$e1ItPX06gdRwp-TG^7G^2pDl-~ZvXpCr6V&{ggE{!mFWrehs z4zr=owk}CTqZGF?EOB;Ixp2E536wZ0_nAVvq9T12fmj;8zX6C&Q=;r1qU|1{jVn9# z_4n6nSzZn%RDgY=FRLLKZbmI(v(br# zMLt`BlypidqV=$qkgWnS*1)1*tb@hR(eEfwL#?3$(FOeEHN@U;46VKl|B_ebZ;( z-b=q89u*=01--WSEVivQk`kJM zGSGdV5@AGiEY3|J$=DrIM(8$5z52;>qQS=!QaGwm{vqGYUU5SIQF0t|cx>#t7oA%b zm%ro@kdjuQD=2+OQql(hTw8Az-1G(>qV1lcEjm>0^40eY#sC$g4Pok`Pmx!K4>o

2tq5va?D4{$Se<+K%i++h81F@F@p( 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 diff --git a/pom.xml b/pom.xml index 66331d1b..00bae497 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.alibaba easyexcel - 3.0.1 + 3.0.2 jar easyexcel diff --git a/src/main/java/com/alibaba/excel/metadata/format/DataFormatter.java b/src/main/java/com/alibaba/excel/metadata/format/DataFormatter.java index bf76404f..ba8fee47 100644 --- a/src/main/java/com/alibaba/excel/metadata/format/DataFormatter.java +++ b/src/main/java/com/alibaba/excel/metadata/format/DataFormatter.java @@ -111,6 +111,8 @@ public class DataFormatter { */ private static final Pattern alternateGrouping = Pattern.compile("([#0]([^.#0])[#0]{3})"); + private static final Pattern E_NOTATION_PATTERN = Pattern.compile("E(\\d)"); + /** * Cells formatted with a date or time format and which contain invalid date or time values show 255 pound signs * ("#"). @@ -644,8 +646,7 @@ public class DataFormatter { */ private String getFormattedNumberString(BigDecimal data, Short dataFormat, String dataFormatString) { Format numberFormat = getFormat(data.doubleValue(), dataFormat, dataFormatString); - String formatted = numberFormat.format(data); - return formatted.replaceFirst("E(\\d)", "E+$1"); // to match Excel's E-notation + return E_NOTATION_PATTERN.matcher(numberFormat.format(data)).replaceFirst("E+$1"); } /** diff --git a/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java index c34990fc..a438a2ee 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java @@ -32,6 +32,7 @@ public class LargeDataTest { private static File template07; private static File fileCsv; private static File fileWrite07; + private static File fileWriteTemp07; private static File fileWritePoi07; private int i = 0; @@ -40,14 +41,14 @@ public class LargeDataTest { public static void init() { fileFill07 = TestFileUtil.createNewFile("largefill07.xlsx"); fileWrite07 = TestFileUtil.createNewFile("large" + File.separator + "fileWrite07.xlsx"); + fileWriteTemp07 = TestFileUtil.createNewFile("large" + File.separator + "fileWriteTemp07.xlsx"); fileWritePoi07 = TestFileUtil.createNewFile("large" + File.separator + "fileWritePoi07.xlsx"); template07 = TestFileUtil.readFile("large" + File.separator + "fill.xlsx"); fileCsv = TestFileUtil.createNewFile("largefileCsv.csv"); } @Test - public void t01Read() throws Exception{ - Thread.sleep(10*1000L); + public void t01Read() throws Exception { long start = System.currentTimeMillis(); EasyExcel.read(TestFileUtil.getPath() + "large" + File.separator + "large07.xlsx", LargeData.class, new LargeDataListener()).headRowNumber(2).sheet().doRead(); @@ -86,9 +87,16 @@ public class LargeDataTest { @Test public void t04Write() throws Exception { - long start = System.currentTimeMillis(); - ExcelWriter excelWriter = EasyExcel.write(fileWrite07, LargeData.class).build(); + ExcelWriter excelWriter = EasyExcel.write(fileWriteTemp07, LargeData.class).build(); WriteSheet writeSheet = EasyExcel.writerSheet().build(); + for (int j = 0; j < 2; j++) { + excelWriter.write(data(), writeSheet); + } + excelWriter.finish(); + + long start = System.currentTimeMillis(); + excelWriter = EasyExcel.write(fileWrite07, LargeData.class).build(); + writeSheet = EasyExcel.writerSheet().build(); for (int j = 0; j < 100; j++) { excelWriter.write(data(), writeSheet); LOGGER.info("{} write success.", j); @@ -116,7 +124,8 @@ public class LargeDataTest { } long costPoi = System.currentTimeMillis() - start; LOGGER.info("poi write cost:{}", System.currentTimeMillis() - start); - Assert.assertTrue(costPoi * 3 > cost); + LOGGER.info("{} vs {}", cost, costPoi); + Assert.assertTrue(costPoi * 2 > cost); } private List data() { diff --git a/update.md b/update.md index 6cc837de..5d1f724c 100644 --- a/update.md +++ b/update.md @@ -1,5 +1,5 @@ # 3.0.2 -* 修复写入的性能问题 +* 大幅提升读写性能 # 3.0.1 * 升级到正式版 From 89c750aa57821197e7892234091e7350092c3374 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 29 Oct 2021 19:31:26 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9style=20=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E7=A9=BA=E6=8C=87=E9=92=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/alibaba/excel/util/StyleUtil.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/excel/util/StyleUtil.java b/src/main/java/com/alibaba/excel/util/StyleUtil.java index 1bafcdc8..e8a503d7 100644 --- a/src/main/java/com/alibaba/excel/util/StyleUtil.java +++ b/src/main/java/com/alibaba/excel/util/StyleUtil.java @@ -1,5 +1,7 @@ package com.alibaba.excel.util; +import java.util.Optional; + import com.alibaba.excel.constant.BuiltinFormats; import com.alibaba.excel.metadata.data.DataFormatData; import com.alibaba.excel.metadata.data.HyperlinkData; @@ -189,7 +191,11 @@ public class StyleUtil { xssfFont.setStrikeout(xssfOriginFont.getStrikeout()); // Colors cannot be overwritten if (writeFont == null || writeFont.getColor() == null) { - xssfFont.setColor(new XSSFColor(xssfOriginFont.getXSSFColor().getRGB(), null)); + xssfFont.setColor(Optional.of(xssfOriginFont) + .map(XSSFFont::getXSSFColor) + .map(XSSFColor::getRGB) + .map(rgb -> new XSSFColor(rgb, null)) + .orElse(null)); } xssfFont.setTypeOffset(xssfOriginFont.getTypeOffset()); xssfFont.setUnderline(xssfOriginFont.getUnderline()); From 6366552137eaf5bba270508b30c22920860e68af Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 29 Oct 2021 20:03:59 +0800 Subject: [PATCH 09/12] =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8D=E5=88=97=E5=AE=BD?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E6=B2=A1=E7=94=A8=E7=9A=84bug=20[Issue=20#21?= =?UTF-8?q?51]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metadata/holder/AbstractWriteHolder.java | 7 ------- .../property/ExcelWriteHeadProperty.java | 11 +++++++++++ .../test/core/annotation/AnnotationData.java | 8 +++++--- .../core/annotation/AnnotationDataTest.java | 19 +++++++++++++++++++ .../test/core/style/StyleDataTest.java | 4 ++++ 5 files changed, 39 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java index cc4b2f21..ca14886c 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java @@ -243,15 +243,11 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ } Map headMap = getExcelWriteHeadProperty().getHeadMap(); boolean hasColumnWidth = false; - boolean hasStyle = false; for (Head head : headMap.values()) { if (head.getColumnWidthProperty() != null) { hasColumnWidth = true; } - if (head.getHeadStyleProperty() != null || head.getHeadFontProperty() != null) { - hasStyle = true; - } dealLoopMerge(handlerList, head); } @@ -259,10 +255,7 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ dealColumnWidth(handlerList); } - //if (hasStyle) { dealStyle(handlerList); - //} - dealRowHigh(handlerList); dealOnceAbsoluteMerge(handlerList); } diff --git a/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java b/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java index 7f52cd1d..84ba05a5 100644 --- a/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java +++ b/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentLoopMerge; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadFontStyle; @@ -17,6 +18,7 @@ import com.alibaba.excel.enums.HeadKindEnum; import com.alibaba.excel.metadata.CellRange; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.metadata.Holder; +import com.alibaba.excel.metadata.property.ColumnWidthProperty; import com.alibaba.excel.metadata.property.ExcelHeadProperty; import com.alibaba.excel.metadata.property.FontProperty; import com.alibaba.excel.metadata.property.LoopMergeProperty; @@ -50,9 +52,11 @@ public class ExcelWriteHeadProperty extends ExcelHeadProperty { this.onceAbsoluteMergeProperty = OnceAbsoluteMergeProperty.build(headClazz.getAnnotation(OnceAbsoluteMerge.class)); + ColumnWidth parentColumnWidth = headClazz.getAnnotation(ColumnWidth.class); HeadStyle parentHeadStyle = headClazz.getAnnotation(HeadStyle.class); HeadFontStyle parentHeadFontStyle = headClazz.getAnnotation(HeadFontStyle.class); + for (Map.Entry entry : getHeadMap().entrySet()) { Head headData = entry.getValue(); if (headData == null) { @@ -61,6 +65,13 @@ public class ExcelWriteHeadProperty extends ExcelHeadProperty { } Field field = headData.getField(); + ColumnWidth columnWidth = field.getAnnotation(ColumnWidth.class); + if (columnWidth == null) { + columnWidth = parentColumnWidth; + } + headData.setColumnWidthProperty(ColumnWidthProperty.build(columnWidth)); + + HeadStyle headStyle = field.getAnnotation(HeadStyle.class); if (headStyle == null) { headStyle = parentHeadStyle; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java b/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java index d1c2a4f7..40bc4b0b 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java @@ -16,16 +16,18 @@ import lombok.Data; * @author Jiaju Zhuang */ @Data -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) +@ColumnWidth(50) +@HeadRowHeight(50) +@ContentRowHeight(100) public class AnnotationData { @ExcelProperty("日期") @DateTimeFormat("yyyy年MM月dd日HH时mm分ss秒") private Date date; + @ExcelProperty(value = "数字") @NumberFormat("#.##%") private Double number; + @ExcelIgnore private String ignore; private static final String staticFinal = "test"; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataTest.java index 7a4dfe21..02bd3159 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataTest.java @@ -8,6 +8,11 @@ import com.alibaba.easyexcel.test.util.TestFileUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.util.DateUtils; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.WorkbookFactory; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -46,6 +51,20 @@ public class AnnotationDataTest { EasyExcel.write().file(file).head(AnnotationData.class).sheet().doWrite(data()); EasyExcel.read().file(file).head(AnnotationData.class).registerReadListener(new AnnotationDataListener()) .sheet().doRead(); + + if (file == fileCsv) { + return; + } + + Workbook workbook = WorkbookFactory.create(file); + Sheet sheet = workbook.getSheetAt(0); + Assert.assertEquals(50 * 256, sheet.getColumnWidth(0), 0); + + Row row0 = sheet.getRow(0); + Assert.assertEquals(1000, row0.getHeight(), 0); + + Row row1 = sheet.getRow(1); + Assert.assertEquals(2000, row1.getHeight(), 0); } private List data() throws Exception { diff --git a/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java index a48c3238..e9323761 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java @@ -209,7 +209,10 @@ public class StyleDataTest { Workbook workbook = WorkbookFactory.create(file); Sheet sheet = workbook.getSheetAt(0); + Assert.assertEquals(50 * 256, sheet.getColumnWidth(0), 0); + Row row0 = sheet.getRow(0); + Assert.assertEquals(800, row0.getHeight(), 0); Cell cell00 = row0.getCell(0); Assert.assertArrayEquals(new byte[] {-1, -1, 0}, StyleTestUtils.getFillForegroundColor(cell00)); Assert.assertArrayEquals(new byte[] {-128, -128, 0}, StyleTestUtils.getFontColor(cell00, workbook)); @@ -221,6 +224,7 @@ public class StyleDataTest { Assert.assertEquals(20, StyleTestUtils.getFontHeightInPoints(cell01, workbook)); Row row1 = sheet.getRow(1); + Assert.assertEquals(1000, row1.getHeight(), 0); Cell cell10 = row1.getCell(0); Assert.assertArrayEquals(new byte[] {0, -128, -128}, StyleTestUtils.getFillForegroundColor(cell10)); Assert.assertArrayEquals(new byte[] {0, 51, 102}, StyleTestUtils.getFontColor(cell10, workbook)); From 3d419feee6386e633eef28ce71a1ce387aeb9123 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 29 Oct 2021 20:04:02 +0800 Subject: [PATCH 10/12] =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8D=E5=88=97=E5=AE=BD?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E6=B2=A1=E7=94=A8=E7=9A=84bug=20[Issue=20#21?= =?UTF-8?q?51]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update.md | 1 + 1 file changed, 1 insertion(+) diff --git a/update.md b/update.md index 5d1f724c..0ac5c924 100644 --- a/update.md +++ b/update.md @@ -1,5 +1,6 @@ # 3.0.2 * 大幅提升读写性能 +* 修复列宽注解没用的bug [Issue #2151](https://github.com/alibaba/easyexcel/issues/2151) # 3.0.1 * 升级到正式版 From 6448d5aef5e2b8ef6a4b8ae704f676059ecff192 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 29 Oct 2021 20:13:01 +0800 Subject: [PATCH 11/12] =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8D`CellData`=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E5=A4=B1=E8=B4=A5=E7=9A=84=E7=9A=84bug=20[Issue=20#21?= =?UTF-8?q?47]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/alibaba/excel/util/ConverterUtils.java | 3 ++- update.md | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/excel/util/ConverterUtils.java b/src/main/java/com/alibaba/excel/util/ConverterUtils.java index 2a30c57c..02ea4a00 100644 --- a/src/main/java/com/alibaba/excel/util/ConverterUtils.java +++ b/src/main/java/com/alibaba/excel/util/ConverterUtils.java @@ -13,6 +13,7 @@ import com.alibaba.excel.converters.NullableObjectConverter; import com.alibaba.excel.converters.ReadConverterContext; import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.exception.ExcelDataConvertException; +import com.alibaba.excel.metadata.data.CellData; import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.read.metadata.holder.ReadSheetHolder; @@ -89,7 +90,7 @@ public class ConverterUtils { } else { clazz = field.getType(); } - if (clazz == ReadCellData.class) { + if (clazz == CellData.class || clazz == ReadCellData.class) { Class classGeneric = getClassGeneric(field.getGenericType()); ReadCellData cellDataReturn = cellData.clone(); cellDataReturn.setData(doConvertToJavaObject(cellData, classGeneric, contentProperty, converterMap, diff --git a/update.md b/update.md index 0ac5c924..f1f90470 100644 --- a/update.md +++ b/update.md @@ -1,6 +1,8 @@ # 3.0.2 * 大幅提升读写性能 * 修复列宽注解没用的bug [Issue #2151](https://github.com/alibaba/easyexcel/issues/2151) +* 修复`CellData`接收失败的的bug [Issue #2147](https://github.com/alibaba/easyexcel/issues/2147) + # 3.0.1 * 升级到正式版 From 7bd8caa559fdd1dce0e3fc5bc38f170480c0b2d4 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 29 Oct 2021 21:29:33 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/converters/ConverterKeyBuild.java | 18 +++++++++++------- .../excel/converters/ReadConverterContext.java | 8 ++++++-- .../converters/WriteConverterContext.java | 8 ++++++-- .../exception/ExcelDataConvertException.java | 8 ++++++-- .../ExcelWriteDataConvertException.java | 8 ++++++-- .../alibaba/excel/metadata/AbstractCell.java | 8 ++++++-- .../alibaba/excel/metadata/AbstractHolder.java | 8 ++++++-- .../alibaba/excel/metadata/BasicParameter.java | 8 ++++++-- .../com/alibaba/excel/metadata/CellRange.java | 8 ++++++-- .../excel/metadata/GlobalConfiguration.java | 8 ++++++-- .../java/com/alibaba/excel/metadata/Head.java | 8 ++++++-- .../alibaba/excel/metadata/csv/CsvCell.java | 6 ++++-- .../excel/metadata/csv/CsvCellStyle.java | 8 ++++++-- .../com/alibaba/excel/metadata/csv/CsvRow.java | 8 ++++++-- .../alibaba/excel/metadata/csv/CsvSheet.java | 8 ++++++-- .../excel/metadata/csv/CsvWorkbook.java | 8 ++++++-- .../alibaba/excel/metadata/data/CellData.java | 8 ++++++-- .../excel/metadata/data/ClientAnchorData.java | 7 +++++-- .../excel/metadata/data/CommentData.java | 8 ++++++-- .../excel/metadata/data/CoordinateData.java | 8 ++++++-- .../excel/metadata/data/DataFormatData.java | 8 ++++++-- .../excel/metadata/data/FormulaData.java | 8 ++++++-- .../excel/metadata/data/HyperlinkData.java | 7 +++++-- .../alibaba/excel/metadata/data/ImageData.java | 7 +++++-- .../excel/metadata/data/ReadCellData.java | 8 ++++++-- .../metadata/data/RichTextStringData.java | 12 +++++++++--- .../excel/metadata/data/WriteCellData.java | 8 ++++++-- .../property/DateTimeFormatProperty.java | 8 ++++++-- .../property/ExcelContentProperty.java | 8 ++++++-- .../metadata/property/ExcelHeadProperty.java | 8 ++++++-- .../excel/metadata/property/FontProperty.java | 8 ++++++-- .../excel/metadata/property/StyleProperty.java | 8 ++++++-- .../read/metadata/ReadBasicParameter.java | 8 ++++++-- .../excel/read/metadata/ReadWorkbook.java | 8 ++++++-- .../metadata/holder/AbstractReadHolder.java | 8 ++++++-- .../read/metadata/holder/ReadSheetHolder.java | 8 ++++++-- .../metadata/holder/ReadWorkbookHolder.java | 8 ++++++-- .../holder/csv/CsvReadSheetHolder.java | 8 ++++++-- .../holder/csv/CsvReadWorkbookHolder.java | 8 ++++++-- .../holder/xlsx/XlsxReadSheetHolder.java | 8 ++++++-- .../holder/xlsx/XlsxReadWorkbookHolder.java | 8 ++++++-- .../com/alibaba/excel/util/ClassUtils.java | 8 ++++++-- .../write/executor/ExcelWriteFillExecutor.java | 9 +++++++-- .../chain/CellHandlerExecutionChain.java | 8 ++++++-- .../chain/RowHandlerExecutionChain.java | 8 ++++++-- .../chain/SheetHandlerExecutionChain.java | 8 ++++++-- .../chain/WorkbookHandlerExecutionChain.java | 8 ++++++-- .../context/CellWriteHandlerContext.java | 8 ++++++-- .../context/RowWriteHandlerContext.java | 8 ++++++-- .../context/SheetWriteHandlerContext.java | 8 ++++++-- .../context/WorkbookWriteHandlerContext.java | 8 ++++++-- .../write/metadata/WriteBasicParameter.java | 8 ++++++-- .../excel/write/metadata/WriteSheet.java | 8 ++++++-- .../excel/write/metadata/WriteTable.java | 8 ++++++-- .../excel/write/metadata/WriteWorkbook.java | 8 ++++++-- .../write/metadata/fill/AnalysisCell.java | 8 ++++++-- .../excel/write/metadata/fill/FillConfig.java | 8 ++++++-- .../metadata/holder/AbstractWriteHolder.java | 18 +++++++++--------- .../metadata/holder/WriteSheetHolder.java | 8 ++++++-- .../metadata/holder/WriteTableHolder.java | 8 ++++++-- .../metadata/holder/WriteWorkbookHolder.java | 10 ++++++++-- .../write/metadata/style/WriteCellStyle.java | 8 ++++++-- .../excel/write/metadata/style/WriteFont.java | 8 ++++++-- .../write/property/ExcelWriteHeadProperty.java | 8 ++++++-- .../style/HorizontalCellStyleStrategy.java | 8 ++++++-- .../test/core/annotation/AnnotationData.java | 8 ++++++-- .../annotation/AnnotationIndexAndNameData.java | 8 ++++++-- .../test/core/celldata/CellDataReadData.java | 8 ++++++-- .../test/core/celldata/CellDataWriteData.java | 8 ++++++-- .../test/core/converter/ConverterReadData.java | 8 ++++++-- .../core/converter/ConverterWriteData.java | 8 ++++++-- .../test/core/converter/ImageData.java | 8 ++++++-- .../core/converter/ReadAllConverterData.java | 8 ++++++-- .../test/core/dataformat/DateFormatData.java | 8 ++++++-- .../test/core/encrypt/EncryptData.java | 8 ++++++-- .../test/core/exception/ExceptionData.java | 8 ++++++-- .../excludeorinclude/ExcludeOrIncludeData.java | 8 ++++++-- .../easyexcel/test/core/extra/ExtraData.java | 8 ++++++-- .../easyexcel/test/core/fill/FillData.java | 8 ++++++-- .../fill/style/FillStyleAnnotatedData.java | 8 ++++++-- .../test/core/fill/style/FillStyleData.java | 8 ++++++-- .../test/core/handler/WriteHandlerData.java | 8 ++++++-- .../test/core/head/ComplexHeadData.java | 8 ++++++-- .../easyexcel/test/core/head/NoHeadData.java | 8 ++++++-- .../easyexcel/test/core/large/LargeData.java | 8 ++++++-- .../multiplesheets/MultipleSheetsData.java | 8 ++++++-- .../test/core/noncamel/UnCamelData.java | 8 ++++++-- .../test/core/parameter/ParameterData.java | 8 ++++++-- .../test/core/repetition/RepetitionData.java | 8 ++++++-- .../easyexcel/test/core/simple/SimpleData.java | 8 ++++++-- .../easyexcel/test/core/skip/SkipData.java | 8 ++++++-- .../easyexcel/test/core/sort/SortData.java | 8 ++++++-- .../easyexcel/test/core/style/StyleData.java | 8 ++++++-- .../test/core/template/TemplateData.java | 8 ++++++-- .../easyexcel/test/demo/fill/FillData.java | 8 ++++++-- .../test/demo/read/CellDataReadDemoData.java | 8 ++++++-- .../test/demo/read/ConverterData.java | 8 ++++++-- .../easyexcel/test/demo/read/DemoData.java | 8 ++++++-- .../test/demo/read/DemoExtraData.java | 8 ++++++-- .../test/demo/read/ExceptionDemoData.java | 8 ++++++-- .../test/demo/read/IndexOrNameData.java | 8 ++++++-- .../easyexcel/test/demo/web/DownloadData.java | 8 ++++++-- .../easyexcel/test/demo/web/UploadData.java | 8 ++++++-- .../test/demo/write/ComplexHeadData.java | 8 ++++++-- .../test/demo/write/ConverterData.java | 8 ++++++-- .../easyexcel/test/demo/write/DemoData.java | 9 ++++++--- .../test/demo/write/DemoMergeData.java | 8 ++++++-- .../test/demo/write/DemoStyleData.java | 8 ++++++-- .../demo/write/ImageDataWithAnnotation.java | 8 ++++++-- .../test/demo/write/ImageDemoData.java | 8 ++++++-- .../easyexcel/test/demo/write/IndexData.java | 8 ++++++-- .../write/LongestMatchColumnWidthData.java | 8 ++++++-- .../test/demo/write/WidthAndHeightData.java | 8 ++++++-- .../test/demo/write/WriteCellDemoData.java | 8 ++++++-- .../alibaba/easyexcel/test/temp/CamlData.java | 8 ++++++-- .../alibaba/easyexcel/test/temp/LockData.java | 8 ++++++-- .../alibaba/easyexcel/test/temp/StyleData.java | 8 ++++++-- .../easyexcel/test/temp/TempFillData.java | 8 ++++++-- .../easyexcel/test/temp/bug/DataType.java | 9 +++++++-- .../easyexcel/test/temp/bug/HeadType.java | 9 +++++++-- .../easyexcel/test/temp/csv/CsvData.java | 8 ++++++-- .../easyexcel/test/temp/data/DataType.java | 8 ++++++-- .../easyexcel/test/temp/data/HeadType.java | 8 ++++++-- .../test/temp/dataformat/DataFormatData.java | 9 ++++++--- .../easyexcel/test/temp/fill/FillData2.java | 8 ++++++-- .../test/temp/issue1662/Data1662.java | 13 +++++++++---- .../test/temp/issue1663/FillData.java | 8 ++++++-- .../easyexcel/test/temp/large/LargeData.java | 8 ++++++-- .../easyexcel/test/temp/poi/TestCell.java | 8 ++++++-- .../easyexcel/test/temp/read/HeadReadData.java | 9 ++++++--- .../easyexcel/test/temp/simple/DemoData1.java | 8 ++++++-- .../easyexcel/test/temp/simple/DemoData2.java | 8 ++++++-- .../easyexcel/test/temp/simple/JsonData.java | 8 ++++++-- .../easyexcel/test/temp/simple/WriteData.java | 10 ++++++---- 134 files changed, 818 insertions(+), 288 deletions(-) diff --git a/src/main/java/com/alibaba/excel/converters/ConverterKeyBuild.java b/src/main/java/com/alibaba/excel/converters/ConverterKeyBuild.java index 5fe8f0bc..d6417be7 100644 --- a/src/main/java/com/alibaba/excel/converters/ConverterKeyBuild.java +++ b/src/main/java/com/alibaba/excel/converters/ConverterKeyBuild.java @@ -6,7 +6,9 @@ import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.util.MapUtils; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Converter unique key.Consider that you can just use class as the key. @@ -29,18 +31,20 @@ public class ConverterKeyBuild { } public static ConverterKey buildKey(Class clazz) { - Class boxingClass = BOXING_MAP.get(clazz); - if (boxingClass != null) { - return new ConverterKey(boxingClass, null); - } - return new ConverterKey(clazz, null); + return buildKey(clazz, null); } public static ConverterKey buildKey(Class clazz, CellDataTypeEnum cellDataTypeEnum) { + Class boxingClass = BOXING_MAP.get(clazz); + if (boxingClass != null) { + return new ConverterKey(boxingClass, cellDataTypeEnum); + } return new ConverterKey(clazz, cellDataTypeEnum); } - @Data + @Getter + @Setter + @EqualsAndHashCode @AllArgsConstructor public static class ConverterKey { private Class clazz; diff --git a/src/main/java/com/alibaba/excel/converters/ReadConverterContext.java b/src/main/java/com/alibaba/excel/converters/ReadConverterContext.java index e1367065..9c7970cd 100644 --- a/src/main/java/com/alibaba/excel/converters/ReadConverterContext.java +++ b/src/main/java/com/alibaba/excel/converters/ReadConverterContext.java @@ -5,14 +5,18 @@ import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.metadata.property.ExcelContentProperty; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * read converter context * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @AllArgsConstructor public class ReadConverterContext { /** diff --git a/src/main/java/com/alibaba/excel/converters/WriteConverterContext.java b/src/main/java/com/alibaba/excel/converters/WriteConverterContext.java index cb01c773..46abda47 100644 --- a/src/main/java/com/alibaba/excel/converters/WriteConverterContext.java +++ b/src/main/java/com/alibaba/excel/converters/WriteConverterContext.java @@ -4,15 +4,19 @@ import com.alibaba.excel.context.WriteContext; import com.alibaba.excel.metadata.property.ExcelContentProperty; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; /** * write converter context * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor @AllArgsConstructor public class WriteConverterContext { diff --git a/src/main/java/com/alibaba/excel/exception/ExcelDataConvertException.java b/src/main/java/com/alibaba/excel/exception/ExcelDataConvertException.java index 1e56a200..ff1b409d 100644 --- a/src/main/java/com/alibaba/excel/exception/ExcelDataConvertException.java +++ b/src/main/java/com/alibaba/excel/exception/ExcelDataConvertException.java @@ -4,14 +4,18 @@ import com.alibaba.excel.metadata.data.CellData; import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.write.builder.ExcelWriterBuilder; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Data convert exception * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExcelDataConvertException extends RuntimeException { /** * NotNull. diff --git a/src/main/java/com/alibaba/excel/exception/ExcelWriteDataConvertException.java b/src/main/java/com/alibaba/excel/exception/ExcelWriteDataConvertException.java index 9f9a2e4a..b8e3fcb3 100644 --- a/src/main/java/com/alibaba/excel/exception/ExcelWriteDataConvertException.java +++ b/src/main/java/com/alibaba/excel/exception/ExcelWriteDataConvertException.java @@ -2,14 +2,18 @@ package com.alibaba.excel.exception; import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Data convert exception * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExcelWriteDataConvertException extends ExcelDataConvertException { /** * handler. diff --git a/src/main/java/com/alibaba/excel/metadata/AbstractCell.java b/src/main/java/com/alibaba/excel/metadata/AbstractCell.java index 6647cf0c..9650b303 100644 --- a/src/main/java/com/alibaba/excel/metadata/AbstractCell.java +++ b/src/main/java/com/alibaba/excel/metadata/AbstractCell.java @@ -1,13 +1,17 @@ package com.alibaba.excel.metadata; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * cell * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class AbstractCell implements Cell { /** * Row index diff --git a/src/main/java/com/alibaba/excel/metadata/AbstractHolder.java b/src/main/java/com/alibaba/excel/metadata/AbstractHolder.java index 828f38e7..839a8b4b 100644 --- a/src/main/java/com/alibaba/excel/metadata/AbstractHolder.java +++ b/src/main/java/com/alibaba/excel/metadata/AbstractHolder.java @@ -6,15 +6,19 @@ import java.util.Map; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.converters.ConverterKeyBuild.ConverterKey; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; /** * Write/read holder * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public abstract class AbstractHolder implements ConfigurationHolder { /** diff --git a/src/main/java/com/alibaba/excel/metadata/BasicParameter.java b/src/main/java/com/alibaba/excel/metadata/BasicParameter.java index f574f10e..0c11f942 100644 --- a/src/main/java/com/alibaba/excel/metadata/BasicParameter.java +++ b/src/main/java/com/alibaba/excel/metadata/BasicParameter.java @@ -5,14 +5,18 @@ import java.util.Locale; import com.alibaba.excel.converters.Converter; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Basic parameter * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class BasicParameter { /** * You can only choose one of the {@link BasicParameter#head} and {@link BasicParameter#clazz} diff --git a/src/main/java/com/alibaba/excel/metadata/CellRange.java b/src/main/java/com/alibaba/excel/metadata/CellRange.java index bd0f54f9..8552d09f 100644 --- a/src/main/java/com/alibaba/excel/metadata/CellRange.java +++ b/src/main/java/com/alibaba/excel/metadata/CellRange.java @@ -1,11 +1,15 @@ package com.alibaba.excel.metadata; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author jipengfei */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CellRange { private int firstRow; diff --git a/src/main/java/com/alibaba/excel/metadata/GlobalConfiguration.java b/src/main/java/com/alibaba/excel/metadata/GlobalConfiguration.java index 987e553b..5cafe90c 100644 --- a/src/main/java/com/alibaba/excel/metadata/GlobalConfiguration.java +++ b/src/main/java/com/alibaba/excel/metadata/GlobalConfiguration.java @@ -2,14 +2,18 @@ package com.alibaba.excel.metadata; import java.util.Locale; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Global configuration * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class GlobalConfiguration { /** * Automatic trim includes sheet name and content diff --git a/src/main/java/com/alibaba/excel/metadata/Head.java b/src/main/java/com/alibaba/excel/metadata/Head.java index 7e1fd47b..5aa1cc3a 100644 --- a/src/main/java/com/alibaba/excel/metadata/Head.java +++ b/src/main/java/com/alibaba/excel/metadata/Head.java @@ -10,14 +10,18 @@ import com.alibaba.excel.metadata.property.FontProperty; import com.alibaba.excel.metadata.property.LoopMergeProperty; import com.alibaba.excel.metadata.property.StyleProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * excel head * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class Head { /** * Column index of head diff --git a/src/main/java/com/alibaba/excel/metadata/csv/CsvCell.java b/src/main/java/com/alibaba/excel/metadata/csv/CsvCell.java index f0e925e6..72beb30a 100644 --- a/src/main/java/com/alibaba/excel/metadata/csv/CsvCell.java +++ b/src/main/java/com/alibaba/excel/metadata/csv/CsvCell.java @@ -10,7 +10,7 @@ import com.alibaba.excel.enums.NumericCellTypeEnum; import com.alibaba.excel.metadata.data.FormulaData; import lombok.AccessLevel; -import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import org.apache.poi.ss.SpreadsheetVersion; @@ -29,7 +29,9 @@ import org.apache.poi.ss.util.CellRangeAddress; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CsvCell extends CellBase { /** diff --git a/src/main/java/com/alibaba/excel/metadata/csv/CsvCellStyle.java b/src/main/java/com/alibaba/excel/metadata/csv/CsvCellStyle.java index 08b46e3a..a992f213 100644 --- a/src/main/java/com/alibaba/excel/metadata/csv/CsvCellStyle.java +++ b/src/main/java/com/alibaba/excel/metadata/csv/CsvCellStyle.java @@ -2,7 +2,9 @@ package com.alibaba.excel.metadata.csv; import com.alibaba.excel.metadata.data.DataFormatData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.Color; @@ -16,7 +18,9 @@ import org.apache.poi.ss.usermodel.VerticalAlignment; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CsvCellStyle implements CellStyle { /** diff --git a/src/main/java/com/alibaba/excel/metadata/csv/CsvRow.java b/src/main/java/com/alibaba/excel/metadata/csv/CsvRow.java index 24acd9d9..89e76a71 100644 --- a/src/main/java/com/alibaba/excel/metadata/csv/CsvRow.java +++ b/src/main/java/com/alibaba/excel/metadata/csv/CsvRow.java @@ -3,7 +3,9 @@ package com.alibaba.excel.metadata.csv; import java.util.Iterator; import java.util.List; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.compress.utils.Lists; import org.apache.poi.ss.usermodel.Cell; @@ -17,7 +19,9 @@ import org.apache.poi.ss.usermodel.Sheet; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CsvRow implements Row { /** diff --git a/src/main/java/com/alibaba/excel/metadata/csv/CsvSheet.java b/src/main/java/com/alibaba/excel/metadata/csv/CsvSheet.java index b002b6b4..79331677 100644 --- a/src/main/java/com/alibaba/excel/metadata/csv/CsvSheet.java +++ b/src/main/java/com/alibaba/excel/metadata/csv/CsvSheet.java @@ -16,7 +16,9 @@ import com.alibaba.excel.util.ListUtils; import com.alibaba.excel.util.NumberDataFormatterUtils; import com.alibaba.excel.util.StringUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVPrinter; import org.apache.poi.ss.usermodel.AutoFilter; @@ -45,7 +47,9 @@ import org.apache.poi.ss.util.PaneInformation; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CsvSheet implements Sheet, Closeable { /** * workbook diff --git a/src/main/java/com/alibaba/excel/metadata/csv/CsvWorkbook.java b/src/main/java/com/alibaba/excel/metadata/csv/CsvWorkbook.java index e26a2b65..4e713509 100644 --- a/src/main/java/com/alibaba/excel/metadata/csv/CsvWorkbook.java +++ b/src/main/java/com/alibaba/excel/metadata/csv/CsvWorkbook.java @@ -6,7 +6,9 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.compress.utils.Lists; import org.apache.poi.ss.SpreadsheetVersion; import org.apache.poi.ss.formula.udf.UDFFinder; @@ -26,7 +28,9 @@ import org.apache.poi.ss.usermodel.Workbook; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CsvWorkbook implements Workbook { /** * output diff --git a/src/main/java/com/alibaba/excel/metadata/data/CellData.java b/src/main/java/com/alibaba/excel/metadata/data/CellData.java index ed6085f9..2f74ea9b 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/CellData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/CellData.java @@ -6,7 +6,9 @@ import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.metadata.AbstractCell; import com.alibaba.excel.util.StringUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Excel internal cell data. @@ -15,7 +17,9 @@ import lombok.Data; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CellData extends AbstractCell { /** * cell type diff --git a/src/main/java/com/alibaba/excel/metadata/data/ClientAnchorData.java b/src/main/java/com/alibaba/excel/metadata/data/ClientAnchorData.java index 2416635d..1963133d 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/ClientAnchorData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/ClientAnchorData.java @@ -1,7 +1,8 @@ package com.alibaba.excel.metadata.data; -import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.Getter; +import lombok.Setter; import org.apache.poi.ss.usermodel.ClientAnchor; import org.apache.poi.util.Internal; @@ -21,7 +22,9 @@ import org.apache.poi.util.Internal; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ClientAnchorData extends CoordinateData { /** * top diff --git a/src/main/java/com/alibaba/excel/metadata/data/CommentData.java b/src/main/java/com/alibaba/excel/metadata/data/CommentData.java index 08cff272..6373b0a6 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/CommentData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/CommentData.java @@ -1,13 +1,17 @@ package com.alibaba.excel.metadata.data; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * comment * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CommentData extends ClientAnchorData { /** * Name of the original comment author diff --git a/src/main/java/com/alibaba/excel/metadata/data/CoordinateData.java b/src/main/java/com/alibaba/excel/metadata/data/CoordinateData.java index 69242e57..0755662b 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/CoordinateData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/CoordinateData.java @@ -1,13 +1,17 @@ package com.alibaba.excel.metadata.data; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * coordinate. * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CoordinateData { /** * first row index.Priority is higher than {@link #relativeFirstRowIndex}. diff --git a/src/main/java/com/alibaba/excel/metadata/data/DataFormatData.java b/src/main/java/com/alibaba/excel/metadata/data/DataFormatData.java index 877ca270..4f447632 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/DataFormatData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/DataFormatData.java @@ -2,14 +2,18 @@ package com.alibaba.excel.metadata.data; import com.alibaba.excel.util.StringUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * data format * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DataFormatData { /** * index diff --git a/src/main/java/com/alibaba/excel/metadata/data/FormulaData.java b/src/main/java/com/alibaba/excel/metadata/data/FormulaData.java index 36d0206b..f71ff2eb 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/FormulaData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/FormulaData.java @@ -1,13 +1,17 @@ package com.alibaba.excel.metadata.data; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * formula * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class FormulaData { /** * formula diff --git a/src/main/java/com/alibaba/excel/metadata/data/HyperlinkData.java b/src/main/java/com/alibaba/excel/metadata/data/HyperlinkData.java index 3fa23893..03edad13 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/HyperlinkData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/HyperlinkData.java @@ -1,14 +1,17 @@ package com.alibaba.excel.metadata.data; -import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.Getter; +import lombok.Setter; /** * hyperlink * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class HyperlinkData extends CoordinateData { /** * Depending on the hyperlink type it can be URL, e-mail, path to a file, etc diff --git a/src/main/java/com/alibaba/excel/metadata/data/ImageData.java b/src/main/java/com/alibaba/excel/metadata/data/ImageData.java index 20cd43e1..2ca1cdc8 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/ImageData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/ImageData.java @@ -1,14 +1,17 @@ package com.alibaba.excel.metadata.data; -import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.Getter; +import lombok.Setter; /** * image * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ImageData extends ClientAnchorData { /** diff --git a/src/main/java/com/alibaba/excel/metadata/data/ReadCellData.java b/src/main/java/com/alibaba/excel/metadata/data/ReadCellData.java index 68231a19..e1bb57ca 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/ReadCellData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/ReadCellData.java @@ -4,15 +4,19 @@ import java.math.BigDecimal; import com.alibaba.excel.enums.CellDataTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; /** * read cell data * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public class ReadCellData extends CellData { /** diff --git a/src/main/java/com/alibaba/excel/metadata/data/RichTextStringData.java b/src/main/java/com/alibaba/excel/metadata/data/RichTextStringData.java index 1717741a..d277614f 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/RichTextStringData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/RichTextStringData.java @@ -6,15 +6,19 @@ import com.alibaba.excel.util.ListUtils; import com.alibaba.excel.write.metadata.style.WriteFont; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; /** * rich text string * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public class RichTextStringData { private String textString; @@ -25,7 +29,9 @@ public class RichTextStringData { this.textString = textString; } - @Data + @Getter + @Setter + @EqualsAndHashCode @AllArgsConstructor public static class IntervalFont { private Integer startIndex; diff --git a/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java b/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java index a988703a..f8ce9064 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java @@ -10,8 +10,10 @@ import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.util.ListUtils; import com.alibaba.excel.write.metadata.style.WriteCellStyle; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import org.apache.poi.ss.usermodel.CellStyle; /** @@ -19,7 +21,9 @@ import org.apache.poi.ss.usermodel.CellStyle; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public class WriteCellData extends CellData { /** diff --git a/src/main/java/com/alibaba/excel/metadata/property/DateTimeFormatProperty.java b/src/main/java/com/alibaba/excel/metadata/property/DateTimeFormatProperty.java index d2bb20cd..10752b74 100644 --- a/src/main/java/com/alibaba/excel/metadata/property/DateTimeFormatProperty.java +++ b/src/main/java/com/alibaba/excel/metadata/property/DateTimeFormatProperty.java @@ -3,14 +3,18 @@ package com.alibaba.excel.metadata.property; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.util.BooleanUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Configuration from annotations * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DateTimeFormatProperty { private String format; private Boolean use1904windowing; diff --git a/src/main/java/com/alibaba/excel/metadata/property/ExcelContentProperty.java b/src/main/java/com/alibaba/excel/metadata/property/ExcelContentProperty.java index 1c0bb232..f0b72198 100644 --- a/src/main/java/com/alibaba/excel/metadata/property/ExcelContentProperty.java +++ b/src/main/java/com/alibaba/excel/metadata/property/ExcelContentProperty.java @@ -4,12 +4,16 @@ import java.lang.reflect.Field; import com.alibaba.excel.converters.Converter; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author jipengfei */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExcelContentProperty { public static final ExcelContentProperty EMPTY = new ExcelContentProperty(); diff --git a/src/main/java/com/alibaba/excel/metadata/property/ExcelHeadProperty.java b/src/main/java/com/alibaba/excel/metadata/property/ExcelHeadProperty.java index a0359fb3..f3a8474a 100644 --- a/src/main/java/com/alibaba/excel/metadata/property/ExcelHeadProperty.java +++ b/src/main/java/com/alibaba/excel/metadata/property/ExcelHeadProperty.java @@ -17,7 +17,9 @@ import com.alibaba.excel.util.MapUtils; import com.alibaba.excel.util.StringUtils; import com.alibaba.excel.write.metadata.holder.AbstractWriteHolder; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,7 +29,9 @@ import org.slf4j.LoggerFactory; * * @author jipengfei */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExcelHeadProperty { private static final Logger LOGGER = LoggerFactory.getLogger(ExcelHeadProperty.class); diff --git a/src/main/java/com/alibaba/excel/metadata/property/FontProperty.java b/src/main/java/com/alibaba/excel/metadata/property/FontProperty.java index 619cfe6b..c280b921 100644 --- a/src/main/java/com/alibaba/excel/metadata/property/FontProperty.java +++ b/src/main/java/com/alibaba/excel/metadata/property/FontProperty.java @@ -4,7 +4,9 @@ import com.alibaba.excel.annotation.write.style.ContentFontStyle; import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.alibaba.excel.util.StringUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.common.usermodel.fonts.FontCharset; import org.apache.poi.hssf.usermodel.HSSFPalette; import org.apache.poi.ss.usermodel.Font; @@ -15,7 +17,9 @@ import org.apache.poi.ss.usermodel.IndexedColors; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class FontProperty { /** * The name for the font (i.e. Arial) diff --git a/src/main/java/com/alibaba/excel/metadata/property/StyleProperty.java b/src/main/java/com/alibaba/excel/metadata/property/StyleProperty.java index 4ef87f68..bb469cd3 100644 --- a/src/main/java/com/alibaba/excel/metadata/property/StyleProperty.java +++ b/src/main/java/com/alibaba/excel/metadata/property/StyleProperty.java @@ -5,7 +5,9 @@ import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.metadata.data.DataFormatData; import com.alibaba.excel.write.metadata.style.WriteFont; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.BuiltinFormats; import org.apache.poi.ss.usermodel.FillPatternType; @@ -19,7 +21,9 @@ import org.apache.poi.ss.usermodel.VerticalAlignment; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class StyleProperty { /** * Set the data format (must be a valid format). Built in formats are defined at {@link BuiltinFormats}. diff --git a/src/main/java/com/alibaba/excel/read/metadata/ReadBasicParameter.java b/src/main/java/com/alibaba/excel/read/metadata/ReadBasicParameter.java index b5d17cbe..59149fb3 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/ReadBasicParameter.java +++ b/src/main/java/com/alibaba/excel/read/metadata/ReadBasicParameter.java @@ -6,14 +6,18 @@ import java.util.List; import com.alibaba.excel.metadata.BasicParameter; import com.alibaba.excel.read.listener.ReadListener; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Read basic parameter * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ReadBasicParameter extends BasicParameter { /** * Count the number of added heads when read sheet. diff --git a/src/main/java/com/alibaba/excel/read/metadata/ReadWorkbook.java b/src/main/java/com/alibaba/excel/read/metadata/ReadWorkbook.java index f8106631..54ab034c 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/ReadWorkbook.java +++ b/src/main/java/com/alibaba/excel/read/metadata/ReadWorkbook.java @@ -14,14 +14,18 @@ import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.excel.read.listener.ModelBuildEventListener; import com.alibaba.excel.support.ExcelTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Workbook * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ReadWorkbook extends ReadBasicParameter { /** * Excel type diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/AbstractReadHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/AbstractReadHolder.java index 6561d377..8163a5df 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/AbstractReadHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/AbstractReadHolder.java @@ -15,15 +15,19 @@ import com.alibaba.excel.read.metadata.ReadWorkbook; import com.alibaba.excel.read.metadata.property.ExcelReadHeadProperty; import com.alibaba.excel.util.ListUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; /** * Read Holder * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public abstract class AbstractReadHolder extends AbstractHolder implements ReadHolder { /** diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/ReadSheetHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/ReadSheetHolder.java index 558bec57..197835ad 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/ReadSheetHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/ReadSheetHolder.java @@ -9,15 +9,19 @@ import com.alibaba.excel.metadata.CellExtra; import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.read.metadata.ReadSheet; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; /** * sheet holder * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public class ReadSheetHolder extends AbstractReadHolder { diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/ReadWorkbookHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/ReadWorkbookHolder.java index b1e03e4f..7de30aa5 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/ReadWorkbookHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/ReadWorkbookHolder.java @@ -19,15 +19,19 @@ import com.alibaba.excel.read.metadata.ReadSheet; import com.alibaba.excel.read.metadata.ReadWorkbook; import com.alibaba.excel.support.ExcelTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; /** * Workbook holder * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public class ReadWorkbookHolder extends AbstractReadHolder { diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadSheetHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadSheetHolder.java index d6bf6953..1b784e44 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadSheetHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadSheetHolder.java @@ -4,14 +4,18 @@ import com.alibaba.excel.read.metadata.ReadSheet; import com.alibaba.excel.read.metadata.holder.ReadSheetHolder; import com.alibaba.excel.read.metadata.holder.ReadWorkbookHolder; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * sheet holder * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CsvReadSheetHolder extends ReadSheetHolder { public CsvReadSheetHolder(ReadSheet readSheet, ReadWorkbookHolder readWorkbookHolder) { diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadWorkbookHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadWorkbookHolder.java index 8066fab6..0a322d58 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadWorkbookHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadWorkbookHolder.java @@ -4,7 +4,9 @@ import com.alibaba.excel.read.metadata.ReadWorkbook; import com.alibaba.excel.read.metadata.holder.ReadWorkbookHolder; import com.alibaba.excel.support.ExcelTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.csv.CSVFormat; /** @@ -12,7 +14,9 @@ import org.apache.commons.csv.CSVFormat; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CsvReadWorkbookHolder extends ReadWorkbookHolder { private CSVFormat csvFormat; diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadSheetHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadSheetHolder.java index b29ba455..f4ed56e7 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadSheetHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadSheetHolder.java @@ -7,14 +7,18 @@ import com.alibaba.excel.read.metadata.ReadSheet; import com.alibaba.excel.read.metadata.holder.ReadSheetHolder; import com.alibaba.excel.read.metadata.holder.ReadWorkbookHolder; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * sheet holder * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class XlsxReadSheetHolder extends ReadSheetHolder { /** * Record the label of the current operation to prevent NPE. diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadWorkbookHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadWorkbookHolder.java index 24ff8503..4e70aa0e 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadWorkbookHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadWorkbookHolder.java @@ -11,7 +11,9 @@ import com.alibaba.excel.read.metadata.holder.ReadWorkbookHolder; import com.alibaba.excel.support.ExcelTypeEnum; import com.alibaba.excel.util.MapUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.xssf.model.StylesTable; import org.apache.poi.xssf.usermodel.XSSFCellStyle; @@ -21,7 +23,9 @@ import org.apache.poi.xssf.usermodel.XSSFCellStyle; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class XlsxReadWorkbookHolder extends ReadWorkbookHolder { /** * Package diff --git a/src/main/java/com/alibaba/excel/util/ClassUtils.java b/src/main/java/com/alibaba/excel/util/ClassUtils.java index 8c7dd6b4..82f78af2 100644 --- a/src/main/java/com/alibaba/excel/util/ClassUtils.java +++ b/src/main/java/com/alibaba/excel/util/ClassUtils.java @@ -32,7 +32,9 @@ import com.alibaba.excel.metadata.property.StyleProperty; import com.alibaba.excel.write.metadata.holder.WriteHolder; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import net.sf.cglib.beans.BeanMap; /** @@ -403,7 +405,9 @@ public class ClassUtils { } } - @Data + @Getter + @Setter + @EqualsAndHashCode @AllArgsConstructor public static class ContentPropertyKey { private Class clazz; diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java index 331c4989..af90d8d5 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java @@ -33,7 +33,9 @@ import com.alibaba.excel.write.metadata.fill.FillWrapper; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.hssf.usermodel.PoiUtils; import org.apache.poi.ss.usermodel.Cell; @@ -232,6 +234,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { List> cellDataList = new ArrayList<>(); cellWriteHandlerContext.setExcelContentProperty(ExcelContentProperty.EMPTY); + cellWriteHandlerContext.setIgnoreFillStyle(Boolean.TRUE); createCell(analysisCell, fillConfig, cellWriteHandlerContext); Cell cell = cellWriteHandlerContext.getCell(); @@ -600,7 +603,9 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { return new UniqueDataFlagKey(writeSheetHolder.getSheetNo(), writeSheetHolder.getSheetName(), wrapperName); } - @Data + @Getter + @Setter + @EqualsAndHashCode @AllArgsConstructor public static class UniqueDataFlagKey { private Integer sheetNo; diff --git a/src/main/java/com/alibaba/excel/write/handler/chain/CellHandlerExecutionChain.java b/src/main/java/com/alibaba/excel/write/handler/chain/CellHandlerExecutionChain.java index 4826d6bc..35afe6fc 100644 --- a/src/main/java/com/alibaba/excel/write/handler/chain/CellHandlerExecutionChain.java +++ b/src/main/java/com/alibaba/excel/write/handler/chain/CellHandlerExecutionChain.java @@ -3,14 +3,18 @@ package com.alibaba.excel.write.handler.chain; import com.alibaba.excel.write.handler.CellWriteHandler; import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Execute the cell handler chain * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CellHandlerExecutionChain { /** * next chain diff --git a/src/main/java/com/alibaba/excel/write/handler/chain/RowHandlerExecutionChain.java b/src/main/java/com/alibaba/excel/write/handler/chain/RowHandlerExecutionChain.java index 872afa8a..4f32f3b1 100644 --- a/src/main/java/com/alibaba/excel/write/handler/chain/RowHandlerExecutionChain.java +++ b/src/main/java/com/alibaba/excel/write/handler/chain/RowHandlerExecutionChain.java @@ -3,14 +3,18 @@ package com.alibaba.excel.write.handler.chain; import com.alibaba.excel.write.handler.RowWriteHandler; import com.alibaba.excel.write.handler.context.RowWriteHandlerContext; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Execute the row handler chain * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class RowHandlerExecutionChain { /** * next chain diff --git a/src/main/java/com/alibaba/excel/write/handler/chain/SheetHandlerExecutionChain.java b/src/main/java/com/alibaba/excel/write/handler/chain/SheetHandlerExecutionChain.java index 56770496..7e079dd2 100644 --- a/src/main/java/com/alibaba/excel/write/handler/chain/SheetHandlerExecutionChain.java +++ b/src/main/java/com/alibaba/excel/write/handler/chain/SheetHandlerExecutionChain.java @@ -3,14 +3,18 @@ package com.alibaba.excel.write.handler.chain; import com.alibaba.excel.write.handler.SheetWriteHandler; import com.alibaba.excel.write.handler.context.SheetWriteHandlerContext; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Execute the sheet handler chain * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class SheetHandlerExecutionChain { /** * next chain diff --git a/src/main/java/com/alibaba/excel/write/handler/chain/WorkbookHandlerExecutionChain.java b/src/main/java/com/alibaba/excel/write/handler/chain/WorkbookHandlerExecutionChain.java index c7dacbb4..56e746e0 100644 --- a/src/main/java/com/alibaba/excel/write/handler/chain/WorkbookHandlerExecutionChain.java +++ b/src/main/java/com/alibaba/excel/write/handler/chain/WorkbookHandlerExecutionChain.java @@ -3,14 +3,18 @@ package com.alibaba.excel.write.handler.chain; import com.alibaba.excel.write.handler.WorkbookWriteHandler; import com.alibaba.excel.write.handler.context.WorkbookWriteHandlerContext; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Execute the workbook handler chain * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WorkbookHandlerExecutionChain { /** * next chain diff --git a/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java index bd6b1930..0007e7ac 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java @@ -12,7 +12,9 @@ import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteTableHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -21,7 +23,9 @@ import org.apache.poi.ss.usermodel.Row; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CellWriteHandlerContext { /** * write context diff --git a/src/main/java/com/alibaba/excel/write/handler/context/RowWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/RowWriteHandlerContext.java index 6578d3a2..c01c8b5b 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/RowWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/RowWriteHandlerContext.java @@ -6,7 +6,9 @@ import com.alibaba.excel.write.metadata.holder.WriteTableHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.ss.usermodel.Row; /** @@ -14,7 +16,9 @@ import org.apache.poi.ss.usermodel.Row; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @AllArgsConstructor public class RowWriteHandlerContext { /** diff --git a/src/main/java/com/alibaba/excel/write/handler/context/SheetWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/SheetWriteHandlerContext.java index c1164eb0..f3c024f4 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/SheetWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/SheetWriteHandlerContext.java @@ -5,14 +5,18 @@ import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * sheet context * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @AllArgsConstructor public class SheetWriteHandlerContext { /** diff --git a/src/main/java/com/alibaba/excel/write/handler/context/WorkbookWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/WorkbookWriteHandlerContext.java index f955d4bf..a7ec289c 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/WorkbookWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/WorkbookWriteHandlerContext.java @@ -4,14 +4,18 @@ import com.alibaba.excel.context.WriteContext; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * workbook context * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @AllArgsConstructor public class WorkbookWriteHandlerContext { /** diff --git a/src/main/java/com/alibaba/excel/write/metadata/WriteBasicParameter.java b/src/main/java/com/alibaba/excel/write/metadata/WriteBasicParameter.java index 91527cc1..b0745d38 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/WriteBasicParameter.java +++ b/src/main/java/com/alibaba/excel/write/metadata/WriteBasicParameter.java @@ -7,14 +7,18 @@ import java.util.List; import com.alibaba.excel.metadata.BasicParameter; import com.alibaba.excel.write.handler.WriteHandler; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Write basic parameter * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteBasicParameter extends BasicParameter { /** * Writes the head relative to the existing contents of the sheet. Indexes are zero-based. diff --git a/src/main/java/com/alibaba/excel/write/metadata/WriteSheet.java b/src/main/java/com/alibaba/excel/write/metadata/WriteSheet.java index 04bfb822..1f41376c 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/WriteSheet.java +++ b/src/main/java/com/alibaba/excel/write/metadata/WriteSheet.java @@ -1,13 +1,17 @@ package com.alibaba.excel.write.metadata; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Write sheet * * @author jipengfei */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteSheet extends WriteBasicParameter { /** * Starting from 0 diff --git a/src/main/java/com/alibaba/excel/write/metadata/WriteTable.java b/src/main/java/com/alibaba/excel/write/metadata/WriteTable.java index a935f326..6681e1b8 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/WriteTable.java +++ b/src/main/java/com/alibaba/excel/write/metadata/WriteTable.java @@ -1,13 +1,17 @@ package com.alibaba.excel.write.metadata; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * table * * @author jipengfei */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteTable extends WriteBasicParameter { /** * Starting from 0 diff --git a/src/main/java/com/alibaba/excel/write/metadata/WriteWorkbook.java b/src/main/java/com/alibaba/excel/write/metadata/WriteWorkbook.java index bcc39211..38b368ec 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/WriteWorkbook.java +++ b/src/main/java/com/alibaba/excel/write/metadata/WriteWorkbook.java @@ -7,14 +7,18 @@ import java.nio.charset.Charset; import com.alibaba.excel.support.ExcelTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Workbook * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteWorkbook extends WriteBasicParameter { /** * Excel type.The default is xlsx diff --git a/src/main/java/com/alibaba/excel/write/metadata/fill/AnalysisCell.java b/src/main/java/com/alibaba/excel/write/metadata/fill/AnalysisCell.java index b9b377ed..783c7d89 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/fill/AnalysisCell.java +++ b/src/main/java/com/alibaba/excel/write/metadata/fill/AnalysisCell.java @@ -4,14 +4,18 @@ import java.util.List; import com.alibaba.excel.enums.WriteTemplateAnalysisCellTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Read the cells of the template while populating the data. * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class AnalysisCell { private int columnIndex; private int rowIndex; diff --git a/src/main/java/com/alibaba/excel/write/metadata/fill/FillConfig.java b/src/main/java/com/alibaba/excel/write/metadata/fill/FillConfig.java index 8fdb240a..ac5581ee 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/fill/FillConfig.java +++ b/src/main/java/com/alibaba/excel/write/metadata/fill/FillConfig.java @@ -4,15 +4,19 @@ import com.alibaba.excel.enums.WriteDirectionEnum; import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; /** * Fill config * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java index ca14886c..0b546703 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java @@ -41,8 +41,10 @@ import com.alibaba.excel.write.style.AbstractVerticalCellStyleStrategy; import com.alibaba.excel.write.style.column.AbstractHeadColumnWidthStyleStrategy; import com.alibaba.excel.write.style.row.SimpleRowHeightStyleStrategy; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import org.apache.commons.collections4.CollectionUtils; /** @@ -50,7 +52,9 @@ import org.apache.commons.collections4.CollectionUtils; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public abstract class AbstractWriteHolder extends AbstractHolder implements WriteHolder { /** @@ -380,9 +384,7 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ } else { cellHandlerExecutionChain.addLast((CellWriteHandler)writeHandler); } - this.writeHandlerList.add(writeHandler); } - return; } if (writeHandler instanceof RowWriteHandler) { if (!runOwn) { @@ -391,9 +393,7 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ } else { rowHandlerExecutionChain.addLast((RowWriteHandler)writeHandler); } - this.writeHandlerList.add(writeHandler); } - return; } if (writeHandler instanceof SheetWriteHandler) { if (!runOwn) { @@ -402,7 +402,6 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ } else { sheetHandlerExecutionChain.addLast((SheetWriteHandler)writeHandler); } - this.writeHandlerList.add(writeHandler); } else { if (ownSheetHandlerExecutionChain == null) { ownSheetHandlerExecutionChain = new SheetHandlerExecutionChain((SheetWriteHandler)writeHandler); @@ -410,7 +409,6 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ ownSheetHandlerExecutionChain.addLast((SheetWriteHandler)writeHandler); } } - return; } if (writeHandler instanceof WorkbookWriteHandler) { if (!runOwn) { @@ -420,7 +418,6 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ } else { workbookHandlerExecutionChain.addLast((WorkbookWriteHandler)writeHandler); } - this.writeHandlerList.add(writeHandler); } else { if (ownWorkbookHandlerExecutionChain == null) { ownWorkbookHandlerExecutionChain = new WorkbookHandlerExecutionChain( @@ -430,6 +427,9 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ } } } + if (!runOwn) { + this.writeHandlerList.add(writeHandler); + } } @Override diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteSheetHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteSheetHolder.java index ede60eab..ffc6f759 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteSheetHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteSheetHolder.java @@ -8,8 +8,10 @@ import com.alibaba.excel.enums.WriteLastRowTypeEnum; import com.alibaba.excel.util.StringUtils; import com.alibaba.excel.write.metadata.WriteSheet; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.xssf.streaming.SXSSFSheet; @@ -20,7 +22,9 @@ import org.apache.poi.xssf.usermodel.XSSFSheet; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public class WriteSheetHolder extends AbstractWriteHolder { /** diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteTableHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteTableHolder.java index e353a44c..3a46e784 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteTableHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteTableHolder.java @@ -3,14 +3,18 @@ package com.alibaba.excel.write.metadata.holder; import com.alibaba.excel.enums.HolderEnum; import com.alibaba.excel.write.metadata.WriteTable; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * sheet holder * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteTableHolder extends AbstractWriteHolder { /*** * poi sheet diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java index 100e59a1..1353ddc4 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java @@ -24,7 +24,10 @@ import com.alibaba.excel.write.metadata.WriteWorkbook; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.metadata.style.WriteFont; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString.Exclude; import lombok.extern.slf4j.Slf4j; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -40,7 +43,9 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @Slf4j public class WriteWorkbookHolder extends AbstractWriteHolder { /*** @@ -147,6 +152,7 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { /** * handler context */ + @Exclude private WorkbookWriteHandlerContext workbookWriteHandlerContext; public WriteWorkbookHolder(WriteWorkbook writeWorkbook) { diff --git a/src/main/java/com/alibaba/excel/write/metadata/style/WriteCellStyle.java b/src/main/java/com/alibaba/excel/write/metadata/style/WriteCellStyle.java index 9298f9da..bebd210e 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/style/WriteCellStyle.java +++ b/src/main/java/com/alibaba/excel/write/metadata/style/WriteCellStyle.java @@ -6,7 +6,9 @@ import com.alibaba.excel.metadata.property.FontProperty; import com.alibaba.excel.metadata.property.StyleProperty; import com.alibaba.excel.util.StringUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.FillPatternType; import org.apache.poi.ss.usermodel.HorizontalAlignment; @@ -19,7 +21,9 @@ import org.apache.poi.ss.usermodel.VerticalAlignment; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteCellStyle { /** * Set the data format (must be a valid format). Built in formats are defined at {@link BuiltinFormats}. diff --git a/src/main/java/com/alibaba/excel/write/metadata/style/WriteFont.java b/src/main/java/com/alibaba/excel/write/metadata/style/WriteFont.java index d1f42f01..a42899e1 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/style/WriteFont.java +++ b/src/main/java/com/alibaba/excel/write/metadata/style/WriteFont.java @@ -2,7 +2,9 @@ package com.alibaba.excel.write.metadata.style; import com.alibaba.excel.util.StringUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.common.usermodel.fonts.FontCharset; import org.apache.poi.hssf.usermodel.HSSFPalette; import org.apache.poi.ss.usermodel.Font; @@ -13,7 +15,9 @@ import org.apache.poi.ss.usermodel.IndexedColors; * * @author jipengfei */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteFont { /** * The name for the font (i.e. Arial) diff --git a/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java b/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java index 84ba05a5..4c11010a 100644 --- a/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java +++ b/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java @@ -26,14 +26,18 @@ import com.alibaba.excel.metadata.property.OnceAbsoluteMergeProperty; import com.alibaba.excel.metadata.property.RowHeightProperty; import com.alibaba.excel.metadata.property.StyleProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Define the header attribute of excel * * @author jipengfei */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExcelWriteHeadProperty extends ExcelHeadProperty { private RowHeightProperty headRowHeightProperty; diff --git a/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java b/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java index 8f033710..df04d248 100644 --- a/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java +++ b/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java @@ -7,7 +7,9 @@ import com.alibaba.excel.util.ListUtils; import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; import com.alibaba.excel.write.metadata.style.WriteCellStyle; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.collections4.CollectionUtils; /** @@ -15,7 +17,9 @@ import org.apache.commons.collections4.CollectionUtils; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class HorizontalCellStyleStrategy extends AbstractCellStyleStrategy { private WriteCellStyle headWriteCellStyle; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java b/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java index 40bc4b0b..0ed28a29 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java @@ -10,12 +10,16 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @ColumnWidth(50) @HeadRowHeight(50) @ContentRowHeight(100) diff --git a/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java b/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java index b41f093d..fa93f2ed 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.annotation; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class AnnotationIndexAndNameData { @ExcelProperty(value = "第四个", index = 4) private String index4; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java b/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java index b8322073..ad50e4a0 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java @@ -3,12 +3,16 @@ package com.alibaba.easyexcel.test.core.celldata; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.metadata.data.ReadCellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CellDataReadData { @DateTimeFormat("yyyy年MM月dd日") private ReadCellData date; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java b/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java index 69ed7bbf..cf10b0d7 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java @@ -5,12 +5,16 @@ import java.util.Date; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.metadata.data.WriteCellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CellDataWriteData { @DateTimeFormat("yyyy年MM月dd日") private WriteCellData date; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java b/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java index 8fa78f7e..f9a6bee6 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java @@ -8,12 +8,16 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.metadata.data.ReadCellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ConverterReadData { @ExcelProperty("日期") private Date date; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java b/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java index 68c34423..6782aa1a 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java @@ -8,12 +8,16 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.metadata.data.WriteCellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ConverterWriteData { @ExcelProperty("日期") private Date date; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java b/src/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java index f8d6ac21..fb31e127 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java @@ -8,12 +8,16 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.converters.string.StringImageConverter; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @ContentRowHeight(500) @ColumnWidth(500 / 8) public class ImageData { diff --git a/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java b/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java index cccee710..dac73127 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java @@ -5,12 +5,16 @@ import java.math.BigInteger; import java.time.LocalDateTime; import java.util.Date; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ReadAllConverterData { private BigDecimal bigDecimalBoolean; private BigDecimal bigDecimalNumber; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java b/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java index 1930bce5..5958161c 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java @@ -1,11 +1,15 @@ package com.alibaba.easyexcel.test.core.dataformat; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DateFormatData { private String date; private String dateStringCn; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java b/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java index 19ef8d03..6cba3a71 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.encrypt; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class EncryptData { @ExcelProperty("姓名") private String name; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java b/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java index 28d273e4..c989ce99 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.exception; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExceptionData { @ExcelProperty("姓名") private String name; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java b/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java index 7c49b01d..737bd61b 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.excludeorinclude; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExcludeOrIncludeData { @ExcelProperty(order = 1) private String column1; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java b/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java index 61822fa8..0424509e 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java @@ -1,11 +1,15 @@ package com.alibaba.easyexcel.test.core.extra; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExtraData { private String row1; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java index a1dd56a3..9a33351c 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java @@ -4,12 +4,16 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.NumberFormat; import com.alibaba.excel.converters.doubleconverter.DoubleStringConverter; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class FillData { private String name; @NumberFormat("#") diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java index 52b1cc04..c568e027 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java @@ -7,12 +7,16 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.enums.BooleanEnum; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class FillStyleAnnotatedData { @ContentStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 13) @ContentFontStyle(bold = BooleanEnum.TRUE, color = 19) diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java index 98c29fb2..20af16a3 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.fill.style; import java.util.Date; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class FillStyleData { private String name; private Double number; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java b/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java index ad2188aa..ec81e596 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.handler; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteHandlerData { @ExcelProperty("姓名") private String name; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java b/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java index 30e7e814..38eb2b8a 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.head; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ComplexHeadData { @ExcelProperty({"顶格", "顶格", "两格"}) private String string0; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java b/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java index 7e19af15..a45bcf9c 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.head; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class NoHeadData { @ExcelProperty("字符串") private String string; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java b/src/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java index 246f9cbd..1bd5a748 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java @@ -1,11 +1,15 @@ package com.alibaba.easyexcel.test.core.large; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class LargeData { private String str1; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java b/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java index 73da1c31..22b00e19 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java @@ -1,11 +1,15 @@ package com.alibaba.easyexcel.test.core.multiplesheets; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class MultipleSheetsData { private String title; } diff --git a/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java b/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java index dd010fc7..286ef8fe 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java @@ -1,11 +1,15 @@ package com.alibaba.easyexcel.test.core.noncamel; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class UnCamelData { private String string1; private String String2; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java b/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java index 7e22a2e7..fedabaa0 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.parameter; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ParameterData { @ExcelProperty("姓名") private String name; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java b/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java index 0a7378f2..e77a995e 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.repetition; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class RepetitionData { @ExcelProperty("字符串") private String string; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java b/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java index 6c541a24..0e43b3c8 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.simple; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class SimpleData { @ExcelProperty("姓名") private String name; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java b/src/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java index 1476448b..8e0d55ee 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.skip; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class SkipData { @ExcelProperty("姓名") diff --git a/src/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java b/src/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java index 870abe87..668dd899 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.sort; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class SortData { private String column5; private String column6; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java b/src/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java index cc30893e..b6b67c9d 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java @@ -4,12 +4,16 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.alibaba.excel.annotation.write.style.HeadStyle; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @HeadStyle @HeadFontStyle public class StyleData { diff --git a/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java b/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java index 31778a21..02d01215 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.template; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class TemplateData { @ExcelProperty("字符串0") private String string0; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java b/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java index 589f838c..6eb34ada 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.demo.fill; import java.util.Date; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class FillData { private String name; private double number; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java index 357dbfe9..b29c39bf 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java @@ -4,14 +4,18 @@ import java.util.Date; import com.alibaba.excel.metadata.data.CellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类.这里的排序和excel里面的排序一致 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CellDataReadDemoData { private CellData string; // 这里注意 虽然是日期 但是 类型 存储的是number 因为excel 存储的就是number diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java index bc27e1f8..2e87616f 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java @@ -4,14 +4,18 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.format.NumberFormat; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类.这里的排序和excel里面的排序一致 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ConverterData { /** * 我自定义 转换器，不管数据库传过来什么 。我给他加上“自定义：” diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java index a7a7519b..6c3321d2 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java @@ -2,14 +2,18 @@ package com.alibaba.easyexcel.test.demo.read; import java.util.Date; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类.这里的排序和excel里面的排序一致 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DemoData { private String string; private Date date; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java index e780bfa7..b0d9a03c 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java @@ -1,11 +1,15 @@ package com.alibaba.easyexcel.test.demo.read; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DemoExtraData { private String row1; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java index 8040728d..b202311d 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java @@ -2,14 +2,18 @@ package com.alibaba.easyexcel.test.demo.read; import java.util.Date; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类.这里的排序和excel里面的排序一致 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExceptionDemoData { /** * 用日期去接字符串 肯定报错 diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java index 1521b8cd..a545ffa8 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java @@ -4,14 +4,18 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class IndexOrNameData { /** * 强制读取第三个 这里不建议 index 和 name 同时用，要么一个对象只用index，要么一个对象只用name去匹配 diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java b/src/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java index 4fa3a780..501ecc78 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java @@ -4,14 +4,18 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DownloadData { @ExcelProperty("字符串标题") private String string; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java b/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java index 80a0e658..2993969a 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java @@ -2,14 +2,18 @@ package com.alibaba.easyexcel.test.demo.web; import java.util.Date; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class UploadData { private String string; private Date date; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java index 44ce5cc7..74a157d1 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java @@ -4,14 +4,18 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 复杂头数据.这里最终效果是第一行就一个主标题，第二行分类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ComplexHeadData { @ExcelProperty({"主标题", "字符串标题"}) private String string; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java index 864cfcbf..c120e47a 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java @@ -6,14 +6,18 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.format.NumberFormat; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类.这里的排序和excel里面的排序一致 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ConverterData { /** * 我想所有的 字符串起前面加上"自定义："三个字 diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java index 8a7902b5..76b50584 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java @@ -3,17 +3,20 @@ package com.alibaba.easyexcel.test.demo.write; import java.util.Date; import com.alibaba.excel.annotation.ExcelIgnore; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DemoData { @ExcelProperty("字符串标题") private String string; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java index ad94321e..44279db6 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java @@ -5,14 +5,18 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ContentLoopMerge; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 样式的数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode // 将第6-7行的2-3列合并成一个单元格 // @OnceAbsoluteMerge(firstRowIndex = 5, lastRowIndex = 6, firstColumnIndex = 1, lastColumnIndex = 2) public class DemoMergeData { diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java index 6dc60ed1..eded587b 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java @@ -9,14 +9,18 @@ import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 样式的数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode // 头背景设置成红色 IndexedColors.RED.getIndex() @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 10) // 头字体设置成20 diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java index a7bd7caa..4c39ffb1 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java @@ -9,13 +9,17 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.converters.string.StringImageConverter; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 图片导出类 * */ -@Data +@Getter +@Setter +@EqualsAndHashCode @ContentRowHeight(100) @ColumnWidth(100 / 8) public class ImageDataWithAnnotation { diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java index ba80d6f1..9f1ebca3 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java @@ -10,14 +10,18 @@ import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.converters.string.StringImageConverter; import com.alibaba.excel.metadata.data.WriteCellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 图片导出类 * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @ContentRowHeight(100) @ColumnWidth(100 / 8) public class ImageDemoData { diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java index 81c2d4e1..47c8c3b4 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java @@ -4,14 +4,18 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class IndexData { @ExcelProperty(value = "字符串标题", index = 0) private String string; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java index 69ad51dc..645be062 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java @@ -4,14 +4,18 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class LongestMatchColumnWidthData { @ExcelProperty("字符串标题") private String string; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java index 42a7f883..a3a9b7f2 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java @@ -7,14 +7,18 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode @ContentRowHeight(10) @HeadRowHeight(20) @ColumnWidth(25) diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java index 2dfed31d..0cd50ddd 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java @@ -2,14 +2,18 @@ package com.alibaba.easyexcel.test.demo.write; import com.alibaba.excel.metadata.data.WriteCellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 根据WriteCellData写 * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteCellDemoData { /** * 超链接 diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/CamlData.java b/src/test/java/com/alibaba/easyexcel/test/temp/CamlData.java index 9c3f39e4..86b9f4f7 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/CamlData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/CamlData.java @@ -1,13 +1,17 @@ package com.alibaba.easyexcel.test.temp; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * TODO * * @author 是仪 */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CamlData { private String string1; private String String2; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/LockData.java b/src/test/java/com/alibaba/easyexcel/test/temp/LockData.java index 14fa65e3..88195cf9 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/LockData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/LockData.java @@ -2,14 +2,18 @@ package com.alibaba.easyexcel.test.temp; import com.alibaba.excel.annotation.format.NumberFormat; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类.这里的排序和excel里面的排序一致 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class LockData { @NumberFormat("#.##%") private Double string0; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/StyleData.java b/src/test/java/com/alibaba/easyexcel/test/temp/StyleData.java index 89214922..89453e5e 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/StyleData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/StyleData.java @@ -2,13 +2,17 @@ package com.alibaba.easyexcel.test.temp; import java.util.List; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class StyleData { private byte[] byteValue; private Byte[] byteValue2; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java b/src/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java index 55984a73..dbbb7058 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.temp; import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @ContentRowHeight(30) public class TempFillData { private String name; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java b/src/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java index 37b8dc2b..b781f9fa 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java @@ -1,14 +1,19 @@ package com.alibaba.easyexcel.test.temp.bug; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author jiaosong * @desc * @date 2021/4/6 */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DataType { /** * 任务id diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java b/src/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java index 15ee006d..bcfa101c 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java @@ -1,14 +1,19 @@ package com.alibaba.easyexcel.test.temp.bug; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author jiaosong * @desc * @date 2021/4/6 */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class HeadType { diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java b/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java index 2f645339..1cc91c72 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java @@ -5,14 +5,18 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * TODO * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CsvData { @ExcelProperty("字符串标题") private String string; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java b/src/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java index 8a4b1fb7..ef92e62c 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java @@ -2,9 +2,13 @@ package com.alibaba.easyexcel.test.temp.data; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; -@Data +@Getter +@Setter +@EqualsAndHashCode public class DataType { /** * 任务id diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java b/src/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java index 32bd065e..2eaf0a27 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java @@ -2,9 +2,13 @@ package com.alibaba.easyexcel.test.temp.data; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; -@Data +@Getter +@Setter +@EqualsAndHashCode public class HeadType { diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java b/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java index 86303729..bd7a7acb 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java @@ -1,16 +1,19 @@ package com.alibaba.easyexcel.test.temp.dataformat; import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.data.WriteCellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * TODO * * @author 罗成 **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DataFormatData { private ReadCellData date; private ReadCellData num; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java b/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java index 17c34cf1..0ddda379 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java @@ -1,11 +1,15 @@ package com.alibaba.easyexcel.test.temp.fill; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class FillData2 { private String test; } diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java b/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java index 53a1a5c8..818aa524 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java @@ -1,13 +1,18 @@ package com.alibaba.easyexcel.test.temp.issue1662; +import java.util.Date; + import com.alibaba.excel.annotation.ExcelProperty; + import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; -import java.util.Date; - -@Data +@Getter +@Setter +@EqualsAndHashCode @AllArgsConstructor @NoArgsConstructor public class Data1662 { diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java b/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java index 57b54107..0dfd27f7 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java @@ -1,8 +1,12 @@ package com.alibaba.easyexcel.test.temp.issue1663; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; -@Data +@Getter +@Setter +@EqualsAndHashCode public class FillData { private String name; private double number; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java b/src/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java index 43726ad3..59444b38 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java @@ -1,12 +1,16 @@ package com.alibaba.easyexcel.test.temp.large; import lombok.Builder; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @Builder public class LargeData { diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java b/src/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java index 0edc995d..99540f2a 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java @@ -4,14 +4,18 @@ import java.util.List; import com.alibaba.excel.metadata.data.CellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * TODO * * @author 罗成 **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class TestCell { private CellData c1; private CellData> c2; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java b/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java index 62d5e317..90a721a2 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java @@ -2,15 +2,18 @@ package com.alibaba.easyexcel.test.temp.read; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; -import lombok.experimental.Accessors; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 临时测试 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class HeadReadData { @ExcelProperty({"主标题","数据1"}) private String h1; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java b/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java index 8de542d1..97c26ed9 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java @@ -7,9 +7,13 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; -@Data +@Getter +@Setter +@EqualsAndHashCode public class DemoData1 { @ExcelProperty("字符串标题") @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 42) diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java b/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java index 00d99041..ddc0e3db 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java @@ -7,9 +7,13 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; -@Data +@Getter +@Setter +@EqualsAndHashCode public class DemoData2 { @ExcelProperty("字符串标题") @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 42) diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java b/src/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java index a9ba7fa4..34a60bc8 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java @@ -1,13 +1,17 @@ package com.alibaba.easyexcel.test.temp.simple; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * TODO * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class JsonData { private String SS1; private String sS2; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java b/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java index 27967b9f..d9a035ce 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java @@ -2,16 +2,18 @@ package com.alibaba.easyexcel.test.temp.simple; import java.util.Date; -import com.alibaba.excel.annotation.write.style.ContentStyle; - -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * write data * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteData { // @ContentStyle(locked = true) private Date dd;