From 99bae93fb50a6ce7c618293458ad02a1b9e37722 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 31 May 2021 12:49:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=99=90=E5=88=B6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1;=E6=95=B0=E6=8D=AE=E6=BA=90=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E5=92=8C=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/ExtractDataService.java    | 18 ++++++++++++++++--
 frontend/src/views/system/datasource/form.vue  | 10 +++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index e3f6d27ae5..aac392e3a5 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -240,8 +240,7 @@ public class ExtractDataService {
             switch (updateType) {
                 // 全量更新
                 case all_scope:
-                    datasetTableTaskLog = writeDatasetTableTaskLog(datasetTableTaskLog, datasetTableId, taskId);
-                    // TODO  before: check doris table column type
+                    datasetTableTaskLog = getDatasetTableTaskLog(datasetTableTaskLog, datasetTableId, taskId);
                     createDorisTable(DorisTableUtils.dorisName(datasetTableId), dorisTablColumnSql);
                     createDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId)), dorisTablColumnSql);
                     generateTransFile("all_scope", datasetTable, datasource, datasetTableFields, null);
@@ -346,6 +345,21 @@ public class ExtractDataService {
         }
     }
 
+    private DatasetTableTaskLog getDatasetTableTaskLog(DatasetTableTaskLog datasetTableTaskLog, String datasetTableId, String taskId) {
+        datasetTableTaskLog.setTableId(datasetTableId);
+        datasetTableTaskLog.setTaskId(taskId);
+        datasetTableTaskLog.setStatus(JobStatus.Underway.name());
+        for (int i=0;i<5;i++){
+            List<DatasetTableTaskLog> datasetTableTaskLogs = dataSetTableTaskLogService.select(datasetTableTaskLog);
+            if(CollectionUtils.isNotEmpty(datasetTableTaskLogs)){
+                return datasetTableTaskLogs.get(0);
+            }
+        }
+        datasetTableTaskLog.setStartTime(System.currentTimeMillis());
+        dataSetTableTaskLogService.save(datasetTableTaskLog);
+        return datasetTableTaskLog;
+    }
+
     private void extractData(DatasetTable datasetTable, String extractType) throws Exception {
 
 
diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue
index ee62f4ae68..608d39f498 100644
--- a/frontend/src/views/system/datasource/form.vue
+++ b/frontend/src/views/system/datasource/form.vue
@@ -19,6 +19,9 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.host')" prop="configuration.host">
+        <el-input v-model="form.configuration.host" autocomplete="off" :disabled="formType=='modify'" />
+      </el-form-item>
       <el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.data_base')" prop="configuration.dataBase">
         <el-input v-model="form.configuration.dataBase" autocomplete="off" :disabled="formType=='modify'" />
       </el-form-item>
@@ -26,13 +29,10 @@
         <el-input v-model="form.configuration.username" autocomplete="off" :disabled="formType=='modify'" />
       </el-form-item>
       <el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.password')" prop="configuration.password">
-        <el-input v-model="form.configuration.password" autocomplete="off" show-password :disabled="formType=='modify'" />
-      </el-form-item>
-      <el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.host')" prop="configuration.host">
-        <el-input v-model="form.configuration.host" autocomplete="off" :disabled="formType=='modify'" />
+        <el-input v-model="form.configuration.password" autocomplete="off" show-password  />
       </el-form-item>
       <el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.port')" prop="configuration.port">
-        <el-input v-model="form.configuration.port" autocomplete="off" :disabled="formType=='modify'" />
+        <el-input v-model="form.configuration.port" autocomplete="off"  />
       </el-form-item>
 
       <el-form-item>