From ba78f764042ca15bf3f3be62e7a3fc699df56d67 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 07 三月 2026 20:59:53 +0800
Subject: [PATCH] 提交管理后台新接口，修改XPU报文相关功能，增加测试小程序状态流转接口
---
xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 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 eed57b4..ae3fb3d 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
@@ -9,8 +9,7 @@
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;
-import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudOrderOperation.OrderOperation;
-import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudOrderOperation.OrderOperationType;
+import com.xiaopeng.api.vo.automaticPilot.protobuf.*;
import com.xiaopeng.automaticPilot.util.XPUUtil;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.utils.SnowFlake;
@@ -38,20 +37,23 @@
@PostMapping("/inner/pushOrder")
public R<Boolean> pushOrder(@RequestBody PushOrderDto dto) {
- RTTask task = new RTTask();
+ RtTask.Builder taskBuilder = RtTask.newBuilder();
//TODO 设置目标地点信息
- task.setOrder_id(dto.getOrderId());
- task.setTask_id("MISSION_"+ IdUtil.fastUUID());
+ taskBuilder.setOrderId(dto.getOrderId().toString());
+ taskBuilder.setTaskId("MISSION_"+ IdUtil.fastUUID());
+
if(dto.getOrderId().contains("XU")){
- task.setTask_type(TaskType.CRUISE);
+ taskBuilder.setTaskType(OrderType.ORDER_TYPE_CRUISE);
}else {
- task.setTask_type(TaskType.ROBOTAXI);
+ taskBuilder.setTaskType(OrderType.ORDER_TYPE_ROBOTAXI);
}
- task.setStatus(TaskStatus.PENDING);
+ RtTaskList.Builder taskListBuilder = RtTaskList.newBuilder();
+ taskListBuilder.addTasks(taskBuilder.build());
+
SnowFlake snowFlake = new SnowFlake(0, 0);
snowFlake.withStartTimestamp(1420041600000L);
long sequence = snowFlake.nextId();
- MqttPublishDto mqttPublishDto = xpuUtil.cloudCreateOrder(task, dto.getVin(),sequence);
+ MqttPublishDto mqttPublishDto = xpuUtil.cloudCreateOrder(taskListBuilder.build(), dto.getVin(),sequence);
// 正常单子才修改 巡游单子不修改状态
if (!dto.getOrderId().contains("XU") && mqttPublishDto.getCode()== 200) {
@@ -65,15 +67,20 @@
@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);
+ OrderOperation.Builder operationBuilder = OrderOperation.newBuilder();
+ operationBuilder.setOrderId(dto.getOrderId().toString());
+ operationBuilder.setTaskId("CANCEL_MISSION_" + IdUtil.fastUUID());
+ if (dto.getOperation_type() != null) {
+ operationBuilder.setOperationType(OrderOperationType.forNumber(dto.getOperation_type().getValue()));
+ }
+
+ SnowFlake snowFlake = new SnowFlake(0, 0);
+ snowFlake.withStartTimestamp(1420041600000L);
+ long sequence = snowFlake.nextId();
+ xpuUtil.cloudOrderOperation(operationBuilder.build(), dto.getVin(), sequence);
+ redisService.setCacheObject(String.valueOf(sequence), "cancelOrder_" + dto.getOrderId() + "_" + dto.getVin(), 30l, TimeUnit.MINUTES);
+ return R.ok(true);
+
+
}
}
--
Gitblit v1.7.1