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 bugs

Browse Source
This commit is contained in:
Looly
2020-02-21 18:56:42 +08:00
parent fc8dfc8fb1
commit 0553c5ca0b
12 changed files with 278 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,11 @@
package cn.hutool.poi.excel.sax;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Console;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.poi.excel.sax.handler.RowHandler;
import cn.hutool.poi.exceptions.POIException;
import org.apache.poi.hssf.eventusermodel.EventWorkbookBuilder.SheetRecordCollectingListener;
import org.apache.poi.hssf.eventusermodel.FormatTrackingHSSFListener;
import org.apache.poi.hssf.eventusermodel.HSSFEventFactory;
@@ -30,10 +29,11 @@ import org.apache.poi.hssf.record.StringRecord;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.poi.excel.sax.handler.RowHandler;
import cn.hutool.poi.exceptions.POIException;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
/**
* Excel2003格式的事件-用户模型方式读取器，在Hutool中，统一将此归类为Sax读取<br>
@@ -194,7 +194,7 @@ public class Excel03SaxReader extends AbstractExcelSaxReader<Excel03SaxReader> i
if (record instanceof MissingCellDummyRecord) {
// 空值的操作
MissingCellDummyRecord mc = (MissingCellDummyRecord) record;
rowCellList.add(mc.getColumn(), StrUtil.EMPTY);
addToRowCellList(mc.getColumn(), StrUtil.EMPTY);
} else if (record instanceof LastCellOfRowDummyRecord) {
// 行结束
processLastCell((LastCellOfRowDummyRecord) record);
@@ -208,6 +208,20 @@ public class Excel03SaxReader extends AbstractExcelSaxReader<Excel03SaxReader> i
// ---------------------------------------------------------------------------------------------- Private method start
/**
* 将单元格数据加入到行列表中
* @param index 加入位置
* @param value 值
*/
private void addToRowCellList(int index, Object value){
while(index > this.rowCellList.size()){
// 对于中间无数据的单元格补齐空白
this.rowCellList.add(StrUtil.EMPTY);
}
this.rowCellList.add(index, value);
}
/**
* 处理单元格值
*
@@ -219,12 +233,12 @@ public class Excel03SaxReader extends AbstractExcelSaxReader<Excel03SaxReader> i
switch (record.getSid()) {
case BlankRecord.sid:
// 空白记录
rowCellList.add(((BlankRecord) record).getColumn(), StrUtil.EMPTY);
addToRowCellList(((BlankRecord) record).getColumn(), StrUtil.EMPTY);
break;
case BoolErrRecord.sid:
// 布尔类型
final BoolErrRecord berec = (BoolErrRecord) record;
rowCellList.add(berec.getColumn(), berec.getBooleanValue());
addToRowCellList(berec.getColumn(), berec.getBooleanValue());
break;
case FormulaRecord.sid:
// 公式类型
@@ -240,7 +254,7 @@ public class Excel03SaxReader extends AbstractExcelSaxReader<Excel03SaxReader> i
} else {
value = StrUtil.wrap(HSSFFormulaParser.toFormulaString(stubWorkbook, formulaRec.getParsedExpression()), "\"");
}
rowCellList.add(formulaRec.getColumn(), value);
addToRowCellList(formulaRec.getColumn(), value);
break;
case StringRecord.sid:
// 单元格中公式的字符串
@@ -253,7 +267,7 @@ public class Excel03SaxReader extends AbstractExcelSaxReader<Excel03SaxReader> i
case LabelRecord.sid:
final LabelRecord lrec = (LabelRecord) record;
value = lrec.getValue();
this.rowCellList.add(lrec.getColumn(), value);
addToRowCellList(lrec.getColumn(), value);
break;
case LabelSSTRecord.sid:
// 字符串类型
@@ -261,7 +275,7 @@ public class Excel03SaxReader extends AbstractExcelSaxReader<Excel03SaxReader> i
if (null != sstRecord) {
value = sstRecord.getString(lsrec.getSSTIndex()).toString();
}
rowCellList.add(lsrec.getColumn(), ObjectUtil.defaultIfNull(value, StrUtil.EMPTY));
addToRowCellList(lsrec.getColumn(), ObjectUtil.defaultIfNull(value, StrUtil.EMPTY));
break;
case NumberRecord.sid: // 数字类型
final NumberRecord numrec = (NumberRecord) record;
@@ -283,7 +297,7 @@ public class Excel03SaxReader extends AbstractExcelSaxReader<Excel03SaxReader> i
}
}
// 向容器加入列值
rowCellList.add(numrec.getColumn(), value);
addToRowCellList(numrec.getColumn(), value);
break;
default:
break;

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

@@ -19,6 +19,20 @@ import org.junit.Test;
*/
public class ExcelSaxReadTest {
@Test
public void excel07Test() {
// 工具化快速读取
ExcelUtil.read07BySax("aaa.xlsx", 0, createRowHandler());
}
@Test
public void excel03Test() {
Excel03SaxReader reader = new Excel03SaxReader(createRowHandler());
reader.read("aaa.xls", 1);
// Console.log("Sheet index: [{}], Sheet name: [{}]", reader.getSheetIndex(), reader.getSheetName());
ExcelUtil.read03BySax("aaa.xls", 1, createRowHandler());
}
@Test
@Ignore
public void readBlankLineTest() {
@@ -47,26 +61,12 @@ public class ExcelSaxReadTest {
ExcelUtil.readBySax("e:/excel/writeMapTest.xlsx", 0, (sheetIndex, rowIndex, rowList) -> Console.log(rowList));
}
@Test
public void excel07Test() {
// 工具化快速读取
ExcelUtil.read07BySax("aaa.xlsx", 0, createRowHandler());
}
@Test
public void excel03Test() {
Excel03SaxReader reader = new Excel03SaxReader(createRowHandler());
reader.read("aaa.xls", 1);
// Console.log("Sheet index: [{}], Sheet name: [{}]", reader.getSheetIndex(), reader.getSheetName());
ExcelUtil.read03BySax("aaa.xls", 1, createRowHandler());
}
@Test
@Ignore
public void readBySaxTest4() {
ExcelUtil.readBySax("e:/excel/single_line.xlsx", 2, createRowHandler());
}
@Test
@Ignore
public void readBySaxTest5() {
@@ -79,6 +79,11 @@ public class ExcelSaxReadTest {
ExcelUtil.readBySax("f:\\test\\sax_test.xlsx", 0, createRowHandler());
}
@Test
public void readBySaxTest7() {
ExcelUtil.readBySax("d:/test/行政许可信息.xls", 0, (sheetIndex, rowIndex, rowList) -> Console.log(rowList));
}
private RowHandler createRowHandler() {
return (sheetIndex, rowIndex, rowlist) -> {
// Console.log("[{}] [{}] {}", sheetIndex, rowIndex, rowlist);