完成策略排序

pom.xml

@@ -71,13 +71,23 @@
             <artifactId>cglib</artifactId>
             <version>3.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.26</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.3</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
     <distributionManagement>
         <snapshotRepository>

src/main/java/com/alibaba/excel/EasyExcelFactory.java

@@ -1,15 +1,16 @@
 package com.alibaba.excel;
 
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.event.WriteHandler;
 import com.alibaba.excel.metadata.Sheet;
 import com.alibaba.excel.support.ExcelTypeEnum;
-
+import com.alibaba.excel.write.builder.ExcelWriterBuilder;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Reader and writer factory class
@@ -69,7 +70,7 @@ public class EasyExcelFactory {
      * @return new ExcelWriter.
      */
     public static ExcelWriter getWriter(OutputStream outputStream) {
-        return new ExcelWriter(outputStream, ExcelTypeEnum.XLSX, true);
+        return writerBuilder().outputFile(outputStream).build();
     }
 
     /**
@@ -81,7 +82,11 @@ public class EasyExcelFactory {
      * @return new  ExcelWriter
      */
     public static ExcelWriter getWriter(OutputStream outputStream, ExcelTypeEnum typeEnum, boolean needHead) {
-        return new ExcelWriter(outputStream, typeEnum, needHead);
+        if (needHead) {
+            return writerBuilder().outputFile(outputStream).excelType(typeEnum).build();
+        } else {
+            return writerBuilder().outputFile(outputStream).excelType(typeEnum).doNotNeedHead().build();
+        }
     }
 
     /**
@@ -94,8 +99,13 @@ public class EasyExcelFactory {
      * @return new  ExcelWriter
      */
     public static ExcelWriter getWriterWithTemp(InputStream temp, OutputStream outputStream, ExcelTypeEnum typeEnum,
-                                                boolean needHead) {
+        boolean needHead) {
-        return new ExcelWriter(temp, outputStream, typeEnum, needHead);
+        if (needHead) {
+            return writerBuilder().withTemplate(temp).outputFile(outputStream).excelType(typeEnum).build();
+        } else {
+            return writerBuilder().withTemplate(temp).outputFile(outputStream).excelType(typeEnum).doNotNeedHead()
+                .build();
+        }
     }
 
     /**
@@ -109,12 +119,26 @@ public class EasyExcelFactory {
      * @param handler      User-defined callback
      * @return new  ExcelWriter
      */
-    public static ExcelWriter getWriterWithTempAndHandler(InputStream temp,
+    public static ExcelWriter getWriterWithTempAndHandler(InputStream temp, OutputStream outputStream,
-                                                          OutputStream outputStream,
+        ExcelTypeEnum typeEnum, boolean needHead, WriteHandler handler) {
-                                                          ExcelTypeEnum typeEnum,
+        if (needHead) {
-                                                          boolean needHead,
+            return writerBuilder().withTemplate(temp).outputFile(outputStream).excelType(typeEnum)
-                                                          WriteHandler handler) {
+                .registerWriteHandler(handler).build();
-        return new ExcelWriter(temp, outputStream, typeEnum, needHead, handler);
+        } else {
+            return writerBuilder().withTemplate(temp).outputFile(outputStream).excelType(typeEnum).doNotNeedHead()
+                .registerWriteHandler(handler).build();
+        }
+    }
+
+    public static ExcelWriterBuilder writerBuilder() {
+        return new ExcelWriterBuilder();
     }
 
+    public static ExcelWriterBuilder writerSheetBuilder() {
+        return new ExcelWriterBuilder();
+    }
+
+    public static ExcelWriterBuilder writerTableBuilder() {
+        return new ExcelWriterBuilder();
+    }
 }

src/main/java/com/alibaba/excel/ExcelWriter.java

@@ -2,30 +2,23 @@ package com.alibaba.excel;
 
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
-import com.alibaba.excel.converters.BooleanConverter;
 import com.alibaba.excel.converters.Converter;
-import com.alibaba.excel.converters.ConverterRegistryCenter;
-import com.alibaba.excel.converters.DateConverter;
-import com.alibaba.excel.converters.DoubleConverter;
-import com.alibaba.excel.converters.FloatConverter;
-import com.alibaba.excel.converters.IntegerConverter;
-import com.alibaba.excel.converters.LongConverter;
-import com.alibaba.excel.converters.StringConverter;
 import com.alibaba.excel.event.WriteHandler;
 import com.alibaba.excel.metadata.BaseRowModel;
 import com.alibaba.excel.metadata.Sheet;
 import com.alibaba.excel.metadata.Table;
-import com.alibaba.excel.parameter.GenerateParam;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.excel.write.ExcelBuilder;
 import com.alibaba.excel.write.ExcelBuilderImpl;
-import com.alibaba.excel.write.merge.MergeStrategy;
+import com.alibaba.excel.write.handler.WriteHandler;
 
 /**
- * Excel Writer This tool is used to write value out to Excel via POI. This object can perform the
+ * Excel Writer This tool is used to write value out to Excel via POI. This object can perform the following two
- * following two functions.
+ * functions.
  * 
  * <pre>
  *    1. Create a new empty Excel workbook, write the value to the stream after the value is filled.
@@ -35,39 +28,55 @@ import com.alibaba.excel.write.merge.MergeStrategy;
  * @author jipengfei
  */
 public class ExcelWriter {
-
     private ExcelBuilder excelBuilder;
 
     /**
      * Create new writer
      * 
-     * @param outputStream the java OutputStream you wish to write the value to
+     * @param templateInputStream
-     * @param typeEnum 03 or 07
+     *            Append value after a POI file ,Can be null（the template POI filesystem that contains the Workbook
+     *            stream)
+     * @param outputStream
+     *            the java OutputStream you wish to write the value to
+     * @param excelType
+     *            03 or 07
+     * @param needHead
+     * @param customConverterMap
+     * @param customWriteHandlerList
      */
-    public ExcelWriter(OutputStream outputStream, ExcelTypeEnum typeEnum) {
+    public ExcelWriter(InputStream templateInputStream, OutputStream outputStream, ExcelTypeEnum excelType,
-        this(outputStream, typeEnum, true);
+        boolean needHead, Map<Class, Converter> customConverterMap, List<WriteHandler> customWriteHandlerList) {
+        excelBuilder = new ExcelBuilderImpl(templateInputStream, outputStream, excelType, needHead, customConverterMap,
+            customWriteHandlerList);
     }
 
-    @Deprecated
-    private Class<? extends BaseRowModel> objectClass;
-
     /**
-     * @param generateParam
+     * Create new writer
+     *
+     * @param outputStream
+     *            the java OutputStream you wish to write the value to
+     * @param typeEnum
+     *            03 or 07
+     * @deprecated please use {@link com.alibaba.excel.write.builder.ExcelWriterBuilder} build ExcelWriter
      */
     @Deprecated
-    public ExcelWriter(GenerateParam generateParam) {
+    public ExcelWriter(OutputStream outputStream, ExcelTypeEnum typeEnum) {
-        this(generateParam.getOutputStream(), generateParam.getType(), generateParam.isNeedHead());
+        this(outputStream, typeEnum, true);
-        this.objectClass = generateParam.getClazz();
     }
 
     /**
      *
      * Create new writer
      *
-     * @param outputStream the java OutputStream you wish to write the value to
+     * @param outputStream
-     * @param typeEnum 03 or 07
+     *            the java OutputStream you wish to write the value to
-     * @param needHead Do you need to write the header to the file?
+     * @param typeEnum
+     *            03 or 07
+     * @param needHead
+     *            Do you need to write the header to the file?
+     * @deprecated please use {@link com.alibaba.excel.write.builder.ExcelWriterBuilder} build ExcelWriter
      */
+    @Deprecated
     public ExcelWriter(OutputStream outputStream, ExcelTypeEnum typeEnum, boolean needHead) {
         this(null, outputStream, typeEnum, needHead, null, null);
     }
@@ -75,63 +84,51 @@ public class ExcelWriter {
     /**
      * Create new writer
      *
-     * @param templateInputStream Append value after a POI file ,Can be null（the template POI
+     * @param templateInputStream
-     *        filesystem that contains the Workbook stream)
+     *            Append value after a POI file ,Can be null（the template POI filesystem that contains the Workbook
-     * @param outputStream the java OutputStream you wish to write the value to
+     *            stream)
-     * @param typeEnum 03 or 07
+     * @param outputStream
+     *            the java OutputStream you wish to write the value to
+     * @param typeEnum
+     *            03 or 07
+     * @deprecated please use {@link com.alibaba.excel.write.builder.ExcelWriterBuilder} build ExcelWriter
      */
+    @Deprecated
     public ExcelWriter(InputStream templateInputStream, OutputStream outputStream, ExcelTypeEnum typeEnum,
-                    Boolean needHead) {
+        Boolean needHead) {
         this(templateInputStream, outputStream, typeEnum, needHead, null, null);
     }
 
-
     /**
      * Create new writer
      *
-     * @param templateInputStream Append value after a POI file ,Can be null（the template POI
+     * @param templateInputStream
-     *        filesystem that contains the Workbook stream)
+     *            Append value after a POI file ,Can be null（the template POI filesystem that contains the Workbook
-     * @param outputStream the java OutputStream you wish to write the value to
+     *            stream)
-     * @param typeEnum 03 or 07
+     * @param outputStream
-     * @param writeHandler User-defined callback
+     *            the java OutputStream you wish to write the value to
+     * @param typeEnum
+     *            03 or 07
+     * @param writeHandler
+     *            User-defined callback
+     * @deprecated please use {@link com.alibaba.excel.write.builder.ExcelWriterBuilder} build ExcelWriter
      */
+    @Deprecated
     public ExcelWriter(InputStream templateInputStream, OutputStream outputStream, ExcelTypeEnum typeEnum,
-                    Boolean needHead, WriteHandler writeHandler) {
+        Boolean needHead, WriteHandler writeHandler) {
-        this(templateInputStream, outputStream, typeEnum, needHead, writeHandler, null);
+        List<WriteHandler> customWriteHandlerList = new ArrayList<WriteHandler>();
-    }
+        customWriteHandlerList.add(writeHandler);
-
+        excelBuilder =
-    public ExcelWriter(InputStream templateInputStream, OutputStream outputStream, ExcelTypeEnum typeEnum,
+            new ExcelBuilderImpl(templateInputStream, outputStream, typeEnum, needHead, null, customWriteHandlerList);
-                    Boolean needHead, WriteHandler writeHandler, List<Converter> converters) {
-        excelBuilder = new ExcelBuilderImpl(templateInputStream, outputStream, typeEnum, needHead, writeHandler,
-                        converters);
-        if (this.excelBuilder instanceof ConverterRegistryCenter) {
-            ConverterRegistryCenter registryCenter = (ConverterRegistryCenter)this.excelBuilder;
-            initConverters(registryCenter, converters);
-        }
     }
 
-    private void initConverters(ConverterRegistryCenter registryCenter, List<Converter> converters) {
-        registerDefaultConverters(registryCenter);
-        if (converters != null && converters.size() > 0) {
-            for (Converter c : converters) {
-                registryCenter.register(c);
-            }
-        }
-    }
-    private void registerDefaultConverters(ConverterRegistryCenter registryCenter) {
-        registryCenter.register(new StringConverter());
-        registryCenter.register(new DateConverter(null));
-        registryCenter.register(new IntegerConverter());
-        registryCenter.register(new DoubleConverter());
-        registryCenter.register(new LongConverter());
-        registryCenter.register(new FloatConverter());
-        registryCenter.register(new BooleanConverter());
-    }
     /**
-     * Write value to a sheet
+     * Write data to a sheet
      *
-     * @param data Data to be written
+     * @param data
-     * @param sheet Write to this sheet
+     *            Data to be written
+     * @param sheet
+     *            Write to this sheet
      * @return this current writer
      */
     public ExcelWriter write(List<? extends BaseRowModel> data, Sheet sheet) {
@@ -139,29 +136,30 @@ public class ExcelWriter {
         return this;
     }
 
-
     /**
      * Write value to a sheet
      *
-     * @param data Data to be written
+     * @param data
-     * @return this current writer
+     *            Data to be written
+     * @param sheet
+     *            Write to this sheet
+     * @param table
+     *            Write to this table
+     * @return this
      */
-    @Deprecated
+    public ExcelWriter write(List<? extends BaseRowModel> data, Sheet sheet, Table table) {
-    public ExcelWriter write(List data) {
+        excelBuilder.addContent(data, sheet, table);
-        if (objectClass != null) {
+        return this;
-            return this.write(data, new Sheet(1, 0, objectClass));
-        } else {
-            return this.write0(data, new Sheet(1, 0, objectClass));
-
-        }
     }
 
     /**
      *
      * Write value to a sheet
      *
-     * @param data Data to be written
+     * @param data
-     * @param sheet Write to this sheet
+     *            Data to be written
+     * @param sheet
+     *            Write to this sheet
      * @return this
      */
     public ExcelWriter write1(List<List<Object>> data, Sheet sheet) {
@@ -172,8 +170,10 @@ public class ExcelWriter {
     /**
      * Write value to a sheet
      *
-     * @param data Data to be written
+     * @param data
-     * @param sheet Write to this sheet
+     *            Data to be written
+     * @param sheet
+     *            Write to this sheet
      * @return this
      */
     public ExcelWriter write0(List<List<String>> data, Sheet sheet) {
@@ -184,22 +184,12 @@ public class ExcelWriter {
     /**
      * Write value to a sheet
      *
-     * @param data Data to be written
+     * @param data
-     * @param sheet Write to this sheet
+     *            Data to be written
-     * @param table Write to this table
+     * @param sheet
-     * @return this
+     *            Write to this sheet
-     */
+     * @param table
-    public ExcelWriter write(List<? extends BaseRowModel> data, Sheet sheet, Table table) {
+     *            Write to this table
-        excelBuilder.addContent(data, sheet, table);
-        return this;
-    }
-
-    /**
-     * Write value to a sheet
-     * 
-     * @param data Data to be written
-     * @param sheet Write to this sheet
-     * @param table Write to this table
      * @return this
      */
     public ExcelWriter write0(List<List<String>> data, Sheet sheet, Table table) {
@@ -207,22 +197,15 @@ public class ExcelWriter {
         return this;
     }
 
-    /**
-     * Merge Cells，Indexes are zero-based.
-     *
-     * @param strategies the merge strategies.
-     */
-    public ExcelWriter merge(List<MergeStrategy> strategies) {
-        excelBuilder.merge(strategies);
-        return this;
-    }
-
     /**
      * Write value to a sheet
      *
-     * @param data Data to be written
+     * @param data
-     * @param sheet Write to this sheet
+     *            Data to be written
-     * @param table Write to this table
+     * @param sheet
+     *            Write to this sheet
+     * @param table
+     *            Write to this table
      * @return
      */
     public ExcelWriter write1(List<List<Object>> data, Sheet sheet, Table table) {
@@ -236,4 +219,5 @@ public class ExcelWriter {
     public void finish() {
         excelBuilder.finish();
     }
+
 }

src/main/java/com/alibaba/excel/analysis/BaseSaxAnalyser.java

@@ -1,16 +1,19 @@
 package com.alibaba.excel.analysis;
 
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.converters.BooleanConverter;
 import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.converters.ConverterKey;
 import com.alibaba.excel.converters.ConverterRegistryCenter;
 import com.alibaba.excel.converters.DateConverter;
+import com.alibaba.excel.converters.Double2Converter;
 import com.alibaba.excel.converters.DoubleConverter;
 import com.alibaba.excel.converters.FloatConverter;
 import com.alibaba.excel.converters.IntegerConverter;
@@ -31,9 +34,10 @@ public abstract class BaseSaxAnalyser implements ConverterRegistryCenter, Analys
     protected AnalysisContext analysisContext;
 
     private LinkedHashMap<String, AnalysisEventListener<Object>> listeners =
-                    new LinkedHashMap<String, AnalysisEventListener<Object>>();
+        new LinkedHashMap<String, AnalysisEventListener<Object>>();
+
+    private Map<ConverterKey, Converter> converters = new HashMap<ConverterKey, Converter>();
 
-    private LinkedHashMap<String, Converter> converters = new LinkedHashMap<String, Converter>();
     /**
      * execute method
      */
@@ -57,6 +61,10 @@ public abstract class BaseSaxAnalyser implements ConverterRegistryCenter, Analys
     }
 
     private void registerDefaultConverters() {
+        Double2Converter double2Converter = new Double2Converter();
+        converters.put(ConverterKey.buildConverterKey(double2Converter.supportJavaTypeKey(),
+            double2Converter.supportExcelTypeKey()), double2Converter);
+
         StringConverter s = new StringConverter();
         converters.put(s.getName(), s);
         DateConverter d = new DateConverter(this.analysisContext);
@@ -77,6 +85,7 @@ public abstract class BaseSaxAnalyser implements ConverterRegistryCenter, Analys
     public Collection<Converter> getConverters() {
         return converters.values();
     }
+
     @Override
     public void analysis(Sheet sheetParam) {
         analysisContext.setCurrentSheet(sheetParam);
@@ -92,6 +101,7 @@ public abstract class BaseSaxAnalyser implements ConverterRegistryCenter, Analys
     public AnalysisContext getAnalysisContext() {
         return analysisContext;
     }
+
     /**
      */
     @Override
@@ -109,9 +119,9 @@ public abstract class BaseSaxAnalyser implements ConverterRegistryCenter, Analys
     public void notify(AnalysisFinishEvent event) {
         analysisContext.setCurrentRowAnalysisResult(event.getAnalysisResult());
         /** Parsing header content **/
-        if (analysisContext.getCurrentRowNum() < analysisContext.getCurrentSheet().getHeadLineMun()) {
+        if (analysisContext.getCurrentRowNum() < analysisContext.getCurrentSheet().getReadHeadRowNumber()) {
-            if (analysisContext.getCurrentRowNum() <= analysisContext.getCurrentSheet().getHeadLineMun() - 1) {
+            if (analysisContext.getCurrentRowNum() <= analysisContext.getCurrentSheet().getReadHeadRowNumber() - 1) {
-                buildExcelHeadProperty(null, (List<String>) analysisContext.getCurrentRowAnalysisResult());
+                buildExcelHeadProperty(null, (List<String>)analysisContext.getCurrentRowAnalysisResult());
             }
         } else {
             for (Entry<String, AnalysisEventListener<Object>> entry : listeners.entrySet()) {
@@ -120,10 +130,9 @@ public abstract class BaseSaxAnalyser implements ConverterRegistryCenter, Analys
         }
     }
 
-
     private void buildExcelHeadProperty(Class<? extends BaseRowModel> clazz, List<String> headOneRow) {
-        ExcelHeadProperty excelHeadProperty = ExcelHeadProperty
+        ExcelHeadProperty excelHeadProperty =
-                        .buildExcelHeadProperty(this.analysisContext.getExcelHeadProperty(), clazz, headOneRow);
+            ExcelHeadProperty.buildExcelHeadProperty(this.analysisContext.getExcelHeadProperty(), clazz, headOneRow);
         this.analysisContext.setExcelHeadProperty(excelHeadProperty);
     }
 }

src/main/java/com/alibaba/excel/analysis/v07/XlsxRowResultHolder.java

@@ -1,11 +1,13 @@
 package com.alibaba.excel.analysis.v07;
 
+import com.alibaba.excel.metadata.CellData;
+
 public interface XlsxRowResultHolder {
     void clearResult();
     
     void appendCurrentCellValue(String currentCellValue);
 
-    String[] getCurRowContent();
+    CellData[] getCurRowContent();
     
     int getColumnSize();
 }

src/main/java/com/alibaba/excel/analysis/v07/handlers/DefaultCellHandler.java

@@ -1,43 +1,41 @@
 package com.alibaba.excel.analysis.v07.handlers;
 
-import static com.alibaba.excel.constant.ExcelXmlConstants.CELL_VALUE_TAG;
+import static com.alibaba.excel.constant.ExcelXmlConstants.CELL_FORMULA_TAG;
 import static com.alibaba.excel.constant.ExcelXmlConstants.CELL_TAG;
+import static com.alibaba.excel.constant.ExcelXmlConstants.CELL_VALUE_TAG;
 import static com.alibaba.excel.constant.ExcelXmlConstants.CELL_VALUE_TAG_1;
+import static com.alibaba.excel.constant.ExcelXmlConstants.CELL_VALUE_TYPE_TAG;
 
 import java.util.Arrays;
 
+import org.apache.poi.ss.usermodel.RichTextString;
 import org.apache.poi.xssf.model.SharedStringsTable;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
 import org.xml.sax.Attributes;
 
 import com.alibaba.excel.analysis.v07.XlsxCellHandler;
 import com.alibaba.excel.analysis.v07.XlsxRowResultHolder;
-import com.alibaba.excel.annotation.FieldType;
 import com.alibaba.excel.constant.ExcelXmlConstants;
 import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.enums.CellDataTypeEnum;
 import com.alibaba.excel.event.AnalysisEventRegistryCenter;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.util.BooleanUtils;
 import com.alibaba.excel.util.PositionUtils;
+import com.alibaba.excel.util.StringUtils;
 
 public class DefaultCellHandler implements XlsxCellHandler, XlsxRowResultHolder {
-    private String currentCellIndex;
-
-    private FieldType currentCellType;
-
-    private int curRow;
-
-    private int curCol;
-
-    private String[] curRowContent = new String[20];
-
-    private String currentCellValue;
-
     private final AnalysisContext analysisContext;
-    
     private final AnalysisEventRegistryCenter registerCenter;
-
     private final SharedStringsTable sst;
+    private String currentTag;
+    private String currentCellIndex;
+    private int curRow;
+    private int curCol;
+    private CellData[] curRowContent = new CellData[20];
+    private CellData currentCellData;
 
-    public DefaultCellHandler(AnalysisContext analysisContext, AnalysisEventRegistryCenter registerCenter, SharedStringsTable sst) {
+    public DefaultCellHandler(AnalysisContext analysisContext, AnalysisEventRegistryCenter registerCenter,
+        SharedStringsTable sst) {
         this.analysisContext = analysisContext;
         this.registerCenter = registerCenter;
         this.sst = sst;
@@ -45,16 +43,19 @@ public class DefaultCellHandler implements XlsxCellHandler, XlsxRowResultHolder
 
     @Override
     public void clearResult() {
-        curRowContent = new String[20];
+        curRowContent = new CellData[20];
     }
 
     @Override
     public boolean support(String name) {
-        return CELL_VALUE_TAG.equals(name) || CELL_VALUE_TAG_1.equals(name) || CELL_TAG.equals(name);
+        return CELL_VALUE_TAG.equals(name) || CELL_FORMULA_TAG.equals(name) || CELL_VALUE_TAG_1.equals(name)
+            || CELL_TAG.equals(name);
     }
 
     @Override
     public void startHandle(String name, Attributes attributes) {
+        currentTag = name;
+        // start a cell
         if (CELL_TAG.equals(name)) {
             currentCellIndex = attributes.getValue(ExcelXmlConstants.POSITION);
             int nextRow = PositionUtils.getRow(currentCellIndex);
@@ -65,51 +66,67 @@ public class DefaultCellHandler implements XlsxCellHandler, XlsxRowResultHolder
             analysisContext.setCurrentRowNum(curRow);
             curCol = PositionUtils.getCol(currentCellIndex);
 
-            String cellType = attributes.getValue("t");
+            // t="s" ,it's means String
-            currentCellType = FieldType.EMPTY;
+            // t="b" ,it's means Boolean
-            if (cellType != null && cellType.equals("s")) {
+            // t is null ,it's means Empty or Number
-                currentCellType = FieldType.STRING;
+            CellDataTypeEnum type = CellDataTypeEnum.buildFromCellType(attributes.getValue(CELL_VALUE_TYPE_TAG));
-            }
+            currentCellData = new CellData(type);
         }
-        if (name.equals(CELL_VALUE_TAG) || name.equals(CELL_VALUE_TAG_1)) {
+        // cell is formula
-            // initialize current cell value
+        if (CELL_FORMULA_TAG.equals(name)) {
-            currentCellValue = "";
+            currentCellData.setReadIsFormula(Boolean.TRUE);
         }
     }
 
     @Override
     public void endHandle(String name) {
-        ensureSize();
         if (CELL_VALUE_TAG.equals(name)) {
-            switch (currentCellType) {
+            ensureSize();
-                case STRING:
+            // Have to go "sharedStrings.xml" and get it
-                    int idx = Integer.parseInt(currentCellValue);
+            if (currentCellData.getType() == CellDataTypeEnum.STRING) {
-                    currentCellValue = new XSSFRichTextString(sst.getEntryAt(idx)).toString();
+                RichTextString richTextString = sst.getItemAt(Integer.parseInt(currentCellData.getStringValue()));
-                    currentCellType = FieldType.EMPTY;
+                currentCellData.setStringValue(richTextString.toString());
-                    break;
             }
-            curRowContent[curCol] = currentCellValue;
+            curRowContent[curCol] = currentCellData;
-        } else if (CELL_VALUE_TAG_1.equals(name)) {
-            curRowContent[curCol] = currentCellValue;
         }
     }
 
-    
-
     private void ensureSize() {
         // try to size
         if (curCol >= curRowContent.length) {
-            curRowContent = Arrays.copyOf(curRowContent, (int) (curCol * 1.5));
+            curRowContent = Arrays.copyOf(curRowContent, (int)(curCol * 1.5));
         }
     }
 
     @Override
     public void appendCurrentCellValue(String currentCellValue) {
-        this.currentCellValue += currentCellValue;
+        if (StringUtils.isEmpty(currentCellValue)) {
+            return;
+        }
+        if (CELL_FORMULA_TAG.equals(currentTag)) {
+            currentCellData.setReadFormula(currentCellValue);
+            return;
+        }
+        CellDataTypeEnum oldType = currentCellData.getType();
+        switch (oldType) {
+            case STRING:
+            case ERROR:
+                currentCellData.setStringValue(currentCellValue);
+                break;
+            case BOOLEAN:
+                currentCellData.setBooleanValue(BooleanUtils.valueOf(currentCellValue));
+                break;
+            case EMPTY:
+                currentCellData.setType(CellDataTypeEnum.NUMBER);
+                currentCellData.setDoubleValue(Double.valueOf(currentCellValue));
+                break;
+            default:
+                throw new IllegalStateException("Cannot set values now");
+        }
     }
 
     @Override
-    public String[] getCurRowContent() {
+    public CellData[] getCurRowContent() {
         return this.curRowContent;
     }
 

src/main/java/com/alibaba/excel/constant/ExcelXmlConstants.java

@@ -10,7 +10,9 @@ public class ExcelXmlConstants {
 
     public static final String ROW_TAG = "row";
     public static final String CELL_TAG = "c";
+    public static final String CELL_FORMULA_TAG = "f";
     public static final String CELL_VALUE_TAG = "v";
+    public static final String CELL_VALUE_TYPE_TAG = "t";
 
     public static final String CELL_VALUE_TAG_1 = "t";
 

src/main/java/com/alibaba/excel/context/WriteContext.java

@@ -1,37 +1,47 @@
 package com.alibaba.excel.context;
 
-import java.io.OutputStream;
-
-import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 
-import com.alibaba.excel.converters.ConverterRegistryCenter;
-import com.alibaba.excel.event.WriteHandler;
 import com.alibaba.excel.metadata.ExcelHeadProperty;
-import com.alibaba.excel.metadata.SheetHolder;
 import com.alibaba.excel.metadata.Table;
+import com.alibaba.excel.metadata.holder.ConfigurationSelector;
 
+/**
+ * Write context
+ * 
+ * @author jipengfei
+ */
 public interface WriteContext {
-
+    /**
-    Sheet getCurrentSheet();
+     * If the current sheet already exists, select it; if not, create it
-
+     * 
-    boolean needHead();
+     * @param sheet
-
+     */
-    ExcelHeadProperty getExcelHeadProperty();
-
     void currentSheet(com.alibaba.excel.metadata.Sheet sheet);
 
+    /**
+     * If the current table already exists, select it; if not, create it
+     * 
+     * @param table
+     */
     void currentTable(Table table);
 
-    OutputStream getOutputStream();
+    /**
+     * Configuration of currently operated cell
+     * 
+     * @return
+     */
+    ConfigurationSelector configurationSelector();
 
-    Workbook getWorkbook();
+    Sheet getCurrentSheet();
 
-    @Deprecated
+    ExcelHeadProperty getExcelHeadProperty();
-    WriteHandler getWriteHandler();
 
-    CellStyle getCurrentContentStyle();
+    Workbook getWorkbook();
 
-    ConverterRegistryCenter getConverterRegistryCenter();
+    /**
+     * close
+     */
+    void finish();
 }

src/main/java/com/alibaba/excel/context/WriteContextImpl.java

@@ -3,28 +3,44 @@ package com.alibaba.excel.context;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
 
 import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.IndexedColors;
 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.util.CellRangeAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.converters.ConverterRegistryCenter;
-import com.alibaba.excel.event.WriteHandler;
+import com.alibaba.excel.converters.bigdecimal.BigDecimalNumberConverter;
+import com.alibaba.excel.converters.date.DateStringConverter;
+import com.alibaba.excel.event.NotRepeatExecutor;
+import com.alibaba.excel.event.Order;
+import com.alibaba.excel.exception.ExcelGenerateException;
+import com.alibaba.excel.metadata.CellStyle;
 import com.alibaba.excel.metadata.ExcelHeadProperty;
+import com.alibaba.excel.metadata.Font;
 import com.alibaba.excel.metadata.Head;
-import com.alibaba.excel.metadata.SheetHolder;
 import com.alibaba.excel.metadata.Table;
-import com.alibaba.excel.metadata.TableHolder;
+import com.alibaba.excel.metadata.holder.ConfigurationSelector;
+import com.alibaba.excel.metadata.holder.SheetHolder;
+import com.alibaba.excel.metadata.holder.TableHolder;
+import com.alibaba.excel.metadata.holder.WorkbookHolder;
 import com.alibaba.excel.support.ExcelTypeEnum;
-import com.alibaba.excel.util.StyleUtil;
 import com.alibaba.excel.util.WorkBookUtil;
-import com.alibaba.excel.write.style.CellStyleStrategy;
+import com.alibaba.excel.write.handler.WriteHandler;
+import com.alibaba.excel.write.style.RowCellStyleStrategy;
+import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
 
 /**
  * A context is the main anchorage point of a excel writer.
@@ -32,10 +48,13 @@ import com.alibaba.excel.write.style.CellStyleStrategy;
  * @author jipengfei
  */
 public class WriteContextImpl implements WriteContext {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(WriteContextImpl.class);
+
     /**
-     * prevent duplicate creation of sheet objects
+     * The Workbook currently written
      */
-    private final Map<Integer, SheetHolder> hasBeenInitializedSheet = new HashMap<Integer, SheetHolder>();
+    private WorkbookHolder currentWorkbookHolder;
     /**
      * Current sheet holder
      */
@@ -45,37 +64,122 @@ public class WriteContextImpl implements WriteContext {
      */
     private TableHolder currentTableHolder;
     /**
-     * Excel type
+     * Configuration of currently operated cell
      */
-    private ExcelTypeEnum excelType;
+    private ConfigurationSelector currentConfigurationSelector;
-
     /**
-     * POI Workbook
+     * Excel type
      */
-    private Workbook workbook;
+    private ExcelTypeEnum excelType;
-
     /**
      * Final output stream
      */
     private OutputStream outputStream;
-
     /**
-     * If sheet and table don't have {@link CellStyleStrategy} , use this one. If they have, use their own
+     * Final output stream
      */
-    private CellStyleStrategy defalutCellStyleStrategy;
+    private InputStream templateInputStream;
+
+    public WriteContextImpl(InputStream templateInputStream, OutputStream outputStream, ExcelTypeEnum excelType,
+        Boolean needHead, Map<Class, Converter> customConverterMap, List<WriteHandler> customWriteHandlerList) {
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("Begin to Initialization 'WriteContextImpl'");
+        }
+        initCurrentWorkbookHolder(needHead, customConverterMap, customWriteHandlerList);
+        this.excelType = excelType;
+        this.outputStream = outputStream;
+        this.templateInputStream = templateInputStream;
+        try {
+            currentWorkbookHolder.setWorkbook(WorkBookUtil.createWorkBook(templateInputStream, excelType));
+        } catch (IOException e) {
+            throw new ExcelGenerateException("Create workbook failure", e);
+        }
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("Initialization 'WriteContextImpl' complete");
+        }
+    }
+
+    private void initCurrentWorkbookHolder(Boolean needHead, Map<Class, Converter> customConverterMap,
+        List<WriteHandler> customWriteHandlerList) {
+        currentWorkbookHolder = new WorkbookHolder();
+        if (needHead == null) {
+            currentWorkbookHolder.setNeedHead(Boolean.TRUE);
+        } else {
+            currentWorkbookHolder.setNeedHead(needHead);
+        }
+        List<WriteHandler> handlerList = new ArrayList<WriteHandler>();
+        if (customWriteHandlerList != null && !customWriteHandlerList.isEmpty()) {
+            handlerList.addAll(customWriteHandlerList);
+        }
+        handlerList.addAll(loadDefaultHandler());
+        currentWorkbookHolder.setWriteHandlerList(sortAndClearUpHandler(handlerList));
+        Map<Class, Converter> converterMap = loadDefaultConverter();
+        if (customConverterMap != null && !customConverterMap.isEmpty()) {
+            converterMap.putAll(customConverterMap);
+        }
+        currentWorkbookHolder.setConverterMap(converterMap);
+        currentWorkbookHolder.setHasBeenInitializedSheet(new HashMap<Integer, SheetHolder>());
+        currentConfigurationSelector = currentWorkbookHolder;
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("CurrentConfigurationSelector is currentWorkbookHolder");
+        }
+    }
 
-    private WriteHandler writeHandler;
+    private List<WriteHandler> sortAndClearUpHandler(List<WriteHandler> handlerList) {
+        // sort
+        Map<Integer, List<WriteHandler>> orderExcelWriteHandlerMap =
+            new TreeMap<Integer, List<WriteHandler>>();
+        for (WriteHandler handler : handlerList) {
+            int order = Integer.MIN_VALUE;
+            if (handler instanceof Order) {
+                order = ((Order)handler).order();
+            }
+            if (orderExcelWriteHandlerMap.containsKey(order)) {
+                orderExcelWriteHandlerMap.get(order).add(handler);
+            } else {
+                List<WriteHandler> tempHandlerList = new ArrayList<WriteHandler>();
+                tempHandlerList.add(handler);
+                orderExcelWriteHandlerMap.put(order, tempHandlerList);
+            }
+        }
+        // clean up
+        Set<String> alreadyExistedHandlerSet = new HashSet<String>();
+        List<WriteHandler> result = new ArrayList<WriteHandler>();
+        for (Map.Entry<Integer, List<WriteHandler>> entry : orderExcelWriteHandlerMap.entrySet()) {
+            for (WriteHandler handler : entry.getValue()) {
+                if (handler instanceof NotRepeatExecutor) {
+                    String uniqueValue = ((NotRepeatExecutor)handler).uniqueValue();
+                    if (alreadyExistedHandlerSet.contains(uniqueValue)) {
+                        continue;
+                    }
+                    alreadyExistedHandlerSet.add(uniqueValue);
+                }
+                result.add(handler);
+            }
+        }
+        return result;
+    }
 
-    private ConverterRegistryCenter registryCenter;
+    private List<WriteHandler> loadDefaultHandler() {
+        List<WriteHandler> handlerList = new ArrayList<WriteHandler>();
+        CellStyle headCellStyle = new CellStyle();
+        Font font = new Font();
+        headCellStyle.setFont(font);
+        font.setFontName("宋体");
+        font.setBold(true);
+        headCellStyle.setIndexedColors(IndexedColors.GREY_25_PERCENT);
+        handlerList.add(new RowCellStyleStrategy(headCellStyle, new ArrayList<CellStyle>()));
+        handlerList.add(new SimpleColumnWidthStyleStrategy(20));
+        return handlerList;
+    }
 
-    public WriteContextImpl(InputStream templateInputStream, OutputStream out, ExcelTypeEnum excelType,
+    private Map<Class, Converter> loadDefaultConverter() {
-        boolean needHead, WriteHandler writeHandler, ConverterRegistryCenter registryCenter) throws IOException {
+        Map<Class, Converter> converterMap = new HashMap<Class, Converter>();
-        this.needHead = needHead;
+        DateStringConverter dateStringConverter = new DateStringConverter();
-        this.outputStream = out;
+        converterMap.put(dateStringConverter.supportJavaTypeKey(), dateStringConverter);
-        this.writeHandler = writeHandler;
+        BigDecimalNumberConverter bigDecimalNumberConverter = new BigDecimalNumberConverter();
-        this.workbook = WorkBookUtil.createWorkBook(templateInputStream, excelType);
+        converterMap.put(bigDecimalNumberConverter.supportJavaTypeKey(), bigDecimalNumberConverter);
-        this.defaultCellStyle = StyleUtil.buildDefaultCellStyle(this.workbook);
+        return converterMap;
-        this.registryCenter = registryCenter;
     }
 
     /**
@@ -86,83 +190,82 @@ public class WriteContextImpl implements WriteContext {
         if (sheet == null) {
             throw new IllegalArgumentException("Sheet argument cannot be null");
         }
-        if (hasBeenInitializedSheet.containsKey(sheet.getSheetNo())) {
+        if (sheet.getSheetNo() == null || sheet.getSheetNo() <= 0) {
-            currentSheetHolder = hasBeenInitializedSheet.get(sheet.getSheetNo());
+            sheet.setSheetNo(0);
-            return;
         }
-        // create sheet
+        if (currentWorkbookHolder.getHasBeenInitializedSheet().containsKey(sheet.getSheetNo())) {
-        currentSheetParam = sheet;
+            if (LOGGER.isDebugEnabled()) {
-        try {
+                LOGGER.debug("Sheet:{} is already existed", sheet.getSheetNo());
-            this.currentSheet = workbook.getSheetAt(sheet.getSheetNo() - 1);
-        } catch (Exception e) {
-            this.currentSheet = WorkBookUtil.createSheet(workbook, sheet);
-            if (null != writeHandler) {
-                this.writeHandler.sheet(sheet.getSheetNo(), currentSheet);
             }
+            currentSheetHolder = currentWorkbookHolder.getHasBeenInitializedSheet().get(sheet.getSheetNo());
+            currentConfigurationSelector = currentSheetHolder;
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug("CurrentConfigurationSelector is currentSheetHolder");
+            }
+            return;
         }
+        initCurrentSheetHolder(sheet);
         // Initialization current sheet
-        initCurrentSheet();
+        initCurrentSheet(sheet);
-    }
-
-    private void initCurrentSheet() {
-        // Initialization head
-        initExcelHeadProperty();
-        // Initialization cell style strategy
-        initCellStyleStrategy();
-        // Initialization sheet head
-        initSheetHead();
     }
 
-    private void initCellStyleStrategy() {
+    private void initCurrentSheetHolder(com.alibaba.excel.metadata.Sheet sheet) {
-        if (currentSheetParam.getCellStyleStrategy() != null) {
+        currentSheetHolder = new SheetHolder();
-            currentSheetHolder.setCellStyleStrategy(currentSheetParam.getCellStyleStrategy());
+        currentSheetHolder.setSheetParam(sheet);
+        if (sheet.getNeedHead() == null) {
+            currentSheetHolder.setNeedHead(currentConfigurationSelector.needHead());
+        } else {
+            currentSheetHolder.setNeedHead(sheet.getNeedHead());
         }
-        currentSheetHolder.setCellStyleStrategy(defalutCellStyleStrategy);
+        if (sheet.getWriteRelativeHeadRowIndex() == null) {
-    }
+            currentSheetHolder.setWriteRelativeHeadRowIndex(currentConfigurationSelector.writeRelativeHeadRowIndex());
-
+        } else {
-    private void initTableCellStyleStrategy() {
+            currentSheetHolder.setNeedHead(sheet.getWriteRelativeHeadRowIndex());
-        if (.getCellStyleStrategy() != null) {
-            currentSheetHolder.setCellStyleStrategy(currentSheetParam.getCellStyleStrategy());
         }
-        currentSheetHolder.setCellStyleStrategy(defalutCellStyleStrategy);
-    }
 
-    /**
+        List<WriteHandler> handlerList = new ArrayList<WriteHandler>();
-     * init excel header
+        if (sheet.getCustomWriteHandlerList() != null && !sheet.getCustomWriteHandlerList().isEmpty()) {
-     */
+            handlerList.addAll(sheet.getCustomWriteHandlerList());
-    private void initExcelHeadProperty() {
+        }
-        currentSheetHolder
+        handlerList.addAll(currentConfigurationSelector.writeHandlerList());
-            .setExcelHeadProperty(new ExcelHeadProperty(currentSheetParam.getClazz(), currentSheetParam.getHead()));
+        currentSheetHolder.setWriteHandlerList(sortAndClearUpHandler(handlerList));
-    }
 
-    /**
+        Map<Class, Converter> converterMap = new HashMap<Class, Converter>(currentConfigurationSelector.converterMap());
-     * init table excel header
+        if (sheet.getCustomConverterMap() != null && !sheet.getCustomConverterMap().isEmpty()) {
-     */
+            converterMap.putAll(sheet.getCustomConverterMap());
-    private void initTableExcelHeadProperty() {
+        }
-        currentTableHolder.setExcelHeadProperty(
+        currentWorkbookHolder.setConverterMap(converterMap);
-            new ExcelHeadProperty(getCurrentTableParam().getClazz(), getCurrentTableParam().getHead()));
+        currentSheetHolder.setHasBeenInitializedTable(new HashMap<Integer, TableHolder>());
+        currentWorkbookHolder.getHasBeenInitializedSheet().put(sheet.getSheetNo(), currentSheetHolder);
+        currentConfigurationSelector = currentSheetHolder;
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("CurrentConfigurationSelector is currentSheetHolder");
+        }
     }
 
-    /**
+    private void initCurrentSheet(com.alibaba.excel.metadata.Sheet sheet) {
-     * init sheet column with
+        Sheet currentSheet;
-     */
+        try {
-    public void initSheetColumnWidth() {
+            currentSheet = currentWorkbookHolder.getWorkbook().getSheetAt(sheet.getSheetNo());
-        for (Head head : currentSheetHolder.getExcelHeadProperty().getHeadList()) {
+        } catch (Exception e) {
-            currentSheet.setColumnWidth(head.getColumnIndex(), currentSheetHolder.getColumnWidthStyleStrategy()
+            if (LOGGER.isDebugEnabled()) {
-                .columnWidth(head.getColumnIndex(), head.getFieldName()));
+                LOGGER.info("Can not find sheet:{} ,now create it", sheet.getSheetNo());
+            }
+            currentSheet = WorkBookUtil.createSheet(currentWorkbookHolder.getWorkbook(), sheet);
         }
+        currentSheetHolder.setSheet(currentSheet);
+        // Initialization head
+        currentSheetHolder.setExcelHeadProperty(new ExcelHeadProperty(sheet.getClazz(), sheet.getHead()));
+        // Initialization head
+        initHead();
     }
 
-    public void initSheetHead() {
+    public void initHead(ExcelHeadProperty excelHeadPropert) {
-        if (!currentSheetHolder.isNeedHead() || !currentSheetHolder.getExcelHeadProperty().hasHead()) {
+        if (!currentConfigurationSelector.needHead() || !currentSheetHolder.getExcelHeadProperty().hasHead()) {
             return;
         }
         int startRow = getCurrentSheet().getLastRowNum();
-        if (startRow > 0) {
+        startRow += currentConfigurationSelector.writeRelativeHeadRowIndex();
-            startRow += 4;
-        } else {
-            startRow = getCurrentSheetParam().getStartRow();
-        }
         // Combined head
         addMergedRegionToCurrentSheet(startRow);
         for (int i = startRow; i < currentSheetHolder.getExcelHeadProperty().getHeadRowNumber() + startRow; i++) {
@@ -174,8 +277,6 @@ public class WriteContextImpl implements WriteContext {
             }
             addOneRowOfHeadDataToExcel(row, i, currentSheetHolder.getExcelHeadProperty().getHeadList());
         }
-        // Initialization sheet column width
-        initSheetColumnWidth();
     }
 
     public void initTableHead() {
@@ -270,15 +371,6 @@ public class WriteContextImpl implements WriteContext {
         return this.needHead;
     }
 
-    @Override
-    public Sheet getCurrentSheet() {
-        return currentSheetHolder.getSheet();
-    }
-
-    public void setCurrentSheet(Sheet currentSheet) {
-        this.currentSheet = currentSheet;
-    }
-
     public String getCurrentSheetName() {
         return currentSheetHolder.getCurrentSheetParam();
     }
@@ -333,4 +425,20 @@ public class WriteContextImpl implements WriteContext {
     public ConverterRegistryCenter getConverterRegistryCenter() {
         return registryCenter;
     }
+
+    @Override
+    public void finish() {
+        try {
+            workbook.write(outputStream);
+            workbook.close();
+            if (outputStream != null) {
+                outputStream.close();
+            }
+            if (templateInputStream != null) {
+                templateInputStream.close();
+            }
+        } catch (IOException e) {
+            throw new ExcelGenerateException("Can not close IO", e);
+        }
+    }
 }

src/main/java/com/alibaba/excel/converters/BigDecimalConverter.java

@@ -1,33 +0,0 @@
-package com.alibaba.excel.converters;
-
-import java.math.BigDecimal;
-
-import org.apache.poi.ss.usermodel.Cell;
-
-import com.alibaba.excel.metadata.ExcelColumnProperty;
-
-public class BigDecimalConverter implements Converter {
-    @Override
-    public String getName() {
-        return "big-decimal-converter";
-    }
-
-    @Override
-    public boolean support(ExcelColumnProperty columnProperty) {
-        return BigDecimal.class.equals(columnProperty.getField().getType());
-    }
-    @Override
-    public Object convert(String value, ExcelColumnProperty columnProperty) {
-        return new BigDecimal(value);
-    }
-    @Override
-    public Cell convert(Cell cell, Object value, ExcelColumnProperty columnProperty) {
-        cell.setCellValue(Double.parseDouble(value.toString()));
-        return cell;
-    }
-    @Override
-    public boolean support(Object cellValue) {
-        return cellValue instanceof BigDecimal;
-    }
-    
-}

src/main/java/com/alibaba/excel/converters/BooleanConverter.java

@@ -1,42 +0,0 @@
-package com.alibaba.excel.converters;
-
-import java.lang.reflect.Field;
-
-import org.apache.poi.ss.usermodel.Cell;
-
-import com.alibaba.excel.metadata.ExcelColumnProperty;
-
-public class BooleanConverter implements Converter {
-    @Override
-    public String getName() {
-        return "boolean-converter";
-    }
-    @Override
-    public boolean support(ExcelColumnProperty columnProperty) {
-        Field field = columnProperty.getField();
-        return Boolean.class.equals(field.getType()) || boolean.class.equals(field.getType());
-    }
-    @Override
-    public Object convert(String value, ExcelColumnProperty columnProperty) {
-        String valueLower = value.toLowerCase();
-        if (valueLower.equals("true") || valueLower.equals("false")) {
-            return Boolean.parseBoolean(value.toLowerCase());
-        }
-        Integer integer = Integer.parseInt(value);
-        if (integer == 0) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-    @Override
-    public Cell convert(Cell cell, Object value, ExcelColumnProperty columnProperty) {
-        cell.setCellValue(String.valueOf(value));
-        return cell;
-    }
-    
-    @Override
-    public boolean support(Object cellValue) {
-        return cellValue instanceof Boolean || boolean.class.equals(cellValue.getClass());
-    }
-}

src/main/java/com/alibaba/excel/converters/Converter.java

@@ -1,13 +1,17 @@
 package com.alibaba.excel.converters;
 
-import org.apache.poi.ss.usermodel.Cell;
+import com.alibaba.excel.enums.CellDataTypeEnum;
-
+import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.ExcelColumnProperty;
+import com.sun.istack.internal.NotNull;
+
+public interface Converter<T> {
+
+    Class supportJavaTypeKey();
+
+    CellDataTypeEnum supportExcelTypeKey();
+
+    T convertToJavaData(@NotNull CellData cellData, ExcelColumnProperty columnProperty) throws Exception;
 
-public interface Converter {
+    CellData convertToExcelData(@NotNull T value, ExcelColumnProperty columnProperty) throws Exception;
-    String getName();
-    boolean support(ExcelColumnProperty columnProperty);
-    boolean support(Object cellValue);
-    Object convert(String value, ExcelColumnProperty columnProperty);
-    Cell convert(Cell cell, Object value, ExcelColumnProperty columnProperty);
 }

src/main/java/com/alibaba/excel/converters/ConverterKey.java

@@ -0,0 +1,48 @@
+package com.alibaba.excel.converters;
+
+import com.alibaba.excel.enums.CellDataTypeEnum;
+
+/**
+ * Converter unique key
+ * 
+ * @author zhuangjiaju
+ */
+public class ConverterKey {
+
+    private Class javaTypeKey;
+    private CellDataTypeEnum excelTypeKey;
+
+    public ConverterKey(Class javaTypeKey, CellDataTypeEnum excelTypeKey) {
+        if (javaTypeKey == null || excelTypeKey == null) {
+            throw new IllegalArgumentException("All parameters can not be null");
+        }
+        this.javaTypeKey = javaTypeKey;
+        this.excelTypeKey = excelTypeKey;
+    }
+
+    public static ConverterKey buildConverterKey(Class javaTypeKey, CellDataTypeEnum excelTypeKey) {
+        return new ConverterKey(javaTypeKey, excelTypeKey);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ConverterKey that = (ConverterKey)o;
+        if (javaTypeKey != null ? !javaTypeKey.equals(that.javaTypeKey) : that.javaTypeKey != null) {
+            return false;
+        }
+        return excelTypeKey == that.excelTypeKey;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = javaTypeKey != null ? javaTypeKey.hashCode() : 0;
+        result = 31 * result + (excelTypeKey != null ? excelTypeKey.hashCode() : 0);
+        return result;
+    }
+}

src/main/java/com/alibaba/excel/converters/DateConverter.java

@@ -1,55 +0,0 @@
-package com.alibaba.excel.converters;
-
-import java.util.Date;
-
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.ss.usermodel.Cell;
-
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.metadata.ExcelColumnProperty;
-import com.alibaba.excel.util.StringUtils;
-import com.alibaba.excel.util.TypeUtil;
-
-public class DateConverter implements Converter {
-    private final AnalysisContext context;
-
-    public DateConverter(AnalysisContext context) {
-        this.context = context;
-    }
-
-    @Override
-    public String getName() {
-        return "date-converter";
-    }
-    @Override
-    public boolean support(ExcelColumnProperty columnProperty) {
-        return Date.class.equals(columnProperty.getField().getType());
-    }
-
-    @Override
-    public Object convert(String value, ExcelColumnProperty columnProperty) {
-        if (value.contains("-") || value.contains("/") || value.contains(":")) {
-            return TypeUtil.getSimpleDateFormatDate(value, columnProperty.getFormat());
-        } else {
-            Double d = Double.parseDouble(value);
-            return HSSFDateUtil.getJavaDate(d, context != null ? context.use1904WindowDate() : false);
-        }
-    }
-
-    @Override
-    public Cell convert(Cell cell, Object value, ExcelColumnProperty columnProperty) {
-        Date d = (Date)value;
-        if (columnProperty != null && StringUtils.isEmpty(columnProperty.getFormat()) == false) {
-            cell.setCellValue(TypeUtil.formatDate(d, columnProperty.getFormat()));
-        } else {
-            cell.setCellValue(d);
-        }
-        
-        return cell;
-    }
-    
-    @Override
-    public boolean support(Object cellValue) {
-        return cellValue instanceof Date;
-    }
-}

src/main/java/com/alibaba/excel/converters/DoubleConverter.java

@@ -1,33 +0,0 @@
-package com.alibaba.excel.converters;
-
-import java.lang.reflect.Field;
-
-import org.apache.poi.ss.usermodel.Cell;
-
-import com.alibaba.excel.metadata.ExcelColumnProperty;
-import com.alibaba.excel.util.TypeUtil;
-
-public class DoubleConverter implements Converter {
-    @Override
-    public String getName() {
-        return "double-converter";
-    }
-    @Override
-    public boolean support(ExcelColumnProperty columnProperty) {
-        Field field = columnProperty.getField();
-        return Double.class.equals(field.getType()) || double.class.equals(field.getType());
-    }
-    @Override
-    public Object convert(String value, ExcelColumnProperty columnProperty) {
-        return TypeUtil.formatFloat(value);
-    }
-    @Override
-    public Cell convert(Cell cell, Object value, ExcelColumnProperty columnProperty) {
-        cell.setCellValue(Double.parseDouble(value.toString()));
-        return cell;
-    }
-    @Override
-    public boolean support(Object cellValue) {
-        return cellValue instanceof Double || double.class.equals(cellValue.getClass());
-    }
-}

src/main/java/com/alibaba/excel/converters/FloatConverter.java

@@ -1,31 +0,0 @@
-package com.alibaba.excel.converters;
-
-import org.apache.poi.ss.usermodel.Cell;
-
-import com.alibaba.excel.metadata.ExcelColumnProperty;
-import com.alibaba.excel.util.TypeUtil;
-
-public class FloatConverter implements Converter {
-    @Override
-    public String getName() {
-        return "float-converter";
-    }
-    @Override
-    public boolean support(ExcelColumnProperty columnProperty) {
-        return Float.class.equals(columnProperty.getField().getType());
-    }
-    @Override
-    public Object convert(String value, ExcelColumnProperty columnProperty) {
-        return TypeUtil.formatFloat(value);
-    }
-    @Override
-    public Cell convert(Cell cell, Object value, ExcelColumnProperty columnProperty) {
-        cell.setCellValue(Double.parseDouble(value.toString()));
-        return cell;
-    }
-    
-    @Override
-    public boolean support(Object cellValue) {
-        return cellValue instanceof Float || float.class.equals(cellValue.getClass());
-    }
-}

src/main/java/com/alibaba/excel/converters/IntegerConverter.java

@@ -1,33 +0,0 @@
-package com.alibaba.excel.converters;
-
-import java.lang.reflect.Field;
-
-import org.apache.poi.ss.usermodel.Cell;
-
-import com.alibaba.excel.metadata.ExcelColumnProperty;
-
-public class IntegerConverter implements Converter {
-    @Override
-    public String getName() {
-        return "integer-converter";
-    }
-    @Override
-    public boolean support(ExcelColumnProperty columnProperty) {
-        Field field = columnProperty.getField();
-        return Integer.class.equals(field.getType()) || int.class.equals(field.getType());
-    }
-    @Override
-    public Object convert(String value, ExcelColumnProperty columnProperty) {
-        return Integer.parseInt(value);
-    }
-    @Override
-    public Cell convert(Cell cell, Object value, ExcelColumnProperty columnProperty) {
-        cell.setCellValue(Double.parseDouble(value.toString()));
-        return cell;
-    }
-    
-    @Override
-    public boolean support(Object cellValue) {
-        return cellValue instanceof Integer || int.class.equals(cellValue.getClass());
-    }
-}

src/main/java/com/alibaba/excel/converters/LongConverter.java

@@ -1,33 +0,0 @@
-package com.alibaba.excel.converters;
-
-import java.lang.reflect.Field;
-
-import org.apache.poi.ss.usermodel.Cell;
-
-import com.alibaba.excel.metadata.ExcelColumnProperty;
-
-public class LongConverter implements Converter {
-    @Override
-    public String getName() {
-        return "long-converter";
-    }
-    @Override
-    public boolean support(ExcelColumnProperty columnProperty) {
-        Field field = columnProperty.getField();
-        return Long.class.equals(field.getType()) || long.class.equals(field.getType());
-    }
-    @Override
-    public Object convert(String value, ExcelColumnProperty columnProperty) {
-        return Long.parseLong(value);
-    }
-    @Override
-    public Cell convert(Cell cell, Object value, ExcelColumnProperty columnProperty) {
-        cell.setCellValue(Double.parseDouble(value.toString()));
-        return cell;
-    }
-    
-    @Override
-    public boolean support(Object cellValue) {
-        return cellValue instanceof Long || long.class.equals(cellValue.getClass());
-    }
-}

src/main/java/com/alibaba/excel/converters/StringConverter.java

@@ -1,31 +0,0 @@
-package com.alibaba.excel.converters;
-
-import org.apache.poi.ss.usermodel.Cell;
-
-import com.alibaba.excel.metadata.ExcelColumnProperty;
-import com.alibaba.excel.util.TypeUtil;
-
-public class StringConverter implements Converter {
-    @Override
-    public String getName() {
-        return "string-converter";
-    }
-    @Override
-    public boolean support(ExcelColumnProperty columnProperty) {
-        return String.class.equals(columnProperty.getField().getType());
-    }
-    @Override
-    public Object convert(String value, ExcelColumnProperty columnProperty) {
-        return TypeUtil.formatFloat(value);
-    }
-    @Override
-    public Cell convert(Cell cell, Object value, ExcelColumnProperty columnProperty) {
-        cell.setCellValue(String.valueOf(value));
-        return cell;
-    }
-    
-    @Override
-    public boolean support(Object cellValue) {
-        return cellValue instanceof String;
-    }
-}

src/main/java/com/alibaba/excel/converters/bigdecimal/BigDecimalBooleanConverter.java

@@ -0,0 +1,42 @@
+package com.alibaba.excel.converters.bigdecimal;
+
+import java.math.BigDecimal;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.ExcelColumnProperty;
+
+/**
+ * BigDecimal and boolean converter
+ *
+ * @author zhuangjiaju
+ */
+public class BigDecimalBooleanConverter implements Converter<BigDecimal> {
+
+    @Override
+    public Class supportJavaTypeKey() {
+        return BigDecimal.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.BOOLEAN;
+    }
+
+    @Override
+    public BigDecimal convertToJavaData(CellData cellData, ExcelColumnProperty columnProperty) {
+        if (cellData.getBooleanValue()) {
+            return BigDecimal.ONE;
+        }
+        return BigDecimal.ZERO;
+    }
+
+    @Override
+    public CellData convertToExcelData(BigDecimal value, ExcelColumnProperty columnProperty) {
+        if (BigDecimal.ONE.equals(value)) {
+            return new CellData(Boolean.TRUE);
+        }
+        return new CellData(Boolean.FALSE);
+    }
+}

src/main/java/com/alibaba/excel/converters/bigdecimal/BigDecimalNumberConverter.java

@@ -0,0 +1,36 @@
+package com.alibaba.excel.converters.bigdecimal;
+
+import java.math.BigDecimal;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.ExcelColumnProperty;
+
+/**
+ * BigDecimal and number converter
+ *
+ * @author zhuangjiaju
+ */
+public class BigDecimalNumberConverter implements Converter<BigDecimal> {
+
+    @Override
+    public Class supportJavaTypeKey() {
+        return BigDecimal.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.NUMBER;
+    }
+
+    @Override
+    public BigDecimal convertToJavaData(CellData cellData, ExcelColumnProperty columnProperty) {
+        return new BigDecimal(cellData.getDoubleValue());
+    }
+
+    @Override
+    public CellData convertToExcelData(BigDecimal value, ExcelColumnProperty columnProperty) {
+        return new CellData(value.doubleValue());
+    }
+}

src/main/java/com/alibaba/excel/converters/bigdecimal/BigDecimalStringConverter.java

@@ -0,0 +1,41 @@
+package com.alibaba.excel.converters.bigdecimal;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.ExcelColumnProperty;
+import com.alibaba.excel.util.StringUtils;
+
+/**
+ * BigDecimal and string converter
+ *
+ * @author zhuangjiaju
+ */
+public class BigDecimalStringConverter implements Converter<BigDecimal> {
+
+    @Override
+    public Class supportJavaTypeKey() {
+        return BigDecimal.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public BigDecimal convertToJavaData(CellData cellData, ExcelColumnProperty columnProperty) {
+        return new BigDecimal(cellData.getStringValue());
+    }
+
+    @Override
+    public CellData convertToExcelData(BigDecimal value, ExcelColumnProperty columnProperty) {
+        if (StringUtils.isEmpty(columnProperty.getFormat())) {
+            return new CellData(value.toString());
+        }
+        return new CellData(new DecimalFormat(columnProperty.getFormat()).format(value));
+    }
+}

src/main/java/com/alibaba/excel/converters/date/DateNumberConverter.java

@@ -0,0 +1,39 @@
+package com.alibaba.excel.converters.date;
+
+import java.util.Date;
+
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.ExcelColumnProperty;
+
+/**
+ * Date and number converter
+ * 
+ * @author zhuangjiaju
+ */
+public class DateNumberConverter implements Converter<Date> {
+
+    @Override
+    public Class supportJavaTypeKey() {
+        return Date.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.NUMBER;
+    }
+
+    @Override
+    public Date convertToJavaData(CellData cellData, ExcelColumnProperty columnProperty) {
+        return HSSFDateUtil.getJavaDate(cellData.getDoubleValue(), columnProperty.getUse1904windowing(),
+            columnProperty.getTimeZone());
+    }
+
+    @Override
+    public CellData convertToExcelData(Date value, ExcelColumnProperty columnProperty) {
+        return new CellData((double)(value.getTime()));
+    }
+}

src/main/java/com/alibaba/excel/converters/date/DateStringConverter.java

@@ -0,0 +1,37 @@
+package com.alibaba.excel.converters.date;
+
+import java.text.ParseException;
+import java.util.Date;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.ExcelColumnProperty;
+import com.alibaba.excel.util.DateUtils;
+
+/**
+ * Date and string converter
+ *
+ * @author zhuangjiaju
+ */
+public class DateStringConverter implements Converter<Date> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return Date.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public Date convertToJavaData(CellData cellData, ExcelColumnProperty columnProperty) throws ParseException {
+        return DateUtils.parseDate(cellData.getStringValue(), columnProperty.getFormat());
+    }
+
+    @Override
+    public CellData convertToExcelData(Date value, ExcelColumnProperty columnProperty) {
+        return new CellData(DateUtils.format(value, columnProperty.getFormat()));
+    }
+}

src/main/java/com/alibaba/excel/enums/CellDataTypeEnum.java

@@ -0,0 +1,54 @@
+package com.alibaba.excel.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.alibaba.excel.util.StringUtils;
+
+/**
+ * excel internal data type
+ *
+ * @author zhuangjiaju
+ */
+public enum CellDataTypeEnum {
+    /**
+     * string
+     */
+    STRING,
+    /**
+     * number
+     */
+    NUMBER,
+    /**
+     * boolean
+     */
+    BOOLEAN,
+    /**
+     * empty
+     */
+    EMPTY,
+    /**
+     * error
+     */
+    ERROR;
+
+    private static final Map<String, CellDataTypeEnum> TYPE_ROUTING_MAP = new HashMap<String, CellDataTypeEnum>(8);
+    static {
+        TYPE_ROUTING_MAP.put("s", STRING);
+        TYPE_ROUTING_MAP.put("e", ERROR);
+        TYPE_ROUTING_MAP.put("b", BOOLEAN);
+    }
+
+    /**
+     * Build data types
+     * 
+     * @param cellType
+     * @return
+     */
+    public static CellDataTypeEnum buildFromCellType(String cellType) {
+        if (StringUtils.isEmpty(cellType)) {
+            return EMPTY;
+        }
+        return TYPE_ROUTING_MAP.get(cellType);
+    }
+}

src/main/java/com/alibaba/excel/enums/HeadKindEnum.java

@@ -1,7 +1,7 @@
 package com.alibaba.excel.enums;
 
 /**
- * The types of head
+ * The types of header
  *
  * @author zhuangjiaju
  **/

src/main/java/com/alibaba/excel/event/EachRowAnalysisFinishEvent.java

@@ -3,6 +3,8 @@ package com.alibaba.excel.event;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.alibaba.excel.metadata.CellData;
+
 /**
  * @author jipengfei
  */
@@ -12,9 +14,9 @@ public class EachRowAnalysisFinishEvent implements AnalysisFinishEvent {
         this.result = content;
     }
 
-    public EachRowAnalysisFinishEvent(String[] content, int length) {
+    public EachRowAnalysisFinishEvent(CellData[] content, int length) {
         if (content != null) {
-            List<String> ls = new ArrayList<String>(length);
+            List<CellData> ls = new ArrayList<CellData>(length);
             for (int i = 0; i <= length; i++) {
                 ls.add(content[i]);
             }

src/main/java/com/alibaba/excel/event/ModelBuildEventListener.java

@@ -9,6 +9,7 @@ import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.exception.ExcelGenerateException;
+import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.ExcelColumnProperty;
 import com.alibaba.excel.metadata.ExcelHeadProperty;
 import com.alibaba.excel.util.TypeUtil;
@@ -29,7 +30,7 @@ public class ModelBuildEventListener extends AnalysisEventListener<Object> {
         if (context.getExcelHeadProperty() != null && context.getExcelHeadProperty().getHeadClazz() != null) {
             try {
                 @SuppressWarnings("unchecked")
-                Object resultModel = buildUserModel(context, (List<String>)object);
+                Object resultModel = buildUserModel(context, (List<CellData>)object);
                 context.setCurrentRowAnalysisResult(resultModel);
             } catch (Exception e) {
                 throw new ExcelGenerateException(e);
@@ -38,7 +39,7 @@ public class ModelBuildEventListener extends AnalysisEventListener<Object> {
     }
 
     @SuppressWarnings({"rawtypes", "unchecked"})
-    private Object buildUserModel(AnalysisContext context, List<String> stringList) throws Exception {
+    private Object buildUserModel(AnalysisContext context, List<CellData> cellDataList) throws Exception {
         ExcelHeadProperty excelHeadProperty = context.getExcelHeadProperty();
         Object resultModel = excelHeadProperty.getHeadClazz().newInstance();
         if (excelHeadProperty == null) {
@@ -58,8 +59,14 @@ public class ModelBuildEventListener extends AnalysisEventListener<Object> {
         return resultModel;
     }
 
-    private Object convertValue(String value, ExcelColumnProperty columnProperty) {
+    private Object convertValue(CellData cellData, ExcelColumnProperty columnProperty) {
+
+//        columnProperty.getField().getClass(), cellData.getType();
+
+
         for (Converter c : converters) {
+//            c.convertToJavaData(cellData,columnProperty);
+
             if (c.support(columnProperty)) {
                 return c.convert(value, columnProperty);
             }

src/main/java/com/alibaba/excel/event/NotRepeatExecutor.java

@@ -0,0 +1,16 @@
+package com.alibaba.excel.event;
+
+/**
+ * There are multiple interceptors that execute only one of them when fired once.If you want to control which one to
+ * execute please use {@link Order}
+ *
+ * @author zhuangjiaju
+ **/
+public interface NotRepeatExecutor {
+    /**
+     * To see if it's the same executor
+     * 
+     * @return
+     */
+    String uniqueValue();
+}

src/main/java/com/alibaba/excel/event/Order.java

@@ -0,0 +1,15 @@
+package com.alibaba.excel.event;
+
+/**
+ * Implement this interface when sorting
+ * 
+ * @author zhuangjiaju
+ */
+public interface Order {
+    /**
+     * The smaller the first implementation
+     *
+     * @return
+     */
+    int order();
+}

src/main/java/com/alibaba/excel/event/WriteHandler.java

@@ -1,42 +0,0 @@
-package com.alibaba.excel.event;
-
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-
-import com.alibaba.excel.write.handler.ExcelWriteHandler;
-
-/**
- *
- * @deprecated Separate implementations
- * @see com.alibaba.excel.write.handler.SheetExcelWriteHandler
- * @see com.alibaba.excel.write.handler.RowExcelWriteHandler
- * @see com.alibaba.excel.write.handler.CellExcelWriteHandler
- * @author jipengfei
- */
-public interface WriteHandler extends ExcelWriteHandler {
-
-    /**
-     * Custom operation after creating each sheet
-     *
-     * @param sheetNo
-     * @param sheet
-     */
-    void sheet(int sheetNo, Sheet sheet);
-
-    /**
-     * Custom operation after creating each row
-     *
-     * @param rowNum
-     * @param row
-     */
-    void row(int rowNum, Row row);
-
-    /**
-     * Custom operation after creating each cell
-     * 
-     * @param cellNum
-     * @param cell
-     */
-    void cell(int cellNum, Cell cell);
-}

src/main/java/com/alibaba/excel/exception/ExcelDataConvertException.java

@@ -0,0 +1,21 @@
+package com.alibaba.excel.exception;
+
+/**
+ * Data convert exception
+ * 
+ * @author zhuangjiaju
+ */
+public class ExcelDataConvertException extends RuntimeException {
+
+    public ExcelDataConvertException(String message) {
+        super(message);
+    }
+
+    public ExcelDataConvertException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ExcelDataConvertException(Throwable cause) {
+        super(cause);
+    }
+}

src/main/java/com/alibaba/excel/metadata/BaseRowModel.java

@@ -1,34 +0,0 @@
-package com.alibaba.excel.metadata;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.poi.ss.usermodel.CellStyle;
-
-/**
- * Excel基础模型
- * @author jipengfei
- */
-public class BaseRowModel {
-
-    /**
-     * 每列样式
-     */
-    private Map<Integer,CellStyle> cellStyleMap = new HashMap<Integer,CellStyle>();
-
-    public void addStyle(Integer row, CellStyle cellStyle){
-        cellStyleMap.put(row,cellStyle);
-    }
-
-    public CellStyle getStyle(Integer row){
-        return cellStyleMap.get(row);
-    }
-
-    public Map<Integer, CellStyle> getCellStyleMap() {
-        return cellStyleMap;
-    }
-
-    public void setCellStyleMap(Map<Integer, CellStyle> cellStyleMap) {
-        this.cellStyleMap = cellStyleMap;
-    }
-}

src/main/java/com/alibaba/excel/metadata/CellData.java

@@ -0,0 +1,138 @@
+package com.alibaba.excel.metadata;
+
+import com.alibaba.excel.enums.CellDataTypeEnum;
+
+/**
+ * excel internal cell data
+ *
+ * @author zhuangjiaju
+ */
+public class CellData {
+    private CellDataTypeEnum type;
+    /**
+     * {@link CellDataTypeEnum#NUMBER}
+     */
+    private Double doubleValue;
+    /**
+     * {@link CellDataTypeEnum#STRING} and{@link CellDataTypeEnum#ERROR}
+     */
+    private String stringValue;
+    /**
+     * {@link CellDataTypeEnum#BOOLEAN}
+     */
+    private Boolean booleanValue;
+
+    /**
+     * Support only when reading
+     */
+    private Boolean readIsFormula;
+    /**
+     * Support only when reading
+     */
+    private String readFormula;
+
+    public CellData(String stringValue) {
+        this(CellDataTypeEnum.STRING, stringValue);
+    }
+
+    public CellData(CellDataTypeEnum type, String stringValue) {
+        if (type != CellDataTypeEnum.STRING && type != CellDataTypeEnum.ERROR) {
+            throw new IllegalArgumentException("Only support CellDataTypeEnum.STRING and  CellDataTypeEnum.ERROR");
+        }
+        if (stringValue == null) {
+            throw new IllegalArgumentException("StringValue can not be null");
+        }
+        this.type = type;
+        this.stringValue = stringValue;
+        this.readIsFormula = Boolean.FALSE;
+    }
+
+    public CellData(Double doubleValue) {
+        if (doubleValue == null) {
+            throw new IllegalArgumentException("DoubleValue can not be null");
+        }
+        this.type = CellDataTypeEnum.NUMBER;
+        this.doubleValue = doubleValue;
+        this.readIsFormula = Boolean.FALSE;
+    }
+
+    public CellData(Boolean booleanValue) {
+        if (booleanValue == null) {
+            throw new IllegalArgumentException("BooleanValue can not be null");
+        }
+        this.type = CellDataTypeEnum.BOOLEAN;
+        this.booleanValue = booleanValue;
+        this.readIsFormula = Boolean.FALSE;
+    }
+
+    public CellData(CellDataTypeEnum type) {
+        if (type == null) {
+            throw new IllegalArgumentException("Type can not be null");
+        }
+        this.type = type;
+        this.readIsFormula = Boolean.FALSE;
+    }
+
+    public CellDataTypeEnum getType() {
+        return type;
+    }
+
+    public void setType(CellDataTypeEnum type) {
+        this.type = type;
+    }
+
+    public Double getDoubleValue() {
+        return doubleValue;
+    }
+
+    public void setDoubleValue(Double doubleValue) {
+        this.doubleValue = doubleValue;
+    }
+
+    public String getStringValue() {
+        return stringValue;
+    }
+
+    public void setStringValue(String stringValue) {
+        this.stringValue = stringValue;
+    }
+
+    public Boolean getBooleanValue() {
+        return booleanValue;
+    }
+
+    public void setBooleanValue(Boolean booleanValue) {
+        this.booleanValue = booleanValue;
+    }
+
+    public Boolean getReadIsFormula() {
+        return readIsFormula;
+    }
+
+    public void setReadIsFormula(Boolean readIsFormula) {
+        this.readIsFormula = readIsFormula;
+    }
+
+    public String getReadFormula() {
+        return readFormula;
+    }
+
+    public void setReadFormula(String readFormula) {
+        this.readFormula = readFormula;
+    }
+
+    @Override
+    public String toString() {
+        switch (type) {
+            case NUMBER:
+                return doubleValue.toString();
+            case BOOLEAN:
+                return booleanValue.toString();
+            case STRING:
+            case ERROR:
+                return stringValue;
+            default:
+                return "empty";
+        }
+    }
+}

src/main/java/com/alibaba/excel/metadata/CellStyle.java

@@ -12,11 +12,10 @@ public class CellStyle {
      * 表头背景颜色
      */
     private IndexedColors indexedColors;
-
     /**
      * 表头字体样式
      */
-    private Font simpleFont;
+    private Font font;
 
     public IndexedColors getIndexedColors() {
         return indexedColors;
@@ -26,11 +25,11 @@ public class CellStyle {
         this.indexedColors = indexedColors;
     }
 
-    public Font getSimpleFont() {
+    public Font getFont() {
-        return simpleFont;
+        return font;
     }
 
-    public void setSimpleFont(Font simpleFont) {
+    public void setFont(Font font) {
-        this.simpleFont = simpleFont;
+        this.font = font;
     }
 }

src/main/java/com/alibaba/excel/metadata/ExcelColumnProperty.java

@@ -3,6 +3,7 @@ package com.alibaba.excel.metadata;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TimeZone;
 
 /**
  * @author jipengfei
@@ -22,9 +23,30 @@ public class ExcelColumnProperty implements Comparable<ExcelColumnProperty> {
     private List<String> head = new ArrayList<String>();
 
     /**
+     *
      */
     private String format;
 
+    private Boolean use1904windowing;
+
+    private TimeZone timeZone;
+
+    public Boolean getUse1904windowing() {
+        return use1904windowing;
+    }
+
+    public void setUse1904windowing(Boolean use1904windowing) {
+        this.use1904windowing = use1904windowing;
+    }
+
+    public TimeZone getTimeZone() {
+        return timeZone;
+    }
+
+    public void setTimeZone(TimeZone timeZone) {
+        this.timeZone = timeZone;
+    }
+
     public String getFormat() {
         return format;
     }

src/main/java/com/alibaba/excel/metadata/ExcelHeadProperty.java

@@ -22,7 +22,7 @@ public class ExcelHeadProperty {
     /**
      * Custom class
      */
-    private Class<? extends BaseRowModel> headClazz;
+    private Class headClazz;
 
     /**
      * A two-dimensional array describing the header
@@ -47,7 +47,7 @@ public class ExcelHeadProperty {
      */
     private int headRowNumber;
 
-    public ExcelHeadProperty(Class<? extends BaseRowModel> headClazz, List<List<String>> head) {
+    public ExcelHeadProperty(Class headClazz, List<List<String>> head) {
         this.headClazz = headClazz;
         headList = new ArrayList<Head>();
         headKind = HeadKindEnum.NONE;
@@ -67,7 +67,7 @@ public class ExcelHeadProperty {
     }
 
     public static ExcelHeadProperty buildExcelHeadProperty(ExcelHeadProperty excelHeadProperty,
-        Class<? extends BaseRowModel> clazz, List<String> headOneRow) {
+        Class clazz, List<String> headOneRow) {
         if (excelHeadProperty == null) {
             return new ExcelHeadProperty(clazz, new ArrayList<List<String>>());
         }
@@ -80,7 +80,7 @@ public class ExcelHeadProperty {
     private void initHeadRowNumber() {
         headRowNumber = 0;
         for (Head head : headList) {
-            List<String> list = head.getHeadNames();
+            List<String> list = head.getHeadNameList();
             if (list != null && list.size() > headRowNumber) {
                 headRowNumber = list.size();
             }
@@ -156,7 +156,7 @@ public class ExcelHeadProperty {
             String rowData = row.get(i);
             // join
             if (i <= headSize) {
-                headList.get(i).getHeadNames().add(rowData);
+                headList.get(i).getHeadNameList().add(rowData);
             } else {
                 // create and join
                 headList.add(new Head(i, null, rowData));
@@ -173,11 +173,11 @@ public class ExcelHeadProperty {
         return excelColumnPropertyMap1.get(columnNum);
     }
 
-    public Class<? extends BaseRowModel> getHeadClazz() {
+    public Class getHeadClazz() {
         return headClazz;
     }
 
-    public void setHeadClazz(Class<? extends BaseRowModel> headClazz) {
+    public void setHeadClazz(Class headClazz) {
         this.headClazz = headClazz;
     }
 
@@ -225,7 +225,7 @@ public class ExcelHeadProperty {
     public List<CellRange> getCellRangeModels() {
         List<CellRange> cellRanges = new ArrayList<CellRange>();
         for (int i = 0; i < headList.size(); i++) {
-            List<String> columnValues = headList.get(i).getHeadNames();
+            List<String> columnValues = headList.get(i).getHeadNameList();
             for (int j = 0; j < columnValues.size(); j++) {
                 int lastRow = getLastRangNum(j, columnValues.get(j), columnValues);
                 int lastColumn = getLastRangNum(i, columnValues.get(j), getHeadByRowNum(j));
@@ -240,7 +240,7 @@ public class ExcelHeadProperty {
     public List<String> getHeadByRowNum(int rowNum) {
         List<String> l = new ArrayList<String>(headList.size());
         for (Head head : headList) {
-            List<String> list = head.getHeadNames();
+            List<String> list = head.getHeadNameList();
             if (list.size() > rowNum) {
                 l.add(list.get(rowNum));
             } else {

src/main/java/com/alibaba/excel/metadata/Head.java

@@ -9,25 +9,33 @@ import java.util.List;
  * @author zhuangjiaju
  **/
 public class Head {
+    /**
+     * Column index of head
+     */
     private Integer columnIndex;
+    /**
+     * It only has values when passed in {@link Sheet#setClazz(Class)} and {@link Table#setClazz(Class)}
+     */
     private String fieldName;
-    private List<String> headNames;
+    /**
+     * Head name
+     */
+    private List<String> headNameList;
 
     public Head(Integer columnIndex, String fieldName, String headName) {
         this.columnIndex = columnIndex;
         this.fieldName = fieldName;
-        List<String> headNamesTmp = new ArrayList<String>();
+        headNameList = new ArrayList<String>();
-        headNamesTmp.add(headName);
+        headNameList.add(headName);
-        this.headNames = headNamesTmp;
     }
 
-    public Head(Integer columnIndex, String fieldName, List<String> headNames) {
+    public Head(Integer columnIndex, String fieldName, List<String> headNameList) {
         this.columnIndex = columnIndex;
         this.fieldName = fieldName;
-        if (headNames == null) {
+        if (headNameList == null) {
-            headNames = new ArrayList<String>();
+            headNameList = new ArrayList<String>();
         }
-        this.headNames = headNames;
+        this.headNameList = headNameList;
     }
 
     public Integer getColumnIndex() {
@@ -46,12 +54,18 @@ public class Head {
         this.fieldName = fieldName;
     }
 
-    public List<String> getHeadNames() {
+    public List<String> getHeadNameList() {
-        return headNames;
+        return headNameList;
+    }
+
+    public void setHeadNameList(List<String> headNameList) {
+        this.headNameList = headNameList;
     }
 
-    public void setHeadNames(List<String> headNames) {
+    @Override
-        this.headNames = headNames;
+    public String toString() {
+        return "Head{" + "columnIndex=" + columnIndex + ", fieldName='" + fieldName + '\'' + ", headNameList="
+            + headNameList + '}';
     }
 
     /**
@@ -61,13 +75,13 @@ public class Head {
      * @return
      */
     public String getHeadName(int index) {
-        if (headNames == null || headNames.isEmpty()) {
+        if (headNameList == null || headNameList.isEmpty()) {
             return null;
         }
-        if (index >= headNames.size()) {
+        if (index >= headNameList.size()) {
-            return headNames.get(headNames.size() - 1);
+            return headNameList.get(headNameList.size() - 1);
         } else {
-            return headNames.get(index);
+            return headNameList.get(index);
         }
     }
 }

src/main/java/com/alibaba/excel/metadata/Sheet.java

@@ -1,99 +1,89 @@
 package com.alibaba.excel.metadata;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.poi.ss.usermodel.TableStyle;
+import com.alibaba.excel.converters.Converter;
-
+import com.alibaba.excel.write.handler.WriteHandler;
-import com.alibaba.excel.write.style.CellStyleStrategy;
-import com.alibaba.excel.write.style.column.ColumnWihtStyleStrategy;
-import com.alibaba.excel.write.style.column.ColumnWithStyleStrategy;
-import com.oracle.webservices.internal.api.databinding.DatabindingMode;
 
 /**
+ * sheet
  * 
  * @author jipengfei
  */
 public class Sheet {
-
     /**
+     * Starting from 0
      */
-    private int headLineMun;
+    private Integer sheetNo;
-
     /**
-     * Starting from 1
+     * sheet name
      */
-    private int sheetNo;
+    private String sheetName;
-
     /**
+     * Count the number of added heads when read sheet.
+     *
+     * <li>0 - This Sheet has no head ,since the first row are the data
+     * <li>1 - This Sheet has one row head , this is the default
+     * <li>2 - This Sheet has two row head ,since the third row is the data
      */
-    private String sheetName;
+    private Integer readHeadRowNumber;
 
     /**
+     * Writes the head relative to the existing contents of the sheet. Indexes are zero-based.
      */
-    private Class<? extends BaseRowModel> clazz;
+    private Integer writeRelativeHeadRowIndex;
-
     /**
+     * You can only choose one of the {@link Sheet#head} and {@link Sheet#clazz}
      */
     private List<List<String>> head;
-
     /**
-     *
+     * You can only choose one of the {@link Sheet#head} and {@link Sheet#clazz}
      */
-    @Deprecated
+    private Class clazz;
-    private TableStyle tableStyle;
-
     /**
-     * column with
+     * Custom type conversions override the default
      */
-    @Deprecated
+    private Map<Class, Converter> customConverterMap;
-    private Map<Integer,Integer> columnWidthMap = new HashMap<Integer, Integer>();
-
     /**
-     *
+     * Need Head
      */
-    private Boolean autoWidth = Boolean.FALSE;
+    private Boolean needHead;
-
     /**
-     *
+     * Custom type handler override the default
      */
-    private int startRow = 0;
+    private List<WriteHandler> customWriteHandlerList;
 
-    private CellStyleStrategy cellStyleStrategy;
+    public Integer getSheetNo() {
+        return sheetNo;
+    }
 
-    private ColumnWithStyleStrategy columnWithStyleStrategy;
+    public void setSheetNo(Integer sheetNo) {
+        this.sheetNo = sheetNo;
+    }
 
-    public ColumnWithStyleStrategy getColumnWithStyleStrategy() {
+    public String getSheetName() {
-        return columnWithStyleStrategy;
+        return sheetName;
     }
 
-    public void setColumnWithStyleStrategy(ColumnWithStyleStrategy columnWithStyleStrategy) {
+    public void setSheetName(String sheetName) {
-        this.columnWithStyleStrategy = columnWithStyleStrategy;
+        this.sheetName = sheetName;
     }
 
-    public Sheet(int sheetNo) {
+    public Integer getReadHeadRowNumber() {
-        this.sheetNo = sheetNo;
+        return readHeadRowNumber;
     }
 
-    public Sheet(int sheetNo, int headLineMun) {
+    public void setReadHeadRowNumber(Integer readHeadRowNumber) {
-        this.sheetNo = sheetNo;
+        this.readHeadRowNumber = readHeadRowNumber;
-        this.headLineMun = headLineMun;
     }
 
-    public Sheet(int sheetNo, int headLineMun, Class<? extends BaseRowModel> clazz) {
+    public Integer getWriteRelativeHeadRowIndex() {
-        this.sheetNo = sheetNo;
+        return writeRelativeHeadRowIndex;
-        this.headLineMun = headLineMun;
-        this.clazz = clazz;
     }
 
-    public Sheet(int sheetNo, int headLineMun, Class<? extends BaseRowModel> clazz, String sheetName,
+    public void setWriteRelativeHeadRowIndex(Integer writeRelativeHeadRowIndex) {
-                 List<List<String>> head) {
+        this.writeRelativeHeadRowIndex = writeRelativeHeadRowIndex;
-        this.sheetNo = sheetNo;
-        this.clazz = clazz;
-        this.headLineMun = headLineMun;
-        this.sheetName = sheetName;
-        this.head = head;
     }
 
     public List<List<String>> getHead() {
@@ -104,93 +94,40 @@ public class Sheet {
         this.head = head;
     }
 
-    public Class<? extends BaseRowModel> getClazz() {
+    public Class getClazz() {
         return clazz;
     }
 
-    public void setClazz(Class<? extends BaseRowModel> clazz) {
+    public void setClazz(Class clazz) {
         this.clazz = clazz;
-        if (headLineMun == 0) {
-            this.headLineMun = 1;
-        }
     }
 
-    public int getHeadLineMun() {
+    public Map<Class, Converter> getCustomConverterMap() {
-        return headLineMun;
+        return customConverterMap;
     }
 
-    public void setHeadLineMun(int headLineMun) {
+    public void setCustomConverterMap(Map<Class, Converter> customConverterMap) {
-        this.headLineMun = headLineMun;
+        this.customConverterMap = customConverterMap;
     }
 
-    public int getSheetNo() {
+    public Boolean getNeedHead() {
-        return sheetNo;
+        return needHead;
     }
 
-    public void setSheetNo(int sheetNo) {
+    public void setNeedHead(Boolean needHead) {
-        this.sheetNo = sheetNo;
+        this.needHead = needHead;
     }
 
-    public String getSheetName() {
+    public List<WriteHandler> getCustomWriteHandlerList() {
-        return sheetName;
+        return customWriteHandlerList;
     }
 
-    public void setSheetName(String sheetName) {
+    public void setCustomWriteHandlerList(List<WriteHandler> customWriteHandlerList) {
-        this.sheetName = sheetName;
+        this.customWriteHandlerList = customWriteHandlerList;
-    }
-
-    public TableStyle getTableStyle() {
-        return tableStyle;
-    }
-
-    public void setTableStyle(TableStyle tableStyle) {
-        this.tableStyle = tableStyle;
-    }
-
-
-
-    public Map<Integer, Integer> getColumnWidthMap() {
-        return columnWidthMap;
-    }
-
-    public void setColumnWidthMap(Map<Integer, Integer> columnWidthMap) {
-        this.columnWidthMap = columnWidthMap;
     }
 
     @Override
     public String toString() {
-        return "Sheet{" +
+        return "Sheet{" + "sheetNo=" + sheetNo + ", sheetName='" + sheetName + '\'' + '}';
-            "headLineMun=" + headLineMun +
-            ", sheetNo=" + sheetNo +
-            ", sheetName='" + sheetName + '\'' +
-            ", clazz=" + clazz +
-            ", head=" + head +
-            ", tableStyle=" + tableStyle +
-            ", columnWidthMap=" + columnWidthMap +
-            '}';
-    }
-
-    public Boolean getAutoWidth() {
-        return autoWidth;
-    }
-
-    public void setAutoWidth(Boolean autoWidth) {
-        this.autoWidth = autoWidth;
-    }
-
-    public int getStartRow() {
-        return startRow;
-    }
-
-    public void setStartRow(int startRow) {
-        this.startRow = startRow;
-    }
-
-    public CellStyleStrategy getCellStyleStrategy() {
-        return cellStyleStrategy;
-    }
-
-    public void setCellStyleStrategy(CellStyleStrategy cellStyleStrategy) {
-        this.cellStyleStrategy = cellStyleStrategy;
     }
 }

src/main/java/com/alibaba/excel/metadata/SheetHolder.java

@@ -1,104 +0,0 @@
-package com.alibaba.excel.metadata;
-
-import java.util.Map;
-
-import org.apache.poi.ss.usermodel.Sheet;
-
-import com.alibaba.excel.write.style.CellStyleStrategy;
-import com.alibaba.excel.write.style.column.ColumnWidthStyleStrategy;
-import com.alibaba.excel.write.style.row.RowHighStyleStrategy;
-
-/**
- * sheet holder
- *
- * @author zhuangjiaju
- */
-public class SheetHolder {
-    /***
-     * poi sheet
-     */
-    private Sheet sheet;
-    /***
-     * has been initialized table
-     */
-    private Map<Integer, TableHolder> hasBeenInitializedTable;
-    /**
-     * the header attribute of excel
-     */
-    private ExcelHeadProperty excelHeadProperty;
-
-    private CellStyleStrategy cellStyleStrategy;
-
-    private ColumnWidthStyleStrategy columnWidthStyleStrategy;
-    private RowHighStyleStrategy rowHighStyleStrategy;
-    /**
-     * current param
-     */
-    private com.alibaba.excel.metadata.Sheet currentSheetParam;
-
-    private boolean needHead = true;
-
-    public com.alibaba.excel.metadata.Sheet getCurrentSheetParam() {
-        return currentSheetParam;
-    }
-
-    public void setCurrentSheetParam(com.alibaba.excel.metadata.Sheet currentSheetParam) {
-        this.currentSheetParam = currentSheetParam;
-    }
-
-    public RowHighStyleStrategy getRowHighStyleStrategy() {
-        return rowHighStyleStrategy;
-    }
-
-    public void setRowHighStyleStrategy(RowHighStyleStrategy rowHighStyleStrategy) {
-        this.rowHighStyleStrategy = rowHighStyleStrategy;
-    }
-
-    public ColumnWidthStyleStrategy getColumnWidthStyleStrategy() {
-        return columnWidthStyleStrategy;
-    }
-
-    public void setColumnWidthStyleStrategy(ColumnWidthStyleStrategy columnWidthStyleStrategy) {
-        this.columnWidthStyleStrategy = columnWidthStyleStrategy;
-    }
-
-    public boolean isNeedHead() {
-        return needHead;
-    }
-
-    public void setNeedHead(boolean needHead) {
-        this.needHead = needHead;
-    }
-
-    public ExcelHeadProperty getExcelHeadProperty() {
-        return excelHeadProperty;
-    }
-
-    public void setExcelHeadProperty(ExcelHeadProperty excelHeadProperty) {
-        this.excelHeadProperty = excelHeadProperty;
-    }
-
-    public Sheet getSheet() {
-        return sheet;
-    }
-
-    public void setSheet(Sheet sheet) {
-        this.sheet = sheet;
-    }
-
-    public Map<Integer, TableHolder> getHasBeenInitializedTable() {
-        return hasBeenInitializedTable;
-    }
-
-    public void setHasBeenInitializedTable(Map<Integer, TableHolder> hasBeenInitializedTable) {
-        this.hasBeenInitializedTable = hasBeenInitializedTable;
-    }
-
-    public CellStyleStrategy getCellStyleStrategy() {
-        return cellStyleStrategy;
-    }
-
-    public void setCellStyleStrategy(CellStyleStrategy cellStyleStrategy) {
-        this.cellStyleStrategy = cellStyleStrategy;
-    }
-}

src/main/java/com/alibaba/excel/metadata/Table.java

@@ -2,57 +2,89 @@ package com.alibaba.excel.metadata;
 
 import java.util.List;
 
-import com.alibaba.excel.write.style.CellStyleStrategy;
+import com.alibaba.excel.event.Handler;
+import com.alibaba.excel.write.handler.WriteHandler;
 
 /**
+ * table
+ * 
  * @author jipengfei
  */
 public class Table {
     /**
+     * Starting from 1
      */
-    private Class<? extends BaseRowModel> clazz;
+    private Integer tableNo;
-
+    /**
+     * Writes the header relative to the existing contents of the sheet. Indexes are zero-based.
+     */
+    private Integer writeRelativeHeadRowIndex;
     /**
+     * You can only choose one of the {@link Table#head} and {@link Table#clazz}
      */
     private List<List<String>> head;
-
     /**
+     * You can only choose one of the {@link Table#head} and {@link Table#clazz}
      */
-    private int tableNo;
+    private Class clazz;
-
+    /**
+     * Need head
+     */
+    private Boolean needHead;
     /**
+     * Handle some extra logic. So far only for writing purposes {@link WriteHandler}
+     *
      */
-    @Deprecated
+    private List<Handler> handler;
-    private TableStyle tableStyle;
 
-    private CellStyleStrategy cellStyleStrategy;
+    public Table(Integer sheetNo) {
+        this(sheetNo, 0, null, null, Boolean.TRUE);
+    }
 
-    public CellStyleStrategy getCellStyleStrategy() {
+    public Table(Integer sheetNo, List<List<String>> head) {
-        return cellStyleStrategy;
+        this(sheetNo, 0, head, null, Boolean.TRUE);
     }
 
-    public void setCellStyleStrategy(CellStyleStrategy cellStyleStrategy) {
+    public Table(Integer sheetNo, Class clazz) {
-        this.cellStyleStrategy = cellStyleStrategy;
+        this(sheetNo, 0, null, clazz, Boolean.TRUE);
     }
 
-    public TableStyle getTableStyle() {
+    public Table(Integer tableNo, Integer writeRelativeHeadRowIndex, List<List<String>> head, Class clazz,
-        return tableStyle;
+        Boolean needHead) {
+        if (tableNo == null || tableNo < 1) {
+            throw new IllegalArgumentException("SheetNo must greater than 0");
+        }
+        if (writeRelativeHeadRowIndex == null || writeRelativeHeadRowIndex < 0) {
+            throw new IllegalArgumentException("WriteRelativeHeadRowIndex must greater than -1");
+        }
+        if (head != null && !head.isEmpty() && clazz != null) {
+            throw new IllegalArgumentException("Head and clazz fill in no more than one");
+        }
+        if (needHead == null) {
+            throw new IllegalArgumentException("NeedHead can not be null");
+        }
+        this.tableNo = tableNo;
+        this.writeRelativeHeadRowIndex = writeRelativeHeadRowIndex;
+        this.head = head;
+        this.clazz = clazz;
+        this.needHead = needHead;
+
     }
 
-    public void setTableStyle(TableStyle tableStyle) {
+    public Integer getTableNo() {
-        this.tableStyle = tableStyle;
+        return tableNo;
     }
 
-    public Table(Integer tableNo) {
+    public void setTableNo(Integer tableNo) {
         this.tableNo = tableNo;
     }
 
-    public Class<? extends BaseRowModel> getClazz() {
+    public Integer getWriteRelativeHeadRowIndex() {
-        return clazz;
+        return writeRelativeHeadRowIndex;
     }
 
-    public void setClazz(Class<? extends BaseRowModel> clazz) {
+    public void setWriteRelativeHeadRowIndex(Integer writeRelativeHeadRowIndex) {
-        this.clazz = clazz;
+        this.writeRelativeHeadRowIndex = writeRelativeHeadRowIndex;
     }
 
     public List<List<String>> getHead() {
@@ -63,11 +95,32 @@ public class Table {
         this.head = head;
     }
 
-    public int getTableNo() {
+    public Class getClazz() {
-        return tableNo;
+        return clazz;
     }
 
-    public void setTableNo(int tableNo) {
+    public void setClazz(Class clazz) {
-        this.tableNo = tableNo;
+        this.clazz = clazz;
+    }
+
+    public Boolean getNeedHead() {
+        return needHead;
+    }
+
+    public void setNeedHead(Boolean needHead) {
+        this.needHead = needHead;
+    }
+
+    public List<Handler> getHandler() {
+        return handler;
+    }
+
+    public void setHandler(List<Handler> handler) {
+        this.handler = handler;
+    }
+
+    @Override
+    public String toString() {
+        return "Table{" + "tableNo=" + tableNo + '}';
     }
 }

src/main/java/com/alibaba/excel/metadata/holder/ConfigurationSelector.java

@@ -0,0 +1,43 @@
+package com.alibaba.excel.metadata.holder;
+
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.write.handler.WriteHandler;
+
+/**
+ * 
+ * Get the corresponding configuration
+ * 
+ * @author zhuangjiaju
+ **/
+public interface ConfigurationSelector {
+
+    /**
+     * What handler does the currently operated cell need to execute
+     * 
+     * @return
+     */
+    List<WriteHandler> writeHandlerList();
+
+    /**
+     * What converter does the currently operated cell need to execute
+     * 
+     * @return
+     */
+    Map<Class, Converter> converterMap();
+
+    /**
+     * Whether a header is required for the currently operated cell
+     * 
+     * @return
+     */
+    boolean needHead();
+
+    /**
+     * Writes the head relative to the existing contents of the sheet. Indexes are zero-based.
+     */
+    int writeRelativeHeadRowIndex();
+
+}

src/main/java/com/alibaba/excel/metadata/holder/SheetHolder.java

@@ -0,0 +1,131 @@
+package com.alibaba.excel.metadata.holder;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.poi.ss.usermodel.Sheet;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.metadata.ExcelHeadProperty;
+import com.alibaba.excel.write.handler.WriteHandler;
+
+/**
+ * sheet holder
+ *
+ * @author zhuangjiaju
+ */
+public class SheetHolder implements ConfigurationSelector {
+    /***
+     * poi sheet
+     */
+    private Sheet sheet;
+
+    /***
+     * has been initialized table
+     */
+    private Map<Integer, TableHolder> hasBeenInitializedTable;
+    /**
+     * Need Head
+     */
+    private Boolean needHead;
+    /**
+     * Write handler for workbook
+     */
+    private List<WriteHandler> writeHandlerList;
+    /**
+     * Converter for workbook
+     */
+    private Map<Class, Converter> converterMap;
+    /**
+     * current param
+     */
+    private com.alibaba.excel.metadata.Sheet sheetParam;
+
+    /**
+     * Excel head property
+     */
+    private ExcelHeadProperty excelHeadProperty;
+    /**
+     * Writes the head relative to the existing contents of the sheet. Indexes are zero-based.
+     */
+    private Integer writeRelativeHeadRowIndex;
+
+    public Sheet getSheet() {
+        return sheet;
+    }
+
+    public void setSheet(Sheet sheet) {
+        this.sheet = sheet;
+    }
+
+    public Map<Integer, TableHolder> getHasBeenInitializedTable() {
+        return hasBeenInitializedTable;
+    }
+
+    public void setHasBeenInitializedTable(Map<Integer, TableHolder> hasBeenInitializedTable) {
+        this.hasBeenInitializedTable = hasBeenInitializedTable;
+    }
+
+    public Boolean getNeedHead() {
+        return needHead;
+    }
+
+    public void setNeedHead(Boolean needHead) {
+        this.needHead = needHead;
+    }
+
+    public List<WriteHandler> getWriteHandlerList() {
+        return writeHandlerList;
+    }
+
+    public void setWriteHandlerList(List<WriteHandler> writeHandlerList) {
+        this.writeHandlerList = writeHandlerList;
+    }
+
+    public Map<Class, Converter> getConverterMap() {
+        return converterMap;
+    }
+
+    public void setConverterMap(Map<Class, Converter> converterMap) {
+        this.converterMap = converterMap;
+    }
+
+    public com.alibaba.excel.metadata.Sheet getSheetParam() {
+        return sheetParam;
+    }
+
+    public void setSheetParam(com.alibaba.excel.metadata.Sheet sheetParam) {
+        this.sheetParam = sheetParam;
+    }
+
+    public ExcelHeadProperty getExcelHeadProperty() {
+        return excelHeadProperty;
+    }
+
+    public void setExcelHeadProperty(ExcelHeadProperty excelHeadProperty) {
+        this.excelHeadProperty = excelHeadProperty;
+    }
+
+    public Integer getWriteRelativeHeadRowIndex() {
+        return writeRelativeHeadRowIndex;
+    }
+
+    public void setWriteRelativeHeadRowIndex(Integer writeRelativeHeadRowIndex) {
+        this.writeRelativeHeadRowIndex = writeRelativeHeadRowIndex;
+    }
+
+    @Override
+    public List<WriteHandler> writeHandlerList() {
+        return getWriteHandlerList();
+    }
+
+    @Override
+    public Map<Class, Converter> converterMap() {
+        return getConverterMap();
+    }
+
+    @Override
+    public boolean needHead() {
+        return getNeedHead();
+    }
+}

src/main/java/com/alibaba/excel/metadata/holder/TableHolder.java

@@ -1,5 +1,7 @@
-package com.alibaba.excel.metadata;
+package com.alibaba.excel.metadata.holder;
 
+import com.alibaba.excel.metadata.ExcelHeadProperty;
+import com.alibaba.excel.metadata.Table;
 import com.alibaba.excel.write.style.CellStyleStrategy;
 import com.alibaba.excel.write.style.column.ColumnWidthStyleStrategy;
 import com.alibaba.excel.write.style.row.RowHighStyleStrategy;
@@ -9,7 +11,7 @@ import com.alibaba.excel.write.style.row.RowHighStyleStrategy;
  *
  * @author zhuangjiaju
  */
-public class TableHolder {
+public class TableHolder implements ConfigurationSelector{
     /***
      * poi sheet
      */

src/main/java/com/alibaba/excel/metadata/holder/WorkbookHolder.java

@@ -0,0 +1,92 @@
+package com.alibaba.excel.metadata.holder;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.poi.ss.usermodel.Workbook;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.write.handler.WriteHandler;
+
+/**
+ * Workbook holder
+ *
+ * @author zhuangjiaju
+ */
+public class WorkbookHolder implements ConfigurationSelector {
+    /***
+     * poi Workbook
+     */
+    private Workbook workbook;
+    /**
+     * Need Head
+     */
+    private Boolean needHead;
+    /**
+     * Write handler for workbook
+     */
+    private List<WriteHandler> writeHandlerList;
+    /**
+     * Converter for workbook
+     */
+    private Map<Class, Converter> converterMap;
+    /**
+     * prevent duplicate creation of sheet objects
+     */
+    private Map<Integer, SheetHolder> hasBeenInitializedSheet;
+
+    public Workbook getWorkbook() {
+        return workbook;
+    }
+
+    public void setWorkbook(Workbook workbook) {
+        this.workbook = workbook;
+    }
+
+    public Boolean getNeedHead() {
+        return needHead;
+    }
+
+    public void setNeedHead(Boolean needHead) {
+        this.needHead = needHead;
+    }
+
+    public List<WriteHandler> getWriteHandlerList() {
+        return writeHandlerList;
+    }
+
+    public void setWriteHandlerList(List<WriteHandler> writeHandlerList) {
+        this.writeHandlerList = writeHandlerList;
+    }
+
+    public Map<Class, Converter> getConverterMap() {
+        return converterMap;
+    }
+
+    public void setConverterMap(Map<Class, Converter> converterMap) {
+        this.converterMap = converterMap;
+    }
+
+    public Map<Integer, SheetHolder> getHasBeenInitializedSheet() {
+        return hasBeenInitializedSheet;
+    }
+
+    public void setHasBeenInitializedSheet(Map<Integer, SheetHolder> hasBeenInitializedSheet) {
+        this.hasBeenInitializedSheet = hasBeenInitializedSheet;
+    }
+
+    @Override
+    public List<WriteHandler> writeHandlerList() {
+        return getWriteHandlerList();
+    }
+
+    @Override
+    public Map<Class, Converter> converterMap() {
+        return getConverterMap();
+    }
+
+    @Override
+    public boolean needHead() {
+        return getNeedHead();
+    }
+}

src/main/java/com/alibaba/excel/util/BooleanUtils.java

@@ -0,0 +1,29 @@
+package com.alibaba.excel.util;
+
+/**
+ * boolean util
+ * 
+ * @author zhuangjiaju
+ */
+public class BooleanUtils {
+
+    private static final String TRUE_NUMBER = "1";
+    private static final String FALSE_NUMBER = "0";
+
+    /**
+     * String to boolean
+     *
+     * <li>
+     *
+     * @param str
+     * @return
+     */
+    public static Boolean valueOf(String str) {
+        if (TRUE_NUMBER.equals(str)) {
+            return Boolean.TRUE;
+        } else {
+            return Boolean.FALSE;
+        }
+    }
+
+}

src/main/java/com/alibaba/excel/util/DateUtils.java

@@ -0,0 +1,101 @@
+package com.alibaba.excel.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.alibaba.excel.exception.ExcelDataConvertException;
+
+/**
+ * Date utils
+ *
+ * @author zhuangjiaju
+ **/
+public class DateUtils {
+    public static final String DATE_FORMAT_14 = "yyyyMMddHHmmss";
+    public static final String DATE_FORMAT_17 = "yyyyMMdd HH:mm:ss";
+    public static final String DATE_FORMAT_19 = "yyyy-MM-dd HH:mm:ss";
+    public static final String DATE_FORMAT_19_FORWARD_SLASH = "yyyy/MM/dd HH:mm:ss";
+    private static final String MINUS = "-";
+
+    private DateUtils() {}
+
+    /**
+     * convert string to date
+     * 
+     * @param dateString
+     * @param dateFormat
+     * @return
+     * @throws ParseException
+     */
+    public static Date parseDate(String dateString, String dateFormat) throws ParseException {
+        if (StringUtils.isEmpty(dateFormat)) {
+            dateFormat = switchDateFormat(dateString);
+        }
+        return new SimpleDateFormat(dateFormat).parse(dateString);
+    }
+
+    /**
+     * convert string to date
+     *
+     * @param dateString
+     * @return
+     * @throws ParseException
+     */
+    public static Date parseDate(String dateString) throws ParseException {
+        return parseDate(switchDateFormat(dateString), null);
+    }
+
+    /**
+     * switch date format
+     *
+     * @param dateString
+     * @return
+     */
+    private static String switchDateFormat(String dateString) {
+        int length = dateString.length();
+        switch (length) {
+            case 19:
+                if (dateString.contains(MINUS)) {
+                    return DATE_FORMAT_19;
+                } else {
+                    return DATE_FORMAT_19_FORWARD_SLASH;
+                }
+            case 17:
+                return DATE_FORMAT_17;
+            case 14:
+                return DATE_FORMAT_14;
+            default:
+                throw new ExcelDataConvertException("can not find date format for：" + dateString);
+        }
+    }
+
+    /**
+     * Format date
+     * <p>
+     * yyyy-MM-dd HH:mm:ss
+     * 
+     * @param date
+     * @return
+     */
+    public static String format(Date date) {
+        return format(date, null);
+    }
+
+    /**
+     * Format date
+     * 
+     * @param date
+     * @param dateFormat
+     * @return
+     */
+    public static String format(Date date, String dateFormat) {
+        if (date == null) {
+            return "";
+        }
+        if (StringUtils.isEmpty(dateFormat)) {
+            dateFormat = DATE_FORMAT_19;
+        }
+        return new SimpleDateFormat(dateFormat).format(date);
+    }
+}

src/main/java/com/alibaba/excel/util/StyleUtil.java

@@ -1,14 +1,11 @@
 package com.alibaba.excel.util;
 
-import java.util.Map;
-
 import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.FillPatternType;
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.apache.poi.ss.usermodel.Workbook;
 
@@ -17,22 +14,6 @@ import org.apache.poi.ss.usermodel.Workbook;
  */
 public class StyleUtil {
 
-    public static void defaultCellStyle(Workbook workbook, CellStyle newCellStyle) {
-        Font font = workbook.createFont();
-        font.setFontName("宋体");
-        font.setFontHeightInPoints((short)14);
-        font.setBold(true);
-        newCellStyle.setFont(font);
-        newCellStyle.setWrapText(true);
-        newCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
-        newCellStyle.setAlignment(HorizontalAlignment.CENTER);
-        newCellStyle.setLocked(true);
-        newCellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        newCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
-        newCellStyle.setBorderBottom(BorderStyle.THIN);
-        newCellStyle.setBorderLeft(BorderStyle.THIN);
-    }
-
     /**
      *
      * @param workbook
@@ -63,9 +44,34 @@ public class StyleUtil {
      * @param indexedColors
      * @return
      */
-    public static CellStyle buildCellStyle(Workbook workbook, com.alibaba.excel.metadata.Font f,
+    public static CellStyle buildHeadCellStyle(Workbook workbook, com.alibaba.excel.metadata.Font f,
+        IndexedColors indexedColors) {
+        CellStyle cellStyle = workbook.createCellStyle();
+        return buildCellStyle(workbook, cellStyle, f, indexedColors);
+    }
+
+    /**
+     *
+     * @param workbook
+     * @param f
+     * @param indexedColors
+     * @return
+     */
+    public static CellStyle buildContentCellStyle(Workbook workbook, com.alibaba.excel.metadata.Font f,
         IndexedColors indexedColors) {
         CellStyle cellStyle = buildDefaultCellStyle(workbook);
+        return buildCellStyle(workbook, cellStyle, f, indexedColors);
+    }
+
+    /**
+     *
+     * @param workbook
+     * @param f
+     * @param indexedColors
+     * @return
+     */
+    private static CellStyle buildCellStyle(Workbook workbook, CellStyle cellStyle, com.alibaba.excel.metadata.Font f,
+        IndexedColors indexedColors) {
         if (f != null) {
             Font font = workbook.createFont();
             font.setFontName(f.getFontName());
@@ -78,24 +84,4 @@ public class StyleUtil {
         }
         return cellStyle;
     }
-
-    /**
-     * Convert {@link com.alibaba.excel.metadata.CellStyle} to {@link CellStyle}
-     * 
-     * @param workbook
-     * @param cellStyle
-     * @return
-     */
-    public static CellStyle buildCellStyle(Workbook workbook, com.alibaba.excel.metadata.CellStyle cellStyle) {
-        return buildCellStyle(workbook, cellStyle.getSimpleFont(), cellStyle.getIndexedColors());
-    }
-
-    public static Sheet buildSheetStyle(Sheet currentSheet, Map<Integer, Integer> sheetWidthMap) {
-        currentSheet.setDefaultColumnWidth(20);
-        for (Map.Entry<Integer, Integer> entry : sheetWidthMap.entrySet()) {
-            currentSheet.setColumnWidth(entry.getKey(), entry.getValue());
-        }
-        return currentSheet;
-    }
-
 }

src/main/java/com/alibaba/excel/util/TypeUtil.java

@@ -1,145 +0,0 @@
-package com.alibaba.excel.util;
-
-import java.lang.reflect.Field;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.alibaba.excel.converters.Converter;
-import com.alibaba.excel.metadata.ExcelColumnProperty;
-import com.alibaba.excel.metadata.ExcelHeadProperty;
-
-/**
- * @author jipengfei
- */
-public class TypeUtil {
-
-    private static List<String> DATE_FORMAT_LIST = new ArrayList<String>(4);
-
-    static {
-        DATE_FORMAT_LIST.add("yyyy/MM/dd HH:mm:ss");
-        DATE_FORMAT_LIST.add("yyyy-MM-dd HH:mm:ss");
-        DATE_FORMAT_LIST.add("yyyyMMdd HH:mm:ss");
-    }
-
-    public static Boolean isNum(Field field) {
-        if (field == null) {
-            return false;
-        }
-        if (Integer.class.equals(field.getType()) || int.class.equals(field.getType())) {
-            return true;
-        }
-        if (Double.class.equals(field.getType()) || double.class.equals(field.getType())) {
-            return true;
-        }
-
-        if (Long.class.equals(field.getType()) || long.class.equals(field.getType())) {
-            return true;
-        }
-
-        if (BigDecimal.class.equals(field.getType())) {
-            return true;
-        }
-        return false;
-    }
-
-    public static Boolean isNum(Object cellValue) {
-        if (cellValue instanceof Integer || cellValue instanceof Double || cellValue instanceof Short
-                        || cellValue instanceof Long || cellValue instanceof Float || cellValue instanceof BigDecimal) {
-            return true;
-        }
-        return false;
-    }
-
-    public static String getDefaultDateString(Date date) {
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        return simpleDateFormat.format(date);
-
-    }
-
-    public static Date getSimpleDateFormatDate(String value, String format) {
-        if (!StringUtils.isEmpty(value)) {
-            Date date = null;
-            if (!StringUtils.isEmpty(format)) {
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
-                try {
-                    date = simpleDateFormat.parse(value);
-                    return date;
-                } catch (ParseException e) {
-                }
-            }
-            for (String dateFormat : DATE_FORMAT_LIST) {
-                try {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormat);
-                    date = simpleDateFormat.parse(value);
-                } catch (ParseException e) {
-                }
-                if (date != null) {
-                    break;
-                }
-            }
-
-            return date;
-
-        }
-        return null;
-
-    }
-
-
-    public static String formatFloat(String value) {
-        if (null != value && value.contains(".")) {
-            if (isNumeric(value)) {
-                try {
-                    BigDecimal decimal = new BigDecimal(value);
-                    BigDecimal setScale = decimal.setScale(10, RoundingMode.HALF_DOWN).stripTrailingZeros();
-                    return setScale.toPlainString();
-                } catch (Exception e) {
-                }
-            }
-        }
-        return value;
-    }
-
-    public static String formatFloat0(String value, int n) {
-        if (null != value && value.contains(".")) {
-            if (isNumeric(value)) {
-                try {
-                    BigDecimal decimal = new BigDecimal(value);
-                    BigDecimal setScale = decimal.setScale(n, RoundingMode.HALF_DOWN);
-                    return setScale.toPlainString();
-                } catch (Exception e) {
-                }
-            }
-        }
-        return value;
-    }
-
-    public static final Pattern pattern = Pattern.compile("[\\+\\-]?[\\d]+([\\.][\\d]*)?([Ee][+-]?[\\d]+)?$");
-
-    private static boolean isNumeric(String str) {
-        Matcher isNum = pattern.matcher(str);
-        if (!isNum.matches()) {
-            return false;
-        }
-        return true;
-    }
-
-    public static String formatDate(Date cellValue, String format) {
-        SimpleDateFormat simpleDateFormat;
-        if (!StringUtils.isEmpty(format)) {
-            simpleDateFormat = new SimpleDateFormat(format);
-        } else {
-            simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        }
-        return simpleDateFormat.format(cellValue);
-    }
-}

src/main/java/com/alibaba/excel/util/WorkBookUtil.java

@@ -30,22 +30,6 @@ public class WorkBookUtil {
         return workbook;
     }
 
-    public static Sheet createOrGetSheet(Workbook workbook, com.alibaba.excel.metadata.Sheet sheet) {
-        Sheet sheet1 = null;
-        try {
-            try {
-                sheet1 = workbook.getSheetAt(sheet.getSheetNo()-1);
-            } catch (Exception e) {
-            }
-            if (null == sheet1) {
-                sheet1 = createSheet(workbook, sheet);
-                buildSheetStyle(sheet1,sheet.getColumnWidthMap());
-            }
-        } catch (Exception e) {
-            throw new RuntimeException("constructCurrentSheet error", e);
-        }
-        return sheet1;
-    }
 
     public static Sheet createSheet(Workbook workbook, com.alibaba.excel.metadata.Sheet sheet) {
         return workbook.createSheet(sheet.getSheetName() != null ? sheet.getSheetName() : sheet.getSheetNo() + "");

src/main/java/com/alibaba/excel/write/ExcelBuilder.java

@@ -1,24 +1,15 @@
 package com.alibaba.excel.write;
 
+import java.util.List;
+
 import com.alibaba.excel.metadata.Sheet;
 import com.alibaba.excel.metadata.Table;
-import com.alibaba.excel.write.merge.MergeStrategy;
-
-import java.util.List;
 
 /**
  * @author jipengfei
  */
 public interface ExcelBuilder {
 
-    /**
-     * workBook increase value
-     *
-     * @param data     java basic type or java model extend BaseModel
-     * @param startRow Start row number
-     */
-    void addContent(List data, int startRow);
-
     /**
      * WorkBook increase value
      *
@@ -39,9 +30,13 @@ public interface ExcelBuilder {
     /**
      * Creates new cell range. Indexes are zero-based.
      *
-     * @param strategies the merge strategy
+     * @param firstRow Index of first row
+     * @param lastRow  Index of last row (inclusive), must be equal to or larger than {@code firstRow}
+     * @param firstCol Index of first column
+     * @param lastCol  Index of last column (inclusive), must be equal to or larger than {@code firstCol}
      */
-    void merge(List<MergeStrategy> strategies);
+    @Deprecated
+    void merge(int firstRow, int lastRow, int firstCol, int lastCol);
 
     /**
      * Close io

src/main/java/com/alibaba/excel/write/ExcelBuilderImpl.java

@@ -1,10 +1,9 @@
 package com.alibaba.excel.write;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
@@ -14,10 +13,8 @@ import org.apache.poi.ss.util.CellRangeAddress;
 import com.alibaba.excel.context.WriteContext;
 import com.alibaba.excel.context.WriteContextImpl;
 import com.alibaba.excel.converters.Converter;
-import com.alibaba.excel.converters.ConverterRegistryCenter;
-import com.alibaba.excel.event.WriteHandler;
-import com.alibaba.excel.exception.ExcelGenerateException;
 import com.alibaba.excel.metadata.BaseRowModel;
+import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.metadata.ExcelColumnProperty;
 import com.alibaba.excel.metadata.Sheet;
 import com.alibaba.excel.metadata.Table;
@@ -25,37 +22,26 @@ import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.excel.util.CollectionUtils;
 import com.alibaba.excel.util.POITempFile;
 import com.alibaba.excel.util.WorkBookUtil;
-import com.alibaba.excel.write.merge.MergeStrategy;
+import com.alibaba.excel.write.handler.WriteHandler;
 
 import net.sf.cglib.beans.BeanMap;
 
 /**
  * @author jipengfei
  */
-public class ExcelBuilderImpl implements ExcelBuilder, ConverterRegistryCenter {
+public class ExcelBuilderImpl implements ExcelBuilder {
-
 
     private WriteContext context;
-    private final List<Converter> converters = new ArrayList<Converter>();
+
-
+    public ExcelBuilderImpl(InputStream templateInputStream, OutputStream out, ExcelTypeEnum excelType,
-    public ExcelBuilderImpl(InputStream templateInputStream,
+        boolean needHead, Map<Class, Converter> customConverterMap, List<WriteHandler> customWriteHandlerList) {
-                            OutputStream out,
+        // 初始化时候创建临时缓存目录，用于规避POI在并发写bug
-                            ExcelTypeEnum excelType,
+        POITempFile.createPOIFilesDirectory();
-                            boolean needHead, WriteHandler writeHandler, List<Converter> converters) {
+        context = new WriteContextImpl(templateInputStream, out, excelType, needHead, customConverterMap,
-        try {
+            customWriteHandlerList);
-            //初始化时候创建临时缓存目录，用于规避POI在并发写bug
-            POITempFile.createPOIFilesDirectory();
-            if (converters != null) {
-                converters.addAll(converters);
-            }
-            context = new WriteContextImpl(templateInputStream, out, excelType, needHead, writeHandler, this);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
     }
 
-    @Override
+    private void doAddContent(List data, int startRow) {
-    public void addContent(List data, int startRow) {
         if (CollectionUtils.isEmpty(data)) {
             return;
         }
@@ -80,35 +66,25 @@ public class ExcelBuilderImpl implements ExcelBuilder, ConverterRegistryCenter {
     @Override
     public void addContent(List data, Sheet sheetParam) {
         context.currentSheet(sheetParam);
-        addContent(data, sheetParam.getStartRow());
+        doAddContent(data, sheetParam.getWriteRelativeHeadRowIndex());
     }
 
     @Override
     public void addContent(List data, Sheet sheetParam, Table table) {
         context.currentSheet(sheetParam);
         context.currentTable(table);
-        addContent(data, sheetParam.getStartRow());
+        doAddContent(data, sheetParam.getWriteRelativeHeadRowIndex());
     }
 
-
     @Override
-    public void merge(List<MergeStrategy> strategies)  {
+    public void finish() {
-        if (strategies != null) {
+        context.finish();
-            for (MergeStrategy ms : strategies) {
-                CellRangeAddress cra = new CellRangeAddress(ms.getFirstRow(), ms.getLastRow(), ms.getFirstCol(), ms.getLastCol());
-                context.getCurrentSheet().addMergedRegion(cra);
-            }
-        }
     }
 
     @Override
-    public void finish() {
+    public void merge(int firstRow, int lastRow, int firstCol, int lastCol) {
-        try {
+        CellRangeAddress cra = new CellRangeAddress(firstRow, lastRow, firstCol, lastCol);
-            context.getWorkbook().write(context.getOutputStream());
+        context.getCurrentSheet().addMergedRegion(cra);
-            context.getWorkbook().close();
-        } catch (IOException e) {
-            throw new ExcelGenerateException("IO error", e);
-        }
     }
 
     private void addBasicTypeToExcel(List<Object> oneRowData, Row row) {
@@ -130,11 +106,13 @@ public class ExcelBuilderImpl implements ExcelBuilder, ConverterRegistryCenter {
         BeanMap beanMap = BeanMap.create(oneRowData);
         for (ExcelColumnProperty excelHeadProperty : context.getExcelHeadProperty().getColumnPropertyList()) {
             BaseRowModel baseRowModel = (BaseRowModel)oneRowData;
-            CellStyle cellStyle = baseRowModel.getStyle(i) != null ? baseRowModel.getStyle(i)
+            CellStyle cellStyle =
-                            : context.getCurrentContentStyle();
+                baseRowModel.getStyle(i) != null ? baseRowModel.getStyle(i) : context.getCurrentContentStyle();
             Object value = beanMap.get(excelHeadProperty.getField().getName());
+            // excelHeadProperty.getField().getType();
+
             Cell cell = WorkBookUtil.createCell(row, i, cellStyle);
-            cell = convertValue(cell, value, excelHeadProperty);
+            cell.setCL cell = convertValue(cell, value, excelHeadProperty);
             if (null != context.getWriteHandler()) {
                 context.getWriteHandler().cell(i, cell);
             }
@@ -145,6 +123,8 @@ public class ExcelBuilderImpl implements ExcelBuilder, ConverterRegistryCenter {
     private Cell convertValue(Cell cell, Object value, ExcelColumnProperty excelHeadProperty) {
         if (!CollectionUtils.isEmpty(this.converters)) {
             for (Converter c : this.converters) {
+              CellData c.convertToExcelData(excelHeadProperty);
+
                 if (value != null && c.support(value)) {
                     return c.convert(cell, value, excelHeadProperty);
                 }
@@ -165,13 +145,4 @@ public class ExcelBuilderImpl implements ExcelBuilder, ConverterRegistryCenter {
         }
     }
 
-    @Override
-    public void register(Converter converter) {
-        this.converters.add(converter);
-    }
-
-    @Override
-    public List<Converter> getConverters() {
-        return this.converters;
-    }
 }

src/main/java/com/alibaba/excel/write/ExcelWriterBuilder.java

@@ -1,30 +0,0 @@
-package com.alibaba.excel.write;
-
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.converters.Converter;
-import com.alibaba.excel.support.ExcelTypeEnum;
-
-public class ExcelWriterBuilder {
-    /**
-     * Excel type
-     */
-    private ExcelTypeEnum excelType;
-
-    /**
-     * Final output stream
-     */
-    private OutputStream outputStream;
-
-    /**
-     *
-     */
-    private List<Converter> customConverter = new ArrayList<Converter>();
-
-    public ExcelWriter build() {
-        new ExcelBuilderImpl(templateInputStream, outputStream, typeEnum, needHead, writeHandler, converters);
-    }
-}

src/main/java/com/alibaba/excel/write/builder/ExcelWriterBuilder.java

@@ -0,0 +1,120 @@
+package com.alibaba.excel.write.builder;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.excel.write.handler.WriteHandler;
+
+/**
+ * Build ExcelBuilder
+ * 
+ * @author zhuangjiaju
+ */
+public class ExcelWriterBuilder {
+    /**
+     * Excel type
+     */
+    private ExcelTypeEnum excelType;
+    /**
+     * Final output stream
+     */
+    private OutputStream outputStream;
+    /**
+     * Template input stream
+     */
+    private InputStream templateInputStream;
+    /**
+     * Custom type conversions override the default
+     */
+    private Map<Class, Converter> customConverterMap = new HashMap<Class, Converter>();
+    /**
+     * Need Head
+     */
+    private Boolean needHead;
+    /**
+     * Custom type handler override the default
+     */
+    private List<WriteHandler> customWriteHandlerList = new ArrayList<WriteHandler>();
+
+    public ExcelWriterBuilder excelType(ExcelTypeEnum excelType) {
+        this.excelType = excelType;
+        return this;
+    }
+
+    public ExcelWriterBuilder outputFile(OutputStream outputStream) {
+        this.outputStream = outputStream;
+        return this;
+    }
+
+    public ExcelWriterBuilder outputFile(File outputFile) throws FileNotFoundException {
+        return outputFile(new FileOutputStream(outputFile));
+    }
+
+    public ExcelWriterBuilder outputFile(String outputPathName) throws FileNotFoundException {
+        return outputFile(new File(outputPathName));
+    }
+
+    public ExcelWriterBuilder outputFile(URI outputUri) throws FileNotFoundException {
+        return outputFile(new File(outputUri));
+    }
+
+    public ExcelWriterBuilder withTemplate(InputStream templateInputStream) {
+        this.templateInputStream = templateInputStream;
+        return this;
+    }
+
+    public ExcelWriterBuilder withTemplate(File templateFile) throws FileNotFoundException {
+        return withTemplate(new FileInputStream(templateFile));
+    }
+
+    public ExcelWriterBuilder withTemplate(String templatePathName) throws FileNotFoundException {
+        return withTemplate(new File(templatePathName));
+    }
+
+    public ExcelWriterBuilder withTemplate(URI templateUri) throws FileNotFoundException {
+        return withTemplate(new File(templateUri));
+    }
+
+    /**
+     * Custom type conversions override the default.
+     * 
+     * @param converter
+     * @return
+     */
+    public ExcelWriterBuilder registerConverter(Converter converter) {
+        this.customConverterMap.put(converter.supportJavaTypeKey(), converter);
+        return this;
+    }
+
+    /**
+     * Default required header
+     * 
+     * @return
+     */
+    public ExcelWriterBuilder doNotNeedHead() {
+        this.needHead = Boolean.FALSE;
+        return this;
+    }
+
+    public ExcelWriterBuilder registerWriteHandler(WriteHandler excelWriteHandler) {
+        this.customWriteHandlerList.add(excelWriteHandler);
+        return this;
+    }
+
+    public ExcelWriter build() {
+        return new ExcelWriter(templateInputStream, outputStream, excelType, needHead, customConverterMap,
+            customWriteHandlerList);
+    }
+}

src/main/java/com/alibaba/excel/write/handler/CellWriteHandler.java

@@ -4,8 +4,8 @@ import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 
 import com.alibaba.excel.metadata.Head;
-import com.alibaba.excel.metadata.SheetHolder;
+import com.alibaba.excel.metadata.holder.SheetHolder;
-import com.alibaba.excel.metadata.TableHolder;
+import com.alibaba.excel.metadata.holder.TableHolder;
 import com.sun.istack.internal.Nullable;
 
 /**
@@ -13,7 +13,7 @@ import com.sun.istack.internal.Nullable;
  * 
  * @author zhuangjiaju
  */
-public interface CellExcelWriteHandler extends ExcelWriteHandler {
+public interface CellWriteHandler extends WriteHandler {
 
     /**
      * called before create the cell

src/main/java/com/alibaba/excel/write/handler/RowWriteHandler.java

@@ -2,8 +2,8 @@ package com.alibaba.excel.write.handler;
 
 import org.apache.poi.ss.usermodel.Row;
 
-import com.alibaba.excel.metadata.SheetHolder;
+import com.alibaba.excel.metadata.holder.SheetHolder;
-import com.alibaba.excel.metadata.TableHolder;
+import com.alibaba.excel.metadata.holder.TableHolder;
 import com.sun.istack.internal.Nullable;
 
 /**
@@ -11,7 +11,7 @@ import com.sun.istack.internal.Nullable;
  * 
  * @author zhuangjiaju
  */
-public interface RowExcelWriteHandler extends ExcelWriteHandler {
+public interface RowWriteHandler extends WriteHandler {
 
     /**
      * called before create the row

src/main/java/com/alibaba/excel/write/handler/SheetWriteHandler.java

@@ -2,14 +2,14 @@ package com.alibaba.excel.write.handler;
 
 import org.apache.poi.ss.usermodel.Workbook;
 
-import com.alibaba.excel.metadata.SheetHolder;
+import com.alibaba.excel.metadata.holder.SheetHolder;
 
 /**
  * intercepts handle sheet creation
  * 
  * @author zhuangjiaju
  */
-public interface SheetExcelWriteHandler extends ExcelWriteHandler {
+public interface SheetWriteHandler extends WriteHandler {
 
     /**
      * called before create the sheet

src/main/java/com/alibaba/excel/write/handler/WorkbookWriteHandler.java

@@ -0,0 +1,25 @@
+package com.alibaba.excel.write.handler;
+
+import org.apache.poi.ss.usermodel.Workbook;
+
+/**
+ * intercepts handle Workbook creation
+ * 
+ * @author zhuangjiaju
+ */
+public interface WorkbookWriteHandler extends WriteHandler {
+
+    /**
+     * called before create the sheet
+     * 
+     * @param writeContext
+     */
+    void beforeWorkbookCreate();
+
+    /**
+     * called after the sheet is created
+     *
+     * @param writeContext
+     */
+    void afterWorkbookCreate(Workbook workbook);
+}

src/main/java/com/alibaba/excel/write/handler/WriteHandler.java

@@ -7,4 +7,4 @@ import com.alibaba.excel.event.Handler;
  * 
  * @author zhuangjiaju
  */
-public interface ExcelWriteHandler extends Handler {}
+public interface WriteHandler extends Handler {}

src/main/java/com/alibaba/excel/write/merge/AbstractMergeStrategy.java

@@ -5,11 +5,11 @@ import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 
 import com.alibaba.excel.metadata.Head;
-import com.alibaba.excel.metadata.SheetHolder;
+import com.alibaba.excel.metadata.holder.SheetHolder;
-import com.alibaba.excel.metadata.TableHolder;
+import com.alibaba.excel.metadata.holder.TableHolder;
-import com.alibaba.excel.write.handler.CellExcelWriteHandler;
+import com.alibaba.excel.write.handler.CellWriteHandler;
 
-public abstract class AbstractMergeStrategy implements CellExcelWriteHandler {
+public abstract class AbstractMergeStrategy implements CellWriteHandler {
 
     @Override
     public void beforeCellCreate(SheetHolder sheetHolder, TableHolder tableHolder, Row row, Head head,

src/main/java/com/alibaba/excel/write/style/AbstractCellStyleStrategy.java

@@ -4,18 +4,25 @@ import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Workbook;
 
+import com.alibaba.excel.event.NotRepeatExecutor;
 import com.alibaba.excel.metadata.Head;
-import com.alibaba.excel.metadata.SheetHolder;
+import com.alibaba.excel.metadata.holder.SheetHolder;
-import com.alibaba.excel.metadata.TableHolder;
+import com.alibaba.excel.metadata.holder.TableHolder;
-import com.alibaba.excel.write.handler.CellExcelWriteHandler;
+import com.alibaba.excel.write.handler.CellWriteHandler;
-import com.alibaba.excel.write.handler.WookbookExcelWriteHandler;
+import com.alibaba.excel.write.handler.WorkbookWriteHandler;
 
-public abstract class AbstractCellStyleStrategy implements CellExcelWriteHandler, WookbookExcelWriteHandler {
+public abstract class AbstractCellStyleStrategy
+    implements CellWriteHandler, WorkbookWriteHandler, NotRepeatExecutor {
     @Override
-    public void beforeWookbookCreate() {}
+    public String uniqueValue() {
+        return "CellStyleStrategy";
+    }
+
+    @Override
+    public void beforeWorkbookCreate() {}
 
     @Override
-    public void afterWookbookCreate(Workbook workbook) {
+    public void afterWorkbookCreate(Workbook workbook) {
         initCellStyle(workbook);
     }
 

src/main/java/com/alibaba/excel/write/style/AbstractColumnCellStyleStrategy.java

@@ -11,9 +11,12 @@ import com.alibaba.excel.metadata.Head;
 import com.alibaba.excel.util.StyleUtil;
 
 /**
- * Head of style shareholders and content of style loop
+ *
+ * Use the same style for the column
+ *
+ * @author zhuangjiaju
  */
-public abstract class AbstractVerticalCellStyleStrategy extends AbstractCellStyleStrategy {
+public abstract class AbstractColumnCellStyleStrategy extends AbstractCellStyleStrategy {
 
     private Workbook workbook;
     private Map<Integer, CellStyle> headCellStyleCache = new HashMap<Integer, CellStyle>();
@@ -47,7 +50,7 @@ public abstract class AbstractVerticalCellStyleStrategy extends AbstractCellStyl
     }
 
     /**
-     * Returns the column width corresponding to each column header
+     * Returns the column width corresponding to each column head
      *
      * @param head
      * @return
@@ -55,7 +58,7 @@ public abstract class AbstractVerticalCellStyleStrategy extends AbstractCellStyl
     protected abstract com.alibaba.excel.metadata.CellStyle headCellStyle(Head head);
 
     /**
-     * Returns the column width corresponding to each column header
+     * Returns the column width corresponding to each column head
      *
      * @param head
      * @return

src/main/java/com/alibaba/excel/write/style/RowCellStyleStrategy.java

@@ -10,7 +10,13 @@ import com.alibaba.excel.metadata.CellStyle;
 import com.alibaba.excel.metadata.Head;
 import com.alibaba.excel.util.StyleUtil;
 
-public class HorizontalCellStyleStrategy extends AbstractCellStyleStrategy {
+/**
+ *
+ * Use the same style for the row
+ *
+ * @author zhuangjiaju
+ */
+public class RowCellStyleStrategy extends AbstractCellStyleStrategy {
 
     private CellStyle headCellStyle;
     private List<CellStyle> contentCellStyleList;
@@ -18,18 +24,12 @@ public class HorizontalCellStyleStrategy extends AbstractCellStyleStrategy {
     private org.apache.poi.ss.usermodel.CellStyle poiHeadCellStyle;
     private List<org.apache.poi.ss.usermodel.CellStyle> poiContentCellStyleList;
 
-    public HorizontalCellStyleStrategy(CellStyle headCellStyle, List<CellStyle> contentCellStyleList) {
+    public RowCellStyleStrategy(CellStyle headCellStyle, List<CellStyle> contentCellStyleList) {
-        if (headCellStyle == null || contentCellStyleList == null || contentCellStyleList.isEmpty()) {
-            throw new IllegalArgumentException("All parameters can not be null");
-        }
         this.headCellStyle = headCellStyle;
         this.contentCellStyleList = contentCellStyleList;
     }
 
-    public HorizontalCellStyleStrategy(CellStyle headCellStyle, CellStyle contentCellStyle) {
+    public RowCellStyleStrategy(CellStyle headCellStyle, CellStyle contentCellStyle) {
-        if (headCellStyle == null || contentCellStyle == null) {
-            throw new IllegalArgumentException("All parameters can not be null");
-        }
         this.headCellStyle = headCellStyle;
         contentCellStyleList = new ArrayList<CellStyle>();
         contentCellStyleList.add(contentCellStyle);
@@ -37,20 +37,30 @@ public class HorizontalCellStyleStrategy extends AbstractCellStyleStrategy {
 
     @Override
     protected void initCellStyle(Workbook workbook) {
-        poiHeadCellStyle = StyleUtil.buildCellStyle(workbook, headCellStyle);
+        if (headCellStyle != null) {
-        poiContentCellStyleList = new ArrayList<org.apache.poi.ss.usermodel.CellStyle>();
+            poiHeadCellStyle = StyleUtil.buildCellStyle(workbook, headCellStyle);
-        for (CellStyle cellStyle : contentCellStyleList) {
+        }
-            poiContentCellStyleList.add(StyleUtil.buildCellStyle(workbook, cellStyle));
+        if (contentCellStyleList != null && !contentCellStyleList.isEmpty()) {
+            poiContentCellStyleList = new ArrayList<org.apache.poi.ss.usermodel.CellStyle>();
+            for (CellStyle cellStyle : contentCellStyleList) {
+                poiContentCellStyleList.add(StyleUtil.buildCellStyle(workbook, cellStyle));
+            }
         }
     }
 
     @Override
     protected void setHeadCellStyle(Cell cell, Head head, int relativeRowIndex) {
+        if (poiHeadCellStyle == null) {
+            return;
+        }
         cell.setCellStyle(poiHeadCellStyle);
     }
 
     @Override
     protected void setContentCellStyle(Cell cell, Head head, int relativeRowIndex) {
+        if (poiContentCellStyleList == null || poiContentCellStyleList.isEmpty()) {
+            return;
+        }
         cell.setCellStyle(poiContentCellStyleList.get(relativeRowIndex % poiContentCellStyleList.size()));
     }
 

src/main/java/com/alibaba/excel/write/style/column/AbstractColumnWidthStyleStrategy.java

@@ -4,17 +4,23 @@ import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 
+import com.alibaba.excel.event.NotRepeatExecutor;
 import com.alibaba.excel.metadata.Head;
-import com.alibaba.excel.metadata.SheetHolder;
+import com.alibaba.excel.metadata.holder.SheetHolder;
-import com.alibaba.excel.metadata.TableHolder;
+import com.alibaba.excel.metadata.holder.TableHolder;
-import com.alibaba.excel.write.handler.CellExcelWriteHandler;
+import com.alibaba.excel.write.handler.CellWriteHandler;
 
 /**
  * Column width style strategy
  * 
  * @author zhuangjiaju
  */
-public abstract class AbstractColumnWidthStyleStrategy implements CellExcelWriteHandler {
+public abstract class AbstractColumnWidthStyleStrategy implements CellWriteHandler, NotRepeatExecutor {
+
+    @Override
+    public String uniqueValue() {
+        return "ColumnWidthStyleStrategy";
+    }
 
     @Override
     public void beforeCellCreate(SheetHolder sheetHolder, TableHolder tableHolder, Row row, Head head,

src/main/java/com/alibaba/excel/write/style/column/AbstractHeadColumnWidthStyleStrategy.java

@@ -17,7 +17,7 @@ public abstract class AbstractHeadColumnWidthStyleStrategy extends AbstractColum
     }
 
     /**
-     * Returns the column width corresponding to each column header
+     * Returns the column width corresponding to each column head
      * 
      * @param head
      * @return

src/main/java/com/alibaba/excel/write/style/row/AbstractRowHighStyleStrategy.java

@@ -2,11 +2,17 @@ package com.alibaba.excel.write.style.row;
 
 import org.apache.poi.ss.usermodel.Row;
 
-import com.alibaba.excel.metadata.SheetHolder;
+import com.alibaba.excel.event.NotRepeatExecutor;
-import com.alibaba.excel.metadata.TableHolder;
+import com.alibaba.excel.metadata.holder.SheetHolder;
-import com.alibaba.excel.write.handler.RowExcelWriteHandler;
+import com.alibaba.excel.metadata.holder.TableHolder;
+import com.alibaba.excel.write.handler.RowWriteHandler;
 
-public abstract class AbstractRowHighStyleStrategy implements RowExcelWriteHandler {
+public abstract class AbstractRowHighStyleStrategy implements RowWriteHandler, NotRepeatExecutor {
+
+    @Override
+    public String uniqueValue() {
+        return "RowHighStyleStrategy";
+    }
 
     @Override
     public void beforeRowCreate(SheetHolder sheetHolder, TableHolder tableHolder, int rowIndex, int relativeRowIndex,

src/test/resources/logback.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <property name="LOG_PATTERN"
+              value="%d{yyyy-MM-dd HH:mm:ss.SSS} %level [%thread] %class:%line - %msg%n"/>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+        </filter>
+    </appender>
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>