From 65dcb2917a3b68e19351878e1d93f0b0ecb83cb5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 13 二月 2026 16:49:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java b/xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
index b66c3e7..42d3ba1 100644
--- a/xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
+++ b/xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
@@ -1,5 +1,8 @@
package com.xiaopeng.automaticPilot.controller;
+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.vo.automaticPilot.proto.down.cloudCreateOrder.RTTask;
@@ -7,12 +10,13 @@
import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudCreateOrder.TaskType;
import com.xiaopeng.automaticPilot.util.XPUUtil;
import com.xiaopeng.common.core.domain.R;
+import com.xiaopeng.common.core.utils.SnowFlake;
+import com.xiaopeng.common.redis.service.RedisService;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.concurrent.TimeUnit;
@Slf4j
@RestController
@@ -22,24 +26,28 @@
private final XPUUtil xpuUtil;
+ private final RedisService redisService;
- public OrderMissionController(XPUUtil xpuUtil) {
+ public OrderMissionController(XPUUtil xpuUtil, RedisService redisService) {
this.xpuUtil = xpuUtil;
+ this.redisService = redisService;
}
- @PostMapping("/inner/pushOrder")
- public R<Boolean> pushOrder(@RequestParam Long orderId) {
+
+ @PostMapping("/inner/pushOrder")
+ public R<Boolean> pushOrder(@RequestBody PushOrderDto dto) {
RTTask task = new RTTask();
- task.setOrder_id(orderId.toString());
- // TODO id处理 已经数据是否存储
- task.setTask_id(System.currentTimeMillis()+ "");
+ task.setOrder_id(dto.getOrderId().toString());
+ task.setTask_id("MISSION_"+ IdUtil.fastUUID());
task.setTask_type(TaskType.ROBOTAXI);
task.setStatus(TaskStatus.PENDING);
-
- ResponseMessage responseMessage = xpuUtil.cloudCreateOrder(task);
- if (responseMessage.getCode()== StatusCode.OK) {
+ 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) {
return R.ok(true);
}
return R.ok(false);
--
Gitblit v1.7.1