修改用户随机密码

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/controller/UserController.java

@@ -185,21 +185,21 @@ public class UserController {
 
     @ApiOperation("导入用户")
     @PostMapping(value = "/importUsers")
-    public ResponseEntity<Object> indexConvert(@RequestParam("file") MultipartFile file) {
+    public ResponseEntity<Map<String, String>> indexConvert(@RequestParam("file") MultipartFile file) {
         if (file != null && !file.isEmpty()) {
             UserDto userDto = JSONUtil.toBean(SecurityUtils.getUser(), UserDto.class);
             List<UserFavorOfExcel> userFavorOfExcels =
                     ReadExcelUtils.readExcelByClass(file, UserFavorOfExcel.class);
-            userService.fileCreateUser(userFavorOfExcels, userDto.getCompanyId(), userDto);
+            return new ResponseEntity<>(userService.fileCreateUser
+                    (userFavorOfExcels, userDto.getCompanyId(), userDto), HttpStatus.OK);
         }
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @ApiOperation("创建或导入用户")
     @PostMapping(value = "/createUsers")
-    public ResponseEntity<Object> createUsers(@Validated @RequestBody CreateUserDTO userDTO) {
+    public ResponseEntity<Map<String, String>> createUsers(@Validated @RequestBody CreateUserDTO userDTO) {
-        userService.createUserOrFile(userDTO);
+        return new ResponseEntity<>(userService.createUserOrFile(userDTO), HttpStatus.OK);
-        return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @ApiOperation("删除用户")

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
      */
-    Boolean fileCreateUser(List<UserFavorOfExcel> file, Long companyId, UserDto userDto);
+    Map<String, String> fileCreateUser(List<UserFavorOfExcel> file, Long companyId, UserDto userDto);
 
     /**
      * 查询用户树状图
@@ -209,8 +209,9 @@ public interface UserService {
      * 创建用户
      *
      * @param userDTO
+     * @return 返回信息
      */
-    void createUserOrFile(CreateUserDTO userDTO);
+    Map<String, String> createUserOrFile(CreateUserDTO userDTO);
 
     /**
      * 批量开通用户过期时间

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java

@@ -24,6 +24,7 @@ import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
 import com.baiye.config.BusinessConfig;
 import com.baiye.config.properties.FileProperties;
 import com.baiye.constant.DefaultNumberConstants;
@@ -54,6 +55,7 @@ import com.baiye.modules.telemarkting.service.ExtensionNumberService;
 import com.baiye.util.*;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -74,6 +76,7 @@ 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;
 
 /**
@@ -135,12 +138,14 @@ public class UserServiceImpl implements UserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean fileCreateUser(List<UserFavorOfExcel> excels, Long companyId, UserDto userDto) {
+    public Map<String, String> fileCreateUser(List<UserFavorOfExcel> excels, Long companyId, UserDto userDto) {
         Company byId = companyService.findById(companyId);
+        Map<String, String> map = Maps.newConcurrentMap();
         if (CollUtil.isNotEmpty(excels) && byId != null) {
             User copyUser;
             Set<Role> roles = new HashSet<>();
             roles.add(repository.findById((long) DefaultNumberConstants.FIVE_NUMBER).orElseGet(Role::new));
+
             for (UserFavorOfExcel user : excels) {
                 copyUser = new User();
                 BeanUtil.copyProperties(user, copyUser);
@@ -154,18 +159,20 @@ public class UserServiceImpl implements UserService {
                 if (userRepository.findByPhone(user.getPhone()) != null) {
                     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() : "123456"));
+                                ? user.getPassword() : randomNumbers));
                 copyUser.setWhichUserId(userDto.getId());
                 copyUser.setCompanyId(companyId);
                 copyUser.setEnabled(Boolean.FALSE);
+                map.put(username, randomNumbers);
                 userRepository.save(copyUser);
             }
-            return Boolean.TRUE;
         }
-        return Boolean.FALSE;
+        return map;
     }
 
     @Override
@@ -214,7 +221,8 @@ public class UserServiceImpl implements UserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void createUserOrFile(CreateUserDTO userDTO) {
+    public Map<String, String> createUserOrFile(CreateUserDTO userDTO) {
+        Map<String, String> userMap = Maps.newConcurrentMap();
         Long companyId = null;
         User user = new User();
         boolean flag = Boolean.FALSE;
@@ -236,9 +244,10 @@ public class UserServiceImpl implements UserService {
             companyDto.setStatus(DefaultNumberConstants.ZERO_NUMBER);
             companyId = companyService.createCompany(companyDto).getId();
         }
+        String randomNumbers = RandomUtil.randomNumbers(DefaultNumberConstants.SIX_NUMBER);
         companyId = companyId != null ? companyId :
                 SecurityUtils.getCompanyId();
-        userDTO.setPassword(passwordEncoder.encode("123456"));
+        userDTO.setPassword(passwordEncoder.encode(randomNumbers));
         // 验证子账号
         Integer sonUserNum = companyService.findCompanyInfo(companyId).getSonUserNum();
         int size = userRepository.findByCompanyId(companyId).size();
@@ -253,6 +262,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  如果是管理员 则创建任务
@@ -276,9 +286,12 @@ public class UserServiceImpl implements UserService {
             CompanyDto dto = new CompanyDto();
             dto.setUserId(userCreateResult.getId());
             List<UserFavorOfExcel> userFavorOfExcels = ReadExcelUtils.readExcelByClass(file, UserFavorOfExcel.class);
-            fileCreateUser(userFavorOfExcels,
+            Map<String, String> map = fileCreateUser(userFavorOfExcels,
                     companyId, Convert.convert(UserDto.class, userCreateResult));
+            // 插入文件导入用户
+            userMap.putAll(map);
         }
+        return userMap;
     }
 
     /**