From 452e54595704db6f0ed3eb80ef04d8cd82458bb0 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 21 Jun 2024 17:36:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=E7=9A=84=E8=A7=86=E5=9B=BE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=20Excel=20=E4=BB=BB=E5=8A=A1=E4=BC=9A=E5=AF=BC?= =?UTF-8?q?=E8=87=B4de=20=E6=97=A0=E6=B3=95=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/exportCenter/ExportCenterService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java b/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java index 89ab1b95d7..dfdf62e4ec 100644 --- a/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java +++ b/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java @@ -2,6 +2,7 @@ package io.dataease.service.exportCenter; import com.google.gson.Gson; import io.dataease.auth.api.dto.CurrentUserDto; +import io.dataease.auth.service.AuthUserService; import io.dataease.commons.constants.ParamConstants; import io.dataease.commons.constants.SysLogConstants; import io.dataease.commons.utils.*; @@ -124,7 +125,8 @@ public class ExportCenterService { private int corePoolSize = 10; private int keepAliveSeconds = 600; private Map Running_Task = new HashMap<>(); - + @Resource + private AuthUserService authUserService; @Autowired private WsService wsService; @@ -394,11 +396,10 @@ public class ExportCenterService { } private void startViewTask(ExportTask exportTask, PanelViewDetailsRequest request) { - String dataPath = exportData_path + exportTask.getId(); File directory = new File(dataPath); boolean isCreated = directory.mkdir(); - CurrentUserDto currentUserDto = AuthUtils.getUser(); + CurrentUserDto currentUserDto = (CurrentUserDto) authUserService.getUserById(exportTask.getUserId()); Future future = scheduledThreadPoolExecutor.submit(() -> { AuthUtils.setUser(currentUserDto); try { @@ -597,7 +598,9 @@ public class ExportCenterService { String dataPath = exportData_path + exportTask.getId(); File directory = new File(dataPath); boolean isCreated = directory.mkdir(); + CurrentUserDto user = (CurrentUserDto) authUserService.getUserById(exportTask.getUserId()); Future future = scheduledThreadPoolExecutor.submit(() -> { + AuthUtils.setUser(user); try { exportTask.setExportStatus("IN_PROGRESS"); exportTaskMapper.updateByPrimaryKey(exportTask);