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 1f4c5cccfe..03e2496191 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java @@ -1,6 +1,8 @@ package io.dataease.controller.dataset; import io.dataease.base.domain.DatasetTableTask; +import io.dataease.controller.request.dataset.DataSetTaskRequest; +import io.dataease.service.dataset.DataSetTableService; import io.dataease.service.dataset.DataSetTableTaskService; import org.springframework.web.bind.annotation.*; @@ -16,10 +18,13 @@ import java.util.List; public class DataSetTableTaskController { @Resource private DataSetTableTaskService dataSetTableTaskService; + @Resource + private DataSetTableService dataSetTableService; @PostMapping("save") - public DatasetTableTask save(@RequestBody DatasetTableTask datasetTableTask) throws Exception { - return dataSetTableTaskService.save(datasetTableTask); + public DatasetTableTask save(@RequestBody DataSetTaskRequest dataSetTaskRequest) throws Exception { + dataSetTableService.saveIncrementalConfig(dataSetTaskRequest.getDatasetTableIncrementalConfig()); + return dataSetTableTaskService.save(dataSetTaskRequest.getDatasetTableTask()); } @PostMapping("delete/{id}") diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 203df5e008..fc93757613 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -480,6 +480,9 @@ public class DataSetTableService { public void saveIncrementalConfig(DatasetTableIncrementalConfig datasetTableIncrementalConfig) { + if(datasetTableIncrementalConfig == null || StringUtils.isEmpty(datasetTableIncrementalConfig.getTableId())){ + return; + } if (StringUtils.isEmpty(datasetTableIncrementalConfig.getId())) { datasetTableIncrementalConfig.setId(UUID.randomUUID().toString()); datasetTableIncrementalConfigMapper.insertSelective(datasetTableIncrementalConfig); 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 d6101d2ad0..10d81eab98 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -22,6 +22,7 @@ import io.dataease.dto.dataset.DataTableInfoDTO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.pentaho.di.cluster.SlaveServer; import org.pentaho.di.core.database.DatabaseMeta; import org.pentaho.di.core.row.ValueMetaInterface; @@ -167,10 +168,6 @@ public class ExtractDataService { } return o1.getColumnIndex().compareTo(o2.getColumnIndex()); }); - for (DatasetTableField datasetTableField : datasetTableFields) { - System.out.println(new Gson().toJson(datasetTableField)); - } - String dorisTablColumnSql = createDorisTablColumnSql(datasetTableFields); switch (updateType) { // 全量更新 @@ -227,9 +224,9 @@ public class ExtractDataService { } } catch (Exception e) { e.printStackTrace(); - LogUtil.error("ExtractData error, dataaset: " + datasetTableId); - LogUtil.error(e.getMessage(), e); + LogUtil.error("Extract data error: " + datasetTableId, e); datasetTableTaskLog.setStatus(JobStatus.Error.name()); + datasetTableTaskLog.setInfo(ExceptionUtils.getStackTrace(e)); datasetTableTaskLog.setEndTime(System.currentTimeMillis()); dataSetTableTaskLogService.save(datasetTableTaskLog); } finally { diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 6eb609dba3..4b2fbe697e 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -757,6 +757,9 @@ export default { start_time: '开始时间', end_time: '结束时间', status: '状态', + error: '错误', + completed: '完成', + underway: '执行中', task_update: '定时更新', update_type: '更新方式', all_scope: '全量更新', diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index d883bb07b8..745f5af1ad 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -4,6 +4,9 @@ {{ $t('dataset.update_setting') }} + + {{ $t('commons.refresh') }} + + + + + - + + {{error_massage}} + + {{ $t('dataset.close') }} + + + {{ $t('dataset.confirm') }} - - - - + {{ $t('dataset.add_task') }} @@ -155,7 +176,7 @@ > { + const dataSetTaskRequest = { + datasetTableTask: task, + datasetTableIncrementalConfig: this.incrementalConfig + } + post('/dataset/task/save', dataSetTaskRequest).then(response => { this.$message({ message: this.$t('dataset.save_success'), type: 'success', diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue index 3addbf1236..b833d1777c 100644 --- a/frontend/src/views/dataset/data/ViewTable.vue +++ b/frontend/src/views/dataset/data/ViewTable.vue @@ -86,7 +86,6 @@ export default { }, methods: { initTable(id) { - console.log(id) this.tabActive = 'dataPreview' this.tableViewRowForm.row = 1000 if (id !== null) { diff --git a/frontend/src/views/dataset/index.vue b/frontend/src/views/dataset/index.vue index 40b2066b07..b172585f4d 100644 --- a/frontend/src/views/dataset/index.vue +++ b/frontend/src/views/dataset/index.vue @@ -37,7 +37,6 @@ export default { }, methods: { switchComponent(c) { - console.log(c) this.param = c.param switch (c.name) { case 'ViewTable':