From f39ab20bfbe9a97c26524c87b8f64ecd78b2e0d8 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 1 Nov 2023 15:37:07 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/manage/DataSourceManage.java     |  7 +++++++
 .../datasource/server/DatasourceServer.java     | 17 +++++------------
 de-xpack                                        |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java b/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java
index 6ebd3a95d7..a26fe93b95 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/manage/DataSourceManage.java
@@ -87,6 +87,13 @@ public class DataSourceManage {
         coreOptRecentManage.saveOpt(coreDatasource.getId(), OptConstants.OPT_RESOURCE_TYPE.DATASOURCE,OptConstants.OPT_TYPE.UPDATE);
     }
 
+    @XpackInteract(value = "datasourceResourceTree", before = false)
+    public void innerEditStatus(CoreDatasource coreDatasource) {
+        UpdateWrapper<CoreDatasource> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id", coreDatasource.getId());
+        coreDatasourceMapper.update(coreDatasource, updateWrapper);
+    }
+
     @XpackInteract(value = "datasourceResourceTree", before = false)
     public void move(DatasourceDTO dataSourceDTO) {
         Long id = dataSourceDTO.getId();
diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
index 0419d7a4d1..d6550acdba 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
@@ -12,8 +12,6 @@ import io.dataease.api.dataset.dto.DatasetTableDTO;
 import io.dataease.api.dataset.dto.PreviewSqlDTO;
 import io.dataease.api.ds.DatasourceApi;
 import io.dataease.api.ds.vo.*;
-import io.dataease.api.permissions.auth.api.InteractiveAuthApi;
-import io.dataease.api.permissions.auth.dto.BusiResourceEditor;
 import io.dataease.commons.constants.TaskStatus;
 import io.dataease.commons.utils.CommonThreadPool;
 import io.dataease.constant.DataSourceType;
@@ -43,7 +41,6 @@ import io.dataease.utils.*;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -88,8 +85,6 @@ public class DatasourceServer implements DatasourceApi {
     @Resource
     private DatasetDataManage datasetDataManage;
 
-    @Autowired(required = false)
-    private InteractiveAuthApi interactiveAuthApi;
 
     @Resource
     private CoreUserManage coreUserManage;
@@ -618,14 +613,12 @@ public class DatasourceServer implements DatasourceApi {
         record.setStatus(coreDatasource.getStatus());
         QueryWrapper<CoreDatasource> wrapper = new QueryWrapper<>();
         wrapper.eq("id", coreDatasource.getId());
-        datasourceMapper.update(record, wrapper);
-        if (interactiveAuthApi != null) {
-            BusiResourceEditor editor = new BusiResourceEditor();
-            editor.setId((long) coreDatasource.getId());
-            editor.setName(coreDatasource.getName());
-            editor.setExtraFlag(getExtraFlag(coreDatasource.getType(), coreDatasource.getStatus()));
-            interactiveAuthApi.editResource(editor);
+        CoreDatasource originData = datasourceMapper.selectById(coreDatasource.getId());
+        String originStatus = originData.getStatus();
+        if (StringUtils.equals(coreDatasource.getStatus(), originStatus)) {
+            return datasourceDTO;
         }
+        dataSourceManage.innerEditStatus(coreDatasource);
         return datasourceDTO;
     }
 
diff --git a/de-xpack b/de-xpack
index 91f3ae7939..bd2abefb4c 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 91f3ae793906139d6d761704b95c162de7d26a3d
+Subproject commit bd2abefb4c91e6399a7de3a6f4dcbadb5633163b