From 5611b19e904ec0daa96ea5f648500cf6205c9385 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 15:39:37 +0800
Subject: [PATCH] fix(hrm): 合并定位打卡与考勤状态功能
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 151 insertions(+), 19 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
index 92f745d..dc658dd 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceRecordServiceImpl.java
@@ -1,7 +1,9 @@
package cn.iocoder.yudao.module.hrm.service.attendance;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceClockReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceMyStatusRespVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordPageReqVO;
import cn.iocoder.yudao.module.hrm.controller.admin.attendance.vo.HrmAttendanceRecordRespVO;
@@ -89,6 +91,7 @@
respVO.setUserId(loginUserId);
respVO.setEmployeeId(employee.getId());
respVO.setEmployeeName(employee.getName());
+ respVO.setUserName(employee.getName());
respVO.setDeptId(employee.getDeptId());
if (employee.getDeptId() != null) {
DeptRespDTO dept = deptApi.getDept(employee.getDeptId());
@@ -117,17 +120,51 @@
}
}
respVO.setRule(ruleRespVO);
+ fillCompatibleRuleFields(respVO, rule);
}
// 4. 褰撴棩鑰冨嫟璁板綍
HrmAttendanceRecordDO record = attendanceRecordMapper.selectByUserIdAndDate(employee.getId(), queryDate);
if (record != null) {
respVO.setRecord(buildRecordRespVO(record, employee));
+ fillCompatibleRecordFields(respVO, record);
}
// 5. 褰撳墠鍙墦鍗＄姸鎬�
- respVO.setClockable(buildClockable(workDay, rule, record, queryDate));
+ HrmAttendanceMyStatusRespVO.Clockable clockable = buildClockable(workDay, rule, record, queryDate);
+ respVO.setClockable(clockable);
+ respVO.setClockInDone(record != null && record.getClockInTime() != null);
+ respVO.setClockOutDone(record != null && record.getClockOutTime() != null);
+ respVO.setCanClockIn(clockable.getClockIn());
+ respVO.setCanClockOut(clockable.getClockOut());
return respVO;
+ }
+
+ /** 鍚屾椂淇濈暀鏃х増 App/Web 浣跨敤鐨勫钩閾鸿鍒欏瓧娈点�� */
+ private void fillCompatibleRuleFields(HrmAttendanceMyStatusRespVO respVO, HrmAttendanceRuleDO rule) {
+ respVO.setRuleName(rule.getName());
+ respVO.setWorkStartTime(rule.getWorkStartTime());
+ respVO.setWorkEndTime(rule.getWorkEndTime());
+ respVO.setLocationRequired(rule.getLocationRequired());
+ respVO.setLocationName(rule.getLocationName());
+ respVO.setLocationAddress(rule.getLocationAddress());
+ respVO.setLongitude(rule.getLongitude());
+ respVO.setLatitude(rule.getLatitude());
+ respVO.setRadiusMeters(rule.getRadiusMeters());
+ respVO.setCoordinateSystem(rule.getCoordinateSystem());
+ }
+
+ /** 鍚屾椂淇濈暀鏃х増 App/Web 浣跨敤鐨勫钩閾鸿�冨嫟璁板綍瀛楁銆� */
+ private void fillCompatibleRecordFields(HrmAttendanceMyStatusRespVO respVO, HrmAttendanceRecordDO record) {
+ respVO.setRecordId(record.getId());
+ respVO.setClockInTime(record.getClockInTime());
+ respVO.setClockOutTime(record.getClockOutTime());
+ respVO.setClockInType(record.getClockInType());
+ respVO.setClockOutType(record.getClockOutType());
+ respVO.setWorkHours(record.getWorkHours());
+ respVO.setOvertimeHours(record.getOvertimeHours());
+ respVO.setLocation(record.getLocation());
+ respVO.setDataSource(record.getDataSource());
}
/**
@@ -314,7 +351,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public HrmAttendanceRecordDO clockIn(Long userId, LocalDateTime clockTime, String location) {
+ public HrmAttendanceClockResult clockIn(Long userId, LocalDateTime clockTime,
+ HrmAttendanceClockReqVO reqVO, String legacyLocation) {
LocalDate clockDate = clockTime.toLocalDate();
// 1. 鏍￠獙鏄惁宸ヤ綔鏃�
if (!attendanceHolidayService.isWorkDay(clockDate)) {
@@ -334,6 +372,8 @@
if (record != null && record.getClockInTime() != null) {
throw exception(ATTENDANCE_CLOCK_ALREADY_CLOCKED);
}
+ // 鍦ㄤ换浣曞啓搴撴搷浣滃墠瀹屾垚瀹氫綅鏍￠獙锛屾棫鐗堝湴鐐瑰瓧绗︿覆涓嶈兘缁曡繃鑼冨洿闄愬埗銆�
+ ClockLocation clockLocation = validateClockLocation(rule, reqVO);
// 4. 鍒ゆ柇鎵撳崱绫诲瀷
LocalTime workStartTime = rule.getWorkStartTime();
int lateAllowMinutes = rule.getLateAllowMinutes() != null ? rule.getLateAllowMinutes() : 0;
@@ -350,24 +390,24 @@
.date(clockDate)
.clockInTime(clockTime)
.clockInType(clockInType)
- .location(location)
.dataSource(HrmAttendanceDataSourceEnum.CLOCK.getType())
.build();
+ applyClockLocation(record, rule, clockLocation, legacyLocation, true);
attendanceRecordMapper.insert(record);
} else {
record.setClockInTime(clockTime);
record.setClockInType(clockInType);
- if (location != null) {
- record.setLocation(location);
- }
+ applyClockLocation(record, rule, clockLocation, legacyLocation, true);
attendanceRecordMapper.updateById(record);
}
- return record;
+ return new HrmAttendanceClockResult(record, rule,
+ clockLocation != null ? clockLocation.distanceMeters() : null);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public HrmAttendanceRecordDO clockOut(Long userId, LocalDateTime clockTime, String location) {
+ public HrmAttendanceClockResult clockOut(Long userId, LocalDateTime clockTime,
+ HrmAttendanceClockReqVO reqVO, String legacyLocation) {
LocalDate clockDate = clockTime.toLocalDate();
// 1. 鏍￠獙鏄惁宸ヤ綔鏃�
if (!attendanceHolidayService.isWorkDay(clockDate)) {
@@ -384,8 +424,12 @@
}
// 3. 鏌ヨ褰撴棩鑰冨嫟璁板綍
HrmAttendanceRecordDO record = attendanceRecordMapper.selectByUserIdAndDate(userId, clockDate);
+ if (record != null && record.getClockOutTime() != null) {
+ throw exception(ATTENDANCE_CLOCK_ALREADY_CLOCKED);
+ }
+ // 瀹氫綅涓嶅悎娉曟椂蹇呴』鍦ㄥ垱寤衡�滅己涓婄彮鍗♀�濊褰曞墠澶辫触锛岄伩鍏嶇暀涓嬭剰鏁版嵁銆�
+ ClockLocation clockLocation = validateClockLocation(rule, reqVO);
if (record == null) {
- // 濡傛灉娌℃湁涓婄彮鎵撳崱璁板綍锛屽垱寤轰竴鏉＄己鍗＄殑璁板綍
record = HrmAttendanceRecordDO.builder()
.userId(userId)
.deptId(employee.getDeptId())
@@ -393,10 +437,6 @@
.clockInType(HrmAttendanceClockTypeEnum.MISSING.getType())
.dataSource(HrmAttendanceDataSourceEnum.CLOCK.getType())
.build();
- attendanceRecordMapper.insert(record);
- }
- if (record.getClockOutTime() != null) {
- throw exception(ATTENDANCE_CLOCK_ALREADY_CLOCKED);
}
// 4. 鍒ゆ柇鎵撳崱绫诲瀷
LocalTime workEndTime = rule.getWorkEndTime();
@@ -409,9 +449,7 @@
// 5. 鏇存柊鑰冨嫟璁板綍
record.setClockOutTime(clockTime);
record.setClockOutType(clockOutType);
- if (location != null) {
- record.setLocation(location);
- }
+ applyClockLocation(record, rule, clockLocation, legacyLocation, false);
// 6. 璁＄畻宸ヤ綔鏃堕暱
if (record.getClockInTime() != null) {
Duration duration = Duration.between(record.getClockInTime(), clockTime);
@@ -419,8 +457,102 @@
.divide(BigDecimal.valueOf(60), 2, RoundingMode.HALF_UP);
record.setWorkHours(workHours);
}
- attendanceRecordMapper.updateById(record);
- return record;
+ if (record.getId() == null) {
+ attendanceRecordMapper.insert(record);
+ } else {
+ attendanceRecordMapper.updateById(record);
+ }
+ return new HrmAttendanceClockResult(record, rule,
+ clockLocation != null ? clockLocation.distanceMeters() : null);
+ }
+
+ record ClockLocation(BigDecimal longitude, BigDecimal latitude, BigDecimal accuracy,
+ BigDecimal distanceMeters) { }
+
+ ClockLocation validateClockLocation(HrmAttendanceRuleDO rule, HrmAttendanceClockReqVO reqVO) {
+ boolean required = Boolean.TRUE.equals(rule.getLocationRequired());
+ if (required && (StrUtil.isBlank(rule.getLocationName()) || rule.getLongitude() == null
+ || rule.getLatitude() == null || rule.getRadiusMeters() == null
+ || rule.getRadiusMeters() < 10 || rule.getRadiusMeters() > 5000
+ || !"WGS84".equalsIgnoreCase(rule.getCoordinateSystem()))) {
+ throw exception(ATTENDANCE_LOCATION_RULE_INVALID);
+ }
+ if (reqVO == null || reqVO.getLongitude() == null || reqVO.getLatitude() == null
+ || reqVO.getAccuracy() == null || StrUtil.isBlank(reqVO.getCoordinateSystem())) {
+ if (required) {
+ throw exception(ATTENDANCE_LOCATION_REQUIRED);
+ }
+ return null;
+ }
+ boolean coordinatesValid = reqVO.getLongitude().compareTo(BigDecimal.valueOf(-180)) >= 0
+ && reqVO.getLongitude().compareTo(BigDecimal.valueOf(180)) <= 0
+ && reqVO.getLatitude().compareTo(BigDecimal.valueOf(-90)) >= 0
+ && reqVO.getLatitude().compareTo(BigDecimal.valueOf(90)) <= 0;
+ if (!coordinatesValid) {
+ if (required) {
+ throw exception(ATTENDANCE_LOCATION_COORDINATE_INVALID);
+ }
+ return null;
+ }
+ if (reqVO.getAccuracy().signum() <= 0
+ || reqVO.getAccuracy().compareTo(BigDecimal.valueOf(100)) > 0) {
+ if (required) {
+ throw exception(ATTENDANCE_LOCATION_ACCURACY_INVALID);
+ }
+ return null;
+ }
+ if (!"WGS84".equalsIgnoreCase(reqVO.getCoordinateSystem().trim())) {
+ if (required) {
+ throw exception(ATTENDANCE_LOCATION_SYSTEM_INVALID);
+ }
+ return null;
+ }
+ if (!required) {
+ return new ClockLocation(reqVO.getLongitude(), reqVO.getLatitude(), reqVO.getAccuracy(), null);
+ }
+ double rawDistance = haversineMeters(rule.getLongitude().doubleValue(), rule.getLatitude().doubleValue(),
+ reqVO.getLongitude().doubleValue(), reqVO.getLatitude().doubleValue());
+ BigDecimal roundedDistance = BigDecimal.valueOf(rawDistance).setScale(2, RoundingMode.HALF_UP);
+ if (rawDistance > rule.getRadiusMeters()) {
+ throw exception(ATTENDANCE_LOCATION_OUT_OF_RANGE, rule.getLocationName(),
+ roundedDistance.toPlainString(), rule.getRadiusMeters());
+ }
+ return new ClockLocation(reqVO.getLongitude(), reqVO.getLatitude(), reqVO.getAccuracy(), roundedDistance);
+ }
+
+ static double haversineMeters(double lon1, double lat1, double lon2, double lat2) {
+ double latDelta = Math.toRadians(lat2 - lat1);
+ double lonDelta = Math.toRadians(lon2 - lon1);
+ double a = Math.pow(Math.sin(latDelta / 2), 2)
+ + Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2))
+ * Math.pow(Math.sin(lonDelta / 2), 2);
+ double bounded = Math.max(0D, Math.min(1D, a));
+ return 6_371_000D * 2D * Math.atan2(Math.sqrt(bounded), Math.sqrt(1D - bounded));
+ }
+
+ private void applyClockLocation(HrmAttendanceRecordDO record, HrmAttendanceRuleDO rule,
+ ClockLocation location, String legacyLocation, boolean clockIn) {
+ if (StrUtil.isNotBlank(rule.getLocationName())) {
+ record.setLocation(rule.getLocationName());
+ } else if (!Boolean.TRUE.equals(rule.getLocationRequired()) && StrUtil.isNotBlank(legacyLocation)) {
+ record.setLocation(legacyLocation);
+ }
+ if (location == null) {
+ return;
+ }
+ if (clockIn) {
+ record.setClockInLongitude(location.longitude());
+ record.setClockInLatitude(location.latitude());
+ record.setClockInAccuracy(location.accuracy());
+ record.setClockInDistance(location.distanceMeters());
+ record.setClockInAddress(rule.getLocationAddress());
+ } else {
+ record.setClockOutLongitude(location.longitude());
+ record.setClockOutLatitude(location.latitude());
+ record.setClockOutAccuracy(location.accuracy());
+ record.setClockOutDistance(location.distanceMeters());
+ record.setClockOutAddress(rule.getLocationAddress());
+ }
}
@Override
@@ -469,4 +601,4 @@
attendanceRecordMapper.updateById(record);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3