更新用户同步逻辑

sample-form-manager/src/main/java/com/mortals/xhx/base/system/user/service/UserService.java

@@ -8,6 +8,7 @@
 
 package com.mortals.xhx.base.system.user.service;
 
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.service.ICRUDCacheService;
@@ -116,6 +117,8 @@ public interface UserService extends ICRUDCacheService<UserEntity,Long> {
     public boolean updateUserPwd(String loginName, String oldPwd, String newPwd) throws AppException;
 
 
+    Rest<Void> refreshUser();
+
     UserDao getUserDao();
 
 }
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -9,6 +9,7 @@
 package com.mortals.xhx.base.system.user.service.impl;
 
 import com.mortals.framework.ap.SysConstains;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.common.code.UserType;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
@@ -25,25 +26,36 @@ import com.mortals.xhx.base.system.resource.model.ResourceEntity;
 import com.mortals.xhx.base.system.resource.service.ResourceService;
 import com.mortals.xhx.base.system.role.dao.RoleUserDao;
 import com.mortals.xhx.base.system.role.model.RoleUserEntity;
+import com.mortals.xhx.base.system.role.service.RoleUserService;
 import com.mortals.xhx.base.system.user.dao.UserDao;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.user.UserPdu;
+import com.mortals.xhx.feign.user.IUserFeign;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>Title: 用户信息</p>
  * <p>Description: UserServiceImpl service接口 </p>
  * <p>Copyright: Copyright &reg;  </p>
  * <p>Company: </p>
+ *
  * @author
  * @version 1.0.0
  */
 @Service("userService")
+@Slf4j
 public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserEntity, Long> implements UserService {
 
 
@@ -54,13 +66,19 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
     @Autowired
     private RoleUserDao roleUserDao;
 
+    @Autowired
+    private RoleUserService roleUserService;
+
+
+    @Autowired
+    private IUserFeign userFeign;
+
     @Override
     protected String getExtKey(UserEntity data) {
         return data.getLoginName();
     }
 
 
-
     private void doHandlerUser(UserEntity entity) throws AppException {
         if (StringUtils.isNotEmpty(entity.getLoginPwd())) {
             try {
@@ -85,9 +103,9 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
 
     @Override
     protected void saveAfter(UserEntity entity, Context context) throws AppException {
-        if(CollectionUtils.isNotEmpty(entity.getRoleIds())){
+        if (CollectionUtils.isNotEmpty(entity.getRoleIds())) {
             List<RoleUserEntity> roleUserEntityList = new ArrayList<>();
-            entity.getRoleIds().stream().forEach(item->{
+            entity.getRoleIds().stream().forEach(item -> {
                 RoleUserEntity roleUserEntity = new RoleUserEntity();
                 roleUserEntity.setUserId(entity.getId());
                 roleUserEntity.setRoleId(item);
@@ -107,9 +125,9 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
 
     @Override
     protected void updateAfter(UserEntity entity, Context context) throws AppException {
-        if(CollectionUtils.isNotEmpty(entity.getRoleIds())){
+        if (CollectionUtils.isNotEmpty(entity.getRoleIds())) {
             List<RoleUserEntity> roleUserEntityList = new ArrayList<>();
-            entity.getRoleIds().stream().forEach(item->{
+            entity.getRoleIds().stream().forEach(item -> {
                 RoleUserEntity roleUserEntity = new RoleUserEntity();
                 roleUserEntity.setUserId(entity.getId());
                 roleUserEntity.setRoleId(item);
@@ -140,13 +158,13 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
 
     @Override
     protected void findAfter(UserEntity params, PageInfo pageInfo, Context context, List<UserEntity> list) throws AppException {
-        if(CollectionUtils.isNotEmpty(list)) {
-            list.stream().forEach(item->{
+        if (CollectionUtils.isNotEmpty(list)) {
+            list.stream().forEach(item -> {
                 RoleUserEntity query = new RoleUserEntity();
                 query.setUserId(item.getId());
                 List<RoleUserEntity> roleUserEntityList = roleUserDao.getList(query);
                 List<Long> roleIds = new ArrayList<>();
-                roleUserEntityList.stream().forEach(role->{
+                roleUserEntityList.stream().forEach(role -> {
                     roleIds.add(role.getRoleId());
                 });
                 item.setRoleIds(roleIds);
@@ -339,6 +357,70 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
         return true;
     }
 
+
+    @Override
+    public Rest<Void> refreshUser() {
+        UserPdu userPdu = new UserPdu();
+        userPdu.setPage(1);
+        userPdu.setSize(-1);
+        Rest<RespData<List<UserPdu>>> resp = userFeign.list(userPdu);
+        if (resp.getCode() == YesNoEnum.YES.getValue()) {
+            List<UserPdu> userPduList = resp.getData().getData();
+            log.info("用户总数量：{}", userPduList.size());
+            if (!ObjectUtils.isEmpty(userPduList)) {
+                List<UserEntity> newUserList = userPduList.stream().map(newUser -> {
+                    UserEntity userEntity = new UserEntity();
+                    userEntity.initAttrValue();
+                    BeanUtils.copyProperties(newUser, userEntity, new String[]{"id", "lastLoginTime", "lastLoginAddress"});
+                    return userEntity;
+                }).collect(Collectors.toList());
+
+                List<UserEntity> saveUpdateUserList = newUserList.parallelStream().map(item -> {
+                    UserEntity extCache = this.getExtCache(item.getLoginName());
+                    if (ObjectUtils.isEmpty(extCache)) {
+                        item.setCreateUserId(1L);
+                        item.setCreateUserName("系统管理员");
+                        item.setCreateTime(new Date());
+                        return item;
+                    } else {
+                        //更新用户列表
+                        item.setId(extCache.getId());
+                        item.setUpdateUserId(1L);
+                        item.setUpdateUserName("系统管理员");
+                        item.setUpdateTime(new Date());
+                        return item;
+                    }
+                }).collect(Collectors.toList());
+                Map<Boolean, List<UserEntity>> saveUpdateCollect = saveUpdateUserList.stream().collect(Collectors.partitioningBy(x -> x.getId() == null));
+                if (!ObjectUtils.isEmpty(saveUpdateCollect.get(true))) {
+                    //需要新增的用户
+                    log.info("需要新增用户数量：{}", saveUpdateCollect.get(true).size());
+                    saveUpdateCollect.get(true).stream().forEach(item -> {
+                        this.getUserDao().insert(item);
+                    });
+                }
+
+                if (!ObjectUtils.isEmpty(saveUpdateCollect.get(false))) {
+                    //需要新增的用户
+                    log.info("需要更新用户数量：{}", saveUpdateCollect.get(false).size());
+                    saveUpdateCollect.get(false).stream().forEach(item -> {
+                        this.getUserDao().update(item);
+                    });
+                }
+                //差集删除
+                Set<String> collectSet = newUserList.parallelStream().map(x -> x.getLoginName()).collect(Collectors.toSet());
+                Long[] removeUserIds = this.getCacheList().parallelStream().filter(f -> !collectSet.contains(f.getLoginName())).map(i -> i.getId()).distinct().toArray(Long[]::new);
+                if (!ObjectUtils.isEmpty(removeUserIds)) {
+                    log.info("需要删除的本地用户数量:{}", removeUserIds.length);
+                    this.remove(removeUserIds, null);
+                }
+            }
+            //查找新增 与更新
+        }
+        return Rest.ok();
+    }
+
+
     @Override
     public UserDao getUserDao() {
         return this.getDao();

sample-form-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserController.java

@@ -16,6 +16,8 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.service.IUser;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.role.model.RoleEntity;
@@ -54,7 +56,6 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
     private RoleService roleService;
 
     public UserController() {
-        super.setFormClass(UserForm.class);
         super.setModuleDesc("用户信息");
     }
 
@@ -95,4 +96,14 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
         }
         return ret.toJSONString();
     }
+
+
+    @PostMapping({"refreshUser"})
+    @UnAuth
+    public Rest<Object> refreshUser() {
+        log.info("刷新用户");
+        this.service.refreshUser();
+        return Rest.ok("用户同步刷新操作成功");
+    }
+
 }
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserForm.java

-/**
-* 文件：UserForm.java
-* 版本：1.0.0
-* 日期：
-* Copyright ® 
-* All right reserved.
-*/
-package com.mortals.xhx.base.system.user.web;
-
-import com.mortals.framework.web.BaseCRUDFormLong;
-import com.mortals.xhx.base.system.user.model.UserEntity;
-import com.mortals.xhx.base.system.user.model.UserQuery;
-
-/**
- * <p>Title: 用户信息</p>
- * <p>Description: UserForm  </p>
- * <p>Copyright: Copyright &reg;  </p>
- * <p>Company: </p>
- * @author 
- * @version 1.0.0
- */
-public class UserForm extends BaseCRUDFormLong<UserEntity> {
-	private UserEntity entity = new UserEntity();
-	private UserQuery query = new UserQuery();
-	public UserForm(){
-		
-	}
-	
-    @Override
-	public UserEntity getEntity() {
-		return entity;
-	}
-
-	public void setEntity(UserEntity entity) {
-		this.entity = entity;
-	}
-
-	@Override
-	public UserQuery getQuery() {
-		return query;
-	}
-
-	public void setQuery(UserQuery query) {
-		this.query = query;
-	}
-}
\ No newline at end of file