|
|
|
@ -20,11 +20,9 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
import cn.hutool.core.convert.Convert;
|
|
|
|
|
import cn.hutool.core.date.DateTime;
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
|
import cn.hutool.core.text.CharSequenceUtil;
|
|
|
|
|
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 cn.hutool.core.util.*;
|
|
|
|
|
import com.baiye.config.BusinessConfig;
|
|
|
|
|
import com.baiye.config.properties.FileProperties;
|
|
|
|
|
import com.baiye.constant.DefaultNumberConstants;
|
|
|
|
@ -53,6 +51,7 @@ import com.baiye.modules.system.repository.UserRepository;
|
|
|
|
|
import com.baiye.modules.system.service.UserService;
|
|
|
|
|
import com.baiye.modules.telemarkting.service.ExtensionNumberService;
|
|
|
|
|
import com.baiye.util.*;
|
|
|
|
|
import com.baiye.util.PageUtil;
|
|
|
|
|
import com.google.common.collect.ImmutableMap;
|
|
|
|
|
import com.google.common.collect.Lists;
|
|
|
|
|
import com.google.common.collect.Maps;
|
|
|
|
@ -76,7 +75,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 +136,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 +157,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 +215,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public Map<String, String> createUserOrFile(CreateUserDTO userDTO) {
|
|
|
|
|
Map<String, String> userMap = Maps.newConcurrentMap();
|
|
|
|
|
public void createUserOrFile(CreateUserDTO userDTO) {
|
|
|
|
|
Long companyId = null;
|
|
|
|
|
User user = new User();
|
|
|
|
|
boolean flag = Boolean.FALSE;
|
|
|
|
@ -244,10 +237,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(randomNumbers));
|
|
|
|
|
userDTO.setPassword(passwordEncoder.encode(StringUtils.isNotBlank(userDTO.getPassword()) ? userDTO.getPassword() : "123456"));
|
|
|
|
|
// 验证子账号
|
|
|
|
|
Integer sonUserNum = companyService.findCompanyInfo(companyId).getSonUserNum();
|
|
|
|
|
int size = userRepository.findByCompanyId(companyId).size();
|
|
|
|
@ -262,9 +255,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 +277,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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -390,7 +378,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
|
public Object queryAll(UserQueryCriteria criteria, Pageable pageable) {
|
|
|
|
|
Page<User> page = userRepository.
|
|
|
|
|
findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable);
|
|
|
|
|
|
|
|
|
|
page.getContent().forEach(user -> user.setPassword(CharSequenceUtil.EMPTY));
|
|
|
|
|
return PageUtil.toPage(page.map(userMapper::toDto));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -524,6 +512,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());
|
|
|
|
|