|
@@ -6,7 +6,6 @@ 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.DingTalkProcessInstanceDao;
|
|
import com.galaxis.manatee.dao.DingTalkProcessInstanceDao;
|
|
import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunAskForLeaveDO;
|
|
import com.galaxis.manatee.entity.chuanyun.data.object.ChuanyunAskForLeaveDO;
|
|
import com.galaxis.manatee.entity.ding.DingTalkProcessInstance;
|
|
import com.galaxis.manatee.entity.ding.DingTalkProcessInstance;
|
|
@@ -50,29 +49,19 @@ public class DingTalkScheduledTask {
|
|
*/
|
|
*/
|
|
private final ChuanyunAskForLeaveDao chuanyunAskForLeaveDao;
|
|
private final ChuanyunAskForLeaveDao chuanyunAskForLeaveDao;
|
|
|
|
|
|
- private final ChuanyunUserCompanyDao userCompanyDao;
|
|
|
|
-
|
|
|
|
- public DingTalkScheduledTask(DingTalkClient processInstanceListIdsClient, DingTalkClient processInstanceClient,ChuanyunUserCompanyDao chuanyunUserDao,
|
|
|
|
|
|
+ public DingTalkScheduledTask(DingTalkClient processInstanceListIdsClient, DingTalkClient processInstanceClient,
|
|
ChuanyunAskForLeaveDao chuanyunAskForLeaveDao,DingTalkProcessInstanceDao dingTalkProcessInstanceDao) {
|
|
ChuanyunAskForLeaveDao chuanyunAskForLeaveDao,DingTalkProcessInstanceDao dingTalkProcessInstanceDao) {
|
|
this.processInstanceListIdsClient = processInstanceListIdsClient;
|
|
this.processInstanceListIdsClient = processInstanceListIdsClient;
|
|
this.processInstanceClient = processInstanceClient;
|
|
this.processInstanceClient = processInstanceClient;
|
|
this.dingTalkProcessInstanceDao = dingTalkProcessInstanceDao;
|
|
this.dingTalkProcessInstanceDao = dingTalkProcessInstanceDao;
|
|
this.chuanyunAskForLeaveDao = chuanyunAskForLeaveDao;
|
|
this.chuanyunAskForLeaveDao = chuanyunAskForLeaveDao;
|
|
- this.userCompanyDao = chuanyunUserDao;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- /**
|
|
|
|
- * 每小时更新
|
|
|
|
- */
|
|
|
|
-// @Scheduled(fixedDelay = 3600000L)
|
|
|
|
- private void updateBusinessTripProcessInstance(){
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
* 每个小时定期更新出差申请数据
|
|
* 每个小时定期更新出差申请数据
|
|
* 出差申请信息暂时不进行更新
|
|
* 出差申请信息暂时不进行更新
|
|
*/
|
|
*/
|
|
-// @Scheduled(fixedDelay = 3600000L,initialDelay = 10000L)
|
|
|
|
|
|
+ @Scheduled(fixedDelay = 3600000L,initialDelay = 10000L)
|
|
void updateBusinessTripProcessInstanceIdList() throws ApiException {
|
|
void updateBusinessTripProcessInstanceIdList() throws ApiException {
|
|
updateProcessInstanceIdList(DingTalkConstant.PROCESS_CODE_BUSINESS_TRIP);
|
|
updateProcessInstanceIdList(DingTalkConstant.PROCESS_CODE_BUSINESS_TRIP);
|
|
}
|
|
}
|
|
@@ -83,7 +72,7 @@ public class DingTalkScheduledTask {
|
|
* 每小时根据出差申请Id跟新出差申请信息。
|
|
* 每小时根据出差申请Id跟新出差申请信息。
|
|
* 出差申请信息暂时不进行更新
|
|
* 出差申请信息暂时不进行更新
|
|
*/
|
|
*/
|
|
-// @Scheduled(fixedDelay = 3600000L,initialDelay = 10000L)
|
|
|
|
|
|
+ @Scheduled(fixedDelay = 3600000L,initialDelay = 10000L)
|
|
void updateProcessInstanceList() throws ApiException {
|
|
void updateProcessInstanceList() throws ApiException {
|
|
updateChuanyunAskForLeave(DingTalkConstant.PROCESS_CODE_ASKFORLEAVE);
|
|
updateChuanyunAskForLeave(DingTalkConstant.PROCESS_CODE_ASKFORLEAVE);
|
|
}
|
|
}
|
|
@@ -113,7 +102,7 @@ public class DingTalkScheduledTask {
|
|
//逐个请求
|
|
//逐个请求
|
|
oapiProcessinstanceListidsResponse.getResult().getList().forEach(resultId->{
|
|
oapiProcessinstanceListidsResponse.getResult().getList().forEach(resultId->{
|
|
Optional<DingTalkProcessInstance> instance=dingTalkProcessInstanceDao.findById(resultId);
|
|
Optional<DingTalkProcessInstance> instance=dingTalkProcessInstanceDao.findById(resultId);
|
|
- if(!instance.isPresent()){
|
|
|
|
|
|
+ if(instance.isEmpty()){
|
|
OapiProcessinstanceGetRequest request=new OapiProcessinstanceGetRequest();
|
|
OapiProcessinstanceGetRequest request=new OapiProcessinstanceGetRequest();
|
|
request.setProcessInstanceId(resultId);
|
|
request.setProcessInstanceId(resultId);
|
|
try {
|
|
try {
|
|
@@ -165,7 +154,7 @@ public class DingTalkScheduledTask {
|
|
//逐个请求
|
|
//逐个请求
|
|
oapiProcessinstanceListidsResponse.getResult().getList().forEach(resultId->{
|
|
oapiProcessinstanceListidsResponse.getResult().getList().forEach(resultId->{
|
|
Optional<DingTalkProcessInstance> instance=dingTalkProcessInstanceDao.findById(resultId);
|
|
Optional<DingTalkProcessInstance> instance=dingTalkProcessInstanceDao.findById(resultId);
|
|
- if(!instance.isPresent()){
|
|
|
|
|
|
+ if(instance.isEmpty()){
|
|
//&&instance.get()==null
|
|
//&&instance.get()==null
|
|
//淘宝SDK方法
|
|
//淘宝SDK方法
|
|
OapiProcessinstanceGetRequest request=new OapiProcessinstanceGetRequest();
|
|
OapiProcessinstanceGetRequest request=new OapiProcessinstanceGetRequest();
|