From abcd4f77f24d99ead266849cb4b36c8e43f015d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E4=BB=AA?= Date: Mon, 11 Mar 2024 20:26:26 +0800 Subject: [PATCH] =?UTF-8?q?*=20=E6=94=AF=E6=8C=81=E5=81=9C=E6=AD=A2?= =?UTF-8?q?=E5=8D=95=E4=B8=AA`sheet`=E4=BB=A5=E5=90=8E=E7=BB=A7=E7=BB=AD?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E5=85=B6=E4=BB=96`sheet`,=E4=BD=BF=E7=94=A8`?= =?UTF-8?q?ExcelAnalysisStopSheetException`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/csv/CsvExcelReadExecutor.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/easyexcel-core/src/main/java/com/alibaba/excel/analysis/csv/CsvExcelReadExecutor.java b/easyexcel-core/src/main/java/com/alibaba/excel/analysis/csv/CsvExcelReadExecutor.java index 6afabe349..5a901b5b1 100644 --- a/easyexcel-core/src/main/java/com/alibaba/excel/analysis/csv/CsvExcelReadExecutor.java +++ b/easyexcel-core/src/main/java/com/alibaba/excel/analysis/csv/CsvExcelReadExecutor.java @@ -16,6 +16,8 @@ import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.enums.RowTypeEnum; import com.alibaba.excel.exception.ExcelAnalysisException; +import com.alibaba.excel.exception.ExcelAnalysisStopException; +import com.alibaba.excel.exception.ExcelAnalysisStopSheetException; import com.alibaba.excel.metadata.Cell; import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.read.metadata.ReadSheet; @@ -69,12 +71,18 @@ public void execute() { if (readSheet == null) { continue; } - csvReadContext.currentSheet(readSheet); - - int rowIndex = 0; - - for (CSVRecord record : csvParser) { - dealRecord(record, rowIndex++); + try { + csvReadContext.currentSheet(readSheet); + + int rowIndex = 0; + + for (CSVRecord record : csvParser) { + dealRecord(record, rowIndex++); + } + } catch (ExcelAnalysisStopSheetException e) { + if (log.isDebugEnabled()) { + log.debug("Custom stop!", e); + } } // The last sheet is read