From 48c336687914f3aa183fc1b2e047cfbde581748d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 30 十一月 2023 16:48:39 +0800
Subject: [PATCH] 定时任务
---
ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java | 4 +++-
ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java | 4 ++++
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java | 1 +
3 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java b/ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java
index fd00a02..f3f58e4 100644
--- a/ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java
+++ b/ycl-platform/src/main/java/com/ycl/common/dingding/DingCommon.java
@@ -15,6 +15,7 @@
import com.alibaba.xxpt.gateway.shared.api.response.OapiMoziOrganizationPageSubOrganizationCodesResponse;
import com.alibaba.xxpt.gateway.shared.client.http.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.ycl.config.DingConfig;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.dingding.DingUserInfo;
@@ -189,6 +190,9 @@
*/
public List<UmsDepart> getOrgInfo(JSONArray deptTopArr) {
List<UmsDepart> orgList = new ArrayList<>();
+ if(CollectionUtils.isEmpty(deptTopArr)){
+ return null;
+ }
//鑾峰彇鍏ㄩ儴閮ㄩ棬code
//JSONObject topObj = getBookAuthority();
//椤剁骇閮ㄩ棬id
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
index 6dccd8e..6d44fa3 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
@@ -265,6 +265,7 @@
//璁剧疆娴佺▼鐜妭鏁版嵁
disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId());
disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId());
+
return baseMapper.insert(disposeRecord) == 1 ? true : false;
}
}
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 c85acea..03f510e 100644
--- a/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java
+++ b/ycl-platform/src/main/java/com/ycl/timer/GetDingUserOrgTimer.java
@@ -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();
--
Gitblit v1.8.0