From e438d4e1f07669c46316386f83d8f462a70e56f0 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 4 Aug 2021 10:33:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=9F=E5=A7=8B=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=97=E6=97=B6=EF=BC=8C=E5=90=8C=E6=AD=A5=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/ExtractDataService.java | 2 +- frontend/src/views/dataset/data/UpdateInfo.vue | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 ccdfda18bd..8aafc110d1 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -283,7 +283,7 @@ public class ExtractDataService { createDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId)), dorisTablColumnSql); generateTransFile("all_scope", datasetTable, datasource, datasetTableFields, null); if (datasetTable.getType().equalsIgnoreCase("sql")) { - generateJobFile("all_scope", datasetTable, fetchSqlField(new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getSql(), datasource)); + generateJobFile("all_scope", datasetTable, String.join(",", datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList()))); } else { generateJobFile("all_scope", datasetTable, String.join(",", datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList()))); } diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index 1c25adaa34..6383d4ba36 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -432,10 +432,14 @@ export default { created() { this.timer = setInterval(() => { this.listTaskLog(false) + }, 5000); + this.taskTimer = setInterval(() => { + this.listTask(false) }, 5000) }, beforeDestroy() { clearInterval(this.timer) + clearInterval(this.taskTimer) }, methods: { calHeight() {