Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
d4a95c28
提交
d4a95c28
authored
7月 21, 2021
作者:
taojinlong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: SAX 解析 excel
上级
65c4b67e
全部展开
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
139 行增加
和
1 行删除
+139
-1
ExcelReaderUtil.java
.../main/java/io/dataease/commons/utils/ExcelReaderUtil.java
+75
-0
ExcelXlsReader.java
...c/main/java/io/dataease/commons/utils/ExcelXlsReader.java
+0
-0
ExcelXlsxReader.java
.../main/java/io/dataease/commons/utils/ExcelXlsxReader.java
+0
-0
JdbcProvider.java
...in/java/io/dataease/datasource/provider/JdbcProvider.java
+3
-0
ExcelSheetData.java
...src/main/java/io/dataease/dto/dataset/ExcelSheetData.java
+13
-0
DataSetTableService.java
...java/io/dataease/service/dataset/DataSetTableService.java
+48
-1
没有找到文件。
backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java
0 → 100644
浏览文件 @
d4a95c28
package
io
.
dataease
.
commons
.
utils
;
import
com.google.gson.Gson
;
import
io.dataease.datasource.dto.TableFiled
;
import
java.io.FileInputStream
;
import
java.io.InputStream
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
public
class
ExcelReaderUtil
{
//excel2003扩展名
public
static
final
String
EXCEL03_EXTENSION
=
".xls"
;
//excel2007扩展名
public
static
final
String
EXCEL07_EXTENSION
=
".xlsx"
;
public
static
void
sendRows
(
String
filePath
,
String
sheetName
,
int
sheetIndex
,
int
curRow
,
List
<
String
>
cellList
)
{
StringBuffer
oneLineSb
=
new
StringBuffer
();
oneLineSb
.
append
(
filePath
);
oneLineSb
.
append
(
"--"
);
oneLineSb
.
append
(
"sheet"
+
sheetIndex
);
oneLineSb
.
append
(
"::"
+
sheetName
);
//加上sheet名
oneLineSb
.
append
(
"--"
);
oneLineSb
.
append
(
"row"
+
curRow
);
oneLineSb
.
append
(
"::"
);
// map.put(cellList.get(9),cellList.get(0)) ;
for
(
String
cell
:
cellList
)
{
oneLineSb
.
append
(
cell
.
trim
());
oneLineSb
.
append
(
"|"
);
}
String
oneLine
=
oneLineSb
.
toString
();
if
(
oneLine
.
endsWith
(
"|"
))
{
oneLine
=
oneLine
.
substring
(
0
,
oneLine
.
lastIndexOf
(
"|"
));
}
// 去除最后一个分隔符
System
.
out
.
println
(
oneLine
);
}
/**
* 读取excel文件路径
* @param fileName 文件路径
* @throws Exception
*/
public
static
void
readExcel
(
String
fileName
,
InputStream
inputStream
)
throws
Exception
{
if
(
fileName
.
endsWith
(
EXCEL03_EXTENSION
))
{
//处理excel2003文件
ExcelXlsReader
excelXls
=
new
ExcelXlsReader
();
excelXls
.
process
(
inputStream
);
System
.
out
.
println
(
excelXls
.
totalSheets
.
size
());
System
.
out
.
println
(
excelXls
.
totalSheets
.
get
(
0
).
getSheetName
());
for
(
TableFiled
field
:
excelXls
.
totalSheets
.
get
(
0
).
getFields
())
{
System
.
out
.
println
(
new
Gson
().
toJson
(
field
));
}
System
.
out
.
println
(
excelXls
.
totalSheets
.
get
(
0
).
getData
().
get
(
0
));
}
else
if
(
fileName
.
endsWith
(
EXCEL07_EXTENSION
))
{
//处理excel2007文件
ExcelXlsxReader
excelXlsxReader
=
new
ExcelXlsxReader
();
excelXlsxReader
.
process
(
inputStream
);
System
.
out
.
println
(
excelXlsxReader
.
totalSheets
.
size
());
System
.
out
.
println
(
excelXlsxReader
.
totalSheets
.
get
(
0
).
getSheetName
());
for
(
TableFiled
field
:
excelXlsxReader
.
totalSheets
.
get
(
0
).
getFields
())
{
System
.
out
.
println
(
new
Gson
().
toJson
(
field
));
}
System
.
out
.
println
(
excelXlsxReader
.
totalSheets
.
get
(
0
).
getData
().
get
(
0
));
}
else
{
throw
new
Exception
(
"文件格式错误,fileName的扩展名只能是xls或xlsx。"
);
}
}
public
static
void
main
(
String
[]
args
)
throws
Exception
{
ExcelReaderUtil
.
readExcel
(
"111.xls"
,
new
FileInputStream
(
"/Users/taojinlong/Desktop/111.xls"
));
}
}
backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java
0 → 100644
浏览文件 @
d4a95c28
差异被折叠。
点击展开。
backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
0 → 100644
浏览文件 @
d4a95c28
差异被折叠。
点击展开。
backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java
浏览文件 @
d4a95c28
...
@@ -185,6 +185,9 @@ public class JdbcProvider extends DatasourceProvider {
...
@@ -185,6 +185,9 @@ public class JdbcProvider extends DatasourceProvider {
field
.
setFieldType
(
t
);
field
.
setFieldType
(
t
);
field
.
setFieldSize
(
metaData
.
getColumnDisplaySize
(
j
+
1
));
field
.
setFieldSize
(
metaData
.
getColumnDisplaySize
(
j
+
1
));
if
(
t
.
equalsIgnoreCase
(
"LONG"
)){
field
.
setFieldSize
(
65533
);}
//oracle LONG
if
(
t
.
equalsIgnoreCase
(
"LONG"
)){
field
.
setFieldSize
(
65533
);}
//oracle LONG
if
(
StringUtils
.
isNotEmpty
(
t
)
&&
t
.
toLowerCase
().
contains
(
"date"
)
&&
field
.
getFieldSize
()
<
50
){
field
.
setFieldSize
(
50
);
}
fieldList
.
add
(
field
);
fieldList
.
add
(
field
);
}
}
return
fieldList
;
return
fieldList
;
...
...
backend/src/main/java/io/dataease/dto/dataset/ExcelSheetData.java
0 → 100644
浏览文件 @
d4a95c28
package
io
.
dataease
.
dto
.
dataset
;
import
io.dataease.datasource.dto.TableFiled
;
import
lombok.Data
;
import
java.util.List
;
@Data
public
class
ExcelSheetData
{
private
String
sheetName
;
private
List
<
List
<
String
>>
data
;
private
List
<
TableFiled
>
fields
;
}
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
浏览文件 @
d4a95c28
...
@@ -1012,7 +1012,7 @@ public class DataSetTableService {
...
@@ -1012,7 +1012,7 @@ public class DataSetTableService {
public
Map
<
String
,
Object
>
excelSaveAndParse
(
MultipartFile
file
,
String
tableId
)
throws
Exception
{
public
Map
<
String
,
Object
>
excelSaveAndParse
(
MultipartFile
file
,
String
tableId
)
throws
Exception
{
String
filename
=
file
.
getOriginalFilename
();
String
filename
=
file
.
getOriginalFilename
();
// parse file
// parse file
Map
<
String
,
Object
>
fileMap
=
parseExcel
(
filename
,
file
.
getInputStream
(),
true
);
Map
<
String
,
Object
>
fileMap
=
parseExcel
2
(
filename
,
file
.
getInputStream
(),
true
);
if
(
StringUtils
.
isNotEmpty
(
tableId
))
{
if
(
StringUtils
.
isNotEmpty
(
tableId
))
{
List
<
DatasetTableField
>
datasetTableFields
=
dataSetTableFieldsService
.
getFieldsByTableId
(
tableId
);
List
<
DatasetTableField
>
datasetTableFields
=
dataSetTableFieldsService
.
getFieldsByTableId
(
tableId
);
datasetTableFields
.
sort
((
o1
,
o2
)
->
{
datasetTableFields
.
sort
((
o1
,
o2
)
->
{
...
@@ -1038,6 +1038,52 @@ public class DataSetTableService {
...
@@ -1038,6 +1038,52 @@ public class DataSetTableService {
return
map
;
return
map
;
}
}
private
Map
<
String
,
Object
>
parseExcel2
(
String
filename
,
InputStream
inputStream
,
boolean
isPreview
)
throws
Exception
{
String
suffix
=
filename
.
substring
(
filename
.
lastIndexOf
(
"."
)
+
1
);
List
<
TableFiled
>
fields
=
new
ArrayList
<>();
List
<
List
<
String
>>
data
=
new
ArrayList
<>();
List
<
Map
<
String
,
Object
>>
jsonArray
=
new
ArrayList
<>();
List
<
String
>
sheets
=
new
ArrayList
<>();
if
(
StringUtils
.
equalsIgnoreCase
(
suffix
,
"xls"
))
{
ExcelXlsReader
excelXlsReader
=
new
ExcelXlsReader
();
excelXlsReader
.
process
(
inputStream
);
fields
=
excelXlsReader
.
totalSheets
.
get
(
0
).
getFields
();
data
=
excelXlsReader
.
totalSheets
.
get
(
0
).
getData
();
sheets
=
excelXlsReader
.
totalSheets
.
stream
().
map
(
ExcelSheetData:
:
getSheetName
).
collect
(
Collectors
.
toList
());
}
if
(
StringUtils
.
equalsIgnoreCase
(
suffix
,
"xlsx"
))
{
ExcelXlsxReader
excelXlsxReader
=
new
ExcelXlsxReader
();
excelXlsxReader
.
process
(
inputStream
);
fields
=
excelXlsxReader
.
totalSheets
.
get
(
0
).
getFields
();
data
=
excelXlsxReader
.
totalSheets
.
get
(
0
).
getData
();
sheets
=
excelXlsxReader
.
totalSheets
.
stream
().
map
(
ExcelSheetData:
:
getSheetName
).
collect
(
Collectors
.
toList
());
}
String
[]
fieldArray
=
fields
.
stream
().
map
(
TableFiled:
:
getFieldName
).
toArray
(
String
[]::
new
);
// 校验excel字段是否重名
if
(
checkIsRepeat
(
fieldArray
))
{
DataEaseException
.
throwException
(
Translator
.
get
(
"i18n_excel_field_repeat"
));
}
if
(
CollectionUtils
.
isNotEmpty
(
data
))
{
jsonArray
=
data
.
stream
().
map
(
ele
->
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
for
(
int
i
=
0
;
i
<
ele
.
size
();
i
++)
{
map
.
put
(
fieldArray
[
i
],
ele
.
get
(
i
));
}
return
map
;
}).
collect
(
Collectors
.
toList
());
}
inputStream
.
close
();
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"fields"
,
fields
);
map
.
put
(
"data"
,
jsonArray
);
map
.
put
(
"sheets"
,
sheets
);
return
map
;
}
private
Map
<
String
,
Object
>
parseExcel
(
String
filename
,
InputStream
inputStream
,
boolean
isPreview
)
throws
Exception
{
private
Map
<
String
,
Object
>
parseExcel
(
String
filename
,
InputStream
inputStream
,
boolean
isPreview
)
throws
Exception
{
String
suffix
=
filename
.
substring
(
filename
.
lastIndexOf
(
"."
)
+
1
);
String
suffix
=
filename
.
substring
(
filename
.
lastIndexOf
(
"."
)
+
1
);
List
<
TableFiled
>
fields
=
new
ArrayList
<>();
List
<
TableFiled
>
fields
=
new
ArrayList
<>();
...
@@ -1191,6 +1237,7 @@ public class DataSetTableService {
...
@@ -1191,6 +1237,7 @@ public class DataSetTableService {
return
map
;
return
map
;
}
}
private
String
readCell
(
Cell
cell
,
boolean
cellType
,
TableFiled
tableFiled
)
{
private
String
readCell
(
Cell
cell
,
boolean
cellType
,
TableFiled
tableFiled
)
{
if
(
cell
==
null
)
{
if
(
cell
==
null
)
{
return
""
;
return
""
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论