From 929332664363a6e496fa0367b08aa2c3689ad8fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 四月 2026 21:58:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java
index b41749d..a4e8561 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceManagementController.java
@@ -24,6 +24,7 @@
import com.xiaopeng.map.constant.I18nKeyConstant;
import com.xiaopeng.map.service.*;
import com.xiaopeng.map.utils.OperationStrategyIndex;
+import com.xiaopeng.map.vo.FenceAndStationVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -89,6 +90,11 @@
return R.ok(regionService.getXpRegion());
}
+ @ApiOperation(value = "获取围栏和场站数据",tags = {"管理后台-电子围栏"})
+ @GetMapping(value = "/findListFenceAndStation")
+ public R<List<FenceAndStationVo>> findListFenceAndStation() {
+ return R.ok(xpPointService.findListFenceAndStation());
+ }
@ApiOperation(value = "获取不分页的电子围栏列表",tags = {"管理后台-电子围栏"})
@PostMapping("/list")
@@ -119,7 +125,7 @@
*/
@PostMapping("/add")
@ApiOperation(value = "新增电子围栏")
- public R add(@Validated @RequestBody ElectronicFenceAddDto dto) {
+ public R add(@Valid @RequestBody ElectronicFenceAddDto dto) {
validateFenceTime(dto.getStatus(), dto.getEffectType(), dto.getEffectTime(), dto.getFailureType(), dto.getFailureTime());
return xpElectronicFenceService.addElectronic(dto);
}
--
Gitblit v1.7.1