admin/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-12-07 01:28:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2025-11-26 23:22:24 +08:00
parent 0461270e84
commit bad0c4c982
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hutool-poi/src/main/java/cn/hutool/v7/poi/excel/sax/Excel03SaxReader.java
View File

@ -80,7 +80,7 @@ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader<Excel03Sax
/** /**
* 自定义需要处理的sheet编号，如果-1表示处理所有sheet * 自定义需要处理的sheet编号，如果-1表示处理所有sheet
*/ */
private int rid = -1; private int sheetIndex = -1;
/** /**
* sheet名称，主要用于使用sheet名读取的情况 * sheet名称，主要用于使用sheet名读取的情况
*/ */
@ -133,7 +133,7 @@ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader<Excel03Sax
* @throws POIException IO异常包装 * @throws POIException IO异常包装
*/ */
public Excel03SaxReader read(final POIFSFileSystem fs, final String idOrRidOrSheetName) throws POIException { public Excel03SaxReader read(final POIFSFileSystem fs, final String idOrRidOrSheetName) throws POIException {
this.rid = getRid(idOrRidOrSheetName); this.sheetIndex = getSheetIndex(idOrRidOrSheetName);
formatListener = new FormatTrackingHSSFListener(new MissingRecordAwareHSSFListener(this)); formatListener = new FormatTrackingHSSFListener(new MissingRecordAwareHSSFListener(this));
final HSSFRequest request = new HSSFRequest(); final HSSFRequest request = new HSSFRequest();
@ -162,8 +162,8 @@ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader<Excel03Sax
* *
* @return sheet序号 * @return sheet序号
*/ */
public int getRid() { public int getSheetIndex() {
return this.rid; return this.sheetIndex;
} }
/** /**
@ -176,8 +176,8 @@ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader<Excel03Sax
return this.sheetName; return this.sheetName;
} }
if (this.boundSheetRecords.size() > this.rid) { if (this.boundSheetRecords.size() > this.sheetIndex) {
return this.boundSheetRecords.get(this.rid > -1 ? this.rid : this.curRid).getSheetname(); return this.boundSheetRecords.get(this.sheetIndex > -1 ? this.sheetIndex : this.curRid).getSheetname();
} }
return null; return null;
@ -190,7 +190,7 @@ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader<Excel03Sax
*/ */
@Override @Override
public void processRecord(final Record record) { public void processRecord(final Record record) {
if (this.rid > -1 && this.curRid > this.rid) { if (this.sheetIndex > -1 && this.curRid > this.sheetIndex) {
// 指定Sheet之后的数据不再处理 // 指定Sheet之后的数据不再处理
return; return;
} }
@ -200,7 +200,7 @@ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader<Excel03Sax
boundSheetRecords.add(boundSheetRecord); boundSheetRecords.add(boundSheetRecord);
final String currentSheetName = boundSheetRecord.getSheetname(); final String currentSheetName = boundSheetRecord.getSheetname();
if(null != this.sheetName && StrUtil.equals(this.sheetName, currentSheetName)){ if(null != this.sheetName && StrUtil.equals(this.sheetName, currentSheetName)){
this.rid = this.boundSheetRecords.size() -1; this.sheetIndex = this.boundSheetRecords.size() -1;
} }
} else if (record instanceof SSTRecord) { } else if (record instanceof SSTRecord) {
// 静态字符串表 // 静态字符串表
@ -214,7 +214,7 @@ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader<Excel03Sax
curRid++; curRid++;
} }
} else if (record instanceof EOFRecord){ } else if (record instanceof EOFRecord){
if(this.rid < 0 && null != this.sheetName){ if(this.sheetIndex < 0 && null != this.sheetName){
throw new POIException("Sheet [{}] not exist!", this.sheetName); throw new POIException("Sheet [{}] not exist!", this.sheetName);
} }
if(this.curRid != -1 && isProcessCurrentSheet()) { if(this.curRid != -1 && isProcessCurrentSheet()) {
@ -367,21 +367,21 @@ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader<Excel03Sax
*/ */
private boolean isProcessCurrentSheet() { private boolean isProcessCurrentSheet() {
// rid < 0 且 sheet名称存在，说明没有匹配到sheet名称 // rid < 0 且 sheet名称存在，说明没有匹配到sheet名称
return (this.rid < 0 && null == this.sheetName) || this.rid == this.curRid; return (this.sheetIndex < 0 && null == this.sheetName) || this.sheetIndex == this.curRid;
} }
/** /**
* 获取sheet索引，从0开始 * 获取sheet索引，从0开始
* <ul> * <ul>
* <li>传入'rId'开头，直接去除rId前缀</li> * <li>Excel03中没有rid概念，如果传入'rId'开头，直接去除rId前缀，按照sheetIndex对待</li>
* <li>传入纯数字，表示sheetIndex，直接转换为rid</li> * <li>传入纯数字，表示sheetIndex</li>
* </ul> * </ul>
* *
* @param idOrRidOrSheetName Excel中的sheet id或者rid编号或sheet名称，从0开始，rid必须加rId前缀，例如rId0，如果为-1处理所有编号的sheet * @param idOrRidOrSheetName Excel中的sheet id或者rid编号或sheet名称，从0开始，rid必须加rId前缀，例如rId0，如果为-1处理所有编号的sheet
* @return sheet索引，从0开始 * @return sheet索引，从0开始
* @since 5.5.5 * @since 5.5.5
*/ */
private int getRid(final String idOrRidOrSheetName) { private int getSheetIndex(final String idOrRidOrSheetName) {
Assert.notBlank(idOrRidOrSheetName, "id or rid or sheetName must be not blank!"); Assert.notBlank(idOrRidOrSheetName, "id or rid or sheetName must be not blank!");
// rid直接处理 // rid直接处理