Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
苏木力格
easyexcel
提交
f74c8299
E
easyexcel
项目概览
苏木力格
/
easyexcel
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
easyexcel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f74c8299
编写于
6月 23, 2020
作者:
庄家钜
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改跳着读取03版本空指针bug
上级
7485dc22
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
109 addition
and
5 deletion
+109
-5
pom.xml
pom.xml
+1
-1
src/main/java/com/alibaba/excel/analysis/v03/XlsSaxAnalyser.java
...n/java/com/alibaba/excel/analysis/v03/XlsSaxAnalyser.java
+4
-4
src/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java
...t/java/com/alibaba/easyexcel/test/core/skip/SkipData.java
+15
-0
src/test/java/com/alibaba/easyexcel/test/core/skip/SkipDataTest.java
...va/com/alibaba/easyexcel/test/core/skip/SkipDataTest.java
+86
-0
update.md
update.md
+3
-0
未找到文件。
pom.xml
浏览文件 @
f74c8299
...
...
@@ -4,7 +4,7 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
com.alibaba
</groupId>
<artifactId>
easyexcel
</artifactId>
<version>
2.2.
5
</version>
<version>
2.2.
6
</version>
<packaging>
jar
</packaging>
<name>
easyexcel
</name>
...
...
src/main/java/com/alibaba/excel/analysis/v03/XlsSaxAnalyser.java
浏览文件 @
f74c8299
...
...
@@ -70,12 +70,12 @@ import com.alibaba.excel.read.metadata.holder.xls.XlsReadWorkbookHolder;
* <p>
* * To turn an excel file into a CSV or similar, then see * the XLS2CSVmra example *
* </p>
* * * @see <a href=
* "http://svn.apache.org/repos/asf/poi/trunk/src/examples/src/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java">XLS2CSVmra</a>
* * * @see <a href= "http://svn.apache.org/repos/asf/poi/trunk/src/examples/src/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java">XLS2CSVmra</a>
*
* @author jipengfei
*/
public
class
XlsSaxAnalyser
implements
HSSFListener
,
ExcelReadExecutor
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
XlsSaxAnalyser
.
class
);
private
static
final
short
DUMMY_RECORD_SID
=
-
1
;
private
XlsReadContext
xlsReadContext
;
...
...
@@ -146,8 +146,8 @@ public class XlsSaxAnalyser implements HSSFListener, ExcelReadExecutor {
if
(
handler
==
null
)
{
return
;
}
boolean
ignoreRecord
=
(
handler
instanceof
IgnorableXlsRecordHandler
)
&&
xlsReadContext
.
xlsReadSheetHolder
()
!=
null
&&
xlsReadContext
.
xlsReadWorkbookHolder
().
getIgnoreRecord
();
boolean
ignoreRecord
=
(
handler
instanceof
IgnorableXlsRecordHandler
)
&&
xlsReadContext
.
xlsReadWorkbookHolder
().
getIgnoreRecord
();
if
(
ignoreRecord
)
{
// No need to read the current sheet
return
;
...
...
src/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java
0 → 100644
浏览文件 @
f74c8299
package
com.alibaba.easyexcel.test.core.skip
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
lombok.Data
;
/**
* @author Jiaju Zhuang
*/
@Data
public
class
SkipData
{
@ExcelProperty
(
"姓名"
)
private
String
name
;
}
src/test/java/com/alibaba/easyexcel/test/core/skip/SkipDataTest.java
0 → 100644
浏览文件 @
f74c8299
package
com.alibaba.easyexcel.test.core.skip
;
import
java.io.File
;
import
java.util.ArrayList
;
import
java.util.List
;
import
org.junit.Assert
;
import
org.junit.BeforeClass
;
import
org.junit.FixMethodOrder
;
import
org.junit.Test
;
import
org.junit.runners.MethodSorters
;
import
com.alibaba.easyexcel.test.core.simple.SimpleData
;
import
com.alibaba.easyexcel.test.core.simple.SimpleDataListener
;
import
com.alibaba.easyexcel.test.core.simple.SimpleDataSheetNameListener
;
import
com.alibaba.easyexcel.test.util.TestFileUtil
;
import
com.alibaba.excel.EasyExcel
;
import
com.alibaba.excel.ExcelReader
;
import
com.alibaba.excel.ExcelWriter
;
import
com.alibaba.excel.event.SyncReadListener
;
import
com.alibaba.excel.read.metadata.ReadSheet
;
import
com.alibaba.excel.write.metadata.WriteSheet
;
/**
* @author Jiaju Zhuang
*/
@FixMethodOrder
(
MethodSorters
.
NAME_ASCENDING
)
public
class
SkipDataTest
{
private
static
File
file07
;
private
static
File
file03
;
@BeforeClass
public
static
void
init
()
{
file07
=
TestFileUtil
.
createNewFile
(
"skip.xlsx"
);
file03
=
TestFileUtil
.
createNewFile
(
"skip.xls"
);
}
@Test
public
void
t01ReadAndWrite07
()
{
readAndWrite
(
file07
);
}
@Test
public
void
t02ReadAndWrite03
()
{
readAndWrite
(
file03
);
}
private
void
readAndWrite
(
File
file
)
{
ExcelWriter
excelWriter
=
EasyExcel
.
write
(
file
,
SimpleData
.
class
).
build
();
WriteSheet
writeSheet0
=
EasyExcel
.
writerSheet
(
0
,
"第一个"
).
build
();
WriteSheet
writeSheet1
=
EasyExcel
.
writerSheet
(
1
,
"第二个"
).
build
();
WriteSheet
writeSheet2
=
EasyExcel
.
writerSheet
(
2
,
"第三个"
).
build
();
WriteSheet
writeSheet3
=
EasyExcel
.
writerSheet
(
3
,
"第四个"
).
build
();
excelWriter
.
write
(
data
(
"name1"
),
writeSheet0
);
excelWriter
.
write
(
data
(
"name2"
),
writeSheet1
);
excelWriter
.
write
(
data
(
"name3"
),
writeSheet2
);
excelWriter
.
write
(
data
(
"name4"
),
writeSheet3
);
excelWriter
.
finish
();
List
<
SkipData
>
list
=
EasyExcel
.
read
(
file
,
SkipData
.
class
,
null
).
sheet
(
"第二个"
).
doReadSync
();
Assert
.
assertEquals
(
1
,
list
.
size
());
Assert
.
assertEquals
(
"name2"
,
list
.
get
(
0
).
getName
());
SyncReadListener
syncReadListener
=
new
SyncReadListener
();
ExcelReader
excelReader
=
EasyExcel
.
read
(
file
,
SkipData
.
class
,
null
).
registerReadListener
(
syncReadListener
)
.
build
();
ReadSheet
readSheet1
=
EasyExcel
.
readSheet
(
"第二个"
).
build
();
ReadSheet
readSheet3
=
EasyExcel
.
readSheet
(
"第四个"
).
build
();
excelReader
.
read
(
readSheet1
,
readSheet3
);
List
<
Object
>
syncList
=
syncReadListener
.
getList
();
Assert
.
assertEquals
(
2
,
syncList
.
size
());
Assert
.
assertEquals
(
"name2"
,
((
SkipData
)
syncList
.
get
(
0
)).
getName
());
Assert
.
assertEquals
(
"name4"
,
((
SkipData
)
syncList
.
get
(
1
)).
getName
());
excelReader
.
finish
();
}
private
List
<
SkipData
>
data
(
String
name
)
{
List
<
SkipData
>
list
=
new
ArrayList
<
SkipData
>();
SkipData
data
=
new
SkipData
();
data
.
setName
(
name
);
list
.
add
(
data
);
return
list
;
}
}
update.md
浏览文件 @
f74c8299
# 2.2.6
*
修改跳着读取03版本空指针bug
# 2.2.5
*
`ExcelProperty`
新增
`order`
用于排序
*
修复导出指定
`index`
会导致空行的bug
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录