From 47aa3631a929533782652bb72fa689f90f19623d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 02 三月 2026 11:13:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java | 64 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
index 6102a1f..5a6b3f0 100644
--- a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
+++ b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
@@ -153,9 +153,22 @@
* @return
*/
@GetMapping("/base/v1/order/acceptingOrder")
- public R acceptingOrder(Long orderId, Long vehicleId, Double startLon, Double startLat){
+ public R acceptingOrder(Long orderId, String code, Long vehicleId, Double startLon, Double startLat){
+ if(null == vehicleId){
+ vehicleId = 1L;
+ }
+ if(null == startLat || null == startLon){
+ startLat = 23.157155D;
+ startLon = 113.382373D;
+ }
XpVehicle xpVehicle = xpVehicleClient.queryById(vehicleId).getData();
- XpOrder xpOrder = xpOrderClient.queryOrderById(orderId).getData();
+ XpOrder xpOrder = null;
+ if(null != orderId){
+ xpOrder = xpOrderClient.queryOrderById(orderId).getData();
+ }
+ if(StringUtils.isNotEmpty(code)){
+ xpOrder = xpOrderClient.queryOrderByOrderNo(code).getData();
+ }
OrderRouteAndFareDto dto = new OrderRouteAndFareDto();
dto.setOrderId(orderId);
LonLatDto origin = new LonLatDto();
@@ -199,17 +212,6 @@
log.error("推送消息失败：{}", stringR.getMsg());
}
xpOrderClient.updateOrderStatus(orderId, OrderStatusEnum.PICK_UP.getCode());
-
-// PushOrderRouteDTO dto3 = new PushOrderRouteDTO();
-// dto3.setOrderId(orderId);
-// dto3.setRouteType(1);
-// dto3.setLongitude(startLon);
-// dto3.setLatitude(startLat);
-// dto3.setDuration(10);
-// dto3.setDistance(2);
-// dto3.setDirection(60);
-// xpPushMessageClient.pushOrderRoute(dto3);
-
return r;
}
@@ -219,9 +221,18 @@
* @param orderId
*/
@GetMapping("/base/v1/order/pushStartDriverLocation")
- private void pushStartDriverLocation(Long vehicleId, Long orderId){
+ private void pushStartDriverLocation(Long vehicleId, Long orderId, String code){
+ if(null == vehicleId){
+ vehicleId = 1L;
+ }
XpVehicle xpVehicle = xpVehicleClient.queryById(vehicleId).getData();
- XpOrder xpOrder = xpOrderClient.queryOrderById(orderId).getData();
+ XpOrder xpOrder = null;
+ if(null != orderId){
+ xpOrder = xpOrderClient.queryOrderById(orderId).getData();
+ }
+ if(StringUtils.isNotEmpty(code)){
+ xpOrder = xpOrderClient.queryOrderByOrderNo(code).getData();
+ }
String vin = xpVehicle.getVehicleVin();
Long appUserId = xpOrder.getAppUserId();
Object cacheObject = redisService.getCacheObject("ORDER_NAVIGATION_START_DATA:" + xpOrder.getAppUserId());
@@ -309,8 +320,14 @@
* @return
*/
@GetMapping("/base/v1/order/updateOrderStatus")
- public R updateOrderStatus(Long orderId, Integer status) {
- XpOrder xpOrder = xpOrderClient.queryOrderById(orderId).getData();
+ public R updateOrderStatus(Long orderId, String code, Integer status) {
+ XpOrder xpOrder = null;
+ if(null != orderId){
+ xpOrder = xpOrderClient.queryOrderById(orderId).getData();
+ }
+ if(StringUtils.isNotEmpty(code)){
+ xpOrder = xpOrderClient.queryOrderByOrderNo(code).getData();
+ }
//构建推送消息
Map<String, Object> params = new HashMap<>();
Map<String, Object> content = new HashMap<>();
@@ -368,9 +385,18 @@
* @param orderId
*/
@GetMapping("/base/v1/order/pushEndDriverLocation")
- private void pushEndDriverLocation(Long vehicleId, Long orderId){
+ private void pushEndDriverLocation(Long vehicleId, Long orderId, String code){
+ if(null == vehicleId){
+ vehicleId = 1L;
+ }
XpVehicle xpVehicle = xpVehicleClient.queryById(vehicleId).getData();
- XpOrder xpOrder = xpOrderClient.queryOrderById(orderId).getData();
+ XpOrder xpOrder = null;
+ if(null != orderId){
+ xpOrder = xpOrderClient.queryOrderById(orderId).getData();
+ }
+ if(StringUtils.isNotEmpty(code)){
+ xpOrder = xpOrderClient.queryOrderByOrderNo(code).getData();
+ }
String vin = xpVehicle.getVehicleVin();
Long appUserId = xpOrder.getAppUserId();
Object cacheObject = redisService.getCacheObject("ORDER_NAVIGATION_END_DATA:" + xpOrder.getAppUserId());
--
Gitblit v1.7.1