From 1cf78d7b0e01a2d960ade3033658c0ab7fac8cd3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 26 二月 2026 11:45:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/XpPointService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/XpPointService.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/XpPointService.java
index dc3f3df..ff6e6aa 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/XpPointService.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/XpPointService.java
@@ -5,12 +5,14 @@
import com.xiaopeng.api.dto.order.HistoryEndPointsDto;
import com.xiaopeng.api.dto.order.HistoryStartPointsDto;
import com.xiaopeng.api.model.operation.XpPoint;
+import com.xiaopeng.api.query.operation.PointPageListListQuery;
import com.xiaopeng.api.vo.order.XpHistoryEndPointsVo;
import com.xiaopeng.api.vo.order.XpHistoryStartPointsVo;
import com.xiaopeng.api.vo.order.XpPointsSearchVo;
+import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.operation.dto.NearestDto;
import com.xiaopeng.operation.query.PointByNameQuery;
-import com.xiaopeng.api.query.operation.PointPageListQuery;
+import com.xiaopeng.api.query.operation.PointListQuery;
import com.xiaopeng.operation.vo.NearestVo;
import javax.validation.Valid;
@@ -46,7 +48,7 @@
boolean getInTime(LocalTime now, Integer effectivePeriod, String effectiveTimePeriod);
List<XpPoint> pointMap(PointMapQuery query);
- List<XpPoint> listAll(PointPageListQuery query);
+ List<XpPoint> listAll(PointListQuery query);
/**
@@ -80,5 +82,6 @@
OrderDistanceVo getOrderDistance();
+ PageInfo<XpPoint> pageList(PointPageListListQuery query);
}
--
Gitblit v1.7.1