From 690b713454828f34f901bc1e3a5f7bcc35a31b30 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 17:52:05 +0800
Subject: [PATCH] feat(hrm): 支持定位范围打卡
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
index 8bbe2ef..e35d714 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceRecordController.java
@@ -8,13 +8,16 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceClockReqVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceClockRespVO;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceMyStatusRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordImportExcelVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordImportReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordRespVO;
-import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceMyStatusRespVO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.attendance.HrmAttendanceRecordDO;
import cn.iocoder.yudao.module.hrm.dal.dataobject.employee.HrmEmployeeDO;
+import cn.iocoder.yudao.module.hrm.service.attendance.HrmAttendanceClockResult;
import cn.iocoder.yudao.module.hrm.service.attendance.HrmAttendanceRecordService;
import cn.iocoder.yudao.module.hrm.service.employee.HrmEmployeeService;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
@@ -60,36 +63,40 @@
@PostMapping("/clock-in")
@Operation(summary = "涓婄彮鎵撳崱")
@PreAuthorize("@ss.hasPermission('hrm:attendance-record:clock')")
- public CommonResult<HrmAttendanceRecordRespVO> clockIn(@RequestParam("location") String location) {
+ @ApiAccessLog(requestEnable = false)
+ public CommonResult<HrmAttendanceClockRespVO> clockIn(
+ @Valid @RequestBody(required = false) HrmAttendanceClockReqVO reqVO,
+ @RequestParam(value = "location", required = false) String legacyLocation) {
Long loginUserId = getLoginUserId();
HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
if (employee == null) {
throw new ServiceException(EMPLOYEE_NOT_EXISTS.getCode(),
"褰撳墠鐧诲綍璐﹀彿鏈叧鑱斿憳宸ヤ俊鎭紝鏃犳硶鎵撳崱銆傝鑱旂郴绠＄悊鍛樺湪銆愬憳宸ョ鐞嗐�戜腑灏嗚鐧诲綍璐﹀彿缁戝畾鍒板憳宸ャ��");
}
- HrmAttendanceRecordDO record = attendanceRecordService.clockIn(employee.getId(), LocalDateTime.now(), location);
- HrmAttendanceRecordRespVO respVO = BeanUtils.toBean(record, HrmAttendanceRecordRespVO.class);
- respVO.setUserName(employee.getName());
- if (record.getDeptId() != null) {
- DeptRespDTO dept = deptApi.getDept(record.getDeptId());
- if (dept != null) {
- respVO.setDeptName(dept.getName());
- }
- }
- return success(respVO);
+ HrmAttendanceClockResult result = attendanceRecordService.clockIn(
+ employee.getId(), LocalDateTime.now(), reqVO, legacyLocation);
+ return success(buildClockResultVO(result, employee));
}
@PostMapping("/clock-out")
@Operation(summary = "涓嬬彮鎵撳崱")
@PreAuthorize("@ss.hasPermission('hrm:attendance-record:clock')")
- public CommonResult<HrmAttendanceRecordRespVO> clockOut(@RequestParam("location") String location) {
+ @ApiAccessLog(requestEnable = false)
+ public CommonResult<HrmAttendanceClockRespVO> clockOut(
+ @Valid @RequestBody(required = false) HrmAttendanceClockReqVO reqVO,
+ @RequestParam(value = "location", required = false) String legacyLocation) {
Long loginUserId = getLoginUserId();
HrmEmployeeDO employee = employeeService.getEmployeeByUserId(loginUserId);
if (employee == null) {
throw new ServiceException(EMPLOYEE_NOT_EXISTS.getCode(),
"褰撳墠鐧诲綍璐﹀彿鏈叧鑱斿憳宸ヤ俊鎭紝鏃犳硶鎵撳崱銆傝鑱旂郴绠＄悊鍛樺湪銆愬憳宸ョ鐞嗐�戜腑灏嗚鐧诲綍璐﹀彿缁戝畾鍒板憳宸ャ��");
}
- HrmAttendanceRecordDO record = attendanceRecordService.clockOut(employee.getId(), LocalDateTime.now(), location);
+ HrmAttendanceClockResult result = attendanceRecordService.clockOut(
+ employee.getId(), LocalDateTime.now(), reqVO, legacyLocation);
+ return success(buildClockResultVO(result, employee));
+ }
+
+ private HrmAttendanceRecordRespVO buildClockRespVO(HrmAttendanceRecordDO record, HrmEmployeeDO employee) {
HrmAttendanceRecordRespVO respVO = BeanUtils.toBean(record, HrmAttendanceRecordRespVO.class);
respVO.setUserName(employee.getName());
if (record.getDeptId() != null) {
@@ -98,7 +105,20 @@
respVO.setDeptName(dept.getName());
}
}
- return success(respVO);
+ return respVO;
+ }
+
+ private HrmAttendanceClockRespVO buildClockResultVO(HrmAttendanceClockResult result,
+ HrmEmployeeDO employee) {
+ HrmAttendanceClockRespVO respVO = new HrmAttendanceClockRespVO();
+ respVO.setRecord(buildClockRespVO(result.record(), employee));
+ respVO.setLocationName(result.rule().getLocationName());
+ if (Boolean.TRUE.equals(result.rule().getLocationRequired())) {
+ respVO.setDistanceMeters(result.distanceMeters());
+ respVO.setRadiusMeters(result.rule().getRadiusMeters());
+ respVO.setWithinRange(true);
+ }
+ return respVO;
}
@GetMapping("/my-status")
@@ -310,4 +330,4 @@
ExcelUtils.write(response, "鑰冨嫟璁板綍.xls", "鏁版嵁", HrmAttendanceRecordRespVO.class, list);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3