From 9cc3a1b20c897fba88d36356200a77e87e0ee943 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 12 三月 2026 18:39:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java | 4 +++-
1 files changed, 3 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 c43eeeb..d3b1b0d 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
@@ -139,7 +139,7 @@
double v = FastDistanceCalculator.distanceFast(dto.getLatitude(), dto.getLongitude(), xpPoint.getPointLat(), xpPoint.getPointLon());
// m做判断
- if ((v*1000) < orderDistance) {
+ if ((v) < orderDistance) {
NearestNextVo nearestNextVo = new NearestNextVo();
nearestNextVo.setId(xpPoint.getId());
nearestNextVo.setName(xpPoint.getPointName());
@@ -227,6 +227,7 @@
ArrayList<XpHistoryStartPointsVo> resultList = new ArrayList<>(10);
for (XpPoint xpPoint : xpPoints) {
XpHistoryStartPointsVo xpHistoryStartPointsVo = new XpHistoryStartPointsVo();
+ xpHistoryStartPointsVo.setOperationStatus(xpPoint.getOperationStatus());
xpHistoryStartPointsVo.setName(xpPoint.getPointName());
xpHistoryStartPointsVo.setAddress(xpPoint.getPointAddress());
xpHistoryStartPointsVo.setLatitude(xpPoint.getPointLat());
@@ -249,6 +250,7 @@
ArrayList<XpHistoryEndPointsVo> resultList = new ArrayList<>(10);
for (XpPoint xpPoint : xpPoints) {
XpHistoryEndPointsVo xpHistoryEndPointsVo = new XpHistoryEndPointsVo();
+ xpHistoryEndPointsVo.setOperationStatus(xpPoint.getOperationStatus());
xpHistoryEndPointsVo.setName(xpPoint.getPointName());
xpHistoryEndPointsVo.setAddress(xpPoint.getPointAddress());
xpHistoryEndPointsVo.setLatitude(xpPoint.getPointLat());
--
Gitblit v1.7.1