From a60e11ee4b568c268c8f8d30759a53fbe100c36f Mon Sep 17 00:00:00 2001 From: BrodyGao Date: Mon, 29 Apr 2024 14:47:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=9B=A0=E6=96=87=E4=BB=B6=E5=90=8D=E7=9B=B8?= =?UTF-8?q?=E5=90=8C=E6=97=A0=E6=B3=95=E8=A7=A6=E5=8F=91=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E5=99=A8=E4=B8=8B=E8=BD=BD=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/maku/system/service/impl/SysUserServiceImpl.java | 5 +++-- .../java/net/maku/framework/common/utils/ExcelUtils.java | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java index 9102c3f..b374f05 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysUserServiceImpl.java @@ -59,7 +59,7 @@ public class SysUserServiceImpl extends BaseServiceImpl page = getPage(query); params.put(Constant.PAGE, page); - + // 数据列表 List list = baseMapper.getList(params); @@ -248,8 +248,9 @@ public class SysUserServiceImpl extends BaseServiceImpl list = list(Wrappers.lambdaQuery(SysUserEntity.class).eq(SysUserEntity::getSuperAdmin, SuperAdminEnum.NO.getValue())); List userExcelVOS = SysUserConvert.INSTANCE.convert2List(list); transService.transBatch(userExcelVOS); + String fileName = "system_user_excel"; // 写到浏览器打开 - ExcelUtils.excelExport(SysUserExcelVO.class, "system_user_excel" + DateUtils.format(new Date()), null, userExcelVOS); + ExcelUtils.excelExport(SysUserExcelVO.class, fileName + DateUtils.format(new Date()), null, userExcelVOS); } } diff --git a/maku-framework/src/main/java/net/maku/framework/common/utils/ExcelUtils.java b/maku-framework/src/main/java/net/maku/framework/common/utils/ExcelUtils.java index fbd4fdf..0614721 100644 --- a/maku-framework/src/main/java/net/maku/framework/common/utils/ExcelUtils.java +++ b/maku-framework/src/main/java/net/maku/framework/common/utils/ExcelUtils.java @@ -25,6 +25,8 @@ import java.io.FileInputStream; import java.io.IOException; import java.lang.reflect.Field; import java.nio.charset.StandardCharsets; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; import java.util.stream.Collectors; @@ -172,6 +174,8 @@ public class ExcelUtils { response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); response.setCharacterEncoding("UTF-8"); + String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")); + excelName+=timestamp; String fileName = URLUtil.encode(excelName, StandardCharsets.UTF_8); response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); -- Gitee