From 578142b92f90434a92ad843efb37b68b8d0dc01e Mon Sep 17 00:00:00 2001 From: bynt Date: Tue, 14 Mar 2023 16:33:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/UserController.java | 8 +++--- .../modules/system/service/UserService.java | 5 ++-- .../system/service/impl/UserServiceImpl.java | 26 +++++++------------ 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/controller/UserController.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/controller/UserController.java index 2d499153..78a78503 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/controller/UserController.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/controller/UserController.java @@ -190,8 +190,9 @@ public class UserController { UserDto userDto = JSONUtil.toBean(SecurityUtils.getUser(), UserDto.class); List userFavorOfExcels = ReadExcelUtils.readExcelByClass(file, UserFavorOfExcel.class); - return new ResponseEntity<>(userService.fileCreateUser - (userFavorOfExcels, userDto.getCompanyId(), userDto), HttpStatus.OK); + userService.fileCreateUser + (userFavorOfExcels, userDto.getCompanyId(), userDto); + return new ResponseEntity<>(HttpStatus.OK); } return new ResponseEntity<>(HttpStatus.OK); } @@ -199,7 +200,8 @@ public class UserController { @ApiOperation("创建或导入用户") @PostMapping(value = "/createUsers") public ResponseEntity> createUsers(@Validated @RequestBody CreateUserDTO userDTO) { - return new ResponseEntity<>(userService.createUserOrFile(userDTO), HttpStatus.OK); + userService.createUserOrFile(userDTO); + return new ResponseEntity<>(HttpStatus.OK); } @ApiOperation("删除用户") diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/UserService.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/UserService.java index b855f191..7eb2ede2 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/UserService.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/UserService.java @@ -178,7 +178,7 @@ public interface UserService { * @return * @throws IOException */ - Map fileCreateUser(List file, Long companyId, UserDto userDto); + void fileCreateUser(List file, Long companyId, UserDto userDto); /** * 查询用户树状图 @@ -209,9 +209,8 @@ public interface UserService { * 创建用户 * * @param userDTO - * @return 返回信息 */ - Map createUserOrFile(CreateUserDTO userDTO); + void createUserOrFile(CreateUserDTO userDTO); /** * 批量开通用户过期时间 diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java index 7719b1b3..a9ab1435 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java @@ -76,7 +76,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.util.*; -import java.util.concurrent.ConcurrentMap; import java.util.stream.Collectors; /** @@ -138,9 +137,8 @@ public class UserServiceImpl implements UserService { @Override @Transactional(rollbackFor = Exception.class) - public Map fileCreateUser(List excels, Long companyId, UserDto userDto) { + public void fileCreateUser(List excels, Long companyId, UserDto userDto) { Company byId = companyService.findById(companyId); - Map map = Maps.newConcurrentMap(); if (CollUtil.isNotEmpty(excels) && byId != null) { User copyUser; Set roles = new HashSet<>(); @@ -160,19 +158,16 @@ public class UserServiceImpl implements UserService { throw new EntityExistException(User.class, "phone", user.getPhone()); } // 随机密码 - String randomNumbers = RandomUtil.randomNumbers(DefaultNumberConstants.SIX_NUMBER); copyUser.setUsername(username); copyUser.setPassword(passwordEncoder.encode - (org.apache.commons.lang3.StringUtils.isEmpty(user.getPassword()) - ? user.getPassword() : randomNumbers)); + (StringUtils.isNotBlank(user.getPassword()) + ? user.getPassword() : "123456")); copyUser.setWhichUserId(userDto.getId()); copyUser.setCompanyId(companyId); copyUser.setEnabled(Boolean.FALSE); - map.put(username, randomNumbers); userRepository.save(copyUser); } } - return map; } @Override @@ -221,8 +216,7 @@ public class UserServiceImpl implements UserService { @Override @Transactional(rollbackFor = Exception.class) - public Map createUserOrFile(CreateUserDTO userDTO) { - Map userMap = Maps.newConcurrentMap(); + public void createUserOrFile(CreateUserDTO userDTO) { Long companyId = null; User user = new User(); boolean flag = Boolean.FALSE; @@ -247,7 +241,7 @@ public class UserServiceImpl implements UserService { String randomNumbers = RandomUtil.randomNumbers(DefaultNumberConstants.SIX_NUMBER); companyId = companyId != null ? companyId : SecurityUtils.getCompanyId(); - userDTO.setPassword(passwordEncoder.encode(randomNumbers)); + userDTO.setPassword(StringUtils.isNotBlank(userDTO.getPassword()) ? userDTO.getPassword() : "123456"); // 验证子账号 Integer sonUserNum = companyService.findCompanyInfo(companyId).getSonUserNum(); int size = userRepository.findByCompanyId(companyId).size(); @@ -262,9 +256,7 @@ public class UserServiceImpl implements UserService { user.setWhichUserId(userId); user.setIsReview(Boolean.FALSE); user.setTurnCrmNum(50); - userMap.put(user.getUsername(), randomNumbers); User userCreateResult = create(user); - //todo 如果是管理员 则创建任务 if (flag) { if (userDTO.getCompanyType() != null && userDTO.getCompanyType() == 1) { @@ -286,12 +278,9 @@ public class UserServiceImpl implements UserService { CompanyDto dto = new CompanyDto(); dto.setUserId(userCreateResult.getId()); List userFavorOfExcels = ReadExcelUtils.readExcelByClass(file, UserFavorOfExcel.class); - Map map = fileCreateUser(userFavorOfExcels, + fileCreateUser(userFavorOfExcels, companyId, Convert.convert(UserDto.class, userCreateResult)); - // 插入文件导入用户 - userMap.putAll(map); } - return userMap; } /** @@ -524,6 +513,9 @@ public class UserServiceImpl implements UserService { } } + if (StringUtils.isBlank(resources.getPassword())) { + user.setPassword(passwordEncoder.encode(resources.getPassword())); + } user.setIsReview(resources.getIsReview()); user.setEmail(resources.getEmail()); user.setEnabled(resources.getEnabled());