From 7add22f6d893217ff19aa44bcb93bbc6579f0e88 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 28 Feb 2022 11:38:51 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E5=88=A0=E9=99=A4=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/datasource/DatasourceController.java |  4 ++--
 .../service/datasource/DatasourceService.java       |  5 +++--
 frontend/src/views/system/datasource/DsTree.vue     | 13 ++++++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
index d03a15f2db..54ccb07504 100644
--- a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
+++ b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
@@ -74,8 +74,8 @@ public class DatasourceController {
     @DePermission(type = DePermissionType.DATASOURCE, level = ResourceAuthLevel.DATASOURCE_LEVEL_MANAGE)
     @ApiOperation("删除数据源")
     @PostMapping("/delete/{datasourceID}")
-    public void deleteDatasource(@PathVariable(value = "datasourceID") String datasourceID) throws Exception {
-        datasourceService.deleteDatasource(datasourceID);
+    public ResultHolder deleteDatasource(@PathVariable(value = "datasourceID") String datasourceID) throws Exception {
+        return datasourceService.deleteDatasource(datasourceID);
     }
 
     @RequiresPermissions("datasource:read")
diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
index 7a20a5bd39..0883d92131 100644
--- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
+++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
@@ -163,16 +163,17 @@ public class DatasourceService {
     }
 
     @DeCleaner(DePermissionType.DATASOURCE)
-    public void deleteDatasource(String datasourceId) throws Exception {
+    public ResultHolder deleteDatasource(String datasourceId) throws Exception {
         DatasetTableExample example = new DatasetTableExample();
         example.createCriteria().andDataSourceIdEqualTo(datasourceId);
         List<DatasetTable> datasetTables = datasetTableMapper.selectByExample(example);
         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);
         datasourceMapper.deleteByPrimaryKey(datasourceId);
         handleConnectionPool(datasource, "delete");
+        return ResultHolder.success("success");
     }
 
     public void updateDatasource(Datasource datasource) {
diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue
index e5ca81de49..e7fa48e7f6 100644
--- a/frontend/src/views/system/datasource/DsTree.vue
+++ b/frontend/src/views/system/datasource/DsTree.vue
@@ -268,9 +268,16 @@ export default {
         type: 'warning'
       }).then(() => {
         delDs(datasource.id).then(res => {
-          this.$success(this.$t('commons.delete_success'))
-          this.switchMain('DataHome', {}, this.tData)
-          this.refreshType(datasource)
+          if(res.success){
+            this.$success(this.$t('commons.delete_success'))
+            this.switchMain('DataHome', {}, this.tData)
+            this.refreshType(datasource)
+          }else {
+            this.$message({
+              type: 'error',
+              message: res.message
+            })
+          }
         })
       }).catch(() => {
         this.$message({