From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 30 十一月 2023 16:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 86e4f07..03f510e 100644
--- a/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java
+++ b/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java
@@ -52,11 +52,11 @@
@Override
public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent) {
- if (contextRefreshedEvent.getApplicationContext().getParent() == null) {
- Thread thread = new Thread(this::run);
- thread.setUncaughtExceptionHandler(handler);
- thread.start();
- }
+// if (contextRefreshedEvent.getApplicationContext().getParent() == null) {
+// Thread thread = new Thread(this::run);
+// thread.setUncaughtExceptionHandler(handler);
+// thread.start();
+// }
}
@Autowired
@@ -72,14 +72,16 @@
@Autowired
private UmsAdminRoleRelationService umsAdminRoleRelationService;
- // @Scheduled(cron = "0 0 00 * * ?")
+ //@Scheduled(cron = "0 50 15 * * ?")
@Transactional(rollbackFor = Exception.class)
public void run() {
+ log.info("寮�濮嬪悓姝ヤ换鍔�");
//鑾峰彇鍏ㄩ儴閮ㄩ棬code
JSONObject topObj = dingCommon.getBookAuthority();
//椤剁骇閮ㄩ棬id
JSONArray deptTopArr = topObj.getJSONArray("deptVisibleScopes");
List<UmsDepart> dingOrgList = dingCommon.getOrgInfo(deptTopArr);
+
//鏌ヨ鏁版嵁搴撲腑鐨勯儴闂�
List<UmsDepart> dataOrgList = umsDepartService.list();
Iterator<UmsDepart> removeIterOrg = dingOrgList.iterator();
@@ -105,7 +107,7 @@
umsDepartService.saveOrUpdate(dingOrg);
});
- log.info(TAG + "update organization size " + dingOrgList.size());
+// log.info(TAG + "update organization size " + dingOrgList.size());
TimeInterval timer = DateUtil.timer();
/**
// * 鏍规嵁缁勭粐code 鏌ヨ 閫氳褰曚汉鍛樹俊鎭�
@@ -134,7 +136,7 @@
}
}
ArrayList<UmsAdminRoleRelation> relations = new ArrayList<>();
- log.info(TAG + " elapsed time:" + timer.interval());
+// log.info(TAG + " elapsed time:" + timer.interval());
for (DingUserInfo dingUserInfo : dingList) {
//1.娣诲姞鐢ㄦ埛
UmsAdmin user = new UmsAdmin();
@@ -185,7 +187,7 @@
if (CollUtil.isNotEmpty(relations)) {
umsAdminRoleRelationService.saveBatch(relations, IService.DEFAULT_BATCH_SIZE);
}
- log.info(TAG + "update user size " + dingList.size());
+// log.info(TAG + "update user size " + dingList.size());
// getEmployeeAvatar();
}
@@ -204,6 +206,6 @@
@Override
public void run(ApplicationArguments args) throws Exception {
- run();
+// run();
}
}
--
Gitblit v1.8.0