From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java
index ad1799b..2b1f46f 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpClockInController.java
@@ -4,17 +4,16 @@
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.security.service.TokenService;
-import com.xiaopeng.maintenance.dto.*;
+import com.xiaopeng.maintenance.dto.ClockDTO;
+import com.xiaopeng.maintenance.dto.ClockInStatisticsDto;
+import com.xiaopeng.maintenance.dto.GetClockInStatisticsDetailsDto;
+import com.xiaopeng.maintenance.dto.VerifyRangeDTO;
import com.xiaopeng.maintenance.service.IXpClockInService;
import com.xiaopeng.maintenance.vo.ClockInStatisticsDetailsVo;
import com.xiaopeng.maintenance.vo.ClockInStatisticsVo;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -26,9 +25,9 @@
* 打卡管理 Controller
*
* @author xiaochen
- * @since 2026-02-06
* @author mitao
* @date 2026-02-14
+ * @since 2026-02-06
*/
@Slf4j
@RestController
@@ -39,15 +38,16 @@
private IXpClockInService xpClockInService;
@Autowired
private TokenService tokenService;
+
@ApiOperation(value = "校验是否在打卡范围内", tags = "运维APP-排班与考勤")
- @PostMapping("/api/v1/clock/verifyRange")
+ @PostMapping("/maintenance-app/api/v1/clock/verifyRange")
public R<Boolean> verifyRange(@RequestBody VerifyRangeDTO dto) {
return R.ok(xpClockInService.verifyRange(dto));
}
@ApiOperation(value = "上班打卡", tags = "运维APP-排班与考勤")
- @PostMapping("/api/v1/clock/clockIn")
- public R<String> clockIn(@RequestBody ClockDTO dto) {
+ @PostMapping("/maintenance-app/api/v1/clock/clockIn")
+ public R<Integer> clockIn(@RequestBody ClockDTO dto) {
Long id = tokenService.getLoginOperationUser().getId();
dto.setOperationsUserId(id);
return xpClockInService.clockIn(dto);
@@ -56,7 +56,7 @@
/**
* 检查用户是否上班中(内部接口)
*/
- @GetMapping("/inner/clock-in/checkWorkStatus")
+ @GetMapping("/logan/inner/clock-in/checkWorkStatus")
@ApiOperation(value = "检查用户是否上班中", tags = {"内部接口"})
public R<Integer> checkWorkStatus(@RequestParam("appUserId") Long appUserId) {
log.info("检查用户上班状态, appUserId={}", appUserId);
@@ -65,8 +65,8 @@
}
@ApiOperation(value = "下班打卡", tags = "运维APP-排班与考勤")
- @PostMapping("/api/v1/clock/clockOut")
- public R<String> clockOut(@RequestBody ClockDTO dto) {
+ @PostMapping("/maintenance-app/api/v1/clock/clockOut")
+ public R<Integer> clockOut(@RequestBody ClockDTO dto) {
Long id = tokenService.getLoginOperationUser().getId();
dto.setOperationsUserId(id);
return xpClockInService.clockOut(dto);
@@ -75,7 +75,7 @@
@ApiOperation(value = "排班考勤打卡统计列表", tags = {"管理后台-运维执行"})
@PostMapping("/api/v1/clock/getClockInStatistics")
- public R<PageInfo<ClockInStatisticsDto>> getClockInStatistics(@RequestBody ClockInStatisticsVo vo){
+ public R<PageInfo<ClockInStatisticsDto>> getClockInStatistics(@RequestBody ClockInStatisticsVo vo) {
PageInfo<ClockInStatisticsDto> clockInStatistics = xpClockInService.getClockInStatistics(vo);
return R.ok(clockInStatistics);
}
@@ -83,16 +83,14 @@
@ApiOperation(value = "排班考勤打卡统计导出", tags = {"管理后台-运维执行"})
@PostMapping("/api/v1/clock/exportClockInStatistics")
- public void exportClockInStatistics(@RequestBody ClockInStatisticsVo vo, HttpServletResponse response){
+ public void exportClockInStatistics(@RequestBody ClockInStatisticsVo vo, HttpServletResponse response) {
xpClockInService.exportClockInStatistics(vo, response);
}
-
-
@ApiOperation(value = "排班考勤打卡统计详情列表", tags = {"管理后台-运维执行"})
@PostMapping("/api/v1/clock/getClockInStatisticsDetails")
- public R<GetClockInStatisticsDetailsDto> getClockInStatisticsDetails(@RequestBody ClockInStatisticsDetailsVo query){
+ public R<GetClockInStatisticsDetailsDto> getClockInStatisticsDetails(@RequestBody ClockInStatisticsDetailsVo query) {
GetClockInStatisticsDetailsDto clockInStatisticsDetails = xpClockInService.getClockInStatisticsDetails(query);
return R.ok(clockInStatisticsDetails);
}
@@ -100,10 +98,9 @@
@ApiOperation(value = "排班考勤打卡统计详情导出", tags = {"管理后台-运维执行"})
@PostMapping("/api/v1/clock/exportClockInStatisticsDetails")
- public void exportClockInStatisticsDetails(@RequestBody ClockInStatisticsDetailsVo query, HttpServletResponse response){
+ public void exportClockInStatisticsDetails(@RequestBody ClockInStatisticsDetailsVo query, HttpServletResponse response) {
xpClockInService.exportClockInStatisticsDetails(query, response);
}
-
}
--
Gitblit v1.7.1