From ac736abe0c9b991446a142e7fbbd433269f29b73 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 25 Jan 2024 14:38:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?=
 =?UTF-8?q?=E6=8B=86=E5=88=86=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/datasource/server/DatasourceServer.java  |  2 ++
 core/core-frontend/src/api/datasource.ts              |  6 ++++++
 .../visualized/data/datasource/form/CreatDsGroup.vue  |  7 ++++---
 .../visualized/data/datasource/form/ExcelDetail.vue   | 11 +++++++----
 .../views/visualized/data/datasource/form/index.vue   |  7 ++++---
 .../main/java/io/dataease/api/ds/DatasourceApi.java   |  3 +++
 6 files changed, 26 insertions(+), 10 deletions(-)

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 5e41610819..46539eb917 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
@@ -311,6 +311,8 @@ public class DatasourceServer implements DatasourceApi {
         return dataSourceDTO;
     }
 
+    @Transactional
+    @Override
     public DatasourceDTO update(DatasourceDTO dataSourceDTO) throws DEException {
         Long pk = null;
         if (ObjectUtils.isEmpty(pk = dataSourceDTO.getId())) {
diff --git a/core/core-frontend/src/api/datasource.ts b/core/core-frontend/src/api/datasource.ts
index 4567ef1599..b90ab1bfea 100644
--- a/core/core-frontend/src/api/datasource.ts
+++ b/core/core-frontend/src/api/datasource.ts
@@ -91,6 +91,12 @@ export const save = async (data = {}): Promise<Dataset> => {
   })
 }
 
+export const update = async (data = {}): Promise<Dataset> => {
+  return request.post({ url: '/datasource/update', data }).then(res => {
+    return res?.data
+  })
+}
+
 export const move = async (data = {}): Promise<Dataset> => {
   return request.post({ url: '/datasource/move', data }).then(res => {
     return res?.data
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue b/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue
index bce89ddff3..62ff287991 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { ref, reactive, computed, watch, nextTick } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
-import { checkRepeat, listDatasources, save } from '@/api/datasource'
+import { checkRepeat, listDatasources, save, update } from '@/api/datasource'
 import { ElMessage, ElMessageBox, ElMessageBoxOptions } from 'element-plus-secondary'
 import type { DatasetOrFolder } from '@/api/dataset'
 import nothingTree from '@/assets/img/nothing-tree.png'
@@ -274,10 +274,11 @@ const saveDataset = () => {
         }
         request.apiConfiguration = ''
         checkRepeat(request).then(res => {
+          let method = request.id === '' ? save : update
           if (res) {
             ElMessageBox.confirm(t('datasource.has_same_ds'), options as ElMessageBoxOptions).then(
               () => {
-                save({ ...request, name: datasetForm.name, pid: params.pid })
+                method({ ...request, name: datasetForm.name, pid: params.pid })
                   .then(res => {
                     if (res !== undefined) {
                       wsCache.set('ds-new-success', true)
@@ -292,7 +293,7 @@ const saveDataset = () => {
               }
             )
           } else {
-            save({ ...request, name: datasetForm.name, pid: params.pid })
+            method({ ...request, name: datasetForm.name, pid: params.pid })
               .then(res => {
                 if (res !== undefined) {
                   wsCache.set('ds-new-success', true)
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue
index 3cd2133d1a..9d06d385d1 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue
@@ -13,7 +13,7 @@ import {
   nextTick
 } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus-secondary'
-import { save } from '@/api/datasource'
+import { save, update } from '@/api/datasource'
 import type { Action } from 'element-plus-secondary'
 import { Base64 } from 'js-base64'
 import ExcelInfo from '../ExcelInfo.vue'
@@ -255,9 +255,12 @@ const saveExcelData = (sheetFileMd5, table, params, successCb, finallyCb) => {
     table.sheets[i].jsonArray = []
   }
   table.configuration = Base64.encode(JSON.stringify(table.sheets))
+  let method = save
   if (!table.id || table.id === '0') {
     delete table.id
     table.pid = params.pid
+  } else {
+    method = update
   }
   if (new Set(sheetFileMd5).size !== sheetFileMd5.length && !props.param.id) {
     ElMessageBox.confirm(t('dataset.merge_title'), {
@@ -272,7 +275,7 @@ const saveExcelData = (sheetFileMd5, table, params, successCb, finallyCb) => {
         loading.value = true
         table.mergeSheet = action === 'confirm'
         if (action === 'confirm') {
-          save(table)
+          method(table)
             .then(res => {
               emitter.emit('showFinishPage', res)
               successCb?.()
@@ -288,7 +291,7 @@ const saveExcelData = (sheetFileMd5, table, params, successCb, finallyCb) => {
         }
 
         if (action === 'cancel') {
-          save(table)
+          method(table)
             .then(res => {
               emitter.emit('showFinishPage', res)
               successCb?.()
@@ -307,7 +310,7 @@ const saveExcelData = (sheetFileMd5, table, params, successCb, finallyCb) => {
   } else {
     if (loading.value) return
     loading.value = true
-    save(table)
+    method(table)
       .then(res => {
         emitter.emit('showFinishPage', res)
         successCb?.()
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
index 9b8fc58a6d..4d4a2f446f 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
@@ -8,7 +8,7 @@ import DsTypeList from './DsTypeList.vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import EditorDetail from './EditorDetail.vue'
 import ExcelDetail from './ExcelDetail.vue'
-import { save, validate, latestUse, isShowFinishPage, checkRepeat } from '@/api/datasource'
+import { save, update, validate, latestUse, isShowFinishPage, checkRepeat } from '@/api/datasource'
 import { Base64 } from 'js-base64'
 import type { Param } from './ExcelDetail.vue'
 import { dsTypes, typeList, nameMap } from './option'
@@ -403,6 +403,7 @@ const saveDS = () => {
           tip: ''
         }
         checkRepeat(request).then(res => {
+          let method = request.id === '' ? save : update
           if (res) {
             ElMessageBox.confirm(t('datasource.has_same_ds'), options as ElMessageBoxOptions).then(
               () => {
@@ -410,7 +411,7 @@ const saveDS = () => {
                   return
                 }
                 dsLoading.value = true
-                save(request)
+                method(request)
                   .then(res => {
                     if (res !== undefined) {
                       handleShowFinishPage({ id: res.id, name: res.name })
@@ -427,7 +428,7 @@ const saveDS = () => {
               return
             }
             dsLoading.value = true
-            save(request)
+            method(request)
               .then(res => {
                 if (res !== undefined) {
                   handleShowFinishPage({ id: res.id, name: res.name })
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java
index d0812d6059..f0a6f5b0d6 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/ds/DatasourceApi.java
@@ -34,6 +34,9 @@ public interface DatasourceApi {
     @PostMapping("/save")
     DatasourceDTO save(@RequestBody DatasourceDTO dataSourceDTO) throws DEException;
 
+    @PostMapping("/update")
+    DatasourceDTO update(@RequestBody DatasourceDTO dataSourceDTO) throws DEException;
+
 
     @PostMapping("/move")
     DatasourceDTO move(@RequestBody DatasourceDTO dataSourceDTO) throws DEException;