fix a bug about xlsx active tab calc

unknown
1 parent 6ed4189b
Showing 2 changed files with 9 additions and 6 deletions Show diff stats
src/main/java/com/taover/easyexcel/analysis/v07/workbook/WorkbookAnalyserImpl.java
src/test/java/com/taover/easyexcel/test/demo/read/ReadTest.java
 package com.taover.easyexcel.analysis.v07.workbook;
  
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
  
@@ -12,6 +15,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
  
 import com.taover.easyexcel.analysis.v07.metadata.WorkbookSheet;
@@ -81,7 +85,7 @@ public class WorkbookAnalyserImpl implements WorkbookAnalyser {
 					++hiddenSheetNum;
 				}
 			}
-			this.activeTabIndex = hiddenSheetNum + activeTab - 1;
+			this.activeTabIndex = hiddenSheetNum + activeTab;
 		}
 	}
  
@@ -129,6 +133,5 @@ public class WorkbookAnalyserImpl implements WorkbookAnalyser {
 			return false;
 		}
 		return this.sheetList.get(sheetIndex).getState().equals(ATTR_STATE_V_HIDDEN);
-	}
-	
+	}	
 }
@@ -280,12 +280,12 @@ public class ReadTest {
     	for(String item: sonFileNameArr) {
     		try {
     			LOGGER.info("======文件名称："+item+"======");
-    			Map<Integer, List<Map<Integer, Object>>> listMap = EasyExcel.read(dirStr+item).headRowNumber(0).readHiddenRow(false).doReadAllSyncForMap();
+    			List<Object> listMap = EasyExcel.read(dirStr+item).headRowNumber(0).readHiddenRow(false).doReadSelectedSync();
 //                for (Map<Integer, String> data : listMap) {
 //                    // 返回每条数据的键值对 表示所在的列 和所在列的值
 //                    //LOGGER.info(">{}", JSON.toJSONString(data));
 //                }
-                LOGGER.info(">SUCCESS{}", JSON.toJSONString(listMap));
+                LOGGER.info(">{}", JSON.toJSONString(listMap));
     		}catch (Exception e) {
     			e.printStackTrace();
 			}
@@ -304,6 +304,6 @@ public class ReadTest {
  
     public static void main(String args[]) {
     	ReadTest rt = new ReadTest();
-    	rt.synchronousRead();
+    	rt.readTestSynchronousRead();
     }
 }
1	1	package com.taover.easyexcel.analysis.v07.workbook;
2	2
	3	+import java.io.BufferedReader;
3	4	import java.io.IOException;
4	5	import java.io.InputStream;
	6	+import java.io.InputStreamReader;
	7	+import java.io.StringReader;
5	8	import java.util.ArrayList;
6	9	import java.util.List;
7	10
...	...	@@ -12,6 +15,7 @@ import org.w3c.dom.Document;
12	15	import org.w3c.dom.NamedNodeMap;
13	16	import org.w3c.dom.Node;
14	17	import org.w3c.dom.NodeList;
	18	+import org.xml.sax.InputSource;
15	19	import org.xml.sax.SAXException;
16	20
17	21	import com.taover.easyexcel.analysis.v07.metadata.WorkbookSheet;
...	...	@@ -81,7 +85,7 @@ public class WorkbookAnalyserImpl implements WorkbookAnalyser {
81	85	++hiddenSheetNum;
82	86	}
83	87	}
84		- this.activeTabIndex = hiddenSheetNum + activeTab - 1;
	88	+ this.activeTabIndex = hiddenSheetNum + activeTab;
85	89	}
86	90	}
87	91
...	...	@@ -129,6 +133,5 @@ public class WorkbookAnalyserImpl implements WorkbookAnalyser {
129	133	return false;
130	134	}
131	135	return this.sheetList.get(sheetIndex).getState().equals(ATTR_STATE_V_HIDDEN);
132		- }
133		-
	136	+ }
134	137	}
...	...
...	...	@@ -280,12 +280,12 @@ public class ReadTest {
280	280	for(String item: sonFileNameArr) {
281	281	try {
282	282	LOGGER.info("======文件名称："+item+"======");
283		- Map<Integer, List<Map<Integer, Object>>> listMap = EasyExcel.read(dirStr+item).headRowNumber(0).readHiddenRow(false).doReadAllSyncForMap();
	283	+ List<Object> listMap = EasyExcel.read(dirStr+item).headRowNumber(0).readHiddenRow(false).doReadSelectedSync();
284	284	// for (Map<Integer, String> data : listMap) {
285	285	// // 返回每条数据的键值对表示所在的列和所在列的值
286	286	// //LOGGER.info(">{}", JSON.toJSONString(data));
287	287	// }
288		- LOGGER.info(">SUCCESS{}", JSON.toJSONString(listMap));
	288	+ LOGGER.info(">{}", JSON.toJSONString(listMap));
289	289	}catch (Exception e) {
290	290	e.printStackTrace();
291	291	}
...	...	@@ -304,6 +304,6 @@ public class ReadTest {
304	304
305	305	public static void main(String args[]) {
306	306	ReadTest rt = new ReadTest();
307		- rt.synchronousRead();
	307	+ rt.readTestSynchronousRead();
308	308	}
309	309	}
...	...