From 0f5fc39356b6bff677984c33c296573bb9c8393e Mon Sep 17 00:00:00 2001
From: zhouhn <zhouhn@xiaopeng.com>
Date: 星期六, 07 三月 2026 20:58:52 +0800
Subject: [PATCH] 引入proto文件，生成与XPU通信的报文对象
---
xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java | 71 ++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 35 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..9bf5f07 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
@@ -6,11 +6,11 @@
import com.xiaopeng.api.dto.automaticPilot.PushOrderDto;
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;
-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.RtTask;
+import com.xiaopeng.api.vo.automaticPilot.protobuf.RtTaskList;
+import com.xiaopeng.api.vo.automaticPilot.protobuf.OrderType;
+import com.xiaopeng.api.vo.automaticPilot.protobuf.OrderOperation;
+import com.xiaopeng.api.vo.automaticPilot.protobuf.OrderOperationType;
import com.xiaopeng.automaticPilot.util.XPUUtil;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.utils.SnowFlake;
@@ -19,7 +19,6 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
import java.util.concurrent.TimeUnit;
@Slf4j
@@ -28,33 +27,32 @@
@Api(tags = "订单任务Api")
public class OrderMissionController {
- @Resource
- private XPUUtil xpuUtil;
- @Resource
- private RedisService redisService;
- @Resource
- private XpVehicleClient xpVehicleClient;
+ private final XPUUtil xpuUtil;
+ private final RedisService redisService;
+ private final XpVehicleClient xpVehicleClient;
+ 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();
+ RtTask.Builder taskBuilder = RtTask.newBuilder();
//TODO 设置目标地点信息
- task.setOrder_id(dto.getOrderId());
- task.setTask_id("MISSION_"+ IdUtil.fastUUID());
- if(dto.getOrderId().contains("XU")){
- task.setTask_type(TaskType.CRUISE);
- }else {
- task.setTask_type(TaskType.ROBOTAXI);
- }
- task.setStatus(TaskStatus.PENDING);
+ taskBuilder.setOrderId(dto.getOrderId().toString());
+ taskBuilder.setTaskId("MISSION_"+ IdUtil.fastUUID());
+ taskBuilder.setTaskType(OrderType.ORDER_TYPE_ROBOTAXI);
+
+ 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);
-
- // 正常单子才修改 巡游单子不修改状态
- if (!dto.getOrderId().contains("XU") && mqttPublishDto.getCode()== 200) {
+ MqttPublishDto mqttPublishDto = xpuUtil.cloudCreateOrder(taskListBuilder.build(), dto.getVin(),sequence);
+ if (mqttPublishDto.getCode()== 200) {
// 修改车子为接单状态
xpVehicleClient.updateVehicleStatus(new UpdateVehicleStateDto(dto.getVin(),1));
@@ -65,15 +63,18 @@
@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