zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix FileResourceBug

Browse Source
This commit is contained in:
Looly
2021-11-10 22:48:11 +08:00
parent d53f1ff15e
commit 662485fb2b
8 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/AbstractRowHandler.java
View File

@@ -40,12 +40,12 @@ public abstract class AbstractRowHandler<T> implements RowHandler {
}
@Override
public void handle(int sheetIndex, long rowIndex, List<Object> rowList) {
public void handle(int sheetIndex, long rowIndex, List<Object> rowCells) {
Assert.notNull(convertFunc);
if (rowIndex < this.startRowIndex || rowIndex > this.endRowIndex) {
return;
}
handleData(sheetIndex, rowIndex, convertFunc.callWithRuntimeException(rowList));
handleData(sheetIndex, rowIndex, convertFunc.callWithRuntimeException(rowCells));
}
/**

6
hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java
View File

@@ -42,11 +42,11 @@ public abstract class BeanRowHandler<T> extends AbstractRowHandler<T> {
}
@Override
public void handle(int sheetIndex, long rowIndex, List<Object> rowList) {
public void handle(int sheetIndex, long rowIndex, List<Object> rowCells) {
if (rowIndex == this.headerRowIndex) {
this.headerList = ListUtil.unmodifiable(Convert.toList(String.class, rowList));
this.headerList = ListUtil.unmodifiable(Convert.toList(String.class, rowCells));
return;
}
super.handle(sheetIndex, rowIndex, rowList);
super.handle(sheetIndex, rowIndex, rowCells);
}
}

6
hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/MapRowHandler.java
View File

@@ -39,11 +39,11 @@ public abstract class MapRowHandler extends AbstractRowHandler<Map<String, Objec
}
@Override
public void handle(int sheetIndex, long rowIndex, List<Object> rowList) {
public void handle(int sheetIndex, long rowIndex, List<Object> rowCells) {
if (rowIndex == this.headerRowIndex) {
this.headerList = ListUtil.unmodifiable(Convert.toList(String.class, rowList));
this.headerList = ListUtil.unmodifiable(Convert.toList(String.class, rowCells));
return;
}
super.handle(sheetIndex, rowIndex, rowList);
super.handle(sheetIndex, rowIndex, rowCells);
}
}

4
hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/RowHandler.java
View File

@@ -17,9 +17,9 @@ public interface RowHandler {
*
* @param sheetIndex 当前Sheet序号
* @param rowIndex 当前行号，从0开始计数
* @param rowList 行数据列表
* @param rowCells 行数据，每个Object表示一个单元格的值
*/
void handle(int sheetIndex, long rowIndex, List<Object> rowList);
void handle(int sheetIndex, long rowIndex, List<Object> rowCells);
/**
* 处理一个单元格的数据

4
hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java
View File

@@ -125,7 +125,7 @@ public class ExcelSaxReadTest {
}
@Override
public void handle(int sheetIndex, long rowIndex, List<Object> rowList) {
public void handle(int sheetIndex, long rowIndex, List<Object> rowCells) {
}
}
@@ -143,7 +143,7 @@ public class ExcelSaxReadTest {
}
@Override
public void handle(int sheetIndex, long rowIndex, List<Object> rowList) {
public void handle(int sheetIndex, long rowIndex, List<Object> rowCells) {
}
}
);