Merge remote-tracking branch 'refs/remotes/origin/master' into feature/REQ-3282
This commit is contained in:
commit
c9cc46b4f7
@ -18,6 +18,7 @@ import cn.axzo.riven.service.converter.DingDingAttendanceRecordConverter;
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.date.DatePattern;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.aliyun.dingtalkoauth2_1_0.models.GetAccessTokenResponseBody;
|
||||
import com.dingtalk.api.DefaultDingTalkClient;
|
||||
import com.dingtalk.api.DingTalkClient;
|
||||
@ -25,6 +26,7 @@ import com.dingtalk.api.request.*;
|
||||
import com.dingtalk.api.response.*;
|
||||
import com.google.common.base.Throwables;
|
||||
import com.google.common.collect.Lists;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
@ -38,6 +40,7 @@ import java.util.stream.Collectors;
|
||||
* @author yangchen@axzo.cn
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
public class DingDingAttendanceGroupServiceImpl implements DingDingAttendanceGroupService {
|
||||
@Autowired
|
||||
private ThirdPartyCredentialDao thirdPartyCredentialDao;
|
||||
@ -229,6 +232,7 @@ public class DingDingAttendanceGroupServiceImpl implements DingDingAttendanceGro
|
||||
req2.setToDate(Date.from(req.getEndTime().atZone(ZoneId.systemDefault()).toInstant()));
|
||||
OapiAttendanceGetcolumnvalResponse response = null;
|
||||
try {
|
||||
log.info("getcolumnval,dingdingRequestParam={}", JSON.toJSONString(req2));
|
||||
response = client.execute(req2, accessToken.getAccessToken());
|
||||
} catch (Exception ex) {
|
||||
Throwables.throwIfUnchecked(ex);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user