fix #1595

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

@@ -57,7 +57,10 @@ public void endElement(XlsxReadContext xlsxReadContext, String name) {
             tempCellData.setStringValue(tempCellData.getStringValue());
         }
 
-        tempCellData.checkEmpty();
+        if (name.equals("c")){
+            tempCellData.checkEmpty();
+        }
+
         xlsxReadSheetHolder.getCellMap().put(xlsxReadSheetHolder.getColumnIndex(), tempCellData);
     }
 

src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java

@@ -43,12 +43,12 @@ public class ReadTest {
     public void simpleRead() {
         // 有个很重要的点 DemoDataListener 不能被spring管理，要每次读取excel都要new,然后里面用到spring可以构造方法传进去
         // 写法1：
-        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
+        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "OLAY.xlsx";
         // 这里 需要指定读用哪个class去读，然后读取第一个sheet 文件流会自动关闭
         EasyExcel.read(fileName, DemoData.class, new DemoDataListener()).sheet().doRead();
 
         // 写法2：
-        fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
+        fileName = TestFileUtil.getPath() + "demo" + File.separator + "OLAY.xlsx";
         ExcelReader excelReader = null;
         try {
             excelReader = EasyExcel.read(fileName, DemoData.class, new DemoDataListener()).build();
@@ -74,7 +74,7 @@ public void simpleRead() {
      */
     @Test
     public void indexOrNameRead() {
-        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
+        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "OLAY.xlsx";
         // 这里默认读取第一个sheet
         EasyExcel.read(fileName, IndexOrNameData.class, new IndexOrNameDataListener()).sheet().doRead();
     }
@@ -90,13 +90,13 @@ public void indexOrNameRead() {
      */
     @Test
     public void repeatedRead() {
-        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
+        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "OLAY.xlsx";
         // 读取全部sheet
         // 这里需要注意 DemoDataListener的doAfterAllAnalysed 会在每个sheet读取完毕后调用一次。然后所有sheet都会往同一个DemoDataListener里面写
         EasyExcel.read(fileName, DemoData.class, new DemoDataListener()).doReadAll();
 
         // 读取部分sheet
-        fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
+        fileName = TestFileUtil.getPath() + "demo" + File.separator + "OLAY.xlsx";
         ExcelReader excelReader = null;
         try {
             excelReader = EasyExcel.read(fileName).build();
@@ -129,7 +129,7 @@ public void repeatedRead() {
      */
     @Test
     public void converterRead() {
-        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
+        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "OLAY.xlsx";
         // 这里 需要指定读用哪个class去读，然后读取第一个sheet
         EasyExcel.read(fileName, ConverterData.class, new ConverterDataListener())
             // 这里注意 我们也可以registerConverter来指定自定义转换器， 但是这个转换变成全局了， 所有java为string,excel为string的都会用这个转换器。
@@ -152,7 +152,7 @@ public void converterRead() {
      */
     @Test
     public void complexHeaderRead() {
-        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
+        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "OLAY.xlsx";
         // 这里 需要指定读用哪个class去读，然后读取第一个sheet
         EasyExcel.read(fileName, DemoData.class, new DemoDataListener()).sheet()
             // 这里可以设置1，因为头就是一行。如果多行头，可以设置其他值。不传入也可以，因为默认会根据DemoData 来解析，他没有指定头，也就是默认1行
@@ -171,7 +171,7 @@ public void complexHeaderRead() {
      */
     @Test
     public void headerRead() {
-        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
+        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "OLAY.xlsx";
         // 这里 需要指定读用哪个class去读，然后读取第一个sheet
         EasyExcel.read(fileName, DemoData.class, new DemoHeadDataListener()).sheet().doRead();
     }
@@ -234,7 +234,7 @@ public void cellDataRead() {
      */
     @Test
     public void exceptionRead() {
-        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
+        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "OLAY.xlsx";
         // 这里 需要指定读用哪个class去读，然后读取第一个sheet
         EasyExcel.read(fileName, ExceptionDemoData.class, new DemoExceptionListener()).sheet().doRead();
     }
@@ -244,7 +244,7 @@ public void exceptionRead() {
      */
     @Test
     public void synchronousRead() {
-        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
+        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "OLAY.xlsx";
         // 这里 需要指定读用哪个class去读，然后读取第一个sheet 同步读取会自动finish
         List<DemoData> list = EasyExcel.read(fileName).head(DemoData.class).sheet().doReadSync();
         for (DemoData data : list) {
@@ -264,7 +264,7 @@ public void synchronousRead() {
      */
     @Test
     public void noModelRead() {
-        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
+        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "OLAY.xlsx";
         // 这里 只要，然后读取第一个sheet 同步读取会自动finish
         EasyExcel.read(fileName, new NoModelDataListener()).sheet().doRead();
     }

src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java

@@ -270,7 +270,7 @@ public void imageWrite() throws Exception {
      */
     @Test
     public void templateWrite() {
-        String templateFileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
+        String templateFileName = TestFileUtil.getPath() + "demo" + File.separator + "OLAY.xlsx";
         String fileName = TestFileUtil.getPath() + "templateWrite" + System.currentTimeMillis() + ".xlsx";
         // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
         EasyExcel.write(fileName, DemoData.class).withTemplate(templateFileName).sheet().doWrite(data());

src/test/java/com/alibaba/easyexcel/test/temp/issue1595/OLAYDAO.java

@@ -0,0 +1,14 @@
+package com.alibaba.easyexcel.test.temp.issue1595;
+
+import java.util.List;
+
+/**
+ * 假设这个是你的DAO存储。当然还要这个类让spring管理，当然你不用需要存储，也不需要这个类。
+ *
+ * @author Jiaju Zhuang
+ **/
+public class OLAYDAO {
+
+    public void save(List<OLAYData> list) {
+    }
+}

src/test/java/com/alibaba/easyexcel/test/temp/issue1595/OLAYData.java

@@ -0,0 +1,17 @@
+package com.alibaba.easyexcel.test.temp.issue1595;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 基础数据类.这里的排序和excel里面的排序一致
+ *
+ * @author Jiaju Zhuang
+ **/
+@Data
+public class OLAYData {
+    private String string;
+    private Date date;
+    private Double doubleData;
+}

src/test/java/com/alibaba/easyexcel/test/temp/issue1595/OLAYDataListener.java

@@ -0,0 +1,83 @@
+package com.alibaba.easyexcel.test.temp.issue1595;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSON;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 模板的读取类
+ *
+ * @author Jiaju Zhuang
+ */
+// 有个很重要的点 DemoDataListener 不能被spring管理，要每次读取excel都要new,然后里面用到spring可以构造方法传进去
+public class OLAYDataListener extends AnalysisEventListener<OLAYData> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(OLAYDataListener.class);
+    /**
+     * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+     */
+    private static final int BATCH_COUNT = 5;
+    List<OLAYData> list = new ArrayList<OLAYData>();
+    /**
+     * 假设这个是一个DAO，当然有业务逻辑这个也可以是一个service。当然如果不用存储这个对象没用。
+     */
+    private OLAYDAO OLAYDAO;
+
+    public OLAYDataListener() {
+        // 这里是demo，所以随便new一个。实际使用如果到了spring,请使用下面的有参构造函数
+        OLAYDAO = new OLAYDAO();
+    }
+
+    /**
+     * 如果使用了spring,请使用这个构造方法。每次创建Listener的时候需要把spring管理的类传进来
+     *
+     * @param OLAYDAO
+     */
+    public OLAYDataListener(OLAYDAO OLAYDAO) {
+        this.OLAYDAO = OLAYDAO;
+    }
+
+    /**
+     * 这个每一条数据解析都会来调用
+     *
+     * @param data
+     *            one row value. Is is same as {@link AnalysisContext#readRowHolder()}
+     * @param context
+     */
+    @Override
+    public void invoke(OLAYData data, AnalysisContext context) {
+        LOGGER.info("解析到一条数据:{}", JSON.toJSONString(data));
+        list.add(data);
+        // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
+        if (list.size() >= BATCH_COUNT) {
+            saveData();
+            // 存储完成清理 list
+            list.clear();
+        }
+    }
+
+    /**
+     * 所有数据解析完成了 都会来调用
+     *
+     * @param context
+     */
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+        // 这里也要保存数据，确保最后遗留的数据也存储到数据库
+        saveData();
+        LOGGER.info("所有数据解析完成！");
+    }
+
+    /**
+     * 加上存储数据库
+     */
+    private void saveData() {
+        LOGGER.info("{}条数据，开始存储数据库！", list.size());
+        OLAYDAO.save(list);
+        LOGGER.info("存储数据库成功！");
+    }
+}

src/test/java/com/alibaba/easyexcel/test/temp/issue1595/ReadOLAY.java

@@ -0,0 +1,38 @@
+package com.alibaba.easyexcel.test.temp.issue1595;
+
+import com.alibaba.easyexcel.test.util.TestFileUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelReader;
+import com.alibaba.excel.read.metadata.ReadSheet;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+
+/**
+ * 读的常见写法
+ *
+ * @author Jiaju Zhuang
+ */
+@Ignore
+public class ReadOLAY {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ReadOLAY.class);
+
+    @Test
+    public void simpleRead() {
+        String fileName = TestFileUtil.getPath() + "issue1595" + File.separator + "OLAY.xlsx";
+        ExcelReader excelReader = null;
+        try {
+            excelReader = EasyExcel.read(fileName, OLAYData.class, new OLAYDataListener()).build();
+            ReadSheet readSheet = EasyExcel.readSheet(0).build();
+            excelReader.read(readSheet);
+        } finally {
+            if (excelReader != null) {
+                excelReader.finish();
+            }
+        }
+    }
+}

src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiFormatTest.java

@@ -40,7 +40,7 @@ public void lastRowNum() throws IOException {
 
     @Test
     public void lastRowNumXSSF() throws IOException {
-        String file = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
+        String file = TestFileUtil.getPath() + "demo" + File.separator + "OLAY.xlsx";
         XSSFWorkbook xssfWorkbook = new XSSFWorkbook(file);
         LOGGER.info("一共:{}个sheet", xssfWorkbook.getNumberOfSheets());
         XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(0);

src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java

@@ -37,7 +37,7 @@ public class PoiTest {
 
     @Test
     public void lastRowNum() throws IOException {
-        String file = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
+        String file = TestFileUtil.getPath() + "demo" + File.separator + "OLAY.xlsx";
         SXSSFWorkbook xssfWorkbook = new SXSSFWorkbook(new XSSFWorkbook(file));
         SXSSFSheet xssfSheet = xssfWorkbook.getSheetAt(0);
         LOGGER.info("一共行数:{}", xssfSheet.getLastRowNum());
@@ -49,7 +49,7 @@ public void lastRowNum() throws IOException {
 
     @Test
     public void lastRowNumXSSF() throws IOException {
-        String file = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
+        String file = TestFileUtil.getPath() + "demo" + File.separator + "OLAY.xlsx";
         XSSFWorkbook xssfWorkbook = new XSSFWorkbook(file);
         LOGGER.info("一共:{}个sheet", xssfWorkbook.getNumberOfSheets());
         XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(0);