修复读取excel可能异常的bug

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

@@ -1,13 +1,6 @@
 package com.alibaba.excel.analysis.v07.handlers;
 
-import java.math.BigDecimal;
-
 import com.alibaba.excel.context.xlsx.XlsxReadContext;
-import com.alibaba.excel.enums.CellDataTypeEnum;
-import com.alibaba.excel.metadata.data.ReadCellData;
-import com.alibaba.excel.read.metadata.holder.xlsx.XlsxReadSheetHolder;
-import com.alibaba.excel.util.BooleanUtils;
-import com.alibaba.excel.util.StringUtils;
 
 /**
  * Cell Value Handler
@@ -16,67 +9,9 @@ import com.alibaba.excel.util.StringUtils;
  */
 public abstract class AbstractCellValueTagHandler extends AbstractXlsxTagHandler {
 
-    @Override
-    public void endElement(XlsxReadContext xlsxReadContext, String name) {
-        XlsxReadSheetHolder xlsxReadSheetHolder = xlsxReadContext.xlsxReadSheetHolder();
-        ReadCellData<?> tempCellData = xlsxReadSheetHolder.getTempCellData();
-        StringBuilder tempData = xlsxReadSheetHolder.getTempData();
-        String tempDataString = tempData.toString();
-        CellDataTypeEnum oldType = tempCellData.getType();
-        switch (oldType) {
-            case DIRECT_STRING:
-            case STRING:
-            case ERROR:
-                tempCellData.setStringValue(tempData.toString());
-                break;
-            case BOOLEAN:
-                if (StringUtils.isEmpty(tempDataString)) {
-                    tempCellData.setType(CellDataTypeEnum.EMPTY);
-                    break;
-                }
-                tempCellData.setBooleanValue(BooleanUtils.valueOf(tempData.toString()));
-                break;
-            case NUMBER:
-            case EMPTY:
-                if (StringUtils.isEmpty(tempDataString)) {
-                    tempCellData.setType(CellDataTypeEnum.EMPTY);
-                    break;
-                }
-                // fix https://github.com/alibaba/easyexcel/issues/1595
-                if (StringUtils.isNumeric(tempDataString)) {
-                    tempCellData.setType(CellDataTypeEnum.NUMBER);
-                    tempCellData.setNumberValue(BigDecimal.valueOf(Double.parseDouble(tempDataString)));
-                } else {
-                    tempCellData.setType(CellDataTypeEnum.STRING);
-                    tempCellData.setStringValue(tempData.toString());
-                }
-                break;
-            default:
-                throw new IllegalStateException("Cannot set values now");
-        }
-
-        // set string value
-        setStringValue(xlsxReadContext);
-
-        if (tempCellData.getStringValue() != null
-            && xlsxReadContext.currentReadHolder().globalConfiguration().getAutoTrim()) {
-            tempCellData.setStringValue(tempCellData.getStringValue().trim());
-        }
-
-        tempCellData.checkEmpty();
-        xlsxReadSheetHolder.getCellMap().put(xlsxReadSheetHolder.getColumnIndex(), tempCellData);
-    }
-
     @Override
     public void characters(XlsxReadContext xlsxReadContext, char[] ch, int start, int length) {
         xlsxReadContext.xlsxReadSheetHolder().getTempData().append(ch, start, length);
     }
 
-    /**
-     * Set string value.
-     *
-     * @param xlsxReadContext
-     */
-    protected abstract void setStringValue(XlsxReadContext xlsxReadContext);
-
 }

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

@@ -1,10 +1,5 @@
 package com.alibaba.excel.analysis.v07.handlers;
 
-import com.alibaba.excel.context.xlsx.XlsxReadContext;
-import com.alibaba.excel.metadata.data.CellData;
-
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-
 /**
  * Cell inline string value handler
  *
@@ -12,12 +7,4 @@ import org.apache.poi.xssf.usermodel.XSSFRichTextString;
  */
 public class CellInlineStringValueTagHandler extends AbstractCellValueTagHandler {
 
-    @Override
-    protected void setStringValue(XlsxReadContext xlsxReadContext) {
-        // This is a special form of string
-        CellData<?> tempCellData = xlsxReadContext.xlsxReadSheetHolder().getTempCellData();
-        XSSFRichTextString richTextString = new XSSFRichTextString(tempCellData.getStringValue());
-        tempCellData.setStringValue(richTextString.toString());
-    }
-
 }

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

@@ -1,5 +1,7 @@
 package com.alibaba.excel.analysis.v07.handlers;
 
+import java.math.BigDecimal;
+
 import com.alibaba.excel.constant.BuiltinFormats;
 import com.alibaba.excel.constant.ExcelXmlConstants;
 import com.alibaba.excel.context.xlsx.XlsxReadContext;
@@ -7,6 +9,7 @@ import com.alibaba.excel.enums.CellDataTypeEnum;
 import com.alibaba.excel.metadata.data.DataFormatData;
 import com.alibaba.excel.metadata.data.ReadCellData;
 import com.alibaba.excel.read.metadata.holder.xlsx.XlsxReadSheetHolder;
+import com.alibaba.excel.util.BooleanUtils;
 import com.alibaba.excel.util.PositionUtils;
 import com.alibaba.excel.util.StringUtils;
 
@@ -31,7 +34,7 @@ public class CellTagHandler extends AbstractXlsxTagHandler {
 
         // t="s" ,it means String
         // t="str" ,it means String,but does not need to be read in the 'sharedStrings.xml'
-        // t="inlineStr" ,it means String
+        // t="inlineStr" ,it means String,but does not need to be read in the 'sharedStrings.xml'
         // t="b" ,it means Boolean
         // t="e" ,it means Error
         // t="n" ,it means Number
@@ -61,4 +64,54 @@ public class CellTagHandler extends AbstractXlsxTagHandler {
         xlsxReadSheetHolder.getTempCellData().setDataFormatData(dataFormatData);
     }
 
+    @Override
+    public void endElement(XlsxReadContext xlsxReadContext, String name) {
+        XlsxReadSheetHolder xlsxReadSheetHolder = xlsxReadContext.xlsxReadSheetHolder();
+        ReadCellData<?> tempCellData = xlsxReadSheetHolder.getTempCellData();
+        StringBuilder tempData = xlsxReadSheetHolder.getTempData();
+        String tempDataString = tempData.toString();
+        CellDataTypeEnum oldType = tempCellData.getType();
+        switch (oldType) {
+            case STRING:
+                // In some cases, although cell type is a string, it may be an empty tag
+                if (StringUtils.isEmpty(tempCellData.getStringValue())) {
+                    break;
+                }
+                String stringValue = xlsxReadContext.readWorkbookHolder().getReadCache()
+                    .get(Integer.valueOf(tempCellData.getStringValue()));
+                tempCellData.setStringValue(stringValue);
+                break;
+            case DIRECT_STRING:
+            case ERROR:
+                tempCellData.setStringValue(tempData.toString());
+                tempCellData.setType(CellDataTypeEnum.STRING);
+                break;
+            case BOOLEAN:
+                if (StringUtils.isEmpty(tempDataString)) {
+                    tempCellData.setType(CellDataTypeEnum.EMPTY);
+                    break;
+                }
+                tempCellData.setBooleanValue(BooleanUtils.valueOf(tempData.toString()));
+                break;
+            case NUMBER:
+            case EMPTY:
+                if (StringUtils.isEmpty(tempDataString)) {
+                    tempCellData.setType(CellDataTypeEnum.EMPTY);
+                    break;
+                }
+                tempCellData.setType(CellDataTypeEnum.NUMBER);
+                tempCellData.setNumberValue(BigDecimal.valueOf(Double.parseDouble(tempDataString)));
+                break;
+            default:
+                throw new IllegalStateException("Cannot set values now");
+        }
+
+        if (tempCellData.getStringValue() != null
+            && xlsxReadContext.currentReadHolder().globalConfiguration().getAutoTrim()) {
+            tempCellData.setStringValue(tempCellData.getStringValue().trim());
+        }
+
+        tempCellData.checkEmpty();
+        xlsxReadSheetHolder.getCellMap().put(xlsxReadSheetHolder.getColumnIndex(), tempCellData);
+    }
 }

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

@@ -1,10 +1,5 @@
 package com.alibaba.excel.analysis.v07.handlers;
 
-import com.alibaba.excel.context.xlsx.XlsxReadContext;
-import com.alibaba.excel.enums.CellDataTypeEnum;
-import com.alibaba.excel.metadata.data.CellData;
-import com.alibaba.excel.util.StringUtils;
-
 /**
  * Cell Value Handler
  *
@@ -12,28 +7,4 @@ import com.alibaba.excel.util.StringUtils;
  */
 public class CellValueTagHandler extends AbstractCellValueTagHandler {
 
-    @Override
-    protected void setStringValue(XlsxReadContext xlsxReadContext) {
-        // Have to go "sharedStrings.xml" and get it
-        CellData tempCellData = xlsxReadContext.xlsxReadSheetHolder().getTempCellData();
-        switch (tempCellData.getType()) {
-            case STRING:
-                // In some cases, although cell type is a string, it may be an empty tag
-                if(StringUtils.isEmpty(tempCellData.getStringValue())){
-                    break;
-                }
-                String stringValue = xlsxReadContext.readWorkbookHolder().getReadCache()
-                    .get(Integer.valueOf(tempCellData.getStringValue()));
-                if (stringValue != null && xlsxReadContext.currentReadHolder().globalConfiguration().getAutoTrim()) {
-                    stringValue = stringValue.trim();
-                }
-                tempCellData.setStringValue(stringValue);
-                break;
-            case DIRECT_STRING:
-                tempCellData.setType(CellDataTypeEnum.STRING);
-                break;
-            default:
-        }
-    }
-
 }

src/main/java/com/alibaba/excel/analysis/v07/handlers/sax/XlsxRowHandler.java

@@ -3,10 +3,6 @@ package com.alibaba.excel.analysis.v07.handlers.sax;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
 import com.alibaba.excel.analysis.v07.handlers.CellFormulaTagHandler;
 import com.alibaba.excel.analysis.v07.handlers.CellInlineStringValueTagHandler;
 import com.alibaba.excel.analysis.v07.handlers.CellTagHandler;
@@ -19,9 +15,15 @@ import com.alibaba.excel.analysis.v07.handlers.XlsxTagHandler;
 import com.alibaba.excel.constant.ExcelXmlConstants;
 import com.alibaba.excel.context.xlsx.XlsxReadContext;
 
+import lombok.extern.slf4j.Slf4j;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
 /**
  * @author jipengfei
  */
+@Slf4j
 public class XlsxRowHandler extends DefaultHandler {
     private XlsxReadContext xlsxReadContext;
     private static final Map<String, XlsxTagHandler> XLSX_CELL_HANDLER_MAP = new HashMap<String, XlsxTagHandler>(32);

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

@@ -51,7 +51,7 @@ public enum CellDataTypeEnum {
     static {
         TYPE_ROUTING_MAP.put("s", STRING);
         TYPE_ROUTING_MAP.put("str", DIRECT_STRING);
-        TYPE_ROUTING_MAP.put("inlineStr", STRING);
+        TYPE_ROUTING_MAP.put("inlineStr", DIRECT_STRING);
         TYPE_ROUTING_MAP.put("e", ERROR);
         TYPE_ROUTING_MAP.put("b", BOOLEAN);
         TYPE_ROUTING_MAP.put("n", NUMBER);

src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java

@@ -36,7 +36,7 @@ public class Lock2Test {
     public void test() throws Exception {
         File file = TestFileUtil.readUserHomeFile("test/test4.xlsx");
 
-        List<Object> list = EasyExcel.read("/Users/zhuangjiaju/Downloads/olay的副本.xlsx").sheet(0).doReadSync();
+        List<Object> list = EasyExcel.read("/Users/zhuangjiaju/Downloads/olay (1).xlsx").sheet(0).doReadSync();
         LOGGER.info("数据：{}", list.size());
         for (Object data : list) {
             LOGGER.info("返回数据：{}", CollectionUtils.size(data));

src/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java

@@ -12,9 +12,11 @@ import com.alibaba.easyexcel.test.temp.data.HeadType;
 import com.alibaba.easyexcel.test.util.TestFileUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.write.merge.OnceAbsoluteMergeStrategy;
 import com.alibaba.excel.write.metadata.WriteSheet;
 
+import lombok.Data;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -86,12 +88,15 @@ public class WriteV33Test {
     @Test
     public void indexWrite() {
         String fileName = TestFileUtil.getPath() + "indexWrite" + System.currentTimeMillis() + ".xlsx";
-        // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
+
-        EasyExcel.write(fileName, IndexData.class)
+        Man man = new Man();
-            .excludeColumnIndexes(Collections.singleton(0))
+        man.setAddr("武汉");
-            .sheet("模板")
+        man.setName("张三");
-            .excludeColumnIndexes(Collections.singleton(1))
+        ExcelWriter excelWriter = EasyExcel.write(fileName, Humen.class).build();
-            .doWrite(indexData());
+        WriteSheet writeSheet = EasyExcel.writerSheet("test").build();
+        excelWriter.write(Collections.singletonList(man), writeSheet);
+        // 千万别忘记finish 会帮忙关闭流
+        excelWriter.finish();
     }
 
     private List<IndexData> indexData() {
@@ -105,4 +110,18 @@ public class WriteV33Test {
         }
         return list;
     }
+
+    @Data
+    static  class Humen{
+        @ExcelProperty("名字")
+        private String name;
+    }
+
+    @Data
+    static
+    class Man extends Humen{
+        @ExcelProperty("地址")
+        private String addr;
+    }
+
 }