diff --git a/core/core-backend/src/main/java/io/dataease/datasource/manage/DatasourceSyncManage.java b/core/core-backend/src/main/java/io/dataease/datasource/manage/DatasourceSyncManage.java index 592a11235f..7117a794f8 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/manage/DatasourceSyncManage.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/manage/DatasourceSyncManage.java @@ -134,7 +134,7 @@ public class DatasourceSyncManage { datasourceRequest.setDatasource(coreDatasource); List tables = ApiUtils.getTables(datasourceRequest); for (DatasetTableDTO api : tables) { - CoreDatasourceTaskLog datasetTableTaskLog = datasourceTaskServer.initTaskLog(coreDatasource.getId(), taskId, api.getName(), scheduleType); + CoreDatasourceTaskLog datasetTableTaskLog = datasourceTaskServer.initTaskLog(coreDatasource.getId(), taskId, api.getTableName(), scheduleType); datasourceRequest.setTable(api.getTableName()); List tableFields = ApiUtils.getTableFields(datasourceRequest); try { @@ -181,7 +181,7 @@ public class DatasourceSyncManage { LogUtil.error("Can not find datasource: " + datasourceId); return; } - CoreDatasourceTaskLog datasetTableTaskLog = datasourceTaskServer.initTaskLog(datasourceId, null, name, MANUAL.toString()); + CoreDatasourceTaskLog datasetTableTaskLog = datasourceTaskServer.initTaskLog(datasourceId, null, tableName, MANUAL.toString()); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(coreDatasource); diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java index e7373c95a3..d34c246923 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java @@ -846,11 +846,24 @@ public class DatasourceServer implements DatasourceApi { } public IPage listSyncRecord(int goPage, int pageSize, Long dsId) { + + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("ds_id", dsId); wrapper.orderByDesc("start_time"); Page page = new Page<>(goPage, pageSize); IPage pager = taskLogExtMapper.pager(page, wrapper); + CoreDatasource coreDatasource = datasourceMapper.selectById(dsId); + DatasourceRequest datasourceRequest = new DatasourceRequest(); + datasourceRequest.setDatasource(coreDatasource); + List datasetTableDTOS = ApiUtils.getTables(datasourceRequest); + for (int i = 0; i < pager.getRecords().size(); i++) { + for (int i1 = 0; i1 < datasetTableDTOS.size(); i1++) { + if(pager.getRecords().get(i).getTableName().equalsIgnoreCase(datasetTableDTOS.get(i1).getTableName())){ + pager.getRecords().get(i).setName(datasetTableDTOS.get(i1).getName()); + } + } + } return pager; } diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue index ffea6854cb..b6f66c75fc 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue @@ -737,7 +737,7 @@ defineExpose({ {{ t('datasource.priority') }} diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue index 6af486f654..59fcaf0680 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/index.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue @@ -995,7 +995,7 @@ onMounted(() => { {{ t('datasource.priority') }} @@ -1236,7 +1236,7 @@ onMounted(() => { @size-change="handleRecordSizeChange" @current-change="handleRecordCurrentChange" > - +