From 2bd17d29961065c14d48287b1d4e784c50b1de7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= <babamu@126.com>
Date: Tue, 30 Jul 2024 10:49:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E9=80=BB=E8=BE=91=EF=BC=8C=E5=87=8F=E5=B0=91=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/SysUserServiceImpl.java    | 23 +++++-----------------
 1 file changed, 5 insertions(+), 18 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 b023da6..defdbeb 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
@@ -8,7 +8,6 @@ import lombok.SneakyThrows;
 import net.maku.framework.common.constant.Constant;
 import net.maku.framework.common.excel.ExcelFinishCallBack;
 import net.maku.framework.common.exception.ServerException;
-import net.maku.framework.common.utils.DateUtils;
 import net.maku.framework.common.utils.ExcelUtils;
 import net.maku.framework.common.utils.PageResult;
 import net.maku.framework.mybatis.service.impl.BaseServiceImpl;
@@ -30,7 +29,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -229,26 +227,15 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void importByExcel(MultipartFile file, String password) {
-
-        ExcelUtils.readAnalysis(file, SysUserExcelVO.class, new ExcelFinishCallBack<SysUserExcelVO>() {
-            @Override
-            public void doAfterAllAnalysed(List<SysUserExcelVO> result) {
-                saveUser(result);
-            }
-
+        ExcelUtils.readAnalysis(file, SysUserExcelVO.class, new ExcelFinishCallBack<>() {
             @Override
             public void doSaveBatch(List<SysUserExcelVO> result) {
-                saveUser(result);
-            }
-
-            private void saveUser(List<SysUserExcelVO> result) {
                 ExcelUtils.parseDict(result);
-                List<SysUserEntity> sysUserEntities = SysUserConvert.INSTANCE.convertListEntity(result);
-                sysUserEntities.forEach(user -> user.setPassword(password));
-                saveBatch(sysUserEntities);
+                List<SysUserEntity> userList = SysUserConvert.INSTANCE.convertListEntity(result);
+                userList.forEach(user -> user.setPassword(password));
+                saveBatch(userList);
             }
         });
-
     }
 
     @Override
@@ -258,7 +245,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         List<SysUserExcelVO> userExcelVOS = SysUserConvert.INSTANCE.convert2List(list);
         transService.transBatch(userExcelVOS);
         // 写到浏览器打开
-        ExcelUtils.excelExport(SysUserExcelVO.class, "system_user_excel" + DateUtils.format(new Date()), null, userExcelVOS);
+        ExcelUtils.excelExport(SysUserExcelVO.class, "用户管理", null, userExcelVOS);
     }
 
 }