From 9e3ecfab0113a6b45e30e0ac64e51e8df53c4f72 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 三月 2026 21:07:57 +0800
Subject: [PATCH] 修改bug
---
/dev/null | 30 ----------
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java | 54 +++++++++++++----
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceServiceImpl.java | 39 ++++++++++++
xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java | 3 -
xp-robotaxi-map-boot/pom.xml | 5 +
xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/automaticPilot/PushOrderDto.java | 2
6 files changed, 83 insertions(+), 50 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/automaticPilot/PushOrderDto.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/automaticPilot/PushOrderDto.java
index 559381b..ecc854c 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/automaticPilot/PushOrderDto.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/automaticPilot/PushOrderDto.java
@@ -1,6 +1,6 @@
package com.xiaopeng.api.dto.automaticPilot;
-import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudOrderOperation.OrderOperationType;
+import com.xiaopeng.api.vo.automaticPilot.protobuf.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/GeoPoint.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/GeoPoint.java
deleted file mode 100644
index b6ae8f0..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/GeoPoint.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down;
-
-import lombok.Data;
-
-/**
- * 高德地图坐标点
- */
-@Data
-public class GeoPoint {
- /**
- * 经度
- */
- private Double longitude;
- /**
- * 纬度
- */
- private Double latitude;
- /**
- * 高德POI ID（可选）
- */
- private String poi_id;
- /**
- * 地址描述（可选）
- */
- private String address;
- /**
- * 地点名称（可选）
- */
- private String poi_name;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/ResponseMessage.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/ResponseMessage.java
deleted file mode 100644
index 87f64e6..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/ResponseMessage.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down;
-
-import lombok.Data;
-
-/**
- * 应答消息
- */
-@Data
-public class ResponseMessage {
- /**
- * 对应请求seq
- */
- private Long request_seq;
- /**
- * 响应码
- */
- private StatusCode code;
- /**
- * 时间戳(毫秒)
- */
- private Long timestamp;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/StatusCode.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/StatusCode.java
deleted file mode 100644
index a589646..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/StatusCode.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down;
-
-/**
- * HTTP状态码枚举
- */
-public enum StatusCode {
-
- HTTP_STATUS_CODE_UNSPECIFIED(0),
- OK(200), // 成功
- BAD_REQUEST(400), // 请求参数错误
- FORBIDDEN(403),
- NOT_FOUND(404),
- REQUEST_TIMEOUT(408), // 请求超时
- INTERNAL_SERVER_ERROR(500); // 失败
-
- private int value;
-
- StatusCode(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/NavigationWaypoint.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/NavigationWaypoint.java
deleted file mode 100644
index 54d4892..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/NavigationWaypoint.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down.cloudCreateOrder;
-
-import com.xiaopeng.api.vo.automaticPilot.proto.down.GeoPoint;
-import lombok.Data;
-
-/**
- * 导航点
- */
-@Data
-public class NavigationWaypoint {
- /**
- * 导航点类型
- */
- private WaypointType type;
- /**
- * 位置信息
- */
- private GeoPoint point;
- /**
- * 在该点执行的动作
- */
- private WaypointAction action;
- /**
- * 顺序号
- */
- private Integer sequence;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/RTTask.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/RTTask.java
deleted file mode 100644
index d4d9f47..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/RTTask.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down.cloudCreateOrder;
-
-import lombok.Data;
-import java.util.List;
-
-/**
- * RT任务主消息
- */
-@Data
-public class RTTask {
- /**
- * 任务唯一标识
- */
- private String task_id;
- /**
- * 关联的订单id
- */
- private String order_id;
- /**
- * 车辆vin
- */
- private String vin;
- /**
- * 导航点列表
- */
- private List<NavigationWaypoint> points;
- /**
- * 任务类型
- */
- private TaskType task_type;
- /**
- * 任务状态
- */
- private TaskStatus status;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/TaskStatus.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/TaskStatus.java
deleted file mode 100644
index d739bed..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/TaskStatus.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down.cloudCreateOrder;
-
-/**
- * 任务状态枚举
- */
-public enum TaskStatus {
-
- TASK_STATUS_UNSPECIFIED(0), // 未指定
- PENDING(1), // 待执行
- EXECUTING(2), // 执行中
- COMPLETED(3), // 已完成
- CANCELLED(4), // 已取消
- FAILED(5); // 失败
-
- private int value;
-
- TaskStatus(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/TaskType.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/TaskType.java
deleted file mode 100644
index becdcfe..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/TaskType.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down.cloudCreateOrder;
-
-/**
- * 任务类型枚举
- */
-public enum TaskType {
-
- TASK_TYPE_UNSPECIFIED(0), // 未指定（默认值）
- ROBOTAXI(1), // Robotaxi任务
- CLOUD_VALET(2), // 云代驾任务
- CRUISE(3); // 巡游任务
-
- private int value;
-
- TaskType(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/WaypointAction.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/WaypointAction.java
deleted file mode 100644
index 1b459a8..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/WaypointAction.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down.cloudCreateOrder;
-
-/**
- * 导航点动作类型
- */
-public enum WaypointAction {
-
- ACTION_UNSPECIFIED(0),
- PICK_UP(1), // 上车/接客
- DROP_OFF(2), // 下车/送客
- WAIT(3), // 等待
- CHARGE(4), // 充电
- PARK(5); // 停车
-
- private Integer value;
-
- WaypointAction(Integer value) {
- this.value = value;
- }
-
- public Integer getValue() {
- return value;
- }
-
- public void setValue(Integer value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/WaypointType.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/WaypointType.java
deleted file mode 100644
index 5f5b94b..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudCreateOrder/WaypointType.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down.cloudCreateOrder;
-
-/**
- * 导航点类型
- */
-public enum WaypointType {
-
- WAYPOINT_TYPE_UNSPECIFIED(0),
- START_POINT(1), // 起点
- WAY_POINT(2), // 途经点
- END_POINT(3); // 终点
-
- private int value;
-
- WaypointType(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/ActionType.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/ActionType.java
deleted file mode 100644
index a310b87..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/ActionType.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down.cloudOrderOperation;
-
-/**
- * 导航点动作类型
- */
-public enum ActionType {
-
- ACTION_UNSPECIFIED(0),
- PICK_UP(1), // 上车/接客
- DROP_OFF(2), // 下车/送客
- WAIT(3), // 等待
- CHARGE(4), // 充电
- PARK(5); // 停车
-
- private Integer value;
-
- ActionType(Integer value) {
- this.value = value;
- }
-
- public Integer getValue() {
- return value;
- }
-
- public void setValue(Integer value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/OrderOperation.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/OrderOperation.java
deleted file mode 100644
index ccce342..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/OrderOperation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down.cloudOrderOperation;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 订单操作信息消息
- */
-@Data
-public class OrderOperation {
- /**
- * 订单ID
- */
- private String order_id;
- /**
- * 任务ID
- */
- private String task_id;
- /**
- * 订单操作类型
- */
- private OrderOperationType operation_type;
- /**
- * 订单类型，新发订单才需要
- */
- private OrderType order_type;
- /**
- * 途径点列表，仅当operation_type为CLOUD_UPDATE_WAYPOINTS时有效
- * 每次需要全量更新
- */
- private List<Waypoint> waypoints;
- /**
- * 目标点，仅当operation_type为CLOUD_CHANGE_DESTINATION时有效
- */
- private TargetPoint target_point;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/OrderOperationType.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/OrderOperationType.java
deleted file mode 100644
index a45d4e4..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/OrderOperationType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down.cloudOrderOperation;
-
-/**
- * 订单操作类型枚举
- */
-public enum OrderOperationType {
-
- ORDER_OPERATION_UNSPECIFIED(0), // 未指定
- CLOUD_CREATE_ORDER(1), // 云端新增订单，XPU与座舱交互指令
- CLOUD_CANCEL_ORDER(2), // 云端取消订单
- VEHICLE_CANCEL_ORDER(3), // 车端取消订单
- CLOUD_PAUSE_ORDER(4), // 云端暂停订单
- VEHICLE_PAUSE_ORDER(5), // 车端暂停订单
- CLOUD_UPDATE_WAYPOINTS(6), // 云端更新途经点
- CLOUD_CHANGE_DESTINATION(7); // 云端更改终点
-
- private int value;
-
- OrderOperationType(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/OrderType.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/OrderType.java
deleted file mode 100644
index 8d747fd..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/OrderType.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down.cloudOrderOperation;
-
-/**
- * 订单类型枚举
- */
-public enum OrderType {
-
- UNSPECIFIED(0), // 未指定
- ROBOTAXI(1), // Robotaxi订单
- REMOTE_DRIVING(2); // 云代驾订单
-
- private int value;
-
- OrderType(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/PointType.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/PointType.java
deleted file mode 100644
index c7c0155..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/PointType.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down.cloudOrderOperation;
-
-/**
- * 导航点类型
- */
-public enum PointType {
-
- WAYPOINT_TYPE_UNSPECIFIED(0),
- START_POINT(1), // 起点
- WAY_POINT(2), // 途经点
- END_POINT(3); // 终点
-
- private int value;
-
- PointType(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/TargetPoint.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/TargetPoint.java
deleted file mode 100644
index 1dab048..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/TargetPoint.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down.cloudOrderOperation;
-
-import com.xiaopeng.api.vo.automaticPilot.proto.down.GeoPoint;
-import lombok.Data;
-
-/**
- * 目标点
- */
-@Data
-public class TargetPoint {
- /**
- * 经纬度
- */
- private GeoPoint point;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/Waypoint.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/Waypoint.java
deleted file mode 100644
index d8906fb..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudOrderOperation/Waypoint.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down.cloudOrderOperation;
-
-import com.xiaopeng.api.vo.automaticPilot.proto.down.GeoPoint;
-import lombok.Data;
-
-/**
- * 途经点信息
- */
-@Data
-public class Waypoint {
- /**
- * 途经点ID
- */
- private String waypoint_id;
- /**
- * 点类型
- */
- private PointType point_type;
- /**
- * 在该点执行的动作
- */
- private ActionType action_type;
- /**
- * 经纬度
- */
- private GeoPoint point;
- /**
- * 顺序序号（在路线中的位置）
- */
- private Integer sequence;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudPushNavigation/RestoreNavigationData.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudPushNavigation/RestoreNavigationData.java
deleted file mode 100644
index 37d3702..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/down/cloudPushNavigation/RestoreNavigationData.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.down.cloudPushNavigation;
-
-import lombok.Data;
-
-/**
- * 订单操作信息消息
- */
-@Data
-public class RestoreNavigationData {
- /**
- * 请求ID
- */
- private String request_id;
- /**
- * 导航路径ID
- */
- private String route_id;
- /**
- * 导航路径还原data信息
- */
- private String content;
- /**
- * 时间戳
- */
- private Long timestamp;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/ResponseMessage.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/ResponseMessage.java
deleted file mode 100644
index 78b00e8..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/ResponseMessage.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up;
-
-import lombok.Data;
-
-/**
- * 应答消息
- */
-@Data
-public class ResponseMessage {
- /**
- * 对应请求seq
- */
- private Long request_seq;
- /**
- * 响应码
- */
- private StatusCode code;
- /**
- * 时间戳(毫秒)
- */
- private Long timestamp;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/StatusCode.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/StatusCode.java
deleted file mode 100644
index 9b18095..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/StatusCode.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up;
-
-/**
- * HTTP状态码枚举
- */
-public enum StatusCode {
-
- HTTP_STATUS_CODE_UNSPECIFIED(0),
- OK(200), // 成功
- BAD_REQUEST(400), // 请求参数错误
- FORBIDDEN(403),
- NOT_FOUND(404),
- REQUEST_TIMEOUT(408), // 请求超时
- INTERNAL_SERVER_ERROR(500); // 失败
-
- private int value;
-
- StatusCode(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationDeviationEvent/NavigationDeviationMessage.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationDeviationEvent/NavigationDeviationMessage.java
deleted file mode 100644
index d0e33cc..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationDeviationEvent/NavigationDeviationMessage.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.navigationDeviationEvent;
-
-import lombok.Data;
-
-/**
- * 导航偏航消息
- */
-@Data
-public class NavigationDeviationMessage {
- /**
- * 任务ID
- */
- private String task_id;
- /**
- * 订单ID
- */
- private String order_id;
- /**
- * 当前位置经度
- */
- private Double longitude;
- /**
- * 当前位置纬度
- */
- private Double latitude;
- /**
- * 偏航原因
- */
- private String reason;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationDeviationEvent/ResponseMessage.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationDeviationEvent/ResponseMessage.java
deleted file mode 100644
index f3669f0..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationDeviationEvent/ResponseMessage.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.navigationDeviationEvent;
-
-import lombok.Data;
-
-/**
- * 应答消息
- */
-@Data
-public class ResponseMessage {
- /**
- * 对应请求seq
- */
- private Long request_seq;
- /**
- * 响应码
- */
- private StatusCode code;
- /**
- * 时间戳(毫秒)
- */
- private Long timestamp;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationDeviationEvent/RtEventType.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationDeviationEvent/RtEventType.java
deleted file mode 100644
index 6ffd211..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationDeviationEvent/RtEventType.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.navigationDeviationEvent;
-
-/**
- * RT事件类型枚举
- */
-public enum RtEventType {
-
- RT_EVENT_TYPE_UNSPECIFIED(0), // 未指定
- RT_EVENT_TYPE_REQUEST(1), // 请求
- RT_EVENT_TYPE_RESPONSE(2), // 应答
- RT_EVENT_TYPE_EVENT(3); // 事件
-
- private int value;
-
- RtEventType(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationDeviationEvent/StatusCode.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationDeviationEvent/StatusCode.java
deleted file mode 100644
index d722a0d..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationDeviationEvent/StatusCode.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.navigationDeviationEvent;
-
-/**
- * HTTP状态码枚举
- */
-public enum StatusCode {
-
- HTTP_STATUS_CODE_UNSPECIFIED(0),
- OK(200), // 成功
- BAD_REQUEST(400), // 请求参数错误
- FORBIDDEN(403),
- NOT_FOUND(404),
- REQUEST_TIMEOUT(408), // 请求超时
- INTERNAL_SERVER_ERROR(500); // 失败
-
- private int value;
-
- StatusCode(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/GeoPoint.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/GeoPoint.java
deleted file mode 100644
index e3c67e9..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/GeoPoint.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.navigationUpdateEvent;
-
-import lombok.Data;
-
-/**
- * 高德地图坐标点
- */
-@Data
-public class GeoPoint {
- /**
- * 经度
- */
- private Double longitude;
- /**
- * 纬度
- */
- private Double latitude;
- /**
- * 高德POI ID（可选）
- */
- private String poi_id;
- /**
- * 地址描述（可选）
- */
- private String address;
- /**
- * 地点名称（可选）
- */
- private String poi_name;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/NaviPosition.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/NaviPosition.java
deleted file mode 100644
index 5d40f7d..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/NaviPosition.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.navigationUpdateEvent;
-
-import lombok.Data;
-
-/**
- * 导航位置信息
- */
-@Data
-public class NaviPosition {
- /**
- * 当前路段索引
- */
- private Integer cur_seg_idx;
- /**
- * 当前Link索引
- */
- private Integer cur_link_idx;
- /**
- * 当前Link剩余距离，单位米
- */
- private Integer link_remain_dist;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/NaviProgressInfo.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/NaviProgressInfo.java
deleted file mode 100644
index 5bce484..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/NaviProgressInfo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.navigationUpdateEvent;
-
-import lombok.Data;
-
-/**
- * 导航进度信息
- */
-@Data
-public class NaviProgressInfo {
- /**
- * 导航ID
- */
- private Long navigation_id;
- /**
- * 剩余导航距离，单位米
- */
- private Double route_remain_dist;
- /**
- * 剩余导航时间
- */
- private Double route_remain_time;
- /**
- * 当前导航位置
- */
- private NaviPosition position;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/NaviStatus.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/NaviStatus.java
deleted file mode 100644
index 337da6e..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/NaviStatus.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.navigationUpdateEvent;
-
-/**
- * 导航状态
- */
-public enum NaviStatus {
-
- NAVI_STATUS_INVALID(0),
- NAVI_STATUS_START(1),
- NAVI_STATUS_FINISH(2);
-
- private int value;
-
- NaviStatus(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/NavigationInfo.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/NavigationInfo.java
deleted file mode 100644
index 1a090cc..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/NavigationInfo.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.navigationUpdateEvent;
-
-import lombok.Data;
-
-/**
- * 导航信息
- */
-@Data
-public class NavigationInfo {
- /**
- * 订单ID
- */
- private String order_id;
- /**
- * 任务ID
- */
- private String task_id;
- /**
- * 订单阶段
- */
- private OrderPhase order_phase;
- /**
- * 导航ID
- */
- private Long navigation_id;
- /**
- * 导航状态
- */
- private NaviStatus navigation_status;
- /**
- * 导航进度信息
- */
- private NaviProgressInfo navi_progress_info;
- /**
- * 时间戳（毫秒）
- */
- private Long timestamp;
-}
-
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/NavigationInfoUpdateEvent.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/NavigationInfoUpdateEvent.java
deleted file mode 100644
index 1ec15d9..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/NavigationInfoUpdateEvent.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.navigationUpdateEvent;
-
-
-import lombok.Data;
-
-/**
- * 导航信息更新事件
- */
-@Data
-public class NavigationInfoUpdateEvent {
- /**
- * 事件类型
- */
- private RtEventType event_type;
- /**
- * 导航信息
- */
- private NavigationInfo navigation_info;
- /**
- * 事件发生的点位
- */
- private Waypoint point;
- /**
- * 时间戳（毫秒）
- */
- private Long timestamp;
-}
-
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/OrderPhase.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/OrderPhase.java
deleted file mode 100644
index d434c34..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/OrderPhase.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.navigationUpdateEvent;
-
-/**
- * 订单阶段枚举
- */
-public enum OrderPhase {
-
- IDLE(0), // 订单的任务未开始执行
- ROUTE_TO_PICKUP(1), // 驶往上车点的行程
- ROUTE_TO_DESTINATION(2), // 驶往下车点的行程
- ROUTE_TO_CRUISE(3); // 巡游阶段路线
-
- private int value;
-
- OrderPhase(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
-
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/ResponseMessage.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/ResponseMessage.java
deleted file mode 100644
index c2aff0d..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/ResponseMessage.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.navigationUpdateEvent;
-
-import lombok.Data;
-
-/**
- * 应答消息
- */
-@Data
-public class ResponseMessage {
- /**
- * 对应请求seq
- */
- private Long request_seq;
- /**
- * 响应码
- */
- private StatusCode code;
- /**
- * 时间戳(毫秒)
- */
- private Long timestamp;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/RtEventType.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/RtEventType.java
deleted file mode 100644
index 26248c7..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/RtEventType.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.navigationUpdateEvent;
-
-/**
- * RT事件类型枚举
- */
-public enum RtEventType {
-
- RT_EVENT_TYPE_UNSPECIFIED(0), // 未指定
- RT_EVENT_TYPE_REQUEST(1), // 请求
- RT_EVENT_TYPE_RESPONSE(2), // 应答
- RT_EVENT_TYPE_EVENT(3); // 事件
-
- private int value;
-
- RtEventType(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/StatusCode.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/StatusCode.java
deleted file mode 100644
index b3ada9d..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/StatusCode.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.navigationUpdateEvent;
-
-/**
- * HTTP状态码枚举
- */
-public enum StatusCode {
-
- HTTP_STATUS_CODE_UNSPECIFIED(0),
- OK(200), // 成功
- BAD_REQUEST(400), // 请求参数错误
- FORBIDDEN(403),
- NOT_FOUND(404),
- REQUEST_TIMEOUT(408), // 请求超时
- INTERNAL_SERVER_ERROR(500); // 失败
-
- private int value;
-
- StatusCode(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/Waypoint.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/Waypoint.java
deleted file mode 100644
index 2194214..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/navigationUpdateEvent/Waypoint.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.navigationUpdateEvent;
-
-import lombok.Data;
-
-/**
- * 途经点信息
- */
-@Data
-public class Waypoint {
- /**
- * 途经点ID
- */
- private String waypoint_id;
- /**
- * 点类型
- */
- private Integer point_type;
- /**
- * 在该点执行的动作
- */
- private Integer action_type;
- /**
- * 经纬度
- */
- private GeoPoint point;
- /**
- * 顺序序号（在路线中的位置）
- */
- private Integer sequence;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/GeoPoint.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/GeoPoint.java
deleted file mode 100644
index 03eac0c..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/GeoPoint.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.orderStateUpdateEvent;
-
-import lombok.Data;
-
-/**
- * 高德地图坐标点
- */
-@Data
-public class GeoPoint {
- /**
- * 经度
- */
- private Double longitude;
- /**
- * 纬度
- */
- private Double latitude;
- /**
- * 高德POI ID（可选）
- */
- private String poi_id;
- /**
- * 地址描述（可选）
- */
- private String address;
- /**
- * 地点名称（可选）
- */
- private String poi_name;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/OrderPhase.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/OrderPhase.java
deleted file mode 100644
index 0d28a39..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/OrderPhase.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.orderStateUpdateEvent;
-
-/**
- * 订单阶段枚举
- */
-public enum OrderPhase {
-
- IDLE(0), // 订单的任务未开始执行
- ROUTE_TO_PICKUP(1), // 驶往上车点的行程
- ROUTE_TO_DESTINATION(2), // 驶往下车点的行程
- ROUTE_TO_CRUISE(3); // 巡游阶段路线
-
- private int value;
-
- OrderPhase(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
-
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/OrderStateChangeSource.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/OrderStateChangeSource.java
deleted file mode 100644
index 4eb6698..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/OrderStateChangeSource.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.orderStateUpdateEvent;
-
-/**
- * 订单状态变化来源
- */
-public enum OrderStateChangeSource {
-
- ORDER_STATE_CHANGE_SOURCE_UNSPECIFIED(0), // 未指定
- ORDER_STATE_CHANGE_SOURCE_CLOUD(1), // 云端系统
- ORDER_STATE_CHANGE_SOURCE_VEHICLE(2); // 车端
-
- private int value;
-
- OrderStateChangeSource(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/OrderStatus.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/OrderStatus.java
deleted file mode 100644
index 98f6f08..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/OrderStatus.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.orderStateUpdateEvent;
-
-/**
- * 订单状态枚举
- */
-public enum OrderStatus {
-
- ORDER_STATUS_UNSPECIFIED(0), // 未指定
- ORDER_RECEIVED(1), // 收到订单
- ORDER_STARTED(2), // 开始执行订单
- ORDER_EN_ROUTE_TO_PICKUP(3), // 前往上车点
- ORDER_ARRIVED_AT_PICKUP(4), // 到达上车点
- ORDER_WAITING_FOR_PICKUP(5), // 等待乘客上车
- ORDER_PASSENGER_ONBOARD(6), // 乘客已上车
- ORDER_EN_ROUTE_TO_DESTINATION(7), // 前往目的地
- ORDER_ARRIVED_AT_DESTINATION(8), // 到达目的地
- ORDER_WAITING_FOR_DROPOFF(9), // 等待乘客下车
- ORDER_DROPOFF_COMPLETED(10), // 下车完成
- ORDER_COMPLETED(11), // 已完成
- ORDER_CANCELLED(12), // 已取消
- ORDER_ARRIVED_AT_CRUISE_DESTINATION(13), // 到达巡游终点
- ORDER_PAUSED(14); // 订单暂停
-
- private int value;
-
- OrderStatus(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/OrderStatusInfo.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/OrderStatusInfo.java
deleted file mode 100644
index b1ce69b..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/OrderStatusInfo.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.orderStateUpdateEvent;
-
-import lombok.Data;
-
-/**
- * 订单状态信息
- */
-@Data
-public class OrderStatusInfo {
- /**
- * 订单ID
- */
- private String order_id;
- /**
- * 关联任务ID
- */
- private String task_id;
- /**
- * 订单当前状态
- */
- private OrderStatus status;
- /**
- * 订单阶段
- */
- private OrderPhase order_phase;
- /**
- * 状态变化来源
- */
- private OrderStateChangeSource change_source;
- /**
- * 车端操作填写车端登录用户ID
- */
- private String operator_id;
- /**
- * RT行程信息
- */
- private RtTripInfo trip_info;
- /**
- * 状态更新时间戳（毫秒）
- */
- private Long timestamp;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/OrderStatusInfoEvent.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/OrderStatusInfoEvent.java
deleted file mode 100644
index 3ea0ae5..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/OrderStatusInfoEvent.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.orderStateUpdateEvent;
-
-import lombok.Data;
-
-/**
- * 更新订单状态信息消息
- */
-@Data
-public class OrderStatusInfoEvent {
- /**
- * 事件类型
- */
- private RtEventType event_type;
- /**
- * 订单状态信息
- */
- private OrderStatusInfo order_status_info;
- /**
- * 事件发生的点位
- */
- private Waypoint point;
- /**
- * RT行程信息事件
- */
- private RtTripInfoEvent trip_info_event;
- /**
- * 状态更新时间戳（毫秒）
- */
- private Long timestamp;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/ResponseMessage.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/ResponseMessage.java
deleted file mode 100644
index 61748b8..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/ResponseMessage.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.orderStateUpdateEvent;
-
-import lombok.Data;
-
-/**
- * 应答消息
- */
-@Data
-public class ResponseMessage {
- /**
- * 对应请求seq
- */
- private Long request_seq;
- /**
- * 响应码
- */
- private StatusCode code;
- /**
- * 时间戳(毫秒)
- */
- private Long timestamp;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/RtEventType.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/RtEventType.java
deleted file mode 100644
index cf7e885..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/RtEventType.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.orderStateUpdateEvent;
-
-/**
- * RT事件类型枚举
- */
-public enum RtEventType {
-
- RT_EVENT_TYPE_UNSPECIFIED(0), // 未指定
- RT_EVENT_TYPE_REQUEST(1), // 请求
- RT_EVENT_TYPE_RESPONSE(2), // 应答
- RT_EVENT_TYPE_EVENT(3); // 事件
-
- private int value;
-
- RtEventType(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/RtTripInfo.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/RtTripInfo.java
deleted file mode 100644
index c80a794..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/RtTripInfo.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.orderStateUpdateEvent;
-
-import lombok.Data;
-
-/**
- * RT行程信息
- */
-@Data
-public class RtTripInfo {
- /**
- * 任务ID
- */
- private String task_id;
- /**
- * 订单ID
- */
- private String order_id;
- /**
- * 行程总距离（米）
- */
- private Double total_distance;
- /**
- * 行程总时间（秒）
- */
- private Integer total_duration;
- /**
- * 剩余距离（米）
- */
- private Double remaining_distance;
- /**
- * 剩余时间（秒）
- */
- private Integer remaining_time;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/RtTripInfoEvent.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/RtTripInfoEvent.java
deleted file mode 100644
index 0bbc42c..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/RtTripInfoEvent.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.orderStateUpdateEvent;
-
-import lombok.Data;
-
-/**
- * RT行程信息事件
- */
-@Data
-public class RtTripInfoEvent {
- /**
- * 任务ID
- */
- private String task_id;
- /**
- * 订单ID
- */
- private String order_id;
- /**
- * 行程距离（米）
- */
- private Double distance;
- /**
- * 预计剩余时间（秒）
- */
- private Integer estimated_time_remaining;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/StatusCode.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/StatusCode.java
deleted file mode 100644
index 6a4bdb8..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/StatusCode.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.orderStateUpdateEvent;
-
-/**
- * HTTP状态码枚举
- */
-public enum StatusCode {
-
- HTTP_STATUS_CODE_UNSPECIFIED(0),
- OK(200), // 成功
- BAD_REQUEST(400), // 请求参数错误
- FORBIDDEN(403),
- NOT_FOUND(404),
- REQUEST_TIMEOUT(408), // 请求超时
- INTERNAL_SERVER_ERROR(500); // 失败
-
- private int value;
-
- StatusCode(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/Waypoint.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/Waypoint.java
deleted file mode 100644
index a5c1561..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/orderStateUpdateEvent/Waypoint.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.orderStateUpdateEvent;
-
-import lombok.Data;
-
-/**
- * 途经点信息
- */
-@Data
-public class Waypoint {
- /**
- * 途经点ID
- */
- private String waypoint_id;
- /**
- * 点类型
- */
- private Integer point_type;
- /**
- * 在该点执行的动作
- */
- private Integer action_type;
- /**
- * 经纬度
- */
- private GeoPoint point;
- /**
- * 顺序序号（在路线中的位置）
- */
- private Integer sequence;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/NaviPosition.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/NaviPosition.java
deleted file mode 100644
index af3ab81..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/NaviPosition.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.systemStatusXpu;
-
-import lombok.Data;
-
-/**
- * 导航位置信息
- */
-@Data
-public class NaviPosition {
- /**
- * 当前路段索引
- */
- private Integer cur_seg_idx;
- /**
- * 当前Link索引
- */
- private Integer cur_link_idx;
- /**
- * 当前Link剩余距离，单位米
- */
- private Integer link_remain_dist;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/NaviProgressInfo.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/NaviProgressInfo.java
deleted file mode 100644
index 658fef2..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/NaviProgressInfo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.systemStatusXpu;
-
-import lombok.Data;
-
-/**
- * 导航进度信息
- */
-@Data
-public class NaviProgressInfo {
- /**
- * 导航ID
- */
- private Long navigation_id;
- /**
- * 剩余导航距离，单位米
- */
- private Double route_remain_dist;
- /**
- * 剩余导航时间
- */
- private Double route_remain_time;
- /**
- * 当前导航位置
- */
- private NaviPosition position;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/NaviStatus.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/NaviStatus.java
deleted file mode 100644
index 1b2e340..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/NaviStatus.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.systemStatusXpu;
-
-/**
- * 导航状态
- */
-public enum NaviStatus {
-
- NAVI_STATUS_INVALID(0),
- NAVI_STATUS_START(1),
- NAVI_STATUS_FINISH(2);
-
- private int value;
-
- NaviStatus(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/NavigationInfo.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/NavigationInfo.java
deleted file mode 100644
index b30eec5..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/NavigationInfo.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.systemStatusXpu;
-
-import lombok.Data;
-
-/**
- * 导航信息
- */
-@Data
-public class NavigationInfo {
- /**
- * 订单ID
- */
- private String order_id;
- /**
- * 任务ID
- */
- private String task_id;
- /**
- * 订单阶段
- */
- private OrderPhase order_phase;
- /**
- * 导航ID
- */
- private Long navigation_id;
- /**
- * 导航状态
- */
- private NaviStatus navigation_status;
- /**
- * 导航进度信息
- */
- private NaviProgressInfo navi_progress_info;
- /**
- * 时间戳（毫秒）
- */
- private Long timestamp;
-}
-
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/OrderPhase.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/OrderPhase.java
deleted file mode 100644
index fbb0aab..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/OrderPhase.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.systemStatusXpu;
-
-/**
- * 订单阶段枚举
- */
-public enum OrderPhase {
-
- IDLE(0), // 订单的任务未开始执行
- ROUTE_TO_PICKUP(1), // 驶往上车点的行程
- ROUTE_TO_DESTINATION(2), // 驶往下车点的行程
- ROUTE_TO_CRUISE(3); // 巡游阶段路线
-
- private int value;
-
- OrderPhase(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
-
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/OrderStateChangeSource.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/OrderStateChangeSource.java
deleted file mode 100644
index 70406ab..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/OrderStateChangeSource.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.systemStatusXpu;
-
-/**
- * 订单状态变化来源
- */
-public enum OrderStateChangeSource {
-
- ORDER_STATE_CHANGE_SOURCE_UNSPECIFIED(0), // 未指定
- ORDER_STATE_CHANGE_SOURCE_CLOUD(1), // 云端系统
- ORDER_STATE_CHANGE_SOURCE_VEHICLE(2); // 车端
-
- private int value;
-
- OrderStateChangeSource(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/OrderStatus.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/OrderStatus.java
deleted file mode 100644
index 5d70e10..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/OrderStatus.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.systemStatusXpu;
-
-/**
- * 订单状态枚举
- */
-public enum OrderStatus {
-
- ORDER_STATUS_UNSPECIFIED(0), // 未指定
- ORDER_RECEIVED(1), // 收到订单
- ORDER_STARTED(2), // 开始执行订单
- ORDER_EN_ROUTE_TO_PICKUP(3), // 前往上车点
- ORDER_ARRIVED_AT_PICKUP(4), // 到达上车点
- ORDER_WAITING_FOR_PICKUP(5), // 等待乘客上车
- ORDER_PASSENGER_ONBOARD(6), // 乘客已上车
- ORDER_EN_ROUTE_TO_DESTINATION(7), // 前往目的地
- ORDER_ARRIVED_AT_DESTINATION(8), // 到达目的地
- ORDER_WAITING_FOR_DROPOFF(9), // 等待乘客下车
- ORDER_DROPOFF_COMPLETED(10), // 下车完成
- ORDER_COMPLETED(11), // 已完成
- ORDER_CANCELLED(12), // 已取消
- ORDER_ARRIVED_AT_CRUISE_DESTINATION(13), // 到达巡游终点
- ORDER_PAUSED(14); // 订单暂停
-
- private int value;
-
- OrderStatus(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/OrderStatusInfo.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/OrderStatusInfo.java
deleted file mode 100644
index 4d36746..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/OrderStatusInfo.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.systemStatusXpu;
-
-import lombok.Data;
-
-/**
- * 订单状态信息
- */
-@Data
-public class OrderStatusInfo {
- /**
- * 订单ID
- */
- private String order_id;
- /**
- * 关联任务ID
- */
- private String task_id;
- /**
- * 订单当前状态
- */
- private OrderStatus status;
- /**
- * 订单阶段
- */
- private OrderPhase order_phase;
- /**
- * 状态变化来源
- */
- private OrderStateChangeSource change_source;
- /**
- * 车端操作填写车端登录用户ID
- */
- private String operator_id;
- /**
- * RT行程信息
- */
- private RtTripInfo trip_info;
- /**
- * 状态更新时间戳（毫秒）
- */
- private Long timestamp;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/RealtimePose.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/RealtimePose.java
deleted file mode 100644
index 3c03b08..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/RealtimePose.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.systemStatusXpu;
-
-import lombok.Data;
-
-/**
- * 实时位姿
- */
-@Data
-public class RealtimePose {
- /**
- * 时间戳(毫秒)
- */
- private Long timestamp;
- /**
- * 高德导航pose,WGS加偏之后的GCJ-02
- */
- private Wgs navi_pose;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/ResponseMessage.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/ResponseMessage.java
deleted file mode 100644
index 9dc2855..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/ResponseMessage.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.systemStatusXpu;
-
-import lombok.Data;
-
-/**
- * 应答消息
- */
-@Data
-public class ResponseMessage {
- /**
- * 对应请求seq
- */
- private Long request_seq;
- /**
- * 响应码
- */
- private StatusCode code;
- /**
- * 时间戳(毫秒)
- */
- private Long timestamp;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/RtTripInfo.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/RtTripInfo.java
deleted file mode 100644
index c3fdb4a..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/RtTripInfo.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.systemStatusXpu;
-
-import lombok.Data;
-
-/**
- * RT行程信息
- */
-@Data
-public class RtTripInfo {
- /**
- * 任务ID
- */
- private String task_id;
- /**
- * 订单ID
- */
- private String order_id;
- /**
- * 行程总距离（米）
- */
- private Double total_distance;
- /**
- * 行程总时间（秒）
- */
- private Integer total_duration;
- /**
- * 剩余距离（米）
- */
- private Double remaining_distance;
- /**
- * 剩余时间（秒）
- */
- private Integer remaining_time;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/StatusCode.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/StatusCode.java
deleted file mode 100644
index 0bedae1..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/StatusCode.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.systemStatusXpu;
-
-/**
- * HTTP状态码枚举
- */
-public enum StatusCode {
-
- HTTP_STATUS_CODE_UNSPECIFIED(0),
- OK(200), // 成功
- BAD_REQUEST(400), // 请求参数错误
- FORBIDDEN(403),
- NOT_FOUND(404),
- REQUEST_TIMEOUT(408), // 请求超时
- INTERNAL_SERVER_ERROR(500); // 失败
-
- private int value;
-
- StatusCode(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/Wgs.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/Wgs.java
deleted file mode 100644
index b94c0e4..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/systemStatusXpu/Wgs.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.systemStatusXpu;
-
-import lombok.Data;
-
-/**
- * WGS坐标
- */
-@Data
-public class Wgs {
- /**
- * 经度
- */
- private Double longitude;
- /**
- * 纬度
- */
- private Double latitude;
- /**
- * 航向，单位：度，北零顺时针。范围：[0-360)。0 => 北, 90 => 东, 180 => 南, 270 => 西
- */
- private Double course;
- /**
- * 位置精度
- */
- private Double pos_acc;
- /**
- * 海拔 单位米
- */
- private Float alt;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/xpuNavigationRequest/GeoPoint.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/xpuNavigationRequest/GeoPoint.java
deleted file mode 100644
index e4e78cf..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/xpuNavigationRequest/GeoPoint.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.xpuNavigationRequest;
-
-import lombok.Data;
-
-/**
- * 高德地图坐标点
- */
-@Data
-public class GeoPoint {
- /**
- * 经度
- */
- private Double longitude;
- /**
- * 纬度
- */
- private Double latitude;
- /**
- * 高德POI ID（可选）
- */
- private String poi_id;
- /**
- * 地址描述（可选）
- */
- private String address;
- /**
- * 地点名称（可选）
- */
- private String poi_name;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/xpuNavigationRequest/OrderPhase.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/xpuNavigationRequest/OrderPhase.java
deleted file mode 100644
index d7b31dd..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/xpuNavigationRequest/OrderPhase.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.xpuNavigationRequest;
-
-/**
- * 订单阶段枚举
- */
-public enum OrderPhase {
-
- IDLE(0), // 订单的任务未开始执行
- ROUTE_TO_PICKUP(1), // 驶往上车点的行程
- ROUTE_TO_DESTINATION(2), // 驶往下车点的行程
- ROUTE_TO_CRUISE(3); // 巡游阶段路线
-
- private int value;
-
- OrderPhase(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
-
- public void setValue(int value) {
- this.value = value;
- }
-}
-
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/xpuNavigationRequest/RealtimePose.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/xpuNavigationRequest/RealtimePose.java
deleted file mode 100644
index cfe5c64..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/xpuNavigationRequest/RealtimePose.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.xpuNavigationRequest;
-
-import lombok.Data;
-
-/**
- * 实时位姿
- */
-@Data
-public class RealtimePose {
- /**
- * 时间戳(毫秒)
- */
- private Long timestamp;
- /**
- * 高德导航pose,WGS加偏之后的GCJ-02
- */
- private Wgs navi_pose;
-}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/xpuNavigationRequest/Wgs.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/xpuNavigationRequest/Wgs.java
deleted file mode 100644
index f2c422c..0000000
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/automaticPilot/proto/up/xpuNavigationRequest/Wgs.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.xiaopeng.api.vo.automaticPilot.proto.up.xpuNavigationRequest;
-
-import lombok.Data;
-
-/**
- * WGS坐标
- */
-@Data
-public class Wgs {
- /**
- * 经度
- */
- private Double longitude;
- /**
- * 纬度
- */
- private Double latitude;
- /**
- * 航向，单位：度，北零顺时针。范围：[0-360)。0 => 北, 90 => 东, 180 => 南, 270 => 西
- */
- private Double course;
- /**
- * 位置精度
- */
- private Double pos_acc;
- /**
- * 海拔 单位米
- */
- private Float alt;
-}
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 921938f..6e12f34 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
@@ -19,9 +19,6 @@
import com.xiaopeng.api.model.order.XpOrder;import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
import com.xiaopeng.api.vo.SystemEventType;
import com.xiaopeng.api.vo.automaticPilot.VehiclePosition;
-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.protobuf.*;
import com.xiaopeng.api.vo.operation.RouteVo;
import com.xiaopeng.api.vo.order.OrderTrajectoryVo;
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java
index 63df5cd..1672a4f 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpClockInServiceImpl.java
@@ -226,23 +226,35 @@
@Override
public PageInfo<ClockInStatisticsDto> getClockInStatistics(ClockInStatisticsVo query) {
PageInfo<ClockInStatisticsDto> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- List<Long> appUserIds = new ArrayList<>();
+ List<Long> appUserIds1 = new ArrayList<>();
+ List<Long> appUserIds2 = new ArrayList<>();
+ List<Long> appUserIds3 = new ArrayList<>();
//处理查询条件
if(StringUtils.isNotEmpty(query.getName())){
R<List<XpOperationsUser>> listR = xpOperationUserClient.listByName(query.getName());
if(listR.getCode() == Constants.SUCCESS){
List<Long> collect = listR.getData().stream().map(XpOperationsUser::getId).collect(Collectors.toList());
- appUserIds.addAll(collect);
+ appUserIds1.addAll(collect);
}
- appUserIds.add(0L);
+ appUserIds1.add(0L);
}
if(null != query.getRoleId()){
R<List<XpOperationsRole>> roleByRoleId = xpOperationUserClient.getXpOperationsRoleByRoleId(query.getRoleId());
if(roleByRoleId.getCode() == Constants.SUCCESS){
List<Long> collect = roleByRoleId.getData().stream().map(XpOperationsRole::getOperationsUserId).collect(Collectors.toList());
- appUserIds.addAll(collect);
+ appUserIds2.addAll(collect);
}
- appUserIds.add(0L);
+ appUserIds2.add(0L);
+ }
+ if(StringUtils.isNotEmpty(query.getName()) && null != query.getRoleId()){
+ for (Long l : appUserIds1) {
+ if(appUserIds2.contains(l)){
+ appUserIds3.add(l);
+ }
+ }
+ }else{
+ appUserIds3.addAll(appUserIds1);
+ appUserIds3.addAll(appUserIds2);
}
String startTime = "";
@@ -253,7 +265,7 @@
endTime = statisticDate.split(" - ")[1].split(" ")[0];
}
//查询数据
- List<ClockInStatisticsDto> clockInStatistics = this.baseMapper.getClockInStatistics(pageInfo, appUserIds, startTime, endTime);
+ List<ClockInStatisticsDto> clockInStatistics = this.baseMapper.getClockInStatistics(pageInfo, appUserIds3, startTime, endTime);
List<String> appUserIdList = clockInStatistics.stream().map(ClockInStatisticsDto::getAppUserId).collect(Collectors.toList());
List<Long> ids = appUserIdList.stream().map(Long::parseLong).collect(Collectors.toList());
List<XpOperationsUserWithRoleVO> data = xpOperationUserClient.listByIdsWithRole(ids).getData();
@@ -272,7 +284,8 @@
}
Integer shouldClockInDays = clockInStatistic.getShouldClockInDays();
Integer clockInDays = clockInStatistic.getClockInDays();
- clockInStatistic.setNotClockInDays(shouldClockInDays - clockInDays);
+ Integer lateEarly = clockInStatistic.getLateEarly();
+ clockInStatistic.setNotClockInDays(shouldClockInDays - clockInDays - lateEarly);
}
pageInfo.setRecords(clockInStatistics);
return pageInfo;
@@ -287,23 +300,35 @@
@Override
public void exportClockInStatistics(ClockInStatisticsVo query, HttpServletResponse response) {
PageInfo<ClockInStatisticsDto> pageInfo = new PageInfo<>(0, 10000);
- List<Long> appUserIds = new ArrayList<>();
+ List<Long> appUserIds1 = new ArrayList<>();
+ List<Long> appUserIds2 = new ArrayList<>();
+ List<Long> appUserIds3 = new ArrayList<>();
//处理查询条件
if(StringUtils.isNotEmpty(query.getName())){
R<List<XpOperationsUser>> listR = xpOperationUserClient.listByName(query.getName());
if(listR.getCode() == Constants.SUCCESS){
List<Long> collect = listR.getData().stream().map(XpOperationsUser::getId).collect(Collectors.toList());
- appUserIds.addAll(collect);
+ appUserIds1.addAll(collect);
}
- appUserIds.add(0L);
+ appUserIds1.add(0L);
}
if(null != query.getRoleId()){
R<List<XpOperationsRole>> roleByRoleId = xpOperationUserClient.getXpOperationsRoleByRoleId(query.getRoleId());
if(roleByRoleId.getCode() == Constants.SUCCESS){
List<Long> collect = roleByRoleId.getData().stream().map(XpOperationsRole::getOperationsUserId).collect(Collectors.toList());
- appUserIds.addAll(collect);
+ appUserIds2.addAll(collect);
}
- appUserIds.add(0L);
+ appUserIds2.add(0L);
+ }
+ if(StringUtils.isNotEmpty(query.getName()) && null != query.getRoleId()){
+ for (Long l : appUserIds1) {
+ if(appUserIds2.contains(l)){
+ appUserIds3.add(l);
+ }
+ }
+ }else{
+ appUserIds3.addAll(appUserIds1);
+ appUserIds3.addAll(appUserIds2);
}
String startTime = "";
String endTime = "";
@@ -313,7 +338,7 @@
endTime = statisticDate.split(" - ")[1].split(" ")[0];
}
//查询数据
- List<ClockInStatisticsDto> clockInStatistics = this.baseMapper.getClockInStatistics(pageInfo, appUserIds, startTime, endTime);
+ List<ClockInStatisticsDto> clockInStatistics = this.baseMapper.getClockInStatistics(pageInfo, appUserIds3, startTime, endTime);
List<String> appUserIdList = clockInStatistics.stream().map(ClockInStatisticsDto::getAppUserId).collect(Collectors.toList());
List<Long> ids = appUserIdList.stream().map(Long::parseLong).collect(Collectors.toList());
List<XpOperationsUserWithRoleVO> data = xpOperationUserClient.listByIdsWithRole(ids).getData();
@@ -331,7 +356,8 @@
}
Integer shouldClockInDays = clockInStatistic.getShouldClockInDays();
Integer clockInDays = clockInStatistic.getClockInDays();
- clockInStatistic.setNotClockInDays(shouldClockInDays - clockInDays);
+ Integer lateEarly = clockInStatistic.getLateEarly();
+ clockInStatistic.setNotClockInDays(shouldClockInDays - clockInDays - lateEarly);
}
ExcelUtil<ClockInStatisticsDto> excel = new ExcelUtil<ClockInStatisticsDto>(ClockInStatisticsDto.class);
diff --git a/xp-robotaxi-map-boot/pom.xml b/xp-robotaxi-map-boot/pom.xml
index 24ebdc9..765db80 100644
--- a/xp-robotaxi-map-boot/pom.xml
+++ b/xp-robotaxi-map-boot/pom.xml
@@ -237,6 +237,11 @@
<artifactId>aliyun-sdk-oss</artifactId>
<version>3.18.5</version>
</dependency>
+ <dependency>
+ <groupId>org.locationtech.jts</groupId>
+ <artifactId>jts-core</artifactId>
+ <version>1.19.0</version> <!-- 请使用最新版本 -->
+ </dependency>
</dependencies>
<build>
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceServiceImpl.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceServiceImpl.java
index 5f49af6..b25bab7 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceServiceImpl.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceServiceImpl.java
@@ -31,6 +31,10 @@
import com.xiaopeng.map.utils.PolygonOverlapService;
import lombok.extern.slf4j.Slf4j;
import net.sourceforge.pinyin4j.PinyinHelper;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.LinearRing;
+import org.locationtech.jts.geom.Polygon;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.geo.Point;
import org.springframework.data.mongodb.core.MongoTemplate;
@@ -40,6 +44,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.awt.geom.Point2D;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -166,7 +171,13 @@
//根据经纬度获取当前城市code
XpElectronicFenceArea xpElectronicFenceArea = dto.getElectronicFenceAreas().get(0);
String[] split = xpElectronicFenceArea.getFencePoints().split(",")[0].split("_");
- Map<String, String> geocode = gdMapGeocodingUtil.geocode(split[0], split[1]);
+ Coordinate[] coordinates = new Coordinate[split.length];
+ for (int i = 0; i < split.length; i++) {
+ String[] split1 = split[i].split("_");
+ coordinates[i] = new Coordinate(Double.parseDouble(split1[0]), Double.parseDouble(split1[1]));
+ }
+ org.locationtech.jts.geom.Point point = calculateCentroid(coordinates);
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(point.getX() + "", point.getY() + "");
if(null == geocode){
return R.fail("经纬度转换城市code失败");
}
@@ -383,7 +394,13 @@
//根据经纬度获取当前城市code
XpElectronicFenceArea electronicFenceArea = dto.getElectronicFenceAreas().get(0);
String[] split = electronicFenceArea.getFencePoints().split(",")[0].split("_");
- Map<String, String> geocode = gdMapGeocodingUtil.geocode(split[0], split[1]);
+ Coordinate[] coordinates = new Coordinate[split.length];
+ for (int i = 0; i < split.length; i++) {
+ String[] split1 = split[i].split("_");
+ coordinates[i] = new Coordinate(Double.parseDouble(split1[0]), Double.parseDouble(split1[1]));
+ }
+ org.locationtech.jts.geom.Point point = calculateCentroid(coordinates);
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(point.getX() + "", point.getY() + "");
if(null == geocode){
return R.fail("经纬度转换城市code失败");
}
@@ -696,4 +713,22 @@
}
+ /**
+ * 计算围栏中心点
+ * @param coordinates
+ * @return
+ */
+ private org.locationtech.jts.geom.Point calculateCentroid(Coordinate[] coordinates) {
+ GeometryFactory factory = new GeometryFactory();
+ // 创建线性环 (LinearRing)
+ LinearRing ring = factory.createLinearRing(coordinates);
+ // 创建多边形 (Polygon)
+ Polygon polygon = factory.createPolygon(ring);
+ // 计算质心 (Centroid)
+ org.locationtech.jts.geom.Point centroid = polygon.getCentroid();
+
+ System.out.println("中心点经度: " + centroid.getX());
+ System.out.println("中心点纬度: " + centroid.getY());
+ return centroid;
+ }
}
--
Gitblit v1.7.1