Commit 26cf382b authored by wujipeng's avatar wujipeng
Browse files

定时任务获取数据优化

parent 0e39c57d
...@@ -13,6 +13,7 @@ import com.ruzhoukj.sms.common.Result; ...@@ -13,6 +13,7 @@ import com.ruzhoukj.sms.common.Result;
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.ruzhoukj.sms.model.vo.DingAttendanceVO;
import com.ruzhoukj.sms.model.vo.DingUserVO;
import com.ruzhoukj.sms.service.DingAttendanceService; import com.ruzhoukj.sms.service.DingAttendanceService;
import com.taobao.api.ApiException; import com.taobao.api.ApiException;
import com.taobao.api.internal.util.StringUtils; import com.taobao.api.internal.util.StringUtils;
...@@ -38,6 +39,8 @@ public class DingAttendanceController { ...@@ -38,6 +39,8 @@ public class DingAttendanceController {
private PermissionConfig permissionConfig; private PermissionConfig permissionConfig;
@Resource @Resource
private DingAttendanceService dingAttendanceService; private DingAttendanceService dingAttendanceService;
@Resource
private DingEmployeeController dingEmployeeController;
@ApiOperation(value = "获取打卡时间区间数据") @ApiOperation(value = "获取打卡时间区间数据")
@PostMapping("/radius") @PostMapping("/radius")
...@@ -50,7 +53,8 @@ public class DingAttendanceController { ...@@ -50,7 +53,8 @@ public class DingAttendanceController {
req.setCheckDateFrom(dingAttendanceDTO.getCheckDateFrom()); req.setCheckDateFrom(dingAttendanceDTO.getCheckDateFrom());
req.setCheckDateTo(dingAttendanceDTO.getCheckDateTo()); req.setCheckDateTo(dingAttendanceDTO.getCheckDateTo());
req.setIsI18n(dingAttendanceDTO.getIsI18n()); req.setIsI18n(dingAttendanceDTO.getIsI18n());
req.setUserIds(dingAttendanceDTO.getUserIds()); List<String> userIds = dingAttendanceDTO.getUserIds();
req.setUserIds(userIds);
OapiAttendanceListRecordResponse rsp = client.execute(req, accessToken); OapiAttendanceListRecordResponse rsp = client.execute(req, accessToken);
List<DingAttendanceVO> data = Lists.newArrayList(); List<DingAttendanceVO> data = Lists.newArrayList();
rsp.getRecordresult().forEach(recordresult -> { rsp.getRecordresult().forEach(recordresult -> {
...@@ -58,12 +62,33 @@ public class DingAttendanceController { ...@@ -58,12 +62,33 @@ public class DingAttendanceController {
.userId(recordresult.getUserId()) .userId(recordresult.getUserId())
.userAddress(recordresult.getUserAddress()) .userAddress(recordresult.getUserAddress())
.userCheckTime(recordresult.getUserCheckTime()) .userCheckTime(recordresult.getUserCheckTime())
.date(StringUtils.parseDateTime(dingAttendanceDTO.getCheckDateFrom()))
.timeResult(recordresult.getTimeResult()) .timeResult(recordresult.getTimeResult())
.checkType(recordresult.getCheckType()) .checkType(recordresult.getCheckType())
.sourceType(recordresult.getSourceType()) .sourceType(recordresult.getSourceType())
.build()); .build());
}); });
//userIds中有data中没有的,添加一条空数据
for (String userId : userIds) {
boolean flag = false;
for (DingAttendanceVO dingAttendanceVO : data) {
if (userId.equals(dingAttendanceVO.getUserId())) {
flag = true;
break;
}
}
if (!flag) {
DingUserVO employeeDetail = dingEmployeeController.getEmployeeDetail(userId);
data.add(DingAttendanceVO.builder()
.name(employeeDetail.getName())
.userId(userId)
.date(StringUtils.parseDateTime(dingAttendanceDTO.getCheckDateFrom()))
.build());
}
}
return data; return data;
} catch (ApiException e) { } catch (ApiException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
......
...@@ -39,6 +39,11 @@ public class DingAttendanceEntity { ...@@ -39,6 +39,11 @@ public class DingAttendanceEntity {
@TableField(value = "user_check_time") @TableField(value = "user_check_time")
private Date userCheckTime; private Date userCheckTime;
@ApiModelProperty(value = "时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField(value = "date")
private Date date;
@ApiModelProperty(value = "打卡地点,打卡设备") @ApiModelProperty(value = "打卡地点,打卡设备")
@TableField(value = "user_address") @TableField(value = "user_address")
private String userAddress; private String userAddress;
......
package com.ruzhoukj.sms.model.vo; package com.ruzhoukj.sms.model.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
...@@ -37,6 +37,11 @@ public class DingAttendanceVO { ...@@ -37,6 +37,11 @@ public class DingAttendanceVO {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date userCheckTime; private Date userCheckTime;
@ApiModelProperty(value = "时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField(value = "date")
private Date date;
@ApiModelProperty(value = "打卡结果 Normal:正常 Early:早退 Late:迟到 SeriousLate:严重迟到 Absenteeism:旷工迟到 NotSigned:未打卡") @ApiModelProperty(value = "打卡结果 Normal:正常 Early:早退 Late:迟到 SeriousLate:严重迟到 Absenteeism:旷工迟到 NotSigned:未打卡")
private String timeResult; private String timeResult;
......
...@@ -77,14 +77,9 @@ public class DingTask { ...@@ -77,14 +77,9 @@ public class DingTask {
// 获取当前日期 // 获取当前日期
Date currentDate = new Date(); Date currentDate = new Date();
System.out.println("当前日期: " + currentDate);
// 将 Date 转换为 LocalDate
LocalDate localDate = currentDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); LocalDate localDate = currentDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
// 减去一天 // 减去一天
LocalDate previousDate = localDate.minusDays(1); LocalDate previousDate = localDate.minusDays(1);
// 将 LocalDate 转换回 Date // 将 LocalDate 转换回 Date
Date previousDateAsDate = Date.from(previousDate.atStartOfDay(ZoneId.systemDefault()).toInstant()); Date previousDateAsDate = Date.from(previousDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
......
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