From e032ce14c50d1d7ff769485d83b945754e356674 Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期三, 22 四月 2026 10:59:20 +0800
Subject: [PATCH] 1.修改场站问题 2.给接口添加查询条件

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

diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java
index 26c853c..e235e9b 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpPointManagementController.java
@@ -3,7 +3,9 @@
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.xiaopeng.api.dto.map.XpPointExportExcelQuery;
 import com.xiaopeng.api.dto.operation.PointAddDto;
 import com.xiaopeng.api.dto.operation.PointUpdateDto;
@@ -72,12 +74,16 @@
 
     @ApiOperation(value = "获取所有运营中的区域", response = XpElectronicFenceArea.class)
     @PostMapping("/listElectronicFenceArea")
-    public R<List<XpElectronicFenceArea>> listElectronicFenceArea(@RequestParam String cityCode) {
+    public R<List<XpElectronicFenceArea>> listElectronicFenceArea(@RequestParam(required = false) String cityCode) {
         // 获取所有启用的电子围栏
-        List<XpElectronicFence> electronicFences = xpElectronicFenceService.lambdaQuery()
-                .eq(XpElectronicFence::getStatus, 2)
-                .eq(XpElectronicFence::getCityCode, cityCode)
-                .list();
+
+        LambdaQueryChainWrapper<XpElectronicFence> eq = xpElectronicFenceService.lambdaQuery()
+                .eq(XpElectronicFence::getStatus, 2);
+        if(StrUtil.isNotBlank(cityCode)){
+            eq.eq(XpElectronicFence::getCityCode, cityCode);
+        }
+
+        List<XpElectronicFence> electronicFences = xpElectronicFenceService.list(eq);
         List<Long> electronicFenceIds = electronicFences.stream().map(XpElectronicFence::getId).collect(Collectors.toList());
         if (electronicFenceIds.isEmpty()) {
             return R.ok(new ArrayList<XpElectronicFenceArea>());

--
Gitblit v1.7.1