xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/GeoPoint.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/MessageType.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/MsgContent.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/RTCmdType.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/ResponseMessage.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/RtMsgHeader.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/StatusCode.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/NavigationWaypoint.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/RTTask.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/RtTaskListResponse.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/RtTaskResult.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/TaskResultStatus.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/TaskStatus.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/TaskType.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/WaypointAction.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/WaypointType.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/ActionType.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/OrderOperation.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/OrderOperationState.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/OrderOperationStatus.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/OrderType.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/PointType.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/TargetPoint.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/Waypoint.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudPushNavigation/RestoreNavigationData.java
File was deleted xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/RtMsgHeader.java
@@ -1,7 +1,5 @@ package com.xiaopeng.api.vo.automaticPilot.proto.up; import com.xiaopeng.api.vo.automaticPilot.proto.down.SourceType; import lombok.Data; /** xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/SourceType.java
File was renamed from xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/SourceType.java @@ -1,4 +1,4 @@ package com.xiaopeng.api.vo.automaticPilot.proto.down; package com.xiaopeng.api.vo.automaticPilot.proto.up; /** * 消息来源类型 xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/util/XPUUtil.java
@@ -8,10 +8,7 @@ import com.xiaopeng.api.feignClient.automaticPilot.VmpOpenServiceClient; import com.xiaopeng.api.feignClient.automaticPilot.XPUClient; import com.xiaopeng.api.vo.automaticPilot.MqttPublishVo; import com.xiaopeng.api.vo.automaticPilot.proto.down.*; import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudCreateOrder.RTTask; import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudOrderOperation.OrderOperation; import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudPushNavigation.RestoreNavigationData; import com.xiaopeng.api.vo.automaticPilot.proto.up.RTCmdType; import com.xiaopeng.api.vo.automaticPilot.protobuf.RtTaskList; import com.xiaopeng.common.core.utils.StringUtils; import com.xiaopeng.common.core.utils.uuid.UUID; @@ -45,6 +42,8 @@ // 查询车管 车辆xpuid信息返回字段，用于按需返回字段 public static final List<String> TYPE_LIST = Collections.singletonList("1"); private static final com.google.protobuf.util.JsonFormat.Printer jsonPrinter = com.google.protobuf.util.JsonFormat.printer().printingEnumsAsInts(); /** * Robotaxi创建订单推送给XPU * @@ -69,7 +68,7 @@ MqttPublishVo vo = new MqttPublishVo(); vo.setTopic(buildTopicByVin(vin)); try { vo.setPayload(com.google.protobuf.util.JsonFormat.printer().print(msgContentBuilder.build())); vo.setPayload(jsonPrinter.print(msgContentBuilder.build())); } catch (Exception e) { log.error("Protobuf转JSON失败", e); throw new RuntimeException("Protobuf转JSON失败", e); @@ -103,7 +102,7 @@ MqttPublishVo vo = new MqttPublishVo(); vo.setTopic(buildTopicByVin(vin)); try { vo.setPayload(com.google.protobuf.util.JsonFormat.printer().print(msgContentBuilder.build())); vo.setPayload(jsonPrinter.print(msgContentBuilder.build())); } catch (Exception e) { log.error("Protobuf转JSON失败", e); throw new RuntimeException("Protobuf转JSON失败", e); @@ -140,7 +139,7 @@ MqttPublishVo vo = new MqttPublishVo(); vo.setTopic(buildTopicByVin(vin)); try { vo.setPayload(com.google.protobuf.util.JsonFormat.printer().print(msgContentBuilder.build())); vo.setPayload(jsonPrinter.print(msgContentBuilder.build())); } catch (Exception e) { log.error("Protobuf转JSON失败", e); throw new RuntimeException("Protobuf转JSON失败", e); @@ -174,7 +173,7 @@ MqttPublishVo vo = new MqttPublishVo(); vo.setTopic(buildTopicByXpuId(xpuId)); try { vo.setPayload(com.google.protobuf.util.JsonFormat.printer().print(msgContentBuilder.build())); vo.setPayload(jsonPrinter.print(msgContentBuilder.build())); } catch (Exception e) { log.error("Protobuf转JSON失败", e); throw new RuntimeException("Protobuf转JSON失败", e); xp-robotaxi-automatic-pilot-boot/src/test/java/com/xiaopeng/automaticPilot/util/XPUUtilTest.java
@@ -24,10 +24,8 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.UUID; public class XPUUtilTest { @@ -80,9 +78,7 @@ RtTask.Builder taskBuilder = RtTask.newBuilder(); taskBuilder.setTaskId("task-123"); taskBuilder.setOrderId(orderId); // taskBuilder.setVin("VIN12345678900000"); // RtTask might not have vin, check proto if needed taskBuilder.setTaskType(OrderType.ORDER_TYPE_ROBOTAXI); // taskBuilder.setStatus(TaskStatus.PENDING); // RtTask might not have status or enum differs Waypoint.Builder pointBuilder = Waypoint.newBuilder(); pointBuilder.setPointType(PointType.START_POINT); @@ -95,10 +91,8 @@ // geoPointBuilder.setPoiName("Start Point"); // GeoPoint might not have poi_name pointBuilder.setPoint(geoPointBuilder.build()); // taskBuilder.addPoints(pointBuilder.build()); // RtTask might use different field for points? // Wait, RtTask in XPUUtil.cloudCreateOrder(RtTaskList taskList...) // So I need to build RtTaskList taskBuilder.addPoints(pointBuilder); RtTaskList.Builder taskListBuilder = RtTaskList.newBuilder(); taskListBuilder.addTasks(taskBuilder.build()); @@ -129,7 +123,6 @@ Waypoint.Builder waypointBuilder = Waypoint.newBuilder(); waypointBuilder.setWaypointId("wp-1"); waypointBuilder.setPointType(PointType.WAY_POINT); // waypointBuilder.setActionType(ActionType.WAIT); // WAIT might not exist waypointBuilder.setActionType(ActionType.PICK_UP); // Use valid enum waypointBuilder.setSequence(2);
