diff --git a/backend/uc/src/main/java/com/hotent/uc/manager/impl/UserManagerImpl.java b/backend/uc/src/main/java/com/hotent/uc/manager/impl/UserManagerImpl.java index 83b5644..053a4fb 100644 --- a/backend/uc/src/main/java/com/hotent/uc/manager/impl/UserManagerImpl.java +++ b/backend/uc/src/main/java/com/hotent/uc/manager/impl/UserManagerImpl.java @@ -9,6 +9,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.sql.SQLException; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -37,7 +38,9 @@ import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -47,6 +50,7 @@ import com.hotent.uc.dto.UserOrgPostPolymerDto; import com.hotent.uc.dto.UserSeletorDto; import com.hotent.uc.params.user.*; import com.hotent.uc.vo.UserOrgPostPolymerVo; +import groovy.util.logging.Slf4j; import org.apache.commons.lang.StringUtils; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.formula.functions.T; @@ -180,6 +184,7 @@ import poi.util.ExcelUtil; * 版权:广州宏天软件有限公司 * */ +@Slf4j @Service public class UserManagerImpl extends BaseManagerImpl implements UserManager { protected static Logger logger = LoggerFactory.getLogger(UserManagerImpl.class); @@ -4132,9 +4137,14 @@ public class UserManagerImpl extends BaseManagerImpl implements @Override public void batchUpdateUsersFromExterUni(String type, List userList) { if(BeanUtils.isNotEmpty(userList)){ + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String baseLog = StrUtil.format("线程ID={},类名={},方法名={}",Thread.currentThread().getId(),this.getClass().getSimpleName(),Thread.currentThread().getStackTrace()[1].getMethodName()); //1、只处理有手机号的用户 List userListHasMobile = userList.stream().filter(e->BeanUtils.isNotEmpty(e.getMobile())).collect(Collectors.toList()); - + List noMobileUserList = userList.stream().filter(user -> BeanUtils.isEmpty(user.getMobile())).map(user->user.getName()).collect(Collectors.toList()); + if (ObjectUtils.isNotEmpty(noMobileUserList)) { + log.warn(baseLog + "行数="+Thread.currentThread().getStackTrace()[1].getLineNumber()+ ",时间="+ LocalDateTime.now().format(dateTimeFormatter)+",无手机号用户信息 ="+ noMobileUserList); + } //2、获取系统存在相同手机号的用户 List existUserList = this.getAll(); diff --git a/backend/uc/src/main/java/com/hotent/uc/manager/impl/UserUniteManagerImpl.java b/backend/uc/src/main/java/com/hotent/uc/manager/impl/UserUniteManagerImpl.java index 5abcf0a..c2d8876 100644 --- a/backend/uc/src/main/java/com/hotent/uc/manager/impl/UserUniteManagerImpl.java +++ b/backend/uc/src/main/java/com/hotent/uc/manager/impl/UserUniteManagerImpl.java @@ -5,6 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; import org.apache.logging.log4j.util.Strings; @@ -59,6 +60,9 @@ public class UserUniteManagerImpl extends BaseManagerImpl userUniteList) { + if(ObjectUtils.isEmpty(userUniteList)) { + return; + } Map map = new HashMap<>(); List userIds = new ArrayList(); for (UserUnite userUnite : userUniteList) { -- libgit2 0.21.2