From 0a0ca6125d0567ba9c07794f12ad75f05fdd8180 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 13 三月 2026 21:14:10 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index 4acedfb..8da8971 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -1924,21 +1924,14 @@
*/
public void addCruiseMission(XpVehicle vehicle, XpOrder order) {
-
if (vehicle.getState() != 0 || vehicle.getOperatingStatus() != 1) {
return;
}
-
- if (vehicle.getState() != 0 || vehicle.getOperatingStatus() != 1) {
- return;
- }
-
// 判断是否有计划
R<XpCruisePlanVehicle> xpCruisePlanR = xpCruisePlanClient.getCruisePlan(vehicle.getId());
if (xpCruisePlanR == null || xpCruisePlanR.getData() == null) {
return;
}
-
// 获取配置 根据配置判断是否该收车 如果是则找到收车点位进行收车操作
R<XpTaskRule> xpTaskRuleR = xpTaskRuleClient.queryDetail();
XpTaskRule xpTaskRule = xpTaskRuleR.getData();
@@ -2019,9 +2012,6 @@
if (vehicle.getState() != 0 || vehicle.getOperatingStatus() != 1) {
return;
}
- if (vehicle.getState() != 0 || vehicle.getOperatingStatus() != 1) {
- return;
- }
// 判断是否有计划
R<XpCruisePlanVehicle> xpCruisePlanR = xpCruisePlanClient.getCruisePlan(vehicle.getId());
if (xpCruisePlanR == null || xpCruisePlanR.getData() == null) {
@@ -2053,16 +2043,28 @@
xpCruiseOrder.setStartLat(vehiclePosition.getPoint().getY());
// 完成的直接走终点 终止的走起点
- if (temp == 0) {
- xpCruiseOrder.setEndPointId(xpCruiseOrders.getStartPointId());
- xpCruiseOrder.setEndPointName(xpCruiseOrders.getStartPointName());
- xpCruiseOrder.setEndLon(xpCruiseOrders.getStartLon());
- xpCruiseOrder.setEndLat(xpCruiseOrders.getStartLat());
- } else {
- xpCruiseOrder.setEndPointId(xpCruiseOrders.getEndPointId());
- xpCruiseOrder.setEndPointName(xpCruiseOrders.getEndPointName());
- xpCruiseOrder.setEndLon(xpCruiseOrders.getEndLon());
- xpCruiseOrder.setEndLat(xpCruiseOrders.getEndLat());
+ if(null != xpCruiseOrders){
+ if (temp == 0) {
+ xpCruiseOrder.setEndPointId(xpCruiseOrders.getStartPointId());
+ xpCruiseOrder.setEndPointName(xpCruiseOrders.getStartPointName());
+ xpCruiseOrder.setEndLon(xpCruiseOrders.getStartLon());
+ xpCruiseOrder.setEndLat(xpCruiseOrders.getStartLat());
+ } else {
+ xpCruiseOrder.setEndPointId(xpCruiseOrders.getEndPointId());
+ xpCruiseOrder.setEndPointName(xpCruiseOrders.getEndPointName());
+ xpCruiseOrder.setEndLon(xpCruiseOrders.getEndLon());
+ xpCruiseOrder.setEndLat(xpCruiseOrders.getEndLat());
+ }
+ }else{
+ // 先找计划
+ List<XpCruisePlanPoint> planPointList = xpCruisePlanClient.getCruisePlanPointList(vehicle.getId()).getData();
+ XpCruisePlanPoint xpCruisePlanPoint = planPointList.get(0);
+ Long endPointId = xpCruisePlanPoint.getPointId();
+ XpPoint endPoint = xpPointClient.queryById(endPointId).getData();
+ xpCruiseOrder.setEndPointId(endPointId);
+ xpCruiseOrder.setEndPointName(endPoint.getPointName());
+ xpCruiseOrder.setEndLon(endPoint.getPointLon());
+ xpCruiseOrder.setEndLat(endPoint.getPointLat());
}
--
Gitblit v1.7.1