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); }