Commit 2fd94283 authored by wujipeng's avatar wujipeng
Browse files

获取打卡详情

parent 9880f466
...@@ -4,17 +4,21 @@ import com.dingtalk.api.DefaultDingTalkClient; ...@@ -4,17 +4,21 @@ import com.dingtalk.api.DefaultDingTalkClient;
import com.dingtalk.api.DingTalkClient; import com.dingtalk.api.DingTalkClient;
import com.dingtalk.api.request.OapiAttendanceListRecordRequest; import com.dingtalk.api.request.OapiAttendanceListRecordRequest;
import com.dingtalk.api.response.OapiAttendanceListRecordResponse; import com.dingtalk.api.response.OapiAttendanceListRecordResponse;
import com.google.common.collect.Lists;
import com.ruzhoukj.sms.ding.PermissionConfig; import com.ruzhoukj.sms.ding.PermissionConfig;
import com.ruzhoukj.sms.model.vo.DingAttendanceDTO; import com.ruzhoukj.sms.model.vo.DingAttendanceDTO;
import com.ruzhoukj.sms.model.vo.DingAttendanceVO;
import com.taobao.api.ApiException; import com.taobao.api.ApiException;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -33,7 +37,7 @@ public class DingAttendanceController { ...@@ -33,7 +37,7 @@ public class DingAttendanceController {
@ApiOperation(value = "获取打卡详情") @ApiOperation(value = "获取打卡详情")
@PostMapping("/getCheckInRecord") @PostMapping("/getCheckInRecord")
public List<OapiAttendanceListRecordResponse.Recordresult> getCheckInRecord(@RequestBody DingAttendanceDTO dingAttendanceDTO) { public List<DingAttendanceVO> getCheckInRecord(@RequestBody DingAttendanceDTO dingAttendanceDTO) {
String accessToken = permissionConfig.getAccessToken(); String accessToken = permissionConfig.getAccessToken();
try { try {
...@@ -44,7 +48,19 @@ public class DingAttendanceController { ...@@ -44,7 +48,19 @@ public class DingAttendanceController {
req.setIsI18n(dingAttendanceDTO.getIsI18n()); req.setIsI18n(dingAttendanceDTO.getIsI18n());
req.setUserIds(dingAttendanceDTO.getUserIds()); req.setUserIds(dingAttendanceDTO.getUserIds());
OapiAttendanceListRecordResponse rsp = client.execute(req, accessToken); OapiAttendanceListRecordResponse rsp = client.execute(req, accessToken);
return rsp.getRecordresult(); List<DingAttendanceVO> data = Lists.newArrayList();
rsp.getRecordresult().forEach(recordresult -> {
data.add(DingAttendanceVO.builder()
.userId(recordresult.getUserId())
.userAddress(recordresult.getUserAddress())
.userCheckTime(recordresult.getUserCheckTime())
.timeResult(recordresult.getTimeResult())
.checkType(recordresult.getCheckType())
.sourceType(recordresult.getSourceType())
.build());
});
return data;
} catch (ApiException e) { } catch (ApiException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
......
package com.ruzhoukj.sms.model.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @author : wujipeng
* @date : 2025/2/28 13:42
* @Version: 1.0
* @Desc : 描述信息
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class DingAttendanceVO {
@ApiModelProperty(value = "员工id")
private String userId;
@ApiModelProperty(value = "打卡地点,打卡设备")
private String userAddress;
@ApiModelProperty(value = "实际打卡时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date userCheckTime;
@ApiModelProperty(value = "打卡结果 Normal:正常 Early:早退 Late:迟到 SeriousLate:严重迟到 Absenteeism:旷工迟到 NotSigned:未打卡")
private String timeResult;
@ApiModelProperty(value = "考勤类型 OnDuty:上班 OffDuty:下班")
private String checkType;
@ApiModelProperty(value = "数据来源 ATM:考勤机打卡(指纹/人脸打卡)BEACON:IBeacon " +
"DING_ATM:钉钉考勤机(考勤机蓝牙打卡)USER:用户打卡 BOSS:老板改签 " +
"APPROVE:审批系统 SYSTEM:考勤系统 AUTO_CHECK:自动打卡")
private String sourceType;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment