From bdadbfa2f22c6919d19ea8178caa5624295a9936 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 28 Jul 2021 14:17:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8A=BD=E5=8F=96orac?= =?UTF-8?q?le=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/base/mapper/ext/ExtDataSetTaskMapper.java | 1 - .../controller/dataset/DataSetTableTaskController.java | 1 - .../dataease/service/dataset/ExtractDataService.java | 10 ++++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java index 423b23201d..54a75269dc 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java @@ -1,6 +1,5 @@ package io.dataease.base.mapper.ext; -import io.dataease.base.domain.DatasetTableTaskLog; import io.dataease.base.mapper.ext.query.GridExample; import io.dataease.dto.dataset.DataSetTaskDTO; import io.dataease.dto.dataset.DataSetTaskLogDTO; diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java index 391dc78a2e..8de2a81f80 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java @@ -7,7 +7,6 @@ import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; import io.dataease.controller.request.dataset.DataSetTaskRequest; import io.dataease.controller.sys.base.BaseGridRequest; -import io.dataease.controller.sys.response.SysUserGridResponse; import io.dataease.dto.dataset.DataSetTaskDTO; import io.dataease.service.dataset.DataSetTableTaskLogService; import io.dataease.service.dataset.DataSetTableTaskService; 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 1f214b8d54..593f12c13a 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -6,7 +6,6 @@ import io.dataease.base.mapper.DatasetTableMapper; import io.dataease.base.mapper.DatasetTableTaskMapper; import io.dataease.base.mapper.DatasourceMapper; import io.dataease.base.mapper.ext.ExtChartViewMapper; -import io.dataease.base.mapper.ext.UtilMapper; import io.dataease.commons.constants.*; import io.dataease.commons.model.AuthURD; import io.dataease.commons.utils.*; @@ -90,8 +89,6 @@ public class ExtractDataService { private DatasourceService datasourceService; @Resource private ExtChartViewMapper extChartViewMapper; - @Resource - private UtilMapper utilMapper; private static String lastUpdateTime = "${__last_update_time__}"; private static String currentUpdateTime = "${__current_update_time__}"; @@ -872,13 +869,18 @@ public class ExtractDataService { textFileOutputMeta.setExtension(extention); if (datasource.getType().equalsIgnoreCase(DatasourceTypes.oracle.name())) { - TextFileField[] outputFields = new TextFileField[datasetTableFields.size()]; + TextFileField[] outputFields = new TextFileField[datasetTableFields.size() + 1]; for(int i=0;i< datasetTableFields.size();i++){ TextFileField textFileField = new TextFileField(); textFileField.setName(datasetTableFields.get(i).getOriginName()); textFileField.setType("String"); outputFields[i] = textFileField; } + TextFileField textFileField = new TextFileField(); + textFileField.setName("dataease_uuid"); + textFileField.setType("String"); + outputFields[datasetTableFields.size()] = textFileField; + textFileOutputMeta.setOutputFields(outputFields); }else { textFileOutputMeta.setOutputFields(new TextFileField[0]);