Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
87c5a440
提交
87c5a440
authored
6月 01, 2021
作者:
junjie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(数据集):excel解析date数据,默认存日期类型
上级
e05dd9f6
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
54 行增加
和
36 行删除
+54
-36
DataSetTableService.java
...java/io/dataease/service/dataset/DataSetTableService.java
+54
-36
没有找到文件。
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
浏览文件 @
87c5a440
...
...
@@ -26,6 +26,7 @@ import io.dataease.provider.QueryProvider;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.poi.hssf.usermodel.HSSFDateUtil
;
import
org.apache.poi.hssf.usermodel.HSSFRow
;
import
org.apache.poi.hssf.usermodel.HSSFSheet
;
import
org.apache.poi.hssf.usermodel.HSSFWorkbook
;
...
...
@@ -45,6 +46,7 @@ import java.math.BigDecimal;
import
java.nio.charset.StandardCharsets
;
import
java.text.MessageFormat
;
import
java.text.NumberFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
java.util.stream.Collectors
;
...
...
@@ -273,16 +275,16 @@ public class DataSetTableService {
map
.
put
(
"status"
,
"warnning"
);
map
.
put
(
"msg"
,
Translator
.
get
(
"i18n_processing_data"
));
dataSetPreviewPage
.
setTotal
(
0
);
}
else
if
(
datasetTable
.
getSyncStatus
().
equalsIgnoreCase
(
JobStatus
.
Error
.
name
()))
{
}
else
if
(
datasetTable
.
getSyncStatus
().
equalsIgnoreCase
(
JobStatus
.
Error
.
name
()))
{
List
<
DatasetTableTaskLog
>
datasetTableTaskLogs
=
dataSetTableTaskLogService
.
getByTableId
(
datasetTable
.
getId
());
map
.
put
(
"status"
,
"error"
);
if
(
CollectionUtils
.
isNotEmpty
(
datasetTableTaskLogs
))
{
if
(
CollectionUtils
.
isNotEmpty
(
datasetTableTaskLogs
))
{
map
.
put
(
"msg"
,
"Failed to extract data: "
+
datasetTableTaskLogs
.
get
(
0
).
getInfo
());
}
else
{
}
else
{
map
.
put
(
"msg"
,
"Failed to extract data."
);
}
dataSetPreviewPage
.
setTotal
(
0
);
}
else
{
}
else
{
Datasource
ds
=
(
Datasource
)
CommonBeanFactory
.
getBean
(
"DorisDatasource"
);
JdbcProvider
jdbcProvider
=
CommonBeanFactory
.
getBean
(
JdbcProvider
.
class
);
DatasourceRequest
datasourceRequest
=
new
DatasourceRequest
();
...
...
@@ -336,9 +338,9 @@ public class DataSetTableService {
}).
collect
(
Collectors
.
toList
());
}
if
(!
map
.
containsKey
(
"status"
))
{
map
.
put
(
"status"
,
"success"
);
}
if
(!
map
.
containsKey
(
"status"
))
{
map
.
put
(
"status"
,
"success"
);
}
map
.
put
(
"fields"
,
fields
);
map
.
put
(
"data"
,
jsonArray
);
map
.
put
(
"page"
,
dataSetPreviewPage
);
...
...
@@ -799,29 +801,38 @@ public class DataSetTableService {
return
map
;
}
private
void
inferFieldType
(
List
<
TableFiled
>
fields
,
List
<
String
[]>
data
){
if
(
CollectionUtils
.
isEmpty
(
fields
)
||
CollectionUtils
.
isEmpty
(
data
))
{
private
void
inferFieldType
(
List
<
TableFiled
>
fields
,
List
<
String
[]>
data
)
{
if
(
CollectionUtils
.
isEmpty
(
fields
)
||
CollectionUtils
.
isEmpty
(
data
))
{
return
;
}
String
[]
firstLine
=
data
.
get
(
0
);
for
(
int
i
=
0
;
i
<
fields
.
size
()
&&
i
<
firstLine
.
length
;
i
++)
{
for
(
int
i
=
0
;
i
<
fields
.
size
()
&&
i
<
firstLine
.
length
;
i
++)
{
TableFiled
filed
=
fields
.
get
(
i
);
try
{
try
{
Integer
.
valueOf
(
firstLine
[
i
]);
filed
.
setFieldType
(
"INT"
);
continue
;
}
catch
(
Exception
ignore
)
{
}
catch
(
Exception
ignore
)
{
}
try
{
try
{
Long
.
valueOf
(
firstLine
[
i
]);
filed
.
setFieldType
(
"LONG"
);
continue
;
}
catch
(
Exception
ignore
){}
try
{
}
catch
(
Exception
ignore
)
{
}
try
{
Double
.
valueOf
(
firstLine
[
i
]);
filed
.
setFieldType
(
"DOUBLE"
);
continue
;
}
catch
(
Exception
ignore
){}
}
catch
(
Exception
ignore
)
{
}
try
{
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
simpleDateFormat
.
parse
(
firstLine
[
i
]);
filed
.
setFieldType
(
"TIME"
);
continue
;
}
catch
(
Exception
ignore
)
{
}
}
}
...
...
@@ -830,20 +841,27 @@ public class DataSetTableService {
if
(
cellTypeEnum
.
equals
(
CellType
.
STRING
))
{
return
cell
.
getStringCellValue
();
}
else
if
(
cellTypeEnum
.
equals
(
CellType
.
NUMERIC
))
{
double
d
=
cell
.
getNumericCellValue
();
try
{
Double
value
=
new
Double
(
d
);
double
eps
=
1
e
-
10
;
if
(
value
-
Math
.
floor
(
value
)
<
eps
){
return
value
.
longValue
()
+
""
;
}
else
{
NumberFormat
nf
=
NumberFormat
.
getInstance
();
nf
.
setGroupingUsed
(
false
);
return
nf
.
format
(
value
);
if
(
HSSFDateUtil
.
isCellDateFormatted
(
cell
))
{
Date
date
=
cell
.
getDateCellValue
();
//格式转换
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
return
sdf
.
format
(
date
);
}
else
{
double
d
=
cell
.
getNumericCellValue
();
try
{
Double
value
=
new
Double
(
d
);
double
eps
=
1
e
-
10
;
if
(
value
-
Math
.
floor
(
value
)
<
eps
)
{
return
value
.
longValue
()
+
""
;
}
else
{
NumberFormat
nf
=
NumberFormat
.
getInstance
();
nf
.
setGroupingUsed
(
false
);
return
nf
.
format
(
value
);
}
}
catch
(
Exception
e
)
{
BigDecimal
b
=
new
BigDecimal
(
d
);
return
b
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
).
doubleValue
()
+
""
;
}
}
catch
(
Exception
e
)
{
BigDecimal
b
=
new
BigDecimal
(
d
);
return
b
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
).
doubleValue
()
+
""
;
}
}
else
if
(
cellTypeEnum
.
equals
(
CellType
.
BOOLEAN
))
{
return
cell
.
getBooleanCellValue
()
?
"1"
:
"0"
;
...
...
@@ -885,20 +903,20 @@ public class DataSetTableService {
private
UtilMapper
utilMapper
;
@QuartzScheduled
(
cron
=
"0 0/3 * * * ?"
)
public
void
updateDatasetTableStatus
(){
public
void
updateDatasetTableStatus
()
{
List
<
QrtzSchedulerState
>
qrtzSchedulerStates
=
qrtzSchedulerStateMapper
.
selectByExample
(
null
);
List
<
String
>
activeQrtzInstances
=
qrtzSchedulerStates
.
stream
().
filter
(
qrtzSchedulerState
->
qrtzSchedulerState
.
getLastCheckinTime
()
+
qrtzSchedulerState
.
getCheckinInterval
()
+
1000
>
utilMapper
.
currentTimestamp
()).
map
(
QrtzSchedulerStateKey:
:
getInstanceName
).
collect
(
Collectors
.
toList
());
List
<
DatasetTable
>
jobStoppeddDatasetTables
=
new
ArrayList
<>();
DatasetTableExample
example
=
new
DatasetTableExample
();
example
.
createCriteria
().
andSyncStatusEqualTo
(
JobStatus
.
Underway
.
name
());
datasetTableMapper
.
selectByExample
(
example
).
forEach
(
datasetTable
->
{
if
(
StringUtils
.
isEmpty
(
datasetTable
.
getQrtzInstance
())
||
!
activeQrtzInstances
.
contains
(
datasetTable
.
getQrtzInstance
().
substring
(
0
,
datasetTable
.
getQrtzInstance
().
length
()
-
13
)))
{
jobStoppeddDatasetTables
.
add
(
datasetTable
);
}
});
datasetTableMapper
.
selectByExample
(
example
).
forEach
(
datasetTable
->
{
if
(
StringUtils
.
isEmpty
(
datasetTable
.
getQrtzInstance
())
||
!
activeQrtzInstances
.
contains
(
datasetTable
.
getQrtzInstance
().
substring
(
0
,
datasetTable
.
getQrtzInstance
().
length
()
-
13
)))
{
jobStoppeddDatasetTables
.
add
(
datasetTable
);
}
});
if
(
CollectionUtils
.
isEmpty
(
jobStoppeddDatasetTables
))
{
if
(
CollectionUtils
.
isEmpty
(
jobStoppeddDatasetTables
))
{
return
;
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论