|
|
@ -24,7 +24,6 @@ import cn.hutool.core.text.StrPool;
|
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
|
import cn.hutool.core.util.NumberUtil;
|
|
|
|
import cn.hutool.core.util.NumberUtil;
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
import com.baiye.component.LoginUser;
|
|
|
|
|
|
|
|
import com.baiye.config.BusinessConfig;
|
|
|
|
import com.baiye.config.BusinessConfig;
|
|
|
|
import com.baiye.config.properties.FileProperties;
|
|
|
|
import com.baiye.config.properties.FileProperties;
|
|
|
|
import com.baiye.constant.DefaultNumberConstants;
|
|
|
|
import com.baiye.constant.DefaultNumberConstants;
|
|
|
@ -54,11 +53,11 @@ import com.baiye.modules.system.service.UserService;
|
|
|
|
import com.baiye.modules.telemarkting.service.ExtensionNumberService;
|
|
|
|
import com.baiye.modules.telemarkting.service.ExtensionNumberService;
|
|
|
|
import com.baiye.util.*;
|
|
|
|
import com.baiye.util.*;
|
|
|
|
import com.google.common.collect.ImmutableMap;
|
|
|
|
import com.google.common.collect.ImmutableMap;
|
|
|
|
|
|
|
|
import com.google.common.collect.Lists;
|
|
|
|
import com.google.common.collect.Sets;
|
|
|
|
import com.google.common.collect.Sets;
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.springframework.cache.Cache;
|
|
|
|
|
|
|
|
import org.springframework.cache.CacheManager;
|
|
|
|
import org.springframework.cache.CacheManager;
|
|
|
|
import org.springframework.cache.annotation.CacheConfig;
|
|
|
|
import org.springframework.cache.annotation.CacheConfig;
|
|
|
|
import org.springframework.cache.annotation.CacheEvict;
|
|
|
|
import org.springframework.cache.annotation.CacheEvict;
|
|
|
@ -533,11 +532,20 @@ public class UserServiceImpl implements UserService {
|
|
|
|
public void updateCenter(User resources) {
|
|
|
|
public void updateCenter(User resources) {
|
|
|
|
User user = userRepository.findById(resources.getId()).orElseGet(User::new);
|
|
|
|
User user = userRepository.findById(resources.getId()).orElseGet(User::new);
|
|
|
|
User user1 = userRepository.findByPhone(resources.getPhone());
|
|
|
|
User user1 = userRepository.findByPhone(resources.getPhone());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<String> userJobNumbers = Lists.newArrayList();
|
|
|
|
if (user1 != null && !user.getId().equals(user1.getId())) {
|
|
|
|
if (user1 != null && !user.getId().equals(user1.getId())) {
|
|
|
|
throw new EntityExistException(User.class, "phone", resources.getPhone());
|
|
|
|
throw new EntityExistException(User.class, "phone", resources.getPhone());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// 删除新旧缓存
|
|
|
|
if (StringUtils.isNotBlank(resources.getJobNumber())) {
|
|
|
|
if (StringUtils.isNotBlank(resources.getJobNumber())) {
|
|
|
|
redisUtils.del(CacheKey.USER_JOB_NUMBER_CACHE + user.getJobNumber());
|
|
|
|
userJobNumbers.addAll(Lists.newArrayList(resources.getJobNumber().split(StrPool.COMMA)));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(user.getJobNumber())) {
|
|
|
|
|
|
|
|
userJobNumbers.addAll(Lists.newArrayList(user.getJobNumber().split(StrPool.COMMA)));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
for (String jobNumber : userJobNumbers) {
|
|
|
|
|
|
|
|
redisUtils.del(CacheKey.USER_JOB_NUMBER_CACHE + jobNumber);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
user.setJobNumber(resources.getJobNumber());
|
|
|
|
user.setJobNumber(resources.getJobNumber());
|
|
|
|
user.setNickName(resources.getNickName());
|
|
|
|
user.setNickName(resources.getNickName());
|
|
|
@ -854,7 +862,11 @@ public class UserServiceImpl implements UserService {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Cacheable(value = "UserJobNumberCache", key = "#jobNumber")
|
|
|
|
@Cacheable(value = "UserJobNumberCache", key = "#jobNumber")
|
|
|
|
public Long findByJobNumber(String jobNumber) {
|
|
|
|
public Long findByJobNumber(String jobNumber) {
|
|
|
|
return userRepository.findByJobNumber(jobNumber);
|
|
|
|
List<Long> byJobNumberLike = userRepository.findByJobNumberLike(jobNumber);
|
|
|
|
|
|
|
|
if (CollUtil.isNotEmpty(byJobNumberLike)) {
|
|
|
|
|
|
|
|
return byJobNumberLike.get(DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return (long) DefaultNumberConstants.ZERO_NUMBER;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|