添加智慧办公回调信息

device-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java

 package com.mortals.xhx.daemon.task;
 
-import com.alibaba.fastjson.JSON;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ITask;
@@ -19,7 +18,10 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 同步用户,唯一标识为用户名。
@@ -41,10 +43,50 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
         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> oldUserList = userService.find(new UserQuery());
+                log.info(" oldUserList size：{}", oldUserList.size());
+
+                Map<String, UserEntity> oldUserMap = oldUserList.stream().collect(Collectors.toMap(x -> x.getLoginName(), y -> y, (o, n) -> n));
+                Map<String, UserEntity> newUserMap = newUserList.stream().collect(Collectors.toMap(x -> x.getLoginName(), y -> y, (o, n) -> n));
+
+
+                List<UserEntity> saveUserList = newUserList.stream().map(item -> {
+                    if (!oldUserMap.containsKey(item.getLoginName())) {
+                        item.setCreateUserId(1L);
+                        item.setCreateUserName("系统管理员");
+                        item.setCreateTime(new Date());
+                        return item;
+                    }
+                    return null;
+                }).filter(f -> f != null).collect(Collectors.toList());
+
+
+                if (!ObjectUtils.isEmpty(saveUserList)) {
+                    log.info("用户新增，size:{}", saveUserList.size());
+                    saveUserList.stream().forEach(item->{
+                        userService.getUserDao().insert(item);
+                    });
+
+                    //userService.save(saveUserList);
+                }
+
+            }
+            //查找新增 与更新
+
+
             //同步更新用户，以loginname为唯一标识，密码默认与用户相同
-            resp.getData().getData().forEach(user -> {
+/*            resp.getData().getData().forEach(user -> {
                 log.info("loginName:{}", user.getLoginName());
                 UserEntity tempEntity = userService.selectOne(new UserQuery().loginName(user.getLoginName()));
                 if (ObjectUtils.isEmpty(tempEntity)) {
@@ -59,7 +101,7 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
                     log.info("更新:{}", JSON.toJSONString(userEntity));
                     userService.getUserDao().update(userEntity);
                 }
-            });
+            });*/
         }
        // log.info("syncUserResp:{}", JSON.toJSONString(resp));