"...com/ruzhoukj/sms/git@gitlab.ruzhoukj.com:wujipeng/ops.git" did not exist on "41c818b0b2901998dcdbaa4f860592b097b3e47f"
Commit 79153234 authored by wujipeng's avatar wujipeng
Browse files

查询同步数据库中考勤数据

parent 03001c1f
...@@ -5,9 +5,11 @@ import com.dingtalk.api.DingTalkClient; ...@@ -5,9 +5,11 @@ 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.google.common.collect.Lists;
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.service.DingAttendanceService;
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;
...@@ -34,6 +36,8 @@ public class DingAttendanceController { ...@@ -34,6 +36,8 @@ public class DingAttendanceController {
@Resource @Resource
private PermissionConfig permissionConfig; private PermissionConfig permissionConfig;
@Resource
private DingAttendanceService dingAttendanceService;
@ApiOperation(value = "获取打卡时间区间数据") @ApiOperation(value = "获取打卡时间区间数据")
@PostMapping("/radius") @PostMapping("/radius")
...@@ -65,4 +69,10 @@ public class DingAttendanceController { ...@@ -65,4 +69,10 @@ public class DingAttendanceController {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
@ApiOperation(value = "查询同步数据库中考勤数据")
@PostMapping("/sync")
public Result getSyncData(@RequestBody DingAttendanceDTO dingAttendanceDTO) {
return Result.success(dingAttendanceService.getSyncData(dingAttendanceDTO));
}
} }
...@@ -2,8 +2,12 @@ package com.ruzhoukj.sms.dao; ...@@ -2,8 +2,12 @@ package com.ruzhoukj.sms.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruzhoukj.sms.entity.DingAttendanceEntity; import com.ruzhoukj.sms.entity.DingAttendanceEntity;
import com.ruzhoukj.sms.model.vo.DingAttendanceDTO;
import com.ruzhoukj.sms.model.vo.DingAttendanceVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
* @date : 2025/2/28 15:37 * @date : 2025/2/28 15:37
...@@ -12,4 +16,13 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -12,4 +16,13 @@ import org.apache.ibatis.annotations.Mapper;
*/ */
@Mapper @Mapper
public interface DingAttendanceDao extends BaseMapper<DingAttendanceEntity> { public interface DingAttendanceDao extends BaseMapper<DingAttendanceEntity> {
/**
* 查询同步数据库中考勤数据
*
* @param dingAttendanceDTO dingAttendanceDTO
* @return List<DingAttendanceVO>
*/
List<DingAttendanceVO> getSyncData(DingAttendanceDTO dingAttendanceDTO);
} }
...@@ -27,6 +27,9 @@ public class DingAttendanceVO { ...@@ -27,6 +27,9 @@ public class DingAttendanceVO {
@ApiModelProperty(value = "员工id") @ApiModelProperty(value = "员工id")
private String userId; private String userId;
@ApiModelProperty(value = "姓名")
private String name;
@ApiModelProperty(value = "打卡地点,打卡设备") @ApiModelProperty(value = "打卡地点,打卡设备")
private String userAddress; private String userAddress;
...@@ -44,4 +47,10 @@ public class DingAttendanceVO { ...@@ -44,4 +47,10 @@ public class DingAttendanceVO {
"DING_ATM:钉钉考勤机(考勤机蓝牙打卡)USER:用户打卡 BOSS:老板改签 " + "DING_ATM:钉钉考勤机(考勤机蓝牙打卡)USER:用户打卡 BOSS:老板改签 " +
"APPROVE:审批系统 SYSTEM:考勤系统 AUTO_CHECK:自动打卡") "APPROVE:审批系统 SYSTEM:考勤系统 AUTO_CHECK:自动打卡")
private String sourceType; private String sourceType;
@ApiModelProperty(value = "上班打卡时间")
private String checkTimeOn;
@ApiModelProperty(value = "下班打卡时间")
private String checkTimeOff;
} }
...@@ -2,6 +2,10 @@ package com.ruzhoukj.sms.service; ...@@ -2,6 +2,10 @@ package com.ruzhoukj.sms.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.sms.entity.DingAttendanceEntity; import com.ruzhoukj.sms.entity.DingAttendanceEntity;
import com.ruzhoukj.sms.model.vo.DingAttendanceDTO;
import com.ruzhoukj.sms.model.vo.DingAttendanceVO;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
...@@ -10,4 +14,13 @@ import com.ruzhoukj.sms.entity.DingAttendanceEntity; ...@@ -10,4 +14,13 @@ import com.ruzhoukj.sms.entity.DingAttendanceEntity;
* @Desc : 描述信息 * @Desc : 描述信息
*/ */
public interface DingAttendanceService extends IService<DingAttendanceEntity> { public interface DingAttendanceService extends IService<DingAttendanceEntity> {
/**
* 查询同步数据库中考勤数据
*
* @param dingAttendanceDTO dingAttendanceDTO
* @return List<DingAttendanceVO>
*/
List<DingAttendanceVO> getSyncData(DingAttendanceDTO dingAttendanceDTO);
} }
...@@ -3,9 +3,13 @@ package com.ruzhoukj.sms.service.impl; ...@@ -3,9 +3,13 @@ package com.ruzhoukj.sms.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruzhoukj.sms.dao.DingAttendanceDao; import com.ruzhoukj.sms.dao.DingAttendanceDao;
import com.ruzhoukj.sms.entity.DingAttendanceEntity; import com.ruzhoukj.sms.entity.DingAttendanceEntity;
import com.ruzhoukj.sms.model.vo.DingAttendanceDTO;
import com.ruzhoukj.sms.model.vo.DingAttendanceVO;
import com.ruzhoukj.sms.service.DingAttendanceService; import com.ruzhoukj.sms.service.DingAttendanceService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* @author : wujipeng * @author : wujipeng
* @date : 2025/2/28 15:38 * @date : 2025/2/28 15:38
...@@ -14,4 +18,8 @@ import org.springframework.stereotype.Service; ...@@ -14,4 +18,8 @@ import org.springframework.stereotype.Service;
*/ */
@Service @Service
public class DingAttendanceServiceImpl extends ServiceImpl<DingAttendanceDao, DingAttendanceEntity> implements DingAttendanceService { public class DingAttendanceServiceImpl extends ServiceImpl<DingAttendanceDao, DingAttendanceEntity> implements DingAttendanceService {
@Override
public List<DingAttendanceVO> getSyncData(DingAttendanceDTO dingAttendanceDTO) {
return baseMapper.getSyncData(dingAttendanceDTO);
}
} }
package com.ruzhoukj.sms.task; package com.ruzhoukj.sms.task;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.ruzhoukj.sms.controller.DingAttendanceController; import com.ruzhoukj.sms.controller.DingAttendanceController;
import com.ruzhoukj.sms.controller.DingEmployeeController; import com.ruzhoukj.sms.controller.DingEmployeeController;
...@@ -20,7 +19,6 @@ import org.springframework.stereotype.Component; ...@@ -20,7 +19,6 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.ZoneId; import java.time.ZoneId;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruzhoukj.sms.dao.DingAttendanceDao">
<select id="getSyncData" resultType="com.ruzhoukj.sms.model.vo.DingAttendanceVO">
SELECT min.id,
min.name,
min.user_id as userId,
MIN(min.user_check_time) AS checkTimeOn,
MAX(max.offduty_max_time) AS checkTimeOff,
min.user_address as userAddress,
min.time_result as timeResult,
FROM ding_attendance min
LEFT JOIN (SELECT user_id,
MAX(user_check_time) AS offduty_max_time
FROM ding_attendance
WHERE user_check_time BETWEEN #{checkDateFrom} AND #{checkDateTo}
AND check_type = 'OffDuty'
GROUP BY user_id -- 按 user_id 分组
) max ON min.user_id = max.user_id
WHERE min.user_check_time BETWEEN #{checkDateFrom} AND #{checkDateTo}
AND min.check_type = 'OnDuty'
GROUP BY min.id, min.name, min.user_id, min.user_address, min.time_result;
</select>
</mapper>
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