From fe12a031de6fc7b539327a2a90e8140cc9714bc1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 三月 2026 10:57:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCruisePlanController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCruisePlanController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCruisePlanController.java
index 633b059..c81e179 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCruisePlanController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpCruisePlanController.java
@@ -24,6 +24,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
+import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -176,9 +177,7 @@
List<XpCruisePlanPoint> planPointList = xpCruisePlanPointService.list(new LambdaQueryWrapper<XpCruisePlanPoint>().eq(XpCruisePlanPoint::getCruisePlanId, plan.getCruisePlanId()).orderByAsc(XpCruisePlanPoint::getSortOrder));
- XpCruisePlanPoint xpCruisePlanPoint = planPointList.get(0);
- Long pointId = xpCruisePlanPoint.getPointId();
- XpPoint point = pointService.getById(pointId);
+
XpCruiseOrder newXpCruiseOrder = new XpCruiseOrder();
newXpCruiseOrder.setFleetId(dto.getFleetId());
newXpCruiseOrder.setVehicleId(dto.getVehicleId());
@@ -187,16 +186,14 @@
newXpCruiseOrder.setMissionId(plan.getCruisePlanId());
newXpCruiseOrder.setStatus(1);
newXpCruiseOrder.setOrderReverse(1);
+ GeoJsonPoint point = dto.getPoint();
// 起点
- newXpCruiseOrder.setStartLon(point.getPointLon());
- newXpCruiseOrder.setStartLat(point.getPointLat());
- newXpCruiseOrder.setStartPointId(pointId);
- newXpCruiseOrder.setStartPointName(point.getPointName());
+ newXpCruiseOrder.setStartLon(point.getX());
+ newXpCruiseOrder.setStartLat(point.getY());
// 终点
-
- XpCruisePlanPoint endCruisePlanPoint = planPointList.get(1);
+ XpCruisePlanPoint endCruisePlanPoint = planPointList.get(0);
Long endPointId = endCruisePlanPoint.getPointId();
XpPoint endPoint = pointService.getById(endPointId);
newXpCruiseOrder.setEndPointId(endPointId);
@@ -205,6 +202,8 @@
newXpCruiseOrder.setEndLat(endPoint.getPointLat());
+
+
return R.ok(newXpCruiseOrder);
}
--
Gitblit v1.7.1