From 7ea060d3acfdee74d24e2207e746c2061ee78a48 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 四月 2026 15:37:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
index 26bea23..37546c3 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
@@ -183,7 +183,7 @@
nearestNextVo.setAddress(xpPoint.getPointAddress());
nearestNextVo.setTime(xpPoint.getParkingTimeLimit());
nearestNextVo.setElectronicAreaId(xpPoint.getElectronicAreaId());
- nearestNextVo.setStationId(xpPoint.getStationId().toString());
+ nearestNextVo.setStationId(xpPoint.getStationId()==null?null:xpPoint.getStationId().toString());
// 判断是否收藏
if(pointIdsByUserId!=null && !pointIdsByUserId.getData().isEmpty()){
@@ -534,6 +534,14 @@
return searchVo;
}
+ @Override
+ public List<XpPointsListVo> getStationChildren(Long stationId) {
+ if (stationId == null) {
+ return Collections.emptyList();
+ }
+ return this.baseMapper.queryStationChildren(Arrays.asList(stationId));
+ }
+
private List<XpPointsListVo> buildStationSearchResults(List<XpPointsListVo> stationList,
List<XpPointsListVo> stationChildren,
PointByNameQuery query) {
--
Gitblit v1.7.1