修改密码

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<UserFavorOfExcel> userFavorOfExcels =
                     ReadExcelUtils.readExcelByClass(file, UserFavorOfExcel.class);
-            return new ResponseEntity<>(userService.fileCreateUser
+            userService.fileCreateUser
-                    (userFavorOfExcels, userDto.getCompanyId(), userDto), HttpStatus.OK);
+                    (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<Map<String, String>> createUsers(@Validated @RequestBody CreateUserDTO userDTO) {
-        return new ResponseEntity<>(userService.createUserOrFile(userDTO), HttpStatus.OK);
+        userService.createUserOrFile(userDTO);
+        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
      */
-    Map<String, String> fileCreateUser(List<UserFavorOfExcel> file, Long companyId, UserDto userDto);
+    void fileCreateUser(List<UserFavorOfExcel> file, Long companyId, UserDto userDto);
 
     /**
      * 查询用户树状图
@@ -209,9 +209,8 @@ public interface UserService {
      * 创建用户
      *
      * @param userDTO
-     * @return 返回信息
      */
-    Map<String, String> createUserOrFile(CreateUserDTO userDTO);
+    void createUserOrFile(CreateUserDTO userDTO);
 
     /**
      * 批量开通用户过期时间

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<String, String> fileCreateUser(List<UserFavorOfExcel> excels, Long companyId, UserDto userDto) {
+    public void 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<>();
@@ -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())
+                        (StringUtils.isNotBlank(user.getPassword())
-                                ? user.getPassword() : randomNumbers));
+                                ? 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<String, String> createUserOrFile(CreateUserDTO userDTO) {
+    public void createUserOrFile(CreateUserDTO userDTO) {
-        Map<String, String> userMap = Maps.newConcurrentMap();
         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<UserFavorOfExcel> userFavorOfExcels = ReadExcelUtils.readExcelByClass(file, UserFavorOfExcel.class);
-            Map<String, String> 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());