From 76fbb7828ac9ffd1f42d69af0d7408b7245f96e7 Mon Sep 17 00:00:00 2001 From: zhuangjiaju Date: Fri, 2 Aug 2019 17:57:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=BB=E5=86=99=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/excel/ExcelWriter.java | 7 +- .../annotation/write/style/ColumnWidth.java | 6 +- .../excel/context/AnalysisContextImpl.java | 8 +- .../alibaba/excel/metadata/TableStyle.java | 4 +- .../metadata/holder/ReadWorkbookHolder.java | 16 +++ .../alibaba/excel/support/ExcelTypeEnum.java | 2 +- .../com/alibaba/excel/util/StyleUtil.java | 2 + .../alibaba/excel/write/ExcelBuilderImpl.java | 4 +- .../write/builder/ExcelWriterBuilder.java | 5 +- .../handler/DefaultWriteHandlerLoader.java | 4 +- .../excel/write/metadata/WriteSheet.java | 4 +- .../excel/write/metadata/WriteTable.java | 6 +- .../metadata/holder/AbstractWriteHolder.java | 19 +-- .../property/ExcelWriteHeadProperty.java | 3 + ...=> AbstractVerticalCellStyleStrategy.java} | 2 +- ....java => HorizontalCellStyleStrategy.java} | 6 +- .../AbstractHeadColumnWidthStyleStrategy.java | 7 +- .../SimpleColumnWidthStyleStrategy.java | 4 +- .../test/core/annotation/AnnotationData.java | 2 +- .../compatibility/AnnotationDataListener.java | 42 ++++++ .../core/compatibility/CompatibilityData.java | 17 +++ .../compatibility/CompatibilityDataTest.java | 133 ++++++++++++++++++ .../test/core/repetition/RepetitionData.java | 14 ++ .../repetition/RepetitionDataListener.java | 34 +++++ .../core/repetition/RepetitionDataTest.java | 88 ++++++++++++ .../easyexcel/test/core/style/StyleData.java | 16 +++ .../test/core/style/StyleDataListener.java | 34 +++++ .../test/core/style/StyleDataTest.java | 84 +++++++++++ .../test/core/template/TemplateData.java | 16 +++ .../core/template/TemplateDataListener.java | 34 +++++ .../test/core/template/TemplateDataTest.java | 69 +++++++++ src/test/resources/template/template03.xls | Bin 0 -> 18944 bytes src/test/resources/template/template07.xlsx | Bin 0 -> 9994 bytes 33 files changed, 648 insertions(+), 44 deletions(-) rename src/main/java/com/alibaba/excel/write/style/{AbstractColumnCellStyleStrategy.java => AbstractVerticalCellStyleStrategy.java} (96%) rename src/main/java/com/alibaba/excel/write/style/{RowCellStyleStrategy.java => HorizontalCellStyleStrategy.java} (86%) create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/compatibility/AnnotationDataListener.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/compatibility/CompatibilityData.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/compatibility/CompatibilityDataTest.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataListener.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataTest.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataListener.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataListener.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java create mode 100644 src/test/resources/template/template03.xls create mode 100644 src/test/resources/template/template07.xlsx diff --git a/src/main/java/com/alibaba/excel/ExcelWriter.java b/src/main/java/com/alibaba/excel/ExcelWriter.java index 84a3b25..54fd2a3 100644 --- a/src/main/java/com/alibaba/excel/ExcelWriter.java +++ b/src/main/java/com/alibaba/excel/ExcelWriter.java @@ -21,12 +21,12 @@ import com.alibaba.excel.write.metadata.WriteWorkbook; /** * Excel Writer This tool is used to write value out to Excel via POI. This object can perform the following two * functions. - * + * * 
  *    1. Create a new empty Excel workbook, write the value to the stream after the value is filled.
  *    2. Edit existing Excel, write the original Excel file, or write it to other places.}
  *
- * + * * @author jipengfei */ public class ExcelWriter { @@ -34,7 +34,7 @@ public class ExcelWriter { /** * Create new writer - * + * * @param writeWorkbook */ public ExcelWriter(WriteWorkbook writeWorkbook) { @@ -197,6 +197,7 @@ public class ExcelWriter { writeSheet.setClazz(sheet.getClazz()); writeSheet.setHead(sheet.getHead()); writeSheet.setTableStyle(sheet.getTableStyle()); + writeSheet.setRelativeHeadRowIndex(sheet.getHeadLineMun()); writeSheet.setColumnWidthMap(sheet.getColumnWidthMap()); } diff --git a/src/main/java/com/alibaba/excel/annotation/write/style/ColumnWidth.java b/src/main/java/com/alibaba/excel/annotation/write/style/ColumnWidth.java index 8661add..e916131 100644 --- a/src/main/java/com/alibaba/excel/annotation/write/style/ColumnWidth.java +++ b/src/main/java/com/alibaba/excel/annotation/write/style/ColumnWidth.java @@ -8,7 +8,7 @@ import java.lang.annotation.Target; /** * Set the width of the table - * + * * @author zhuangjiaju */ @Target({ElementType.FIELD, ElementType.TYPE}) @@ -16,9 +16,7 @@ import java.lang.annotation.Target; @Inherited public @interface ColumnWidth { /** - * Using the Calibri font as an example, the maximum digit width of 11 point font size is 7 pixels (at 96 dpi). If - * you set a column width to be 8 characters wide, e.g. 8*256 - * + * Column width *

* -1 mean the auto set width */ diff --git a/src/main/java/com/alibaba/excel/context/AnalysisContextImpl.java b/src/main/java/com/alibaba/excel/context/AnalysisContextImpl.java index 031ef6b..d9d7ded 100644 --- a/src/main/java/com/alibaba/excel/context/AnalysisContextImpl.java +++ b/src/main/java/com/alibaba/excel/context/AnalysisContextImpl.java @@ -55,11 +55,15 @@ public class AnalysisContextImpl implements AnalysisContext { @Override public void currentSheet(ExcelExecutor excelExecutor, ReadSheet readSheet) { if (readSheet == null) { - throw new IllegalArgumentException("Sheet argument cannot be null"); + throw new IllegalArgumentException("Sheet argument cannot be null."); } readSheetHolder = new ReadSheetHolder(readSheet, readWorkbookHolder); currentReadHolder = readSheetHolder; selectSheet(excelExecutor); + if (readWorkbookHolder.getHasReadSheet().contains(readSheetHolder.getSheetNo())) { + throw new ExcelAnalysisException("Cannot read sheet repeatedly."); + } + readWorkbookHolder.getHasReadSheet().add(readSheetHolder.getSheetNo()); if (LOGGER.isDebugEnabled()) { LOGGER.debug("Began to read：{}", readSheetHolder); } @@ -135,7 +139,7 @@ public class AnalysisContextImpl implements AnalysisContext { @Override public ReadHolder currentReadHolder() { - return readSheetHolder; + return currentReadHolder; } @Override diff --git a/src/main/java/com/alibaba/excel/metadata/TableStyle.java b/src/main/java/com/alibaba/excel/metadata/TableStyle.java index ef3b9eb..fa8905c 100644 --- a/src/main/java/com/alibaba/excel/metadata/TableStyle.java +++ b/src/main/java/com/alibaba/excel/metadata/TableStyle.java @@ -2,11 +2,11 @@ package com.alibaba.excel.metadata; import org.apache.poi.ss.usermodel.IndexedColors; -import com.alibaba.excel.write.style.RowCellStyleStrategy; +import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; /** * @author jipengfei - * @deprecated please use {@link RowCellStyleStrategy} + * @deprecated please use {@link HorizontalCellStyleStrategy} */ @Deprecated public class TableStyle { 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 c2a9407..18c4d12 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 @@ -2,6 +2,8 @@ package com.alibaba.excel.read.metadata.holder; import java.io.File; import java.io.InputStream; +import java.util.HashSet; +import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -76,6 +78,11 @@ public class ReadWorkbookHolder extends AbstractReadHolder { @Deprecated private Boolean convertAllFiled; + /** + * Prevent repeating sheet + */ + private Set hasReadSheet; + public ReadWorkbookHolder(ReadWorkbook readWorkbook) { super(readWorkbook, null, readWorkbook.getConvertAllFiled()); this.readWorkbook = readWorkbook; @@ -107,6 +114,7 @@ public class ReadWorkbookHolder extends AbstractReadHolder { if (readCache != null && ExcelTypeEnum.XLS == excelType) { LOGGER.warn("Xls not support 'readCache'!"); } + this.hasReadSheet = new HashSet(); } public ReadWorkbook getReadWorkbook() { @@ -189,6 +197,14 @@ public class ReadWorkbookHolder extends AbstractReadHolder { this.convertAllFiled = convertAllFiled; } + public Set getHasReadSheet() { + return hasReadSheet; + } + + public void setHasReadSheet(Set hasReadSheet) { + this.hasReadSheet = hasReadSheet; + } + @Override public HolderEnum holderType() { return HolderEnum.WORKBOOK; diff --git a/src/main/java/com/alibaba/excel/support/ExcelTypeEnum.java b/src/main/java/com/alibaba/excel/support/ExcelTypeEnum.java index 4bbda76..5cd3a93 100644 --- a/src/main/java/com/alibaba/excel/support/ExcelTypeEnum.java +++ b/src/main/java/com/alibaba/excel/support/ExcelTypeEnum.java @@ -29,7 +29,7 @@ public enum ExcelTypeEnum { public static ExcelTypeEnum valueOf(File file, InputStream inputStream) { try { - FileMagic fileMagic = null; + FileMagic fileMagic; if (file != null) { fileMagic = FileMagic.valueOf(file); if (!FileMagic.OLE2.equals(fileMagic) && !FileMagic.OOXML.equals(fileMagic)) { diff --git a/src/main/java/com/alibaba/excel/util/StyleUtil.java b/src/main/java/com/alibaba/excel/util/StyleUtil.java index 0cd8c2a..3031048 100644 --- a/src/main/java/com/alibaba/excel/util/StyleUtil.java +++ b/src/main/java/com/alibaba/excel/util/StyleUtil.java @@ -29,8 +29,10 @@ public class StyleUtil { newCellStyle.setLocked(true); newCellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); newCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex()); + newCellStyle.setBorderTop(BorderStyle.THIN); newCellStyle.setBorderBottom(BorderStyle.THIN); newCellStyle.setBorderLeft(BorderStyle.THIN); + newCellStyle.setBorderRight(BorderStyle.THIN); return newCellStyle; } diff --git a/src/main/java/com/alibaba/excel/write/ExcelBuilderImpl.java b/src/main/java/com/alibaba/excel/write/ExcelBuilderImpl.java index faa93d4..566ca84 100644 --- a/src/main/java/com/alibaba/excel/write/ExcelBuilderImpl.java +++ b/src/main/java/com/alibaba/excel/write/ExcelBuilderImpl.java @@ -68,9 +68,9 @@ public class ExcelBuilderImpl implements ExcelBuilder { lastRowNum--; } if (!data.isEmpty()) { - context.writeSheetHolder().setWriteLastRowType(WriteLastRowType.HAVE_DATA); + writeSheetHolder.setWriteLastRowType(WriteLastRowType.HAVE_DATA); } - if (context.currentWriteHolder().isNew()) { + if (writeSheetHolder.isNew() && !writeSheetHolder.getExcelWriteHeadProperty().hasHead()) { lastRowNum += context.currentWriteHolder().relativeHeadRowIndex(); } for (int relativeRowIndex = 0; relativeRowIndex < data.size(); relativeRowIndex++) { diff --git a/src/main/java/com/alibaba/excel/write/builder/ExcelWriterBuilder.java b/src/main/java/com/alibaba/excel/write/builder/ExcelWriterBuilder.java index 0d84e0a..673e81c 100644 --- a/src/main/java/com/alibaba/excel/write/builder/ExcelWriterBuilder.java +++ b/src/main/java/com/alibaba/excel/write/builder/ExcelWriterBuilder.java @@ -193,14 +193,15 @@ public class ExcelWriterBuilder { } public ExcelWriterSheetBuilder sheet(Integer sheetNo, String sheetName) { - ExcelWriterSheetBuilder excelWriterSheetBuilder = new ExcelWriterSheetBuilder(build()); + ExcelWriter excelWriter = build(); + ExcelWriterSheetBuilder excelWriterSheetBuilder = new ExcelWriterSheetBuilder(excelWriter); if (sheetNo != null) { excelWriterSheetBuilder.sheetNo(sheetNo); } if (sheetName != null) { excelWriterSheetBuilder.sheetName(sheetName); } - return new ExcelWriterSheetBuilder(build()); + return new ExcelWriterSheetBuilder(excelWriter); } } diff --git a/src/main/java/com/alibaba/excel/write/handler/DefaultWriteHandlerLoader.java b/src/main/java/com/alibaba/excel/write/handler/DefaultWriteHandlerLoader.java index 147ccf7..c8772b4 100644 --- a/src/main/java/com/alibaba/excel/write/handler/DefaultWriteHandlerLoader.java +++ b/src/main/java/com/alibaba/excel/write/handler/DefaultWriteHandlerLoader.java @@ -7,7 +7,7 @@ import org.apache.poi.ss.usermodel.IndexedColors; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.metadata.style.WriteFont; -import com.alibaba.excel.write.style.RowCellStyleStrategy; +import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; /** * Load default handler @@ -30,7 +30,7 @@ public class DefaultWriteHandlerLoader { headWriteFont.setFontHeightInPoints((short)14); headWriteFont.setBold(true); headWriteCellStyle.setWriteFont(headWriteFont); - handlerList.add(new RowCellStyleStrategy(headWriteCellStyle, new ArrayList())); + handlerList.add(new HorizontalCellStyleStrategy(headWriteCellStyle, new ArrayList())); return handlerList; } 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 fa5c1ba..62fac75 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/WriteSheet.java +++ b/src/main/java/com/alibaba/excel/write/metadata/WriteSheet.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; import com.alibaba.excel.metadata.TableStyle; -import com.alibaba.excel.write.style.RowCellStyleStrategy; +import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; /** @@ -30,7 +30,7 @@ public class WriteSheet extends WriteBasicParameter { private Map columnWidthMap = new HashMap(); /** * - * @deprecated please use{@link RowCellStyleStrategy} + * @deprecated please use{@link HorizontalCellStyleStrategy} */ @Deprecated private TableStyle tableStyle; 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 1221712..ec7933c 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/WriteTable.java +++ b/src/main/java/com/alibaba/excel/write/metadata/WriteTable.java @@ -1,11 +1,11 @@ package com.alibaba.excel.write.metadata; import com.alibaba.excel.metadata.TableStyle; -import com.alibaba.excel.write.style.RowCellStyleStrategy; +import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; /** * table - * + * * @author jipengfei */ public class WriteTable extends WriteBasicParameter { @@ -15,7 +15,7 @@ public class WriteTable extends WriteBasicParameter { private Integer tableNo; /** * - * @deprecated please use{@link RowCellStyleStrategy} + * @deprecated please use{@link HorizontalCellStyleStrategy} */ @Deprecated private TableStyle tableStyle; 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 24d9c75..bb6f2be 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 @@ -8,6 +8,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; +import org.apache.poi.ss.usermodel.FillPatternType; import org.apache.poi.ss.usermodel.IndexedColors; import com.alibaba.excel.converters.Converter; @@ -34,7 +35,7 @@ import com.alibaba.excel.write.metadata.WriteTable; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.metadata.style.WriteFont; import com.alibaba.excel.write.property.ExcelWriteHeadProperty; -import com.alibaba.excel.write.style.RowCellStyleStrategy; +import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; import com.alibaba.excel.write.style.column.AbstractHeadColumnWidthStyleStrategy; import com.alibaba.excel.write.style.row.SimpleRowHeightStyleStrategy; @@ -102,12 +103,8 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ compatibleOldCode(writeBasicParameter); // Set writeHandlerMap - List handlerList; - if (parentAbstractWriteHolder == null) { - handlerList = DefaultWriteHandlerLoader.loadDefaultHandler(); - } else { - handlerList = new ArrayList(); - } + List handlerList = new ArrayList(); + // Initialization Annotation initAnnotationConfig(handlerList); @@ -119,7 +116,10 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ Map, List> parentWriteHandlerMap = null; if (parentAbstractWriteHolder != null) { parentWriteHandlerMap = parentAbstractWriteHolder.getWriteHandlerMap(); + } else { + handlerList.addAll(DefaultWriteHandlerLoader.loadDefaultHandler()); } + this.writeHandlerMap = sortAndClearUpHandler(handlerList, parentWriteHandlerMap); // Set converterMap @@ -166,7 +166,7 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ writeBasicParameter.setCustomWriteHandlerList(new ArrayList()); } writeBasicParameter.getCustomWriteHandlerList() - .add(new RowCellStyleStrategy( + .add(new HorizontalCellStyleStrategy( buildWriteCellStyle(tableStyle.getTableHeadFont(), tableStyle.getTableHeadBackGroundColor()), buildWriteCellStyle(tableStyle.getTableContentFont(), tableStyle.getTableContentBackGroundColor()))); } @@ -175,6 +175,7 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ private WriteCellStyle buildWriteCellStyle(Font font, IndexedColors indexedColors) { WriteCellStyle writeCellStyle = new WriteCellStyle(); if (indexedColors != null) { + writeCellStyle.setFillPatternType(FillPatternType.SOLID_FOREGROUND); writeCellStyle.setFillForegroundColor(indexedColors.getIndex()); } if (font != null) { @@ -199,7 +200,7 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ @Override protected Integer columnWidth(Head head) { if (columnWidthMap.containsKey(head.getColumnIndex())) { - columnWidthMap.get(head.getColumnIndex()); + return columnWidthMap.get(head.getColumnIndex()) / 256; } return 20; } 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 736611b..b4d43e1 100644 --- a/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java +++ b/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java @@ -109,6 +109,9 @@ public class ExcelWriteHeadProperty extends ExcelHeadProperty { endY = k; alreadyRangeSet.addAll(tempAlreadyRangeSet); } + if (j == endY && i == endX) { + continue; + } cellRangeList.add(new CellRange(j, endY, i, endX)); } } diff --git a/src/main/java/com/alibaba/excel/write/style/AbstractColumnCellStyleStrategy.java b/src/main/java/com/alibaba/excel/write/style/AbstractVerticalCellStyleStrategy.java similarity index 96% rename from src/main/java/com/alibaba/excel/write/style/AbstractColumnCellStyleStrategy.java rename to src/main/java/com/alibaba/excel/write/style/AbstractVerticalCellStyleStrategy.java index 343336d..c8513d5 100644 --- a/src/main/java/com/alibaba/excel/write/style/AbstractColumnCellStyleStrategy.java +++ b/src/main/java/com/alibaba/excel/write/style/AbstractVerticalCellStyleStrategy.java @@ -17,7 +17,7 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle; * * @author zhuangjiaju */ -public abstract class AbstractColumnCellStyleStrategy extends AbstractCellStyleStrategy { +public abstract class AbstractVerticalCellStyleStrategy extends AbstractCellStyleStrategy { private Workbook workbook; private Map headCellStyleCache = new HashMap(); diff --git a/src/main/java/com/alibaba/excel/write/style/RowCellStyleStrategy.java b/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java similarity index 86% rename from src/main/java/com/alibaba/excel/write/style/RowCellStyleStrategy.java rename to src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java index 1d65f9f..d96bfa0 100644 --- a/src/main/java/com/alibaba/excel/write/style/RowCellStyleStrategy.java +++ b/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java @@ -17,7 +17,7 @@ import com.alibaba.excel.write.metadata.style.WriteCellStyle; * * @author zhuangjiaju */ -public class RowCellStyleStrategy extends AbstractCellStyleStrategy { +public class HorizontalCellStyleStrategy extends AbstractCellStyleStrategy { private WriteCellStyle headWriteCellStyle; private List contentWriteCellStyleList; @@ -25,12 +25,12 @@ public class RowCellStyleStrategy extends AbstractCellStyleStrategy { private CellStyle headCellStyle; private List contentCellStyleList; - public RowCellStyleStrategy(WriteCellStyle headWriteCellStyle, List contentWriteCellStyleList) { + public HorizontalCellStyleStrategy(WriteCellStyle headWriteCellStyle, List contentWriteCellStyleList) { this.headWriteCellStyle = headWriteCellStyle; this.contentWriteCellStyleList = contentWriteCellStyleList; } - public RowCellStyleStrategy(WriteCellStyle headWriteCellStyle, WriteCellStyle contentWriteCellStyle) { + public HorizontalCellStyleStrategy(WriteCellStyle headWriteCellStyle, WriteCellStyle contentWriteCellStyle) { this.headWriteCellStyle = headWriteCellStyle; contentWriteCellStyleList = new ArrayList(); contentWriteCellStyleList.add(contentWriteCellStyle); diff --git a/src/main/java/com/alibaba/excel/write/style/column/AbstractHeadColumnWidthStyleStrategy.java b/src/main/java/com/alibaba/excel/write/style/column/AbstractHeadColumnWidthStyleStrategy.java index a295cf9..f88bace 100644 --- a/src/main/java/com/alibaba/excel/write/style/column/AbstractHeadColumnWidthStyleStrategy.java +++ b/src/main/java/com/alibaba/excel/write/style/column/AbstractHeadColumnWidthStyleStrategy.java @@ -18,7 +18,8 @@ public abstract class AbstractHeadColumnWidthStyleStrategy extends AbstractColum } Integer width = columnWidth(head); if (width != null) { - sheet.setColumnWidth(cell.getColumnIndex(), columnWidth(head)); + width = width * 256; + sheet.setColumnWidth(cell.getColumnIndex(), width); } } @@ -29,9 +30,7 @@ public abstract class AbstractHeadColumnWidthStyleStrategy extends AbstractColum * * @param head * Nullable - * @return the width in units of 1/256th of a character width . Using the Calibri font as an example, the maximum - * digit width of 11 point font size is 7 pixels (at 96 dpi). If you set a column width to be eight - * characters wide, e.g. you need return 8*256 + * @return */ protected abstract Integer columnWidth(Head head); } diff --git a/src/main/java/com/alibaba/excel/write/style/column/SimpleColumnWidthStyleStrategy.java b/src/main/java/com/alibaba/excel/write/style/column/SimpleColumnWidthStyleStrategy.java index 4598300..48ac060 100644 --- a/src/main/java/com/alibaba/excel/write/style/column/SimpleColumnWidthStyleStrategy.java +++ b/src/main/java/com/alibaba/excel/write/style/column/SimpleColumnWidthStyleStrategy.java @@ -11,11 +11,9 @@ public class SimpleColumnWidthStyleStrategy extends AbstractHeadColumnWidthStyle private Integer columnWidth; /** - * Using the Calibri font as an example, the maximum digit width of 11 point font size is 7 pixels (at 96 dpi). * If - * you set a column width to be eight characters wide, e.g. SimpleColumnWidthStyleStrategy( 8*256), * * @param columnWidth - * the width in units of 1/256th of a character width + * */ public SimpleColumnWidthStyleStrategy(Integer columnWidth) { this.columnWidth = columnWidth; 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 d10f87e..cabd3e3 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 @@ -17,7 +17,7 @@ import lombok.Data; * @author zhuangjiaju */ @Data -@ColumnWidth(30 * 256) +@ColumnWidth(30) @HeadRowHeight(15) @ContentRowHeight(20) public class AnnotationData { diff --git a/src/test/java/com/alibaba/easyexcel/test/core/compatibility/AnnotationDataListener.java b/src/test/java/com/alibaba/easyexcel/test/core/compatibility/AnnotationDataListener.java new file mode 100644 index 0000000..35acfa7 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/compatibility/AnnotationDataListener.java @@ -0,0 +1,42 @@ +package com.alibaba.easyexcel.test.core.compatibility; + +import java.text.ParseException; +import java.util.ArrayList; +import java.util.List; + +import org.junit.Assert; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.alibaba.easyexcel.test.core.annotation.AnnotationData; +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import com.alibaba.excel.exception.ExcelCommonException; +import com.alibaba.excel.util.DateUtils; +import com.alibaba.fastjson.JSON; + +/** + * @author zhuangjiaju + */ +public class AnnotationDataListener extends AnalysisEventListener { + private static final Logger LOGGER = LoggerFactory.getLogger(AnnotationDataListener.class); + List list = new ArrayList(); + + @Override + public void invoke(AnnotationData data, AnalysisContext context) { + list.add(data); + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + Assert.assertEquals(list.size(), 1); + AnnotationData data = list.get(0); + try { + Assert.assertEquals(data.getDate(), DateUtils.parseDate("2020-01-01 01:01:01")); + } catch (ParseException e) { + throw new ExcelCommonException("Test Exception", e); + } + Assert.assertEquals(data.getNumber(), 99.99, 0.00); + LOGGER.debug("First row:{}", JSON.toJSONString(list.get(0))); + } +} diff --git a/src/test/java/com/alibaba/easyexcel/test/core/compatibility/CompatibilityData.java b/src/test/java/com/alibaba/easyexcel/test/core/compatibility/CompatibilityData.java new file mode 100644 index 0000000..8d97115 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/compatibility/CompatibilityData.java @@ -0,0 +1,17 @@ +package com.alibaba.easyexcel.test.core.compatibility; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.metadata.BaseRowModel; + +import lombok.Data; + +/** + * @author zhuangjiaju + */ +@Data +public class CompatibilityData extends BaseRowModel { + @ExcelProperty("字符串标题0") + private String string0; + @ExcelProperty("字符串标题1") + private String string1; +} diff --git a/src/test/java/com/alibaba/easyexcel/test/core/compatibility/CompatibilityDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/compatibility/CompatibilityDataTest.java new file mode 100644 index 0000000..9122822 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/compatibility/CompatibilityDataTest.java @@ -0,0 +1,133 @@ +package com.alibaba.easyexcel.test.core.compatibility; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.poi.ss.usermodel.IndexedColors; +import org.junit.BeforeClass; +import org.junit.Test; + +import com.alibaba.easyexcel.test.util.TestFileUtil; +import com.alibaba.excel.EasyExcelFactory; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.metadata.Font; +import com.alibaba.excel.metadata.Sheet; +import com.alibaba.excel.metadata.Table; +import com.alibaba.excel.metadata.TableStyle; + +/** + * + * @author zhuangjiaju + */ +public class CompatibilityDataTest { + + private static File file07; + private static File file03; + + @BeforeClass + public static void init() { + file07 = TestFileUtil.createNewFile("compatibility07.xlsx"); + file03 = TestFileUtil.createNewFile("compatibility03.xls"); + } + + @Test + public void T01ReadAndWrite07() throws Exception { + readAndWrite(file07); + } + + @Test + public void T02ReadAndWrite03() throws Exception { + readAndWrite(file03); + } + + private void readAndWrite(File file) throws Exception { + OutputStream out = new FileOutputStream(file); + ExcelWriter writer = EasyExcelFactory.getWriter(out); + // sheet1 width,string head,stirng data + Sheet sheet1 = new Sheet(1, 3); + sheet1.setSheetName("第一个sheet"); + Map columnWidth = new HashMap(); + columnWidth.put(0, 10000); + columnWidth.put(1, 50000); + sheet1.setColumnWidthMap(columnWidth); + sheet1.setHead(head()); + writer.write1(listData(), sheet1); + + // sheet2 style,class head + Sheet sheet2 = new Sheet(2, 3, CompatibilityData.class, "第二个sheet", null); + sheet2.setTableStyle(style()); + writer.write(data(), sheet2); + + // sheet3 table + Sheet sheet3 = new Sheet(3, 0); + sheet3.setSheetName("第三个sheet"); + + Table table1 = new Table(1); + table1.setHead(head()); + writer.write1(listData(), sheet3, table1); + + Table table2 = new Table(2); + table2.setClazz(CompatibilityData.class); + writer.write(data(), sheet3, table2); + + writer.finish(); + out.close(); + + // EasyExcelFactory.write(file, AnnotationData.class).sheet().doWrite(data()).finish(); + // EasyExcelFactory.read(file, AnnotationData.class, new AnnotationDataListener()).sheet().doRead().finish(); + } + + private List> head() { + List> list = new ArrayList>(); + List head0 = new ArrayList(); + head0.add("字符串标题0"); + List head1 = new ArrayList(); + head1.add("字符串标题1"); + list.add(head0); + list.add(head1); + return list; + } + + private List> listData() { + List> list = new ArrayList>(); + List data0 = new ArrayList(); + data0.add("字符串0"); + data0.add(1); + list.add(data0); + return list; + } + + private List data() { + List list = new ArrayList(); + for (int i = 0; i < 10; i++) { + CompatibilityData data = new CompatibilityData(); + data.setString0("字符串0" + i); + data.setString1("字符串1" + i); + list.add(data); + } + return list; + } + + public TableStyle style() { + TableStyle tableStyle = new TableStyle(); + Font headFont = new Font(); + headFont.setBold(true); + headFont.setFontHeightInPoints((short)22); + headFont.setFontName("楷体"); + tableStyle.setTableHeadFont(headFont); + tableStyle.setTableHeadBackGroundColor(IndexedColors.BLUE); + + Font contentFont = new Font(); + contentFont.setBold(true); + contentFont.setFontHeightInPoints((short)22); + contentFont.setFontName("黑体"); + tableStyle.setTableContentFont(contentFont); + tableStyle.setTableContentBackGroundColor(IndexedColors.GREEN); + return tableStyle; + } +} 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 new file mode 100644 index 0000000..191af17 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java @@ -0,0 +1,14 @@ +package com.alibaba.easyexcel.test.core.repetition; + +import com.alibaba.excel.annotation.ExcelProperty; + +import lombok.Data; + +/** + * @author zhuangjiaju + */ +@Data +public class RepetitionData { + @ExcelProperty("字符串") + private String string; +} diff --git a/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataListener.java b/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataListener.java new file mode 100644 index 0000000..263514e --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataListener.java @@ -0,0 +1,34 @@ +package com.alibaba.easyexcel.test.core.repetition; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.Assert; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.alibaba.easyexcel.test.core.simple.SimpleDataListener; +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import com.alibaba.fastjson.JSON; + +/** + * @author zhuangjiaju + */ +public class RepetitionDataListener extends AnalysisEventListener { + private static final Logger LOGGER = LoggerFactory.getLogger(SimpleDataListener.class); + List list = new ArrayList(); + + @Override + public void invoke(RepetitionData data, AnalysisContext context) { + list.add(data); + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + Assert.assertEquals(list.size(), 2); + Assert.assertEquals(list.get(0).getString(), "字符串0"); + Assert.assertEquals(list.get(1).getString(), "字符串0"); + LOGGER.debug("First row:{}", JSON.toJSONString(list.get(0))); + } +} diff --git a/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataTest.java new file mode 100644 index 0000000..446d68c --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataTest.java @@ -0,0 +1,88 @@ +package com.alibaba.easyexcel.test.core.repetition; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import org.junit.BeforeClass; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + +import com.alibaba.easyexcel.test.util.TestFileUtil; +import com.alibaba.excel.EasyExcelFactory; +import com.alibaba.excel.ExcelReader; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.read.metadata.ReadSheet; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.excel.write.metadata.WriteTable; + +/** + * + * @author zhuangjiaju + */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class RepetitionDataTest { + + private static File file07; + private static File file03; + private static File fileTable07; + private static File fileTable03; + + @BeforeClass + public static void init() { + file07 = TestFileUtil.createNewFile("repetition07.xlsx"); + file03 = TestFileUtil.createNewFile("repetition03.xls"); + fileTable07 = TestFileUtil.createNewFile("repetitionTable07.xlsx"); + fileTable03 = TestFileUtil.createNewFile("repetitionTable03.xls"); + } + + @Test + public void T01ReadAndWrite07() { + readAndWrite(file07); + } + + @Test + public void T02ReadAndWrite03() { + readAndWrite(file03); + } + + private void readAndWrite(File file) { + ExcelWriter excelWriter = EasyExcelFactory.write(file, RepetitionData.class).build(); + WriteSheet writeSheet = EasyExcelFactory.writerSheet(0).build(); + excelWriter.write(data(), writeSheet).write(data(), writeSheet).finish(); + ExcelReader excelReader = + EasyExcelFactory.read(file, RepetitionData.class, new RepetitionDataListener()).build(); + ReadSheet readSheet = EasyExcelFactory.readSheet(0).build(); + excelReader.read(readSheet).finish(); + } + + @Test + public void T03ReadAndWriteTable07() { + readAndWriteTable(fileTable07); + } + + @Test + public void T04ReadAndWriteTable03() { + readAndWriteTable(fileTable03); + } + + private void readAndWriteTable(File file) { + ExcelWriter excelWriter = EasyExcelFactory.write(file, RepetitionData.class).build(); + WriteSheet writeSheet = EasyExcelFactory.writerSheet(0).build(); + WriteTable writeTable = EasyExcelFactory.writerTable(0).build(); + excelWriter.write(data(), writeSheet, writeTable).write(data(), writeSheet, writeTable).finish(); + ExcelReader excelReader = + EasyExcelFactory.read(file, RepetitionData.class, new RepetitionDataListener()).build(); + ReadSheet readSheet = EasyExcelFactory.readSheet(0).headRowNumber(2).build(); + excelReader.read(readSheet).finish(); + } + + private List data() { + List list = new ArrayList(); + RepetitionData data = new RepetitionData(); + data.setString("字符串0"); + list.add(data); + return list; + } +} 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 new file mode 100644 index 0000000..d8699f5 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java @@ -0,0 +1,16 @@ +package com.alibaba.easyexcel.test.core.style; + +import com.alibaba.excel.annotation.ExcelProperty; + +import lombok.Data; + +/** + * @author zhuangjiaju + */ +@Data +public class StyleData { + @ExcelProperty("字符串") + private String string; + @ExcelProperty("字符串1") + private String string1; +} diff --git a/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataListener.java b/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataListener.java new file mode 100644 index 0000000..bc169f4 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataListener.java @@ -0,0 +1,34 @@ +package com.alibaba.easyexcel.test.core.style; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.Assert; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.alibaba.easyexcel.test.core.simple.SimpleDataListener; +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import com.alibaba.fastjson.JSON; + +/** + * @author zhuangjiaju + */ +public class StyleDataListener extends AnalysisEventListener { + private static final Logger LOGGER = LoggerFactory.getLogger(SimpleDataListener.class); + List list = new ArrayList(); + + @Override + public void invoke(StyleData data, AnalysisContext context) { + list.add(data); + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + Assert.assertEquals(list.size(), 2); + Assert.assertEquals(list.get(0).getString(), "字符串0"); + Assert.assertEquals(list.get(1).getString(), "字符串1"); + LOGGER.debug("First row:{}", JSON.toJSONString(list.get(0))); + } +} 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 new file mode 100644 index 0000000..37e6659 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java @@ -0,0 +1,84 @@ +package com.alibaba.easyexcel.test.core.style; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import org.apache.poi.ss.usermodel.FillPatternType; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.junit.BeforeClass; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + +import com.alibaba.easyexcel.test.util.TestFileUtil; +import com.alibaba.excel.EasyExcelFactory; +import com.alibaba.excel.write.metadata.style.WriteCellStyle; +import com.alibaba.excel.write.metadata.style.WriteFont; +import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; +import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy; +import com.alibaba.excel.write.style.row.SimpleRowHeightStyleStrategy; + +/** + * + * @author zhuangjiaju + */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class StyleDataTest { + + private static File file07; + private static File file03; + + @BeforeClass + public static void init() { + file07 = TestFileUtil.createNewFile("style07.xlsx"); + file03 = TestFileUtil.createNewFile("style03.xls"); + } + + @Test + public void T01ReadAndWrite07() { + readAndWrite(file07); + } + + @Test + public void T02ReadAndWrite03() { + readAndWrite(file03); + } + + private void readAndWrite(File file) { + SimpleColumnWidthStyleStrategy simpleColumnWidthStyleStrategy = new SimpleColumnWidthStyleStrategy(50); + SimpleRowHeightStyleStrategy simpleRowHeightStyleStrategy = + new SimpleRowHeightStyleStrategy((short)40, (short)50); + + WriteCellStyle headWriteCellStyle = new WriteCellStyle(); + headWriteCellStyle.setFillForegroundColor(IndexedColors.RED.getIndex()); + WriteFont headWriteFont = new WriteFont(); + headWriteFont.setFontHeightInPoints((short)20); + headWriteCellStyle.setWriteFont(headWriteFont); + WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); + contentWriteCellStyle.setFillPatternType(FillPatternType.SOLID_FOREGROUND); + contentWriteCellStyle.setFillForegroundColor(IndexedColors.GREEN.getIndex()); + WriteFont contentWriteFont = new WriteFont(); + contentWriteFont.setFontHeightInPoints((short)20); + headWriteCellStyle.setWriteFont(contentWriteFont); + HorizontalCellStyleStrategy horizontalCellStyleStrategy = + new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); + EasyExcelFactory.write(file, StyleData.class).registerWriteHandler(simpleColumnWidthStyleStrategy) + .registerWriteHandler(simpleRowHeightStyleStrategy).registerWriteHandler(horizontalCellStyleStrategy) + .sheet().doWrite(data()).finish(); + EasyExcelFactory.read(file, StyleData.class, new StyleDataListener()).sheet().doRead().finish(); + } + + private List data() { + List list = new ArrayList(); + StyleData data = new StyleData(); + data.setString("字符串0"); + data.setString1("字符串01"); + StyleData data1 = new StyleData(); + data1.setString("字符串1"); + data1.setString1("字符串11"); + list.add(data); + list.add(data1); + return list; + } +} 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 new file mode 100644 index 0000000..fb776d2 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java @@ -0,0 +1,16 @@ +package com.alibaba.easyexcel.test.core.template; + +import com.alibaba.excel.annotation.ExcelProperty; + +import lombok.Data; + +/** + * @author zhuangjiaju + */ +@Data +public class TemplateData { + @ExcelProperty("字符串0") + private String string0; + @ExcelProperty("字符串1") + private String string1; +} diff --git a/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataListener.java b/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataListener.java new file mode 100644 index 0000000..9a08ca8 --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataListener.java @@ -0,0 +1,34 @@ +package com.alibaba.easyexcel.test.core.template; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.Assert; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.alibaba.easyexcel.test.core.simple.SimpleDataListener; +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import com.alibaba.fastjson.JSON; + +/** + * @author zhuangjiaju + */ +public class TemplateDataListener extends AnalysisEventListener { + private static final Logger LOGGER = LoggerFactory.getLogger(SimpleDataListener.class); + List list = new ArrayList(); + + @Override + public void invoke(TemplateData data, AnalysisContext context) { + list.add(data); + } + + @Override + public void doAfterAllAnalysed(AnalysisContext context) { + Assert.assertEquals(list.size(), 2); + Assert.assertEquals(list.get(0).getString0(), "字符串0"); + Assert.assertEquals(list.get(1).getString0(), "字符串1"); + LOGGER.debug("First row:{}", JSON.toJSONString(list.get(0))); + } +} diff --git a/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java new file mode 100644 index 0000000..15aea6b --- /dev/null +++ b/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java @@ -0,0 +1,69 @@ +package com.alibaba.easyexcel.test.core.template; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import org.junit.BeforeClass; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + +import com.alibaba.easyexcel.test.util.TestFileUtil; +import com.alibaba.excel.EasyExcelFactory; + +/** + * + * @author zhuangjiaju + */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class TemplateDataTest { + + private static File file07; + private static File file03; + + @BeforeClass + public static void init() { + file07 = TestFileUtil.createNewFile("template07.xlsx"); + file03 = TestFileUtil.createNewFile("template03.xls"); + } + + @Test + public void T01ReadAndWrite07() { + readAndWrite07(file07); + } + + @Test + public void T02ReadAndWrite03() { + readAndWrite03(file03); + } + + private void readAndWrite07(File file) { + EasyExcelFactory.write(file, TemplateData.class) + .withTemplate(TestFileUtil.readFile("template" + File.separator + "template07.xlsx")).sheet() + .doWrite(data()).finish(); + EasyExcelFactory.read(file, TemplateData.class, new TemplateDataListener()).headRowNumber(2).sheet().doRead() + .finish(); + } + + private void readAndWrite03(File file) { + EasyExcelFactory.write(file, TemplateData.class) + .withTemplate(TestFileUtil.readFile("template" + File.separator + "template03.xls")).sheet().doWrite(data()) + .finish(); + EasyExcelFactory.read(file, TemplateData.class, new TemplateDataListener()).headRowNumber(2).sheet().doRead() + .finish(); + } + + private List data() { + List list = new ArrayList(); + TemplateData data = new TemplateData(); + data.setString0("字符串0"); + data.setString1("字符串01"); + TemplateData data1 = new TemplateData(); + data1.setString0("字符串1"); + data1.setString1("字符串11"); + list.add(data); + list.add(data1); + return list; + } +} diff --git a/src/test/resources/template/template03.xls b/src/test/resources/template/template03.xls new file mode 100644 index 0000000000000000000000000000000000000000..e8b1631e6387228ce499d2f27dbff46f41fc7bc4 GIT binary patch literal 18944 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
    o^wR9#P#6ah_-Ugg>kdus z2nq>AAQyeA*J{47wQ(}GaneiuixlebV&4HX=-QQmSo zd{+!Tq*3U}oN;wnqy)${H86?EkaA_qdV>*YA0hW>5T_ts9(7O2*>qt0hxm+S$FZ|Q zubsM_wlq-t!DlO3)^2XVJFwP>U9=aiTRtbIGkU-6p+7#7W>-yD47ZcS9JO5N#1)i8 zw~fyr6UuEAcpez!@yWHjjWyN(QL^t%!` zl`>8BJiZvpo=|ij0TN@`qkLYkOl9rWG@c*@+zGqJv~)X26S%WDiN4$NF#DcVOv$Zx0@IE{Ae5@u8r@HXO}fB7k!qKJSqU@ z6B|Q}V$0qY=IdXp<6FCEK2AwK_WIv_7&`I2-8i==@qtv51&6@=aRB}79r@ErAVYzH zgOP&XJ3w#$V6&eB{`X)6;slMSHWVDk#`CZ?i4Kh!}KlMHTJKMk7W&VWd&#sSO+;JfH{!8heMfdV}ED+ zRjc}Q%6}$6zXVhe{?Pk(*#6t3pIR|~jwcIi|FrNE^Iwe_zt8;7){H0KpH>V158hvm z8h=jz&m#RVDFdMJ4T9}&Gx#CpN6G>uLL{KT7#g2v(AXe#&A%hXe*#B52O~a8UO$Q literal 0 HcmV?d00001