Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
c493849d
提交
c493849d
authored
3月 28, 2022
作者:
taojinlong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 精简模式下创建关联数据集失败
上级
8857c995
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
21 行增加
和
16 行删除
+21
-16
MysqlDDLProvider.java
...a/io/dataease/provider/engine/mysql/MysqlDDLProvider.java
+1
-1
DataSetTableService.java
...java/io/dataease/service/dataset/DataSetTableService.java
+13
-12
DatasetGroupSelector.vue
frontend/src/views/dataset/common/DatasetGroupSelector.vue
+5
-1
UnionView.vue
frontend/src/views/dataset/data/UnionView.vue
+2
-2
没有找到文件。
backend/src/main/java/io/dataease/provider/engine/mysql/MysqlDDLProvider.java
浏览文件 @
c493849d
...
...
@@ -22,7 +22,7 @@ public class MysqlDDLProvider extends DDLProviderImpl {
@Override
public
String
createView
(
String
name
,
String
viewSQL
)
{
return
"CREATE
VIEW IF NOT EXISTS
"
+
name
+
" AS ("
+
viewSQL
+
")"
;
return
"CREATE
or replace view
"
+
name
+
" AS ("
+
viewSQL
+
")"
;
}
@Override
...
...
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
浏览文件 @
c493849d
...
...
@@ -962,7 +962,7 @@ public class DataSetTableService {
}
else
{
ds
=
engineService
.
getDeEngine
();
datasourceRequest
.
setDatasource
(
ds
);
sql
=
getCustom
SQLDoris
(
dataTableInfoDTO
,
list
);
sql
=
getCustom
ViewSQL
(
dataTableInfoDTO
,
list
);
}
Map
<
String
,
Object
>
res
=
new
HashMap
<>();
try
{
...
...
@@ -1010,8 +1010,8 @@ public class DataSetTableService {
}
}
// 自助数据集从
doris
里预览数据
private
String
getCustom
SQLDoris
(
DataTableInfoDTO
dataTableInfoDTO
,
List
<
DataSetTableUnionDTO
>
list
)
{
// 自助数据集从
数据引擎(dorsi/mysql/...)
里预览数据
private
String
getCustom
ViewSQL
(
DataTableInfoDTO
dataTableInfoDTO
,
List
<
DataSetTableUnionDTO
>
list
)
{
Map
<
String
,
String
[]>
customInfo
=
new
TreeMap
<>();
dataTableInfoDTO
.
getList
().
forEach
(
ele
->
{
String
table
=
TableUtils
.
tableName
(
ele
.
getTableId
());
...
...
@@ -1519,7 +1519,7 @@ public class DataSetTableService {
dataSetTableFieldsService
.
batchEdit
(
fieldList
);
// custom 创建doris视图
if
(
datasetTable
.
getMode
()
==
1
)
{
createDorisView
(
TableUtils
.
tableName
(
datasetTable
.
getId
()),
getCustom
SQLDoris
(
dataTableInfoDTO
,
createDorisView
(
TableUtils
.
tableName
(
datasetTable
.
getId
()),
getCustom
ViewSQL
(
dataTableInfoDTO
,
dataSetTableUnionService
.
listByTableId
(
dataTableInfoDTO
.
getList
().
get
(
0
).
getTableId
())));
}
return
;
...
...
@@ -1670,11 +1670,11 @@ public class DataSetTableService {
}
private
void
createDorisView
(
String
dorisTableName
,
String
customSql
)
throws
Exception
{
Datasource
dorisDatasourc
e
=
engineService
.
getDeEngine
();
Datasource
engin
e
=
engineService
.
getDeEngine
();
JdbcProvider
jdbcProvider
=
CommonBeanFactory
.
getBean
(
JdbcProvider
.
class
);
DatasourceRequest
datasourceRequest
=
new
DatasourceRequest
();
datasourceRequest
.
setDatasource
(
dorisDatasourc
e
);
DDLProvider
ddlProvider
=
ProviderFactory
.
getDDLProvider
(
dorisDatasourc
e
.
getType
());
datasourceRequest
.
setDatasource
(
engin
e
);
DDLProvider
ddlProvider
=
ProviderFactory
.
getDDLProvider
(
engin
e
.
getType
());
// 先删除表
datasourceRequest
.
setQuery
(
ddlProvider
.
dropView
(
dorisTableName
));
jdbcProvider
.
exec
(
datasourceRequest
);
...
...
@@ -2184,21 +2184,21 @@ public class DataSetTableService {
private
UtilMapper
utilMapper
;
public
void
updateDatasetTableStatus
()
{
if
(
this
.
isUpdatingDatasetTableStatus
)
{
if
(
this
.
isUpdatingDatasetTableStatus
)
{
return
;
}
else
{
}
else
{
this
.
isUpdatingDatasetTableStatus
=
true
;
}
try
{
doUpdate
();
}
catch
(
Exception
e
){}
finally
{
}
catch
(
Exception
e
)
{
}
finally
{
this
.
isUpdatingDatasetTableStatus
=
false
;
}
}
private
void
doUpdate
(){
private
void
doUpdate
()
{
List
<
QrtzSchedulerState
>
qrtzSchedulerStates
=
qrtzSchedulerStateMapper
.
selectByExample
(
null
);
List
<
String
>
activeQrtzInstances
=
qrtzSchedulerStates
.
stream
()
.
filter
(
qrtzSchedulerState
->
qrtzSchedulerState
.
getLastCheckinTime
()
...
...
@@ -2250,6 +2250,7 @@ public class DataSetTableService {
extractDataService
.
deleteFile
(
"incremental_delete"
,
jobStoppeddDatasetTable
.
getId
());
}
}
/*
* 判断数组中是否有重复的值
*/
...
...
frontend/src/views/dataset/common/DatasetGroupSelector.vue
浏览文件 @
c493849d
...
...
@@ -115,6 +115,7 @@
<
script
>
import
{
isKettleRunning
,
post
}
from
'@/api/dataset/dataset'
import
{
engineMode
}
from
"@/api/system/engine"
;
export
default
{
name
:
'DatasetGroupSelector'
,
...
...
@@ -219,6 +220,9 @@ export default {
},
created
()
{
this
.
kettleState
()
engineMode
().
then
(
res
=>
{
this
.
engineMode
=
res
.
data
})
},
methods
:
{
filterNode
(
value
,
data
)
{
...
...
@@ -271,7 +275,7 @@ export default {
return
!
(
ele
.
mode
===
0
&&
ele
.
type
===
'sql'
)
})
for
(
let
i
=
0
;
i
<
this
.
tables
.
length
;
i
++
)
{
if
(
this
.
tables
[
i
].
mode
===
1
&&
this
.
kettleRunning
===
false
)
{
if
(
this
.
tables
[
i
].
mode
===
1
&&
this
.
kettleRunning
===
false
&&
this
.
engineMode
!==
'simple'
)
{
this
.
$set
(
this
.
tables
[
i
],
'disabled'
,
true
)
}
}
...
...
frontend/src/views/dataset/data/UnionView.vue
浏览文件 @
c493849d
...
...
@@ -182,7 +182,7 @@ export default {
sourceFieldOption
:
[],
targetFieldOption
:
[],
targetTable
:
{},
customType
:
[
'db'
,
'sql'
,
'excel'
]
customType
:
[
'db'
,
'sql'
,
'excel'
,
'api'
]
}
},
watch
:
{
...
...
@@ -207,7 +207,7 @@ export default {
if
(
this
.
table
.
mode
===
0
)
{
this
.
customType
=
[
'db'
]
}
else
{
this
.
customType
=
[
'db'
,
'sql'
,
'excel'
]
this
.
customType
=
[
'db'
,
'sql'
,
'excel'
,
'api'
]
}
post
(
'dataset/union/listByTableId/'
+
this
.
table
.
id
,
{}).
then
(
response
=>
{
// console.log(response)
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论