From 72af3702cd88f418b200d5b6dffab0d8c5674f2e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 三月 2026 18:28:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpCheckLocationController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpCheckLocationController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpCheckLocationController.java
index ccf5d2a..d019083 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpCheckLocationController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpCheckLocationController.java
@@ -1,5 +1,7 @@
package com.xiaopeng.maintenance.controller;
+import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetClient;
+import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.api.model.maintenance.XpCheckLocation;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.enums.DisabledEnum;
@@ -26,6 +28,7 @@
@RequiredArgsConstructor(onConstructor_ = @Lazy)
public class XpCheckLocationController {
private final IXpCheckLocationService xpCheckLocationService;
+ private final XpFleetClient xpFleetClient;
private final TokenService tokenService;
@GetMapping("/api/v1/check-location/list")
@@ -71,6 +74,11 @@
@DeleteMapping("/api/v1/check-location/deleteById")
@ApiOperation(value = "删除打卡地", tags = {"管理后台-运维执行"})
public R<String> deleteById(@RequestParam Long id){
+ // 判断打卡地是否已被使用
+ Long data = xpFleetClient.getUseCountByLocationId(id).getData();
+ if (data > 0) {
+ return R.fail("打卡地已被使用，请先解除关联");
+ }
xpCheckLocationService.removeById(id);
return R.ok();
}
--
Gitblit v1.7.1