|
@@ -1,20 +1,14 @@
|
|
package com.galaxis.manatee.service;
|
|
package com.galaxis.manatee.service;
|
|
|
|
|
|
-import com.dingtalk.api.DefaultDingTalkClient;
|
|
|
|
import com.dingtalk.api.DingTalkClient;
|
|
import com.dingtalk.api.DingTalkClient;
|
|
import com.dingtalk.api.request.*;
|
|
import com.dingtalk.api.request.*;
|
|
-import com.dingtalk.api.response.OapiAttendanceGetleavestatusResponse;
|
|
|
|
-import com.dingtalk.api.response.OapiGettokenResponse;
|
|
|
|
import com.dingtalk.api.response.OapiProcessinstanceGetResponse;
|
|
import com.dingtalk.api.response.OapiProcessinstanceGetResponse;
|
|
import com.dingtalk.api.response.OapiProcessinstanceListidsResponse;
|
|
import com.dingtalk.api.response.OapiProcessinstanceListidsResponse;
|
|
import com.galaxis.manatee.constant.DingTalkConstant;
|
|
import com.galaxis.manatee.constant.DingTalkConstant;
|
|
import com.galaxis.manatee.dao.ChuanyunAskForLeaveDao;
|
|
import com.galaxis.manatee.dao.ChuanyunAskForLeaveDao;
|
|
import com.galaxis.manatee.dao.ChuanyunUserCompanyDao;
|
|
import com.galaxis.manatee.dao.ChuanyunUserCompanyDao;
|
|
-import com.galaxis.manatee.dao.ChuanyunUserDao;
|
|
|
|
import com.galaxis.manatee.dao.DingTalkProcessInstanceDao;
|
|
import com.galaxis.manatee.dao.DingTalkProcessInstanceDao;
|
|
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunAskForLeaveDo;
|
|
|
|
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunUserCompanyDO;
|
|
|
|
-import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunUserDO;
|
|
|
|
|
|
+import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunAskForLeaveDO;
|
|
import com.galaxis.manatee.entity.ding.DingTalkProcessInstance;
|
|
import com.galaxis.manatee.entity.ding.DingTalkProcessInstance;
|
|
import com.taobao.api.ApiException;
|
|
import com.taobao.api.ApiException;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -106,7 +100,7 @@ public class DingTalkScheduledTask {
|
|
while(flag){
|
|
while(flag){
|
|
LocalDateTime start=LocalDateTime.now();
|
|
LocalDateTime start=LocalDateTime.now();
|
|
OapiProcessinstanceListidsResponse oapiProcessinstanceListidsResponse=processInstanceListIdsClient.execute(oApiProcessInstanceListIdsRequest,DingTalkConstant.DING_TALK_TOKEN);
|
|
OapiProcessinstanceListidsResponse oapiProcessinstanceListidsResponse=processInstanceListIdsClient.execute(oApiProcessInstanceListIdsRequest,DingTalkConstant.DING_TALK_TOKEN);
|
|
- List<ChuanyunAskForLeaveDo> chuanyunAskForLeaveDoList=new ArrayList<>();
|
|
|
|
|
|
+ List<ChuanyunAskForLeaveDO> chuanyunAskForLeaveDoList=new ArrayList<>();
|
|
if(oapiProcessinstanceListidsResponse.getErrcode()!=0){
|
|
if(oapiProcessinstanceListidsResponse.getErrcode()!=0){
|
|
log.info(oapiProcessinstanceListidsResponse.getErrmsg());
|
|
log.info(oapiProcessinstanceListidsResponse.getErrmsg());
|
|
try {
|
|
try {
|
|
@@ -124,8 +118,8 @@ public class DingTalkScheduledTask {
|
|
request.setProcessInstanceId(resultId);
|
|
request.setProcessInstanceId(resultId);
|
|
try {
|
|
try {
|
|
OapiProcessinstanceGetResponse oapiProcessinstanceGetResponse = processInstanceClient.execute(request, DingTalkConstant.DING_TALK_TOKEN);
|
|
OapiProcessinstanceGetResponse oapiProcessinstanceGetResponse = processInstanceClient.execute(request, DingTalkConstant.DING_TALK_TOKEN);
|
|
- ChuanyunAskForLeaveDo chuanyunAskForLeaveDo = ChuanyunAskForLeaveDo.fromAskForLeaveDTO(oapiProcessinstanceGetResponse.getProcessInstance());
|
|
|
|
- List<ChuanyunAskForLeaveDo> existsAskForLeave = chuanyunAskForLeaveDao.findByTitleSQL(chuanyunAskForLeaveDo.getTitle());
|
|
|
|
|
|
+ ChuanyunAskForLeaveDO chuanyunAskForLeaveDo = ChuanyunAskForLeaveDO.fromAskForLeaveDTO(oapiProcessinstanceGetResponse.getProcessInstance());
|
|
|
|
+ List<ChuanyunAskForLeaveDO> existsAskForLeave = chuanyunAskForLeaveDao.findByTitleSQL(chuanyunAskForLeaveDo.getTitle());
|
|
if(existsAskForLeave != null && !existsAskForLeave.isEmpty()) {
|
|
if(existsAskForLeave != null && !existsAskForLeave.isEmpty()) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|