Commit 5a481232 authored by 钱坤's avatar 钱坤

从企微同步人员信息时候记录一下概要,不然像恒泰这样几千人一直在同步的,都不知道具体啥原因

parent e7a0f333
...@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; ...@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.digest.MD5; import cn.hutool.crypto.digest.MD5;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.tanpu.common.util.JsonUtil;
import com.tanpu.feo.feojob.constant.BaseConstant; import com.tanpu.feo.feojob.constant.BaseConstant;
import com.tanpu.feo.feojob.constant.OrgExtConstant; import com.tanpu.feo.feojob.constant.OrgExtConstant;
import com.tanpu.feo.feojob.dao.user.entity.*; import com.tanpu.feo.feojob.dao.user.entity.*;
...@@ -30,10 +31,7 @@ import org.springframework.scheduling.annotation.Scheduled; ...@@ -30,10 +31,7 @@ import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -112,13 +110,15 @@ public class OrgSyncByWxcpJob { ...@@ -112,13 +110,15 @@ public class OrgSyncByWxcpJob {
} }
log.info("======从企业微信获取组织信息及员工信息 结束======"); log.info("======从企业微信获取组织信息及员工信息 结束======");
logOrgManSimpleInfo(orgId, wxCpDepartDtoList);
//4 判断是否需要 同步 //4 判断是否需要 同步
String digestHex = isExecute(isAuto, wxCpDepartDtoList, orgExtEntity.getMd5WxcpData()); String digestHex = isExecute(isAuto, wxCpDepartDtoList, orgExtEntity.getMd5WxcpData());
log.info("====== 机构:{}整体digest, old: {}, new: {}=======", orgId, orgExtEntity.getMd5WxcpData(), digestHex);
if (StrUtil.isBlank(digestHex)) { if (StrUtil.isBlank(digestHex)) {
log.info("====== 机构:{} 不需要执行同步=======", orgId); log.info("====== 机构:{} 不需要执行同步=======", orgId);
continue; continue;
} }
String qrCodeUrl = getQrCodeUrl(orgEntity.getId()); String qrCodeUrl = getQrCodeUrl(orgEntity.getId());
//5 开始比对 5张表 数据 user_info employee department department_employee employee_role //5 开始比对 5张表 数据 user_info employee department department_employee employee_role
...@@ -141,6 +141,18 @@ public class OrgSyncByWxcpJob { ...@@ -141,6 +141,18 @@ public class OrgSyncByWxcpJob {
} }
private void logOrgManSimpleInfo(String orgId, List<WxCpDepartDto> wxCpDepartDtoList) {
if (CollectionUtils.isEmpty(wxCpDepartDtoList)) {
log.info("机构{}当前无部门人员信息", orgId);
return;
}
Map<String, Integer> map = new LinkedHashMap<>(wxCpDepartDtoList.size());
for (WxCpDepartDto departDto : wxCpDepartDtoList) {
map.put(departDto.getName() + "," + departDto.getEnName() + "," + departDto.getId(), departDto.getMembers());
}
log.info("机构{}当前部门数:{}, 人员数概要是: {}", orgId, wxCpDepartDtoList.size(), JsonUtil.toJson(map));
}
private String getQrCodeUrl(String orgId) { private String getQrCodeUrl(String orgId) {
CommonResp<String> commonResp = feignClientForFatools.getQrCodeUrl(orgId); CommonResp<String> commonResp = feignClientForFatools.getQrCodeUrl(orgId);
if (commonResp.isNotSuccess()) { if (commonResp.isNotSuccess()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment