Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
e89c8ac4
提交
e89c8ac4
authored
5月 12, 2021
作者:
taojinlong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 删掉数据集时,同步删掉 doris 里的表
上级
20daae2b
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
23 行增加
和
6 行删除
+23
-6
DorisTableUtils.java
.../main/java/io/dataease/commons/utils/DorisTableUtils.java
+4
-0
DataSetGroupController.java
...o/dataease/controller/dataset/DataSetGroupController.java
+1
-1
DataSetTableController.java
...o/dataease/controller/dataset/DataSetTableController.java
+1
-1
DataSetGroupService.java
...java/io/dataease/service/dataset/DataSetGroupService.java
+2
-2
DataSetTableService.java
...java/io/dataease/service/dataset/DataSetTableService.java
+15
-2
没有找到文件。
backend/src/main/java/io/dataease/commons/utils/DorisTableUtils.java
浏览文件 @
e89c8ac4
...
...
@@ -17,4 +17,8 @@ public class DorisTableUtils {
public
static
String
dorisFieldName
(
String
dorisName
)
{
return
"f_"
+
Md5Utils
.
md5
(
dorisName
);
}
public
static
String
excelColumnName
(
String
filedName
)
{
return
"C_"
+
Md5Utils
.
md5
(
filedName
);
}
}
backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java
浏览文件 @
e89c8ac4
...
...
@@ -32,7 +32,7 @@ public class DataSetGroupController {
}
@PostMapping
(
"/delete/{id}"
)
public
void
tree
(
@PathVariable
String
id
)
{
public
void
tree
(
@PathVariable
String
id
)
throws
Exception
{
dataSetGroupService
.
delete
(
id
);
}
...
...
backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
浏览文件 @
e89c8ac4
...
...
@@ -34,7 +34,7 @@ public class DataSetTableController {
}
@PostMapping
(
"delete/{id}"
)
public
void
delete
(
@PathVariable
String
id
)
{
public
void
delete
(
@PathVariable
String
id
)
throws
Exception
{
dataSetTableService
.
delete
(
id
);
}
...
...
backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java
浏览文件 @
e89c8ac4
...
...
@@ -47,7 +47,7 @@ public class DataSetGroupService {
return
dataSetGroupDTO
;
}
public
void
delete
(
String
id
)
{
public
void
delete
(
String
id
)
throws
Exception
{
DataSetGroupRequest
datasetGroup
=
new
DataSetGroupRequest
();
datasetGroup
.
setId
(
id
);
List
<
DataSetGroupDTO
>
tree
=
tree
(
datasetGroup
);
...
...
@@ -64,7 +64,7 @@ public class DataSetGroupService {
return
datasetGroupMapper
.
selectByPrimaryKey
(
id
);
}
public
void
deleteTableAndField
(
List
<
String
>
sceneIds
)
{
public
void
deleteTableAndField
(
List
<
String
>
sceneIds
)
throws
Exception
{
for
(
String
sceneId
:
sceneIds
)
{
DataSetTableRequest
dataSetTableRequest
=
new
DataSetTableRequest
();
dataSetTableRequest
.
setSceneId
(
sceneId
);
...
...
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
浏览文件 @
e89c8ac4
...
...
@@ -112,11 +112,24 @@ public class DataSetTableService {
return
datasetTable
;
}
public
void
delete
(
String
id
)
{
public
void
delete
(
String
id
)
throws
Exception
{
datasetTableMapper
.
deleteByPrimaryKey
(
id
);
dataSetTableFieldsService
.
deleteByTableId
(
id
);
// 删除同步任务
dataSetTableTaskService
.
deleteByTableId
(
id
);
deleteDorisTable
(
id
);
}
private
void
deleteDorisTable
(
String
datasetId
)
throws
Exception
{
String
dorisTableName
=
DorisTableUtils
.
dorisName
(
datasetId
);
Datasource
dorisDatasource
=
(
Datasource
)
CommonBeanFactory
.
getBean
(
"DorisDatasource"
);
JdbcProvider
jdbcProvider
=
CommonBeanFactory
.
getBean
(
JdbcProvider
.
class
);;
DatasourceRequest
datasourceRequest
=
new
DatasourceRequest
();
datasourceRequest
.
setDatasource
(
dorisDatasource
);
datasourceRequest
.
setQuery
(
"drop table if exists "
+
dorisTableName
);
jdbcProvider
.
exec
(
datasourceRequest
);
datasourceRequest
.
setQuery
(
"drop table if exists "
+
DorisTableUtils
.
dorisTmpName
(
dorisTableName
));
jdbcProvider
.
exec
(
datasourceRequest
);
}
public
List
<
DatasetTable
>
list
(
DataSetTableRequest
dataSetTableRequest
)
{
...
...
@@ -515,7 +528,7 @@ public class DataSetTableService {
datasetTableField
.
setOriginName
(
filed
.
getFieldName
());
datasetTableField
.
setName
(
filed
.
getRemarks
());
if
(
StringUtils
.
equalsIgnoreCase
(
datasetTable
.
getType
(),
"excel"
))
{
datasetTableField
.
setDataeaseName
(
"C_"
+
Md5Utils
.
md5
(
filed
.
getFieldName
()));
datasetTableField
.
setDataeaseName
(
DorisTableUtils
.
excelColumnName
(
filed
.
getFieldName
()));
}
else
{
datasetTableField
.
setDataeaseName
(
filed
.
getFieldName
());
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论