From be9c8ec26de00bbb8b763a5d01a94d9bbc8c49d1 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 二月 2026 13:54:59 +0800
Subject: [PATCH] 巡游任务 修改bug
---
xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java | 51 +++++++++++++++++++++++++++++----------------------
1 files changed, 29 insertions(+), 22 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 af8f0bc..71497f4 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
@@ -1,10 +1,11 @@
package com.xiaopeng.automaticPilot.controller;
+import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.IdUtil;
import com.xiaopeng.api.dto.automaticPilot.MqttPublishDto;
import com.xiaopeng.api.dto.automaticPilot.PushOrderDto;
-import com.xiaopeng.api.vo.automaticPilot.proto.down.ResponseMessage;
-import com.xiaopeng.api.vo.automaticPilot.proto.down.StatusCode;
+import com.xiaopeng.api.dto.vehicleConvoy.UpdateVehicleStateDto;
+import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudCreateOrder.RTTask;
import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudCreateOrder.TaskStatus;
import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudCreateOrder.TaskType;
@@ -26,47 +27,53 @@
@Api(tags = "订单任务Api")
public class OrderMissionController {
-
private final XPUUtil xpuUtil;
private final RedisService redisService;
+ private final XpVehicleClient xpVehicleClient;
- public OrderMissionController(XPUUtil xpuUtil, RedisService redisService) {
+ public OrderMissionController(XPUUtil xpuUtil, RedisService redisService, XpVehicleClient xpVehicleClient, Snowflake snowflake) {
this.xpuUtil = xpuUtil;
this.redisService = redisService;
+ this.xpVehicleClient = xpVehicleClient;
}
-
-
-
@PostMapping("/inner/pushOrder")
public R<Boolean> pushOrder(@RequestBody PushOrderDto dto) {
RTTask task = new RTTask();
- task.setOrder_id(dto.getOrderId().toString());
+ task.setOrder_id(dto.getOrderId());
task.setTask_id("MISSION_"+ IdUtil.fastUUID());
- task.setTask_type(TaskType.ROBOTAXI);
+ if(dto.getOrderId().contains("XU")){
+ task.setTask_type(TaskType.CRUISE);
+ }else {
+ task.setTask_type(TaskType.ROBOTAXI);
+ }
task.setStatus(TaskStatus.PENDING);
SnowFlake snowFlake = new SnowFlake(0, 0);
snowFlake.withStartTimestamp(1420041600000L);
long sequence = snowFlake.nextId();
MqttPublishDto mqttPublishDto = xpuUtil.cloudCreateOrder(task, dto.getVin(),sequence);
- if (mqttPublishDto.getCode()== 200) {
+
+ // 正常单子才修改 巡游单子不修改状态
+ if (!dto.getOrderId().contains("XU") && mqttPublishDto.getCode()== 200) {
+ // 修改车子为接单状态
+ xpVehicleClient.updateVehicleStatus(new UpdateVehicleStateDto(dto.getVin(),1));
+
return R.ok(true);
}
return R.ok(false);
}
-
@PostMapping("/inner/cancelOrder")
- R<Boolean> cancelOrder(@RequestBody PushOrderDto dto){
- OrderOperation operation = new OrderOperation();
- operation.setOrder_id(dto.getOrderId().toString());
- operation.setTask_id("CANCEL_MISSION_"+ IdUtil.fastUUID());
- operation.setOperation_type(dto.getOperation_type());
- SnowFlake snowFlake = new SnowFlake(0, 0);
- snowFlake.withStartTimestamp(1420041600000L);
- long sequence = snowFlake.nextId();
- xpuUtil.cloudOrderOperation(operation,dto.getVin(),sequence);
- redisService.setCacheObject(String.valueOf(sequence),"cancelOrder_"+dto.getOrderId()+"_"+ dto.getVin(),30l, TimeUnit.MINUTES);
- return R.ok(true);
+ R<Boolean> cancelOrder(@RequestBody PushOrderDto dto) {
+ OrderOperation operation = new OrderOperation();
+ operation.setOrder_id(dto.getOrderId().toString());
+ operation.setTask_id("CANCEL_MISSION_"+ IdUtil.fastUUID());
+ operation.setOperation_type(dto.getOperation_type());
+ SnowFlake snowFlake = new SnowFlake(0, 0);
+ snowFlake.withStartTimestamp(1420041600000L);
+ long sequence = snowFlake.nextId();
+ xpuUtil.cloudOrderOperation(operation,dto.getVin(),sequence);
+ redisService.setCacheObject(String.valueOf(sequence),"cancelOrder_"+dto.getOrderId()+"_"+ dto.getVin(),30l, TimeUnit.MINUTES);
+ return R.ok(true);
}
}
--
Gitblit v1.7.1