From 18653f874dc47c7a9ff007d57a59dac873deebdf Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 16 十二月 2023 19:54:36 +0800
Subject: [PATCH] 同步修改
---
ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java | 181 +++++++++++++++++++++++----------------------
1 files changed, 93 insertions(+), 88 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java b/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java
index dc42646..0491949 100644
--- a/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java
+++ b/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java
@@ -23,6 +23,7 @@
import com.ycl.service.user.UmsRoleService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.context.ApplicationListener;
@@ -69,110 +70,113 @@
@Autowired
private UmsAdminRoleRelationService umsAdminRoleRelationService;
- @Scheduled(cron = "40 50 16 * * ?")
+ @Value("${spring.profiles.active}")
+ private String env;
+ @Scheduled(cron = "0 0 1 * * ?") // 姣忓ぉ闆剁偣鎵ц
@Transactional(rollbackFor = Exception.class)
public void run() {
- log.info("寮�濮嬪悓姝ヤ换鍔�");
- //鑾峰彇鍏ㄩ儴閮ㄩ棬code
- JSONObject topObj = dingCommon.getBookAuthority();
- //椤剁骇閮ㄩ棬id
- log.info("閮ㄩ棬code------------>{}",topObj.toJSONString());
- JSONArray deptTopArr = topObj.getJSONArray("deptVisibleScopes");
- List<UmsDepart> dingOrgList = dingCommon.getOrgInfo(deptTopArr);
+ if ("online".equals(env)) {
+ log.info("寮�濮嬪悓姝ヤ换鍔�");
+ //鑾峰彇鍏ㄩ儴閮ㄩ棬code
+ JSONObject topObj = dingCommon.getBookAuthority();
+ //椤剁骇閮ㄩ棬id
+ log.info("閮ㄩ棬code------------>{}", topObj.toJSONString());
+ JSONArray deptTopArr = topObj.getJSONArray("deptVisibleScopes");
+ List<UmsDepart> dingOrgList = dingCommon.getOrgInfo(deptTopArr);
- //鏌ヨ鏁版嵁搴撲腑鐨勯儴闂�
- List<UmsDepart> dataOrgList = umsDepartService.list();
- if(CollectionUtils.isNotEmpty(dingOrgList)) {
- Iterator<UmsDepart> removeIterOrg = dingOrgList.iterator();
- while (removeIterOrg.hasNext()) {
- UmsDepart dingOrg = removeIterOrg.next();
- if (dingOrg.getCode().equals(deptTopArr.getString(0))) {
- dingOrg.setParentId(0L);
- }
- //鍒ゆ柇
- for (UmsDepart org : dataOrgList) {
- if (ObjectUtil.equals(org.getId(), dingOrg.getId()) && ObjectUtil.equals(org.getDepartName(), dingOrg.getDepartName()) && ObjectUtil.equals(org.getParentId(), dingOrg.getParentId())) {
- removeIterOrg.remove();
+ //鏌ヨ鏁版嵁搴撲腑鐨勯儴闂�
+ List<UmsDepart> dataOrgList = umsDepartService.list();
+ if (CollectionUtils.isNotEmpty(dingOrgList)) {
+ Iterator<UmsDepart> removeIterOrg = dingOrgList.iterator();
+ while (removeIterOrg.hasNext()) {
+ UmsDepart dingOrg = removeIterOrg.next();
+ if (dingOrg.getCode().equals(deptTopArr.getString(0))) {
+ dingOrg.setParentId(0L);
+ }
+ //鍒ゆ柇
+ for (UmsDepart org : dataOrgList) {
+ if (ObjectUtil.equals(org.getId(), dingOrg.getId()) && ObjectUtil.equals(org.getDepartName(), dingOrg.getDepartName()) && ObjectUtil.equals(org.getParentId(), dingOrg.getParentId())) {
+ removeIterOrg.remove();
+ }
}
}
+ //姝ゆ椂 dingOrgList 涓墿涓嬬殑灏辨槸鏂扮殑缁勭粐鏈烘瀯浜嗐��
+ dingOrgList.forEach(dingOrg -> {
+ if (dingOrg.getCode().equals(deptTopArr.getString(0))) {
+ dingOrg.setParentId(0L);
+ }
+ //umsDepartService.fillPids(dingOrg);
+ dingOrg.setStatus((short) 1);
+ umsDepartService.saveOrUpdate(dingOrg);
+ });
}
- //姝ゆ椂 dingOrgList 涓墿涓嬬殑灏辨槸鏂扮殑缁勭粐鏈烘瀯浜嗐��
- dingOrgList.forEach(dingOrg -> {
- if (dingOrg.getCode().equals(deptTopArr.getString(0))) {
- dingOrg.setParentId(0L);
- }
- //umsDepartService.fillPids(dingOrg);
- dingOrg.setStatus((short) 1);
- umsDepartService.saveOrUpdate(dingOrg);
- });
- }
// log.info(TAG + "update organization size " + dingOrgList.size());
- TimeInterval timer = DateUtil.timer();
- /**
- // * 鏍规嵁缁勭粐code 鏌ヨ 閫氳褰曚汉鍛樹俊鎭�
- // */
- //鏌ヨ鐢ㄦ埛缁勭粐鍏宠仈琛�
- List<UmsDepartManage> empOrgList = departManageService.list();
- //鏌ヨ鎵�鏈夌敤鎴�
- Set<DingUserInfo> dingList = dingCommon.getPersonInfoByOrgCode();
- Set<DingUserInfo> dingUsers = new HashSet<>(dingList);
- log.info("dinglistStart----->{}",dingList);
- List<UmsAdmin> userList = umsAdminService.list();
- Iterator<DingUserInfo> iterator = dingUsers.iterator();
- while (iterator.hasNext()) {
- DingUserInfo dingUserInfo = iterator.next();
- //鍒ゆ柇鐢ㄦ埛鏄惁瀛樺湪锛岃緭鍑烘柊鐢ㄦ埛
- for (UmsAdmin user : userList) {
- //鍒ゆ柇濮撳悕
- if (ObjectUtil.equals(user.getId(), dingUserInfo.getUserId()) ) {
- iterator.remove();
- //鍒ゆ柇缁勭粐
+ TimeInterval timer = DateUtil.timer();
+ /**
+ // * 鏍规嵁缁勭粐code 鏌ヨ 閫氳褰曚汉鍛樹俊鎭�
+ // */
+ //鏌ヨ鐢ㄦ埛缁勭粐鍏宠仈琛�
+ List<UmsDepartManage> empOrgList = departManageService.list();
+ //鏌ヨ鎵�鏈夌敤鎴�
+ Set<DingUserInfo> dingList = dingCommon.getPersonInfoByOrgCode();
+ Set<DingUserInfo> dingUsers = new HashSet<>(dingList);
+ log.info("dinglistStart----->{}", dingList);
+ List<UmsAdmin> userList = umsAdminService.list();
+ Iterator<DingUserInfo> iterator = dingUsers.iterator();
+ while (iterator.hasNext()) {
+ DingUserInfo dingUserInfo = iterator.next();
+ //鍒ゆ柇鐢ㄦ埛鏄惁瀛樺湪锛岃緭鍑烘柊鐢ㄦ埛
+ for (UmsAdmin user : userList) {
+ //鍒ゆ柇濮撳悕
+ if (ObjectUtil.equals(user.getId(), dingUserInfo.getUserId())) {
+ iterator.remove();
+ //鍒ゆ柇缁勭粐
// for (UmsDepartManage emp : empOrgList) {
// if (ObjectUtil.equals(user.getId(), emp.getUserId()) && ObjectUtil.equals(dingUserInfo.getOrgId(), emp.getDepartId())) {
// iterator.remove();
// break;
// }
// }
+ }
}
}
- }
- log.info("dinglistEnd----->{}",dingUsers);
- ArrayList<UmsAdminRoleRelation> relations = new ArrayList<>();
+ log.info("dinglistEnd----->{}", dingUsers);
+ ArrayList<UmsAdminRoleRelation> relations = new ArrayList<>();
// log.info(TAG + " elapsed time:" + timer.interval());
- for (DingUserInfo dingUserInfo : dingUsers) {
- //1.娣诲姞鐢ㄦ埛
- UmsAdmin user = new UmsAdmin();
- //璐﹀彿
- user.setUsername(dingUserInfo.getEmployeeName());
- //鏄电О
- if (StringUtils.isNotBlank(dingUserInfo.getNickNameCn())) {
- user.setNickName(dingUserInfo.getNickNameCn());
- } else {
- user.setNickName(dingUserInfo.getEmployeeName());
- }
- //code
- //accountId
- log.info("鍛樺伐璐︽埛id{}",dingUserInfo.getAccountId());
- user.setAccountId(dingUserInfo.getAccountId());
- //澶村儚
- user.setIcon(dingUserInfo.getGovEmpAvatar());
- //濮撳悕
- //鎬у埆
- user.setSex(dingUserInfo.getEmpGender().byteValue());
- //瀵嗙爜 鑾峰彇鍒濆瀵嗙爜
- //灏嗗瘑鐮佽繘琛屽姞瀵嗘搷浣�
- String encodePassword = passwordEncoder.encode("123456");
- user.setPassword(encodePassword);
- user.setIsDy(Byte.parseByte("0"));
- user.setMobile("");
- user.setOpenid(dingUserInfo.getOpenid());
- //id
- user.setId(dingUserInfo.getUserId());
- //鐘舵�佷负鍋滅敤锛堜笉鍙敤鐘舵�侊級鐐瑰嚮鐧诲綍鍚庢墠鑳戒娇鐢�
- user.setStatus(1);
- umsAdminService.save(user);
+ for (DingUserInfo dingUserInfo : dingUsers) {
+ //1.娣诲姞鐢ㄦ埛
+ UmsAdmin user = new UmsAdmin();
+ //璐﹀彿
+ user.setUsername(dingUserInfo.getEmployeeName());
+ //鏄电О
+ if (StringUtils.isNotBlank(dingUserInfo.getNickNameCn())) {
+ user.setNickName(dingUserInfo.getNickNameCn());
+ } else {
+ user.setNickName(dingUserInfo.getEmployeeName());
+ }
+ //code
+ //accountId
+ log.info("鍛樺伐璐︽埛id{}", dingUserInfo.getAccountId());
+ user.setAccountId(dingUserInfo.getAccountId());
+ //澶村儚
+ user.setIcon(dingUserInfo.getGovEmpAvatar());
+ //濮撳悕
+ //鎬у埆
+ user.setSex(dingUserInfo.getEmpGender().byteValue());
+ //瀵嗙爜 鑾峰彇鍒濆瀵嗙爜
+ //灏嗗瘑鐮佽繘琛屽姞瀵嗘搷浣�
+ String encodePassword = passwordEncoder.encode("123456");
+ user.setPassword(encodePassword);
+ user.setIsDy(Byte.parseByte("0"));
+ user.setMobile("");
+ user.setOpenid(dingUserInfo.getOpenid());
+ //id
+ user.setId(dingUserInfo.getUserId());
+ //鐘舵�佷负鍋滅敤锛堜笉鍙敤鐘舵�侊級鐐瑰嚮鐧诲綍鍚庢墠鑳戒娇鐢�
+ user.setStatus(1);
+ umsAdminService.save(user);
// //鍛樺伐淇℃伅锛屽叧鑱旂粍缁�
// UmsDepartManage departManage = new UmsDepartManage();
// departManage.setDepartId(dingUserInfo.getOrgId());
@@ -193,10 +197,11 @@
// }
// if (CollUtil.isNotEmpty(relations)) {
// umsAdminRoleRelationService.saveBatch(relations, IService.DEFAULT_BATCH_SIZE);
- }
- log.info("鍚屾浠诲姟缁撴潫");
+ }
+ log.info("鍚屾浠诲姟缁撴潫");
// log.info(TAG + "update user size " + dingList.size());
// getEmployeeAvatar();
+ }
}
/**
--
Gitblit v1.8.0