From ad5754d503c59c6a7d78925bac7fab758c185d22 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 26 二月 2026 11:47:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

---
 xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceController.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceController.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceController.java
index ecdda2c..1a724e8 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceController.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceController.java
@@ -21,7 +21,7 @@
 
 @Slf4j
 @RestController
-@RequestMapping("/base/v1/mini-program")
+@RequestMapping("")
 @Api(tags = "电子围栏")
 public class XpElectronicFenceController extends BaseController {
 
@@ -38,21 +38,30 @@
      * @return
      */
     @ApiOperation(value = "获取地图开放区域围栏",tags = {"小程序-获取地图开放区域围栏"},response = XpElectronicFenceVo.class)
-    @GetMapping("/cities/list")
+    @GetMapping("/base/v1/mini-program/cities/list")
     public R<List<XpElectronicFenceVo>> citiesList(@RequestParam String cityCode) {
         return R.ok(xpElectronicFenceAreaService.citiesList(cityCode));
     }
 
+    /**
+     * 获取地图开放区域围栏
+     * @return
+     */
+    @ApiOperation(value = "获取地图开放区域围栏",tags = {"运维APP-电子围栏"},response = XpElectronicFenceVo.class)
+    @GetMapping("/api/v1/fence/listByCityCode")
+    public R<List<XpElectronicFenceVo>> listByCityCode(@RequestParam String cityCode) {
+        return R.ok(xpElectronicFenceAreaService.citiesList(cityCode));
+    }
 
     @ApiOperation(value = "判断当前位置是否在运营区域内",tags = {"小程序-判断当前位置是否在运营区域内"})
-    @PostMapping("/fence/check")
+    @PostMapping("/base/v1/mini-program/fence/check")
     public R<IsInOperationAreaVo> isInOperationArea(@RequestBody @Valid  LonLatDto dto) {
         return R.ok(xpElectronicFenceAreaService.isInOperationArea(dto));
     }
 
 
     @ApiOperation(value = "根据点位获取步行时间和距离",tags = {"小程序-根据点位获取步行时间和距离"})
-    @PostMapping("/fence/walkTime")
+    @PostMapping("/base/v1/mini-program/fence/walkTime")
     public R<WalkTimeVo> getWalkTime(@RequestBody @Valid WalkTimeDto dto) {
         return R.ok(xpElectronicFenceAreaService.getWalkTime(dto));
     }
@@ -64,7 +73,7 @@
      * @param dto
      * @return
      */
-    @PostMapping("/fence/diagnosisArea")
+    @PostMapping("/base/v1/mini-program/fence/diagnosisArea")
     public R<Boolean> diagnosisArea(@RequestBody RouteAndFareDto dto){
         return R.ok(xpElectronicFenceAreaService.diagnosisArea(dto));
     }

--
Gitblit v1.7.1