From 709c4823e1b474de23cb66995501f03539bb1cae Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 10 Dec 2024 18:23:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=9C=80=E6=96=B0=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/server/DatasourceTaskServer.java | 9 +++++++++ .../java/io/dataease/job/schedule/CleanScheduler.java | 10 ++++++++++ .../src/main/resources/db/migration/V2.10.4__ddl.sql | 1 + 3 files changed, 20 insertions(+) create mode 100644 core/core-backend/src/main/resources/db/migration/V2.10.4__ddl.sql diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceTaskServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceTaskServer.java index d147caedef..426e185381 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceTaskServer.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceTaskServer.java @@ -57,6 +57,7 @@ public class DatasourceTaskServer { queryWrapper.eq("ds_id", dsId); queryWrapper.eq("table_name", tableName); queryWrapper.orderByDesc("start_time"); + queryWrapper.last("limit 1"); List logs = coreDatasourceTaskLogMapper.selectList(queryWrapper); if (!CollectionUtils.isEmpty(logs)) { return logs.get(0); @@ -192,6 +193,14 @@ public class DatasourceTaskServer { datasourceTaskMapper.update(record, updateTaskWrapper); } + public void cleanLog() { + long expTime = Long.parseLong("30") * 24L * 3600L * 1000L; + long threshold = System.currentTimeMillis() - expTime; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lt("start_time", threshold); + coreDatasourceTaskLogMapper.delete(queryWrapper); + } + public enum ScheduleType { CRON, RIGHTNOW, SIMPLE_CRON, MANUAL diff --git a/core/core-backend/src/main/java/io/dataease/job/schedule/CleanScheduler.java b/core/core-backend/src/main/java/io/dataease/job/schedule/CleanScheduler.java index d1c8ecc3f5..375548ba09 100644 --- a/core/core-backend/src/main/java/io/dataease/job/schedule/CleanScheduler.java +++ b/core/core-backend/src/main/java/io/dataease/job/schedule/CleanScheduler.java @@ -1,5 +1,6 @@ package io.dataease.job.schedule; +import io.dataease.datasource.server.DatasourceTaskServer; import io.dataease.exportCenter.manage.ExportCenterManage; import io.dataease.utils.LogUtil; import jakarta.annotation.Resource; @@ -11,6 +12,8 @@ public class CleanScheduler { @Resource(name = "exportCenterManage") private ExportCenterManage exportCenterManage; + @Resource(name = "datasourceTaskServer") + private DatasourceTaskServer datasourceTaskServer; @Scheduled(cron = "0 0 0 * * ?") public void clean() { @@ -18,4 +21,11 @@ public class CleanScheduler { exportCenterManage.cleanLog(); LogUtil.info("Execute export file cleaner success"); } + + @Scheduled(cron = "0 0 0 * * ?") + public void cleanSyncLog() { + LogUtil.info("Start to clean sync log ..."); + datasourceTaskServer.cleanLog(); + LogUtil.info("End to clean sync log."); + } } diff --git a/core/core-backend/src/main/resources/db/migration/V2.10.4__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.10.4__ddl.sql new file mode 100644 index 0000000000..6ab0735d5f --- /dev/null +++ b/core/core-backend/src/main/resources/db/migration/V2.10.4__ddl.sql @@ -0,0 +1 @@ +CREATE INDEX idx_dataset_table_task_log_A ON core_datasource_task_log(ds_id, table_name, start_time); From 29e2a8a16022df9f6f05f0e390fe95e40d17c00e Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 11 Dec 2024 17:16:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=B8=AD=E5=BF=83=E3=80=91=E5=85=A8=E9=83=A8=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/visualized/data/dataset/ExportExcel.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue index 81c52f79d0..3bf362903a 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue @@ -243,12 +243,12 @@ const callbackExportSuc = () => { const downLoadAll = () => { if (multipleSelection.value.length === 0) { tableData.value.forEach(item => { - window.open(PATH_URL + '/exportCenter/download/' + item.id, openType) + window.open(PATH_URL + '/exportCenter/download/' + item.id) }) return } multipleSelection.value.map(ele => { - window.open(PATH_URL + '/exportCenter/download/' + ele.id, openType) + window.open(PATH_URL + '/exportCenter/download/' + ele.id) }) } const showMsg = item => {