!919 修复“sax方式读取excel2003版本，会调用两次doAfterAllAnalysed方法”问题。

Merge pull request !919 from hellozrh/v5-dev

hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java

@@ -1,9 +1,12 @@
 package cn.hutool.poi.excel.sax;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.log.StaticLog;
 import cn.hutool.poi.excel.sax.handler.RowHandler;
 import cn.hutool.poi.exceptions.POIException;
 import org.apache.poi.hssf.eventusermodel.EventWorkbookBuilder.SheetRecordCollectingListener;
@@ -216,7 +219,10 @@ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader<Excel03Sax
 			if(this.rid < 0 && null != this.sheetName){
 				throw new POIException("Sheet [{}] not exist!", this.sheetName);
 			}
-			processLastCellSheet();
+			if(this.curRid != -1 && isProcessCurrentSheet()) {
+				//只有在当前指定的sheet中，才触发结束事件，且curId=-1时也不处理，避免重复调用
+				processLastCellSheet();
+			}
 		} else if (isProcessCurrentSheet()) {
 			if (record instanceof MissingCellDummyRecord) {
 				// 空值的操作

hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelUtilTest.java

@@ -1,11 +1,22 @@
 package cn.hutool.poi.excel;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.poi.excel.cell.CellLocation;
+import cn.hutool.poi.excel.sax.handler.RowHandler;
+import org.apache.poi.ss.usermodel.CellStyle;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class ExcelUtilTest {
 
@@ -61,4 +72,28 @@ public class ExcelUtilTest {
 		reader.close();
 		Assert.assertEquals(1L, list.get(1).get("鞋码"));
 	}
+
+	@Test
+	public void doAfterAllAnalysedTest() {
+		String path = "readBySax.xls";
+		AtomicInteger doAfterAllAnalysedTime = new AtomicInteger(0);
+		try{
+			ExcelUtil.readBySax(path, -1, new RowHandler() {
+				@Override
+				public void handle(int sheetIndex, long rowIndex, List<Object> rowCells) {
+					System.out.println(StrUtil.format("sheetIndex={};rowIndex={},rowCells={}",sheetIndex,rowIndex,rowCells));
+				}
+
+				@Override
+				public void doAfterAllAnalysed() {
+					doAfterAllAnalysedTime.addAndGet(1);
+				}
+			});
+		}catch (Exception ex){
+			ex.printStackTrace();
+		}
+		//总共2个sheet页，读取所有sheet时，一共执行doAfterAllAnalysed2次。
+		Assert.assertEquals(2, doAfterAllAnalysedTime.intValue());
+	}
+
 }