From c77e2f79837927af46cc39cfdb24e0040f3b95aa Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 26 Oct 2023 15:07:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20MongoDB-BI=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E5=88=9B=E5=BB=BA=E7=95=8C=E9=9D=A2=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E8=AE=BE=E7=BD=AE=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/visualized/data/datasource/form/EditorDetail.vue | 2 +- .../src/views/visualized/data/datasource/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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..a21052ab00 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') }} From 2a601cfdd659edb3a53b9c5f87d91bea5c5e8282 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 26 Oct 2023 15:49:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/manage/DatasourceSyncManage.java | 4 ++-- .../datasource/server/DatasourceServer.java | 13 +++++++++++++ .../src/views/visualized/data/datasource/index.vue | 2 +- .../api/ds/vo/CoreDatasourceTaskLogDTO.java | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) 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/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue index a21052ab00..59fcaf0680 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/index.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue @@ -1236,7 +1236,7 @@ onMounted(() => { @size-change="handleRecordSizeChange" @current-change="handleRecordCurrentChange" > - +