From fdf8c19224d67e94a4404388359db4b4ee348a5d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 四月 2026 23:55:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpPointServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpPointServiceImpl.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpPointServiceImpl.java
index 0760b67..548fb8a 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpPointServiceImpl.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpPointServiceImpl.java
@@ -18,6 +18,7 @@
import com.xiaopeng.api.model.operation.XpRegion;
import com.xiaopeng.api.model.operation.XpStation;
import com.xiaopeng.api.model.operation.XpSystemSetting;
+import com.xiaopeng.api.query.operation.FenceAndStationVo;
import com.xiaopeng.api.query.operation.PointListQuery;
import com.xiaopeng.api.query.operation.PointPageListListQuery;
import com.xiaopeng.api.vo.order.XpHistoryEndPointsVo;
@@ -368,8 +369,8 @@
}
@Override
- public List<FenceAndStationVo> findListFenceAndStation(){
- return baseMapper.findListFenceAndStation();
+ public List<FenceAndStationVo> findListFenceAndStation(String cityCode){
+ return baseMapper.findListFenceAndStation(cityCode);
}
@Override
@@ -558,6 +559,21 @@
@Override
public PageInfo<XpPoint> pageList(PointPageListListQuery query) {
+ if(CollUtil.isNotEmpty(query.getFenceAndStationList())){
+ List<String> fenceAreaIds = new ArrayList<>();
+ List<String> stationIds = new ArrayList<>();
+ for (FenceAndStationVo bean : query.getFenceAndStationList()) {
+ if(bean.getType()==1){
+ fenceAreaIds.addAll(StrUtil.split(bean.getIds(),",") );
+ }else{
+ stationIds.addAll(StrUtil.split(bean.getIds(),",") );
+ }
+ }
+ query.setFenceAreaIds(fenceAreaIds);
+ query.setStationIds(stationIds);
+ }
+
+
PageInfo<XpPoint> pageInfo = new PageInfo<>(query.getPageNum(),query.getPageSize());
if (StringUtils.isNotBlank(query.getPointLonAndLat())) {
List<String> lonAndLat = query.getPointLonAndLat().trim().contains(",") ? Arrays.asList(query.getPointLonAndLat().split(",")) :
--
Gitblit v1.7.1