From 1cdde77f32bb4c70584383099e1233eb90cd3d69 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 11 Jun 2024 12:19:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/commons/utils/AuthUtils.java | 4 ++++ .../dataease/service/exportCenter/ExportCenterService.java | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java b/core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java index 2360c19fa6..cf68b429d1 100644 --- a/core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java +++ b/core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java @@ -54,6 +54,10 @@ public class AuthUtils { return userDto; } + public static void setUser(CurrentUserDto user) { + USER_INFO.set(user); + } + public static void setProxyUser(Long userId) { CurrentUserDto currentUserDto = proxyAuthService.queryCacheUserDto(userId); USER_INFO.set(currentUserDto); 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 4c753ab00b..64a2a50575 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 @@ -322,7 +322,7 @@ public class ExportCenterService { ChartViewDTO chartViewInfo = chartViewService.getData(request.getViewId(), componentFilterInfo); List tableRow = (List) chartViewInfo.getData().get("sourceData"); request.setDetails(tableRow); - if("dataset".equals(request.getDownloadType())){ + if ("dataset".equals(request.getDownloadType())) { request.setHeader((String[]) chartViewInfo.getData().get("header")); request.setExcelTypes((Integer[]) chartViewInfo.getData().get("dsTypes")); } @@ -390,6 +390,7 @@ public class ExportCenterService { boolean isCreated = directory.mkdir(); CurrentUserDto currentUserDto = AuthUtils.getUser(); Future future = scheduledThreadPoolExecutor.submit(() -> { + AuthUtils.setUser(currentUserDto); try { exportTask.setExportStatus("IN_PROGRESS"); exportTaskMapper.updateByPrimaryKey(exportTask); @@ -415,7 +416,7 @@ public class ExportCenterService { cellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex()); //设置单元格填充样式(使用纯色背景颜色填充) cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); - if ("table-info".equals(request.getViewType())||"dataset".equals(request.getDownloadType())) { + if ("table-info".equals(request.getViewType()) || "dataset".equals(request.getDownloadType())) { exportTableDetails(request, wb, cellStyle, detailsSheet); } else { Boolean mergeHead = false; @@ -1343,6 +1344,7 @@ public class ExportCenterService { map.put("data", jsonArray); return map; } + private static final String LOG_RETENTION = "30"; public void cleanLog() {