Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

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

 package com.mortals.xhx.daemon.task;
 
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ITask;
 import com.mortals.framework.service.ITaskExcuteService;
-import com.mortals.xhx.common.code.*;
-import com.mortals.xhx.module.attendance.model.AttendanceStatEntity;
-import com.mortals.xhx.module.attendance.model.AttendanceVacationBalanceEntity;
+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.module.attendance.service.AttendanceStatService;
 import com.mortals.xhx.module.attendance.service.AttendanceVacationBalanceService;
 import com.mortals.xhx.module.dept.model.DeptEntity;
 import com.mortals.xhx.module.dept.model.DeptQuery;
 import com.mortals.xhx.module.dept.service.DeptService;
+import com.mortals.xhx.module.dingding.personal.service.IDingPersonService;
 import com.mortals.xhx.module.hik.person.model.req.org.OrgListReq;
-import com.mortals.xhx.module.hik.person.model.req.person.PersonReq;
 import com.mortals.xhx.module.hik.person.model.rsp.org.OrgDataInfo;
 import com.mortals.xhx.module.hik.person.model.rsp.org.OrgInfo;
-import com.mortals.xhx.module.hik.person.model.rsp.person.PersonDataInfo;
-import com.mortals.xhx.module.hik.person.model.rsp.person.PersonInfo;
 import com.mortals.xhx.module.hik.person.service.IHikPersonService;
 import com.mortals.xhx.module.staff.model.StaffEntity;
-import com.mortals.xhx.module.staff.model.StaffLeaveEntity;
-import com.mortals.xhx.module.staff.model.StaffQuery;
 import com.mortals.xhx.module.staff.service.StaffLeaveService;
 import com.mortals.xhx.module.staff.service.StaffService;
 import lombok.extern.slf4j.Slf4j;
@@ -31,7 +26,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.util.*;
+import java.util.Date;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -45,6 +41,8 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
     private StaffService staffService;
     @Autowired
     private DeptService deptService;
+    @Autowired
+    private UserService userService;
 
     @Autowired
     private AttendanceStatService attendanceStatService;
@@ -56,6 +54,8 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
     private IHikPersonService hikPersonService;
     @Autowired
     private StaffLeaveService staffLeaveService;
+    @Autowired
+    private IDingPersonService dingPersonService;
 
     @Override
     public void excuteTask(ITask task) throws AppException {
@@ -63,9 +63,45 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
             log.info("同步部门");
             syncDepts();
             log.info("同步用户");
-
             staffService.syncPersons(null);
+            log.info("同步钉钉usreId");
+
+            List<UserEntity> userList = userService.getCacheList().stream()
+                    .filter(f -> !ObjectUtils.isEmpty(f.getCustomerId()))
+                    .filter(f -> ObjectUtils.isEmpty(f.getDingUserId())).collect(Collectors.toList());
 
+
+            List<UserEntity> updateUserList = userList.stream().map(item -> {
+                UserEntity userEntity = new UserEntity();
+                userEntity.setId(item.getId());
+
+                String mobile = item.getMobile();
+                if (ObjectUtils.isEmpty(mobile)) {
+                    //根据customerId查询staff 看是否有
+                    StaffEntity staffCache = staffService.getCache(item.getCustomerId().toString());
+                    if (!ObjectUtils.isEmpty(staffCache) && !ObjectUtils.isEmpty(staffCache.getPhoneNumber())) {
+                        mobile = staffCache.getPhoneNumber();
+                        userEntity.setMobile(mobile);
+                    }
+                }
+                if (!ObjectUtils.isEmpty(mobile)) {
+                    Rest<String> personByMobile = dingPersonService.getPersonByMobile(mobile);
+                    if (!ObjectUtils.isEmpty(personByMobile) &&
+                            YesNoEnum.YES.getValue() == personByMobile.getCode()
+                            && !ObjectUtils.isEmpty(personByMobile.getData())) {
+                        userEntity.setDingUserId(personByMobile.getData());
+                    }
+                }
+
+                userEntity.setUpdateTime(new Date());
+                userEntity.setUpdateUserId(1L);
+                return userEntity;
+            }).collect(Collectors.toList());
+
+            if(!ObjectUtils.isEmpty(updateUserList)){
+                 log.info("更新用户钉钉id信息数量：{}",updateUserList.size());
+                 userService.update(updateUserList);
+            }
         } catch (Exception e) {
             log.error("同步人事异常", e);
         }