xls 默认不读取隐藏行

unknown
1 parent 6e8fabfa
Showing 5 changed files with 35 additions and 14 deletions Show diff stats
bin/.gitignore
src/main/java/com/taover/easyexcel/analysis/v03/XlsSaxAnalyser.java
src/main/java/com/taover/easyexcel/analysis/v03/handlers/AbstractXlsRecordHandler.java
src/test/java/com/taover/easyexcel/test/demo/read/ReadTest.java
src/test/resources/demo/demo.xls
+/com/
 /converter/
 /dataformat/
 /demo/
@@ -8,4 +9,3 @@
 /multiplesheets/
 /simple/
 /template/
-/com/
 package com.taover.easyexcel.analysis.v03;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -11,11 +12,11 @@ import org.apache.poi.hssf.eventusermodel.HSSFEventFactory;
 import org.apache.poi.hssf.eventusermodel.HSSFListener;
 import org.apache.poi.hssf.eventusermodel.HSSFRequest;
 import org.apache.poi.hssf.eventusermodel.MissingRecordAwareHSSFListener;
-import org.apache.poi.hssf.eventusermodel.dummyrecord.LastCellOfRowDummyRecord;
 import org.apache.poi.hssf.record.BOFRecord;
 import org.apache.poi.hssf.record.BlankRecord;
 import org.apache.poi.hssf.record.BoolErrRecord;
 import org.apache.poi.hssf.record.BoundSheetRecord;
+import org.apache.poi.hssf.record.CellRecord;
 import org.apache.poi.hssf.record.EOFRecord;
 import org.apache.poi.hssf.record.FormulaRecord;
 import org.apache.poi.hssf.record.HyperlinkRecord;
@@ -28,6 +29,7 @@ import org.apache.poi.hssf.record.NumberRecord;
 import org.apache.poi.hssf.record.ObjRecord;
 import org.apache.poi.hssf.record.RKRecord;
 import org.apache.poi.hssf.record.Record;
+import org.apache.poi.hssf.record.RowRecord;
 import org.apache.poi.hssf.record.SSTRecord;
 import org.apache.poi.hssf.record.StringRecord;
 import org.apache.poi.hssf.record.TextObjectRecord;
@@ -80,7 +82,8 @@ public class XlsSaxAnalyser implements HSSFListener, ExcelReadExecutor {
     private static final short DUMMY_RECORD_SID = -1;
     private XlsReadContext xlsReadContext;
     private static final Map<Short, XlsRecordHandler> XLS_RECORD_HANDLER_MAP = new HashMap<Short, XlsRecordHandler>(32);
-
+    List<Integer> skipCellRowIndexList = new ArrayList<Integer>();
+    
     static {
         XLS_RECORD_HANDLER_MAP.put(BlankRecord.sid, new BlankRecordHandler());
         XLS_RECORD_HANDLER_MAP.put(BOFRecord.sid, new BofRecordHandler());
@@ -142,7 +145,10 @@ public class XlsSaxAnalyser implements HSSFListener, ExcelReadExecutor {
     @Override
     public void processRecord(Record record) {
-        XlsRecordHandler handler = XLS_RECORD_HANDLER_MAP.get(record.getSid());
+    	if(this.needSkip(xlsReadContext, record)) {
+        	return;
+        }    	
+    	XlsRecordHandler handler = XLS_RECORD_HANDLER_MAP.get(record.getSid());
         if (handler == null) {
             return;
         }
@@ -151,11 +157,27 @@ public class XlsSaxAnalyser implements HSSFListener, ExcelReadExecutor {
         if (ignoreRecord) {
             // No need to read the current sheet
             return;
-        }
+        }        
         if (!handler.support(xlsReadContext, record)) {
             return;
         }
         handler.processRecord(xlsReadContext, record);
     }
+	public boolean needSkip(XlsReadContext xlsReadContext, Record record) {
+		if(record.getSid() == RowRecord.sid) {
+			RowRecord rowRec = (RowRecord) record;
+	    	if(!xlsReadContext.xlsReadWorkbookHolder().getReadHiddenRow() 
+	    			&& rowRec.getZeroHeight()) {
+	    		skipCellRowIndexList.add(rowRec.getRowNumber());
+	    		return true;
+	    	}
+		}else if(record instanceof CellRecord) {
+			CellRecord cellRec = (CellRecord)record;
+			if(skipCellRowIndexList.contains(cellRec.getRow())) {
+				return true;
+			}
+		}
+		return false;
+	}
 }
@@ -10,10 +10,9 @@ import com.taover.easyexcel.context.xls.XlsReadContext;
  *
  * @author Jiaju Zhuang
  **/
-public abstract class AbstractXlsRecordHandler implements XlsRecordHandler {
-
+public abstract class AbstractXlsRecordHandler implements XlsRecordHandler {	
     @Override
     public boolean support(XlsReadContext xlsReadContext, Record record) {
         return true;
-    }
+    }	
 }
@@ -244,7 +244,7 @@ public class ReadTest {
      */
     @Test
     public void synchronousRead() {
-        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
+        String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xls";
         // 这里 需要指定读用哪个class去读，然后读取第一个sheet 同步读取会自动finish
         List<DemoData> list = EasyExcel.read(fileName).head(DemoData.class).sheet().doReadSync();
         for (DemoData data : list) {
@@ -252,11 +252,11 @@ public class ReadTest {
         }
         // 这里 也可以不指定class，返回一个list，然后读取第一个sheet 同步读取会自动finish
-        List<Map<Integer, String>> listMap = EasyExcel.read(fileName).sheet().doReadSync();
-        for (Map<Integer, String> data : listMap) {
-            // 返回每条数据的键值对 表示所在的列 和所在列的值
-            LOGGER.info("读取到数据:{}", JSON.toJSONString(data));
-        }
+//        List<Map<Integer, String>> listMap = EasyExcel.read(fileName).sheet().doReadSync();
+//        for (Map<Integer, String> data : listMap) {
+//            // 返回每条数据的键值对 表示所在的列 和所在列的值
+//            LOGGER.info("读取到数据:{}", JSON.toJSONString(data));
+//        }
     }
     /**