ZongYue / ChinaPortEnergy

Download as
Browse Code »

Commit 5940597156dba6fdc6558a9b67d64a83a53d0a99

Authored by lst
1 parent cf1430aa
Exists in master

钉钉同步通讯录：跳过未绑定手机号用户

Showing 2 changed files with 15 additions and 1 deletions   Show diff stats
backend/uc/src/main/java/com/hotent/uc/manager/impl/UserManagerImpl.java
  Diff comments   View file @5940597
... ... @@ -9,6 +9,7 @@ import java.nio.file.Path;
9 9 import java.nio.file.Paths;
10 10 import java.sql.SQLException;
11 11 import java.time.LocalDateTime;
  12 +import java.time.format.DateTimeFormatter;
12 13 import java.util.ArrayList;
13 14 import java.util.Arrays;
14 15 import java.util.Collection;
... ... @@ -37,7 +38,9 @@ import java.util.stream.Collectors;
37 38  
38 39 import javax.servlet.http.HttpServletResponse;
39 40  
  41 +import cn.hutool.core.util.StrUtil;
40 42 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  43 +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
41 44 import com.google.common.collect.Lists;
42 45 import com.google.common.collect.Maps;
43 46 import com.google.common.collect.Sets;
... ... @@ -47,6 +50,7 @@ import com.hotent.uc.dto.UserOrgPostPolymerDto;
47 50 import com.hotent.uc.dto.UserSeletorDto;
48 51 import com.hotent.uc.params.user.*;
49 52 import com.hotent.uc.vo.UserOrgPostPolymerVo;
  53 +import groovy.util.logging.Slf4j;
50 54 import org.apache.commons.lang.StringUtils;
51 55 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
52 56 import org.apache.poi.ss.formula.functions.T;
... ... @@ -180,6 +184,7 @@ import poi.util.ExcelUtil;
180 184 * 版权：广州宏天软件有限公司
181 185 * </pre>
182 186 */
  187 +@Slf4j
183 188 @Service
184 189 public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements UserManager {
185 190 protected static Logger logger = LoggerFactory.getLogger(UserManagerImpl.class);
... ... @@ -4132,9 +4137,14 @@ public class UserManagerImpl extends BaseManagerImpl &lt;UserDao, User&gt; implements
4132 4137 @Override
4133 4138 public void batchUpdateUsersFromExterUni(String type, List<WxUser> userList) {
4134 4139 if(BeanUtils.isNotEmpty(userList)){
  4140 + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
  4141 + String baseLog = StrUtil.format("线程ID={},类名={},方法名={}",Thread.currentThread().getId(),this.getClass().getSimpleName(),Thread.currentThread().getStackTrace()[1].getMethodName());
4135 4142 //1、只处理有手机号的用户
4136 4143 List<WxUser> userListHasMobile = userList.stream().filter(e->BeanUtils.isNotEmpty(e.getMobile())).collect(Collectors.toList());
4137   -
  4144 + List<String> noMobileUserList = userList.stream().filter(user -> BeanUtils.isEmpty(user.getMobile())).map(user->user.getName()).collect(Collectors.toList());
  4145 + if (ObjectUtils.isNotEmpty(noMobileUserList)) {
  4146 + log.warn(baseLog + "行数="+Thread.currentThread().getStackTrace()[1].getLineNumber()+ ",时间="+ LocalDateTime.now().format(dateTimeFormatter)+",无手机号用户信息 ="+ noMobileUserList);
  4147 + }
4138 4148 //2、获取系统存在相同手机号的用户
4139 4149 List<User> existUserList = this.getAll();
4140 4150  
... ...
backend/uc/src/main/java/com/hotent/uc/manager/impl/UserUniteManagerImpl.java
  Diff comments   View file @5940597
... ... @@ -5,6 +5,7 @@ import java.util.HashMap;
5 5 import java.util.List;
6 6 import java.util.Map;
7 7  
  8 +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
8 9 import com.google.common.collect.Lists;
9 10 import org.apache.commons.collections.CollectionUtils;
10 11 import org.apache.logging.log4j.util.Strings;
... ... @@ -59,6 +60,9 @@ public class UserUniteManagerImpl extends BaseManagerImpl&lt;UserUniteDao, UserUnit
59 60  
60 61 @Override
61 62 public void updateUserUniteList(List<UserUnite> userUniteList) {
  63 + if(ObjectUtils.isEmpty(userUniteList)) {
  64 + return;
  65 + }
62 66 Map<String,UserUnite> map = new HashMap<>();
63 67 List<String> userIds = new ArrayList<String>();
64 68 for (UserUnite userUnite : userUniteList) {
... ...