diff --git a/base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java b/base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java index cc13265c0a1922cdbf70c4a663cb932344fd6d10..603d0a9f70078e02fc0cdaa176df88022e1c8025 100644 --- a/base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java +++ b/base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java @@ -326,7 +326,6 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE //鍒嗙粍鏌ユ壘瀛樺湪鐨勪笌涓嶅瓨鍦ㄧ殑鐢ㄦ埛 Map<Boolean, List<UserPdu>> collect = list.parallelStream().collect(Collectors.partitioningBy(x -> existUserMap.containsKey(x.getLoginName()))); List<UserPdu> userPdusUpdate = collect.get(true);//鏇存柊 - List<UserEntity> userEntityUpdate = new ArrayList<>(); List<UserPdu> userPdusSave = collect.get(false);//鏂板 List<UserEntity> userEntitySave = new ArrayList<>(); @@ -356,7 +355,6 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE Map<String, List<UserEntity>> saveSitesCollect = userEntitySave.stream().collect(Collectors.groupingBy(x -> x.getSiteIds())); // Map<String, List<UserEntity>> updateSitesCollect = userEntityUpdate.stream().collect(Collectors.groupingBy(x -> x.getSiteIds())); saveSitesCollect.entrySet().stream().forEach(item -> { - String siteIds = item.getKey(); List<UserEntity> userEntities = item.getValue(); if (!ObjectUtils.isEmpty(userEntities)) { Context context = new Context(); @@ -364,35 +362,6 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE ThreadPool.getInstance().execute(new SyncTreeSiteThread(context, userEntities)); } }); - -/* - //濡傛灉鐢ㄦ埛鏈湁鎵€灞炵珯鐐� 鍒欎笉鏇存柊 - for (UserPdu user : list) { - UserEntity tempUser = this.selectOne(new UserQuery().loginName(user.getLoginName())); - if (ObjectUtils.isEmpty(tempUser)) { - //鏂板 - UserEntity entity = new UserEntity(); - entity.initAttrValue(); - BeanUtils.copyProperties(user, entity, BeanUtil.getNullPropertyNames(user)); - this.save(entity); - if (!ObjectUtils.isEmpty(entity.getSiteIds())) { - Context context = new Context(); - context.setUser(entity); - ThreadPool.getInstance().execute(new SyncTreeSiteThread(context)); - } - } else { - //鏇存柊 - UserEntity userEntity = new UserEntity(); - BeanUtils.copyProperties(user, userEntity, new String[]{"loginPwd", "loginName", "userType", "status", "lastLoginTime", "lastLoginAddress"}); - userEntity.setId(tempUser.getId()); - this.updateWidthDao(userEntity); - if (!ObjectUtils.isEmpty(userEntity.getSiteIds())) { - Context context = new Context(); - context.setUser(userEntity); - ThreadPool.getInstance().execute(new SyncTreeSiteThread(context)); - } - } - }*/ } @@ -458,8 +427,9 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE log.info("闇€瑕佸垹闄ょ殑鏈湴鐢ㄦ埛鏁伴噺:{}", removeUserIds.length); this.remove(removeUserIds, null); } + + this.updateUserList(userPduList); } - //鏌ユ壘鏂板 涓庢洿鏂� } return Rest.ok(); } diff --git a/base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java b/base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java index 7bedd822866f1e20eaa234f0767e96b3d11cc790..60924739a67e6aae4fb2dc9e25091eb9a24f665e 100644 --- a/base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java +++ b/base-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java @@ -42,6 +42,9 @@ public class SyncUserTaskImpl implements ITaskExcuteService { @Override public void excuteTask(ITask task) throws AppException { + userService.refreshUser(); + + log.info("鍚屾鐢ㄦ埛"); UserPdu userPdu = new UserPdu(); userPdu.setPage(1);