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 6afd148af2..1f45725f81 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -342,34 +342,26 @@ public class ExtractDataService { try { if(datasource.getType().equalsIgnoreCase(DatasourceTypes.api.name())){ extractData(datasetTable, datasource, datasetTableFields, "incremental_add", null); - return; - } - DatasetTableIncrementalConfig datasetTableIncrementalConfig = dataSetTableService.incrementalConfig(datasetTableId); - if (datasetTableIncrementalConfig == null || StringUtils.isEmpty(datasetTableIncrementalConfig.getTableId())) { - updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, null); - return; - } - if (datasetTable.getLastUpdateTime() == null || datasetTable.getLastUpdateTime() == 0) { - updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, null); - saveErrorLog(datasetTableId, taskId, new Exception("未进行全量同步")); - lastExecStatus = JobStatus.Error; - return; - } + }else{ + DatasetTableIncrementalConfig datasetTableIncrementalConfig = dataSetTableService.incrementalConfig(datasetTableId); + if (datasetTable.getLastUpdateTime() == null || datasetTable.getLastUpdateTime() == 0) { + throw new Exception("未进行全量同步"); + } - execTime = System.currentTimeMillis(); - if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd()) && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd().replace(" ", ""))) {// 增量添加 - String sql = datasetTableIncrementalConfig.getIncrementalAdd().replace(lastUpdateTime, datasetTable.getLastUpdateTime().toString()) - .replace(currentUpdateTime, Long.valueOf(System.currentTimeMillis()).toString()); - extractData(datasetTable, datasource, datasetTableFields, "incremental_add", sql); - } + execTime = System.currentTimeMillis(); + if (datasetTableIncrementalConfig != null && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd()) && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd().replace(" ", ""))) {// 增量添加 + String sql = datasetTableIncrementalConfig.getIncrementalAdd().replace(lastUpdateTime, datasetTable.getLastUpdateTime().toString()) + .replace(currentUpdateTime, Long.valueOf(System.currentTimeMillis()).toString()); + extractData(datasetTable, datasource, datasetTableFields, "incremental_add", sql); + } - if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalDelete()) && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalDelete().replace(" ", ""))) {// 增量删除 - String sql = datasetTableIncrementalConfig.getIncrementalDelete().replace(lastUpdateTime, datasetTable.getLastUpdateTime().toString()) - .replace(currentUpdateTime, Long.valueOf(System.currentTimeMillis()).toString()); - extractData(datasetTable, datasource, datasetTableFields, "incremental_delete", sql); + if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalDelete()) && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalDelete().replace(" ", ""))) {// 增量删除 + String sql = datasetTableIncrementalConfig.getIncrementalDelete().replace(lastUpdateTime, datasetTable.getLastUpdateTime().toString()) + .replace(currentUpdateTime, Long.valueOf(System.currentTimeMillis()).toString()); + extractData(datasetTable, datasource, datasetTableFields, "incremental_delete", sql); + } } saveSuccessLog(datasetTableTaskLog); - msg = true; lastExecStatus = JobStatus.Completed; } catch (Exception e) { diff --git a/frontend/src/views/dataset/add/AddCustom.vue b/frontend/src/views/dataset/add/AddCustom.vue index 8906e24097..e5d13885fc 100644 --- a/frontend/src/views/dataset/add/AddCustom.vue +++ b/frontend/src/views/dataset/add/AddCustom.vue @@ -84,7 +84,7 @@ export default { height: 500, data: [], fields: [], - customType: ['db', 'sql', 'excel'] + customType: ['db', 'sql', 'excel', 'api'] } }, watch: {