github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 03:52:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
wangjiahao 2021-07-28 14:30:49 +08:00
commit 343ea39385
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java
View File

@ -1,6 +1,5 @@
package io.dataease.base.mapper.ext; package io.dataease.base.mapper.ext;
import io.dataease.base.domain.DatasetTableTaskLog;
import io.dataease.base.mapper.ext.query.GridExample; import io.dataease.base.mapper.ext.query.GridExample;
import io.dataease.dto.dataset.DataSetTaskDTO; import io.dataease.dto.dataset.DataSetTaskDTO;
import io.dataease.dto.dataset.DataSetTaskLogDTO; import io.dataease.dto.dataset.DataSetTaskLogDTO;

1
backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java
View File

@ -7,7 +7,6 @@ import io.dataease.commons.utils.PageUtils;
import io.dataease.commons.utils.Pager; import io.dataease.commons.utils.Pager;
import io.dataease.controller.request.dataset.DataSetTaskRequest; import io.dataease.controller.request.dataset.DataSetTaskRequest;
import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.controller.sys.base.BaseGridRequest;
import io.dataease.controller.sys.response.SysUserGridResponse;
import io.dataease.dto.dataset.DataSetTaskDTO; import io.dataease.dto.dataset.DataSetTaskDTO;
import io.dataease.service.dataset.DataSetTableTaskLogService; import io.dataease.service.dataset.DataSetTableTaskLogService;
import io.dataease.service.dataset.DataSetTableTaskService; import io.dataease.service.dataset.DataSetTableTaskService;

10
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -6,7 +6,6 @@ import io.dataease.base.mapper.DatasetTableMapper;
import io.dataease.base.mapper.DatasetTableTaskMapper; import io.dataease.base.mapper.DatasetTableTaskMapper;
import io.dataease.base.mapper.DatasourceMapper; import io.dataease.base.mapper.DatasourceMapper;
import io.dataease.base.mapper.ext.ExtChartViewMapper; import io.dataease.base.mapper.ext.ExtChartViewMapper;
import io.dataease.base.mapper.ext.UtilMapper;
import io.dataease.commons.constants.*; import io.dataease.commons.constants.*;
import io.dataease.commons.model.AuthURD; import io.dataease.commons.model.AuthURD;
import io.dataease.commons.utils.*; import io.dataease.commons.utils.*;
@ -90,8 +89,6 @@ public class ExtractDataService {
private DatasourceService datasourceService; private DatasourceService datasourceService;
@Resource @Resource
private ExtChartViewMapper extChartViewMapper; private ExtChartViewMapper extChartViewMapper;
@Resource
private UtilMapper utilMapper;
private static String lastUpdateTime = "${__last_update_time__}"; private static String lastUpdateTime = "${__last_update_time__}";
private static String currentUpdateTime = "${__current_update_time__}"; private static String currentUpdateTime = "${__current_update_time__}";
@ -872,13 +869,18 @@ public class ExtractDataService {
textFileOutputMeta.setExtension(extention); textFileOutputMeta.setExtension(extention);
if (datasource.getType().equalsIgnoreCase(DatasourceTypes.oracle.name())) { 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++){ for(int i=0;i< datasetTableFields.size();i++){
TextFileField textFileField = new TextFileField(); TextFileField textFileField = new TextFileField();
textFileField.setName(datasetTableFields.get(i).getOriginName()); textFileField.setName(datasetTableFields.get(i).getOriginName());
textFileField.setType("String"); textFileField.setType("String");
outputFields[i] = textFileField; outputFields[i] = textFileField;
} }
TextFileField textFileField = new TextFileField();
textFileField.setName("dataease_uuid");
textFileField.setType("String");
outputFields[datasetTableFields.size()] = textFileField;
textFileOutputMeta.setOutputFields(outputFields); textFileOutputMeta.setOutputFields(outputFields);
}else { }else {
textFileOutputMeta.setOutputFields(new TextFileField[0]); textFileOutputMeta.setOutputFields(new TextFileField[0]);