public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-16 20:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 【数据导出中心】导出数据填报失败

Browse Source
This commit is contained in:
taojinlong
2025-09-08 12:35:57 +08:00
parent c2301389c3
commit f77984eee4
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterDownLoadManage.java
View File

@@ -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 {

4
core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
View File

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