提交 7add22f6 authored 作者: taojinlong's avatar taojinlong

refactor: 优化数据源删除提示信息

上级 c9b355c6
...@@ -74,8 +74,8 @@ public class DatasourceController { ...@@ -74,8 +74,8 @@ public class DatasourceController {
@DePermission(type = DePermissionType.DATASOURCE, level = ResourceAuthLevel.DATASOURCE_LEVEL_MANAGE) @DePermission(type = DePermissionType.DATASOURCE, level = ResourceAuthLevel.DATASOURCE_LEVEL_MANAGE)
@ApiOperation("删除数据源") @ApiOperation("删除数据源")
@PostMapping("/delete/{datasourceID}") @PostMapping("/delete/{datasourceID}")
public void deleteDatasource(@PathVariable(value = "datasourceID") String datasourceID) throws Exception { public ResultHolder deleteDatasource(@PathVariable(value = "datasourceID") String datasourceID) throws Exception {
datasourceService.deleteDatasource(datasourceID); return datasourceService.deleteDatasource(datasourceID);
} }
@RequiresPermissions("datasource:read") @RequiresPermissions("datasource:read")
......
...@@ -163,16 +163,17 @@ public class DatasourceService { ...@@ -163,16 +163,17 @@ public class DatasourceService {
} }
@DeCleaner(DePermissionType.DATASOURCE) @DeCleaner(DePermissionType.DATASOURCE)
public void deleteDatasource(String datasourceId) throws Exception { public ResultHolder deleteDatasource(String datasourceId) throws Exception {
DatasetTableExample example = new DatasetTableExample(); DatasetTableExample example = new DatasetTableExample();
example.createCriteria().andDataSourceIdEqualTo(datasourceId); example.createCriteria().andDataSourceIdEqualTo(datasourceId);
List<DatasetTable> datasetTables = datasetTableMapper.selectByExample(example); List<DatasetTable> datasetTables = datasetTableMapper.selectByExample(example);
if(CollectionUtils.isNotEmpty(datasetTables)){ if(CollectionUtils.isNotEmpty(datasetTables)){
DataEaseException.throwException(datasetTables.size() + Translator.get("i18n_datasource_not_allow_delete_msg")); return ResultHolder.error(datasetTables.size() + Translator.get("i18n_datasource_not_allow_delete_msg"));
} }
Datasource datasource = datasourceMapper.selectByPrimaryKey(datasourceId); Datasource datasource = datasourceMapper.selectByPrimaryKey(datasourceId);
datasourceMapper.deleteByPrimaryKey(datasourceId); datasourceMapper.deleteByPrimaryKey(datasourceId);
handleConnectionPool(datasource, "delete"); handleConnectionPool(datasource, "delete");
return ResultHolder.success("success");
} }
public void updateDatasource(Datasource datasource) { public void updateDatasource(Datasource datasource) {
......
...@@ -268,9 +268,16 @@ export default { ...@@ -268,9 +268,16 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
delDs(datasource.id).then(res => { delDs(datasource.id).then(res => {
this.$success(this.$t('commons.delete_success')) if(res.success){
this.switchMain('DataHome', {}, this.tData) this.$success(this.$t('commons.delete_success'))
this.refreshType(datasource) this.switchMain('DataHome', {}, this.tData)
this.refreshType(datasource)
}else {
this.$message({
type: 'error',
message: res.message
})
}
}) })
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论