From f77984eee494fb99dec6aa99fa5c4492392e07cd Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 8 Sep 2025 12:35:57 +0800 Subject: [PATCH] =?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=AF=BC=E5=87=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E6=8A=A5=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exportCenter/manage/ExportCenterDownLoadManage.java | 5 +++++ .../io/dataease/exportCenter/manage/ExportCenterManage.java | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java index 5a158f1fbf..fa12594cc8 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java +++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java @@ -178,7 +178,9 @@ public class ExportCenterDownLoadManage { boolean isCreated = directory.mkdir(); TokenUserBO tokenUserBO = AuthUtils.getUser(); Future future = scheduledThreadPoolExecutor.submit(() -> { + coreExportTaskRepository.saveAndFlush(exportTask); AuthUtils.setUser(tokenUserBO); + coreExportTaskRepository.saveAndFlush(exportTask); try { exportTask.setExportStatus("IN_PROGRESS"); coreExportTaskRepository.saveAndFlush(exportTask); @@ -209,9 +211,11 @@ public class ExportCenterDownLoadManage { TokenUserBO tokenUserBO = AuthUtils.getUser(); Future future = scheduledThreadPoolExecutor.submit(() -> { + coreExportTaskRepository.saveAndFlush(exportTask); LicenseUtil.validate(); AuthUtils.setUser(tokenUserBO); try { + coreExportTaskRepository.saveAndFlush(exportTask); exportTask.setExportStatus("IN_PROGRESS"); coreExportTaskRepository.saveAndFlush(exportTask); CoreDatasetGroup coreDatasetGroup = coreDatasetGroupRepository.findById(exportTask.getExportFrom()).orElse(null); @@ -446,6 +450,7 @@ public class ExportCenterDownLoadManage { boolean isCreated = directory.mkdir(); TokenUserBO tokenUserBO = AuthUtils.getUser(); Future future = scheduledThreadPoolExecutor.submit(() -> { + coreExportTaskRepository.saveAndFlush(exportTask); LicenseUtil.validate(); AuthUtils.setUser(tokenUserBO); try { diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java index 91d100a4d4..6035de0210 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java +++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java @@ -138,7 +138,6 @@ public class ExportCenterManage implements BaseExportApi { exportTask.setExportProgress("0"); exportTask.setExportMachineName(hostName()); exportTask.setExportTime(System.currentTimeMillis()); - coreExportTaskRepository.saveAndFlush(exportTask); FileUtils.deleteDirectoryRecursively(exportData_path + id); if (exportTask.getExportFromType().equalsIgnoreCase("chart")) { ChartExcelRequest request = JsonUtil.parseObject(exportTask.getParams(), ChartExcelRequest.class); @@ -251,7 +250,6 @@ public class ExportCenterManage implements BaseExportApi { exportTask.setExportTime(System.currentTimeMillis()); exportTask.setParams(JsonUtil.toJSONString(request).toString()); exportTask.setExportMachineName(hostName()); - coreExportTaskRepository.saveAndFlush(exportTask); if (busiFlag.equalsIgnoreCase("dashboard")) { exportCenterDownLoadManage.startPanelViewTask(exportTask, request); } else { @@ -272,7 +270,6 @@ public class ExportCenterManage implements BaseExportApi { exportTask.setExportTime(System.currentTimeMillis()); exportTask.setParams(JsonUtil.toJSONString(request).toString()); exportTask.setExportMachineName(hostName()); - coreExportTaskRepository.saveAndFlush(exportTask); exportCenterDownLoadManage.startDatasetTask(exportTask, request); } @@ -290,7 +287,6 @@ public class ExportCenterManage implements BaseExportApi { exportTask.setExportTime(System.currentTimeMillis()); exportTask.setParams(JsonUtil.toJSONString(request).toString()); exportTask.setExportMachineName(hostName()); - coreExportTaskRepository.saveAndFlush(exportTask); if (StringUtils.equals(exportFromType, "data_filling")) { exportCenterDownLoadManage.startDataFillingTask(exportTask, request); }