From 1a787ef055b0928a4dad02fc81e737e21965f70d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 23 四月 2026 22:29:50 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpElectronicFenceController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 cdb8dec..aae6518 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
@@ -16,6 +16,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.List;
@@ -40,8 +41,9 @@
@ApiOperation(value = "获取地图开放区域围栏",tags = {"小程序-获取地图开放区域围栏"},response = XpElectronicFenceVo.class)
@GetMapping("/base/v1/mini-program/cities/list")
@XpClientCheck(checkToken = false, checkOtpToken = true)
- public R<List<XpElectronicFenceVo>> citiesList(@RequestParam String cityCode) {
- return R.ok(xpElectronicFenceAreaService.citiesList(cityCode));
+ public R<List<XpElectronicFenceVo>> citiesList(@RequestParam String cityCode, HttpServletRequest request) {
+ String uid = request.getHeader("XP-Uid");
+ return R.ok(xpElectronicFenceAreaService.citiesList(cityCode,uid));
}
/**
@@ -51,7 +53,7 @@
@ApiOperation(value = "获取地图开放区域围栏",tags = {"运维APP-电子围栏"},response = XpElectronicFenceVo.class)
@GetMapping("/maintenance-app/api/v1/fence/listByCityCode")
public R<List<XpElectronicFenceVo>> listByCityCode(@RequestParam String cityCode) {
- return R.ok(xpElectronicFenceAreaService.citiesList(cityCode));
+ return R.ok(xpElectronicFenceAreaService.citiesList(cityCode,null));
}
@ApiOperation(value = "判断当前位置是否在运营区域内",tags = {"小程序-判断当前位置是否在运营区域内"})
--
Gitblit v1.7.1