From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/vehicleConvoy/XpVehicleClient.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/vehicleConvoy/XpVehicleClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/vehicleConvoy/XpVehicleClient.java
index fcc42a6..2ec3aaf 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/vehicleConvoy/XpVehicleClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/vehicleConvoy/XpVehicleClient.java
@@ -1,16 +1,15 @@
package com.xiaopeng.api.feignClient.vehicleConvoy;
import com.xiaopeng.api.dto.operation.VehiclePositionByVinDto;
+import com.xiaopeng.api.dto.vehicleConvoy.ServiceVehicleListDto;
import com.xiaopeng.api.dto.vehicleConvoy.UpdateVehicleStateDto;
import com.xiaopeng.api.factory.vehicleConvoy.XpVehicleClientFallbackFactory;
import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
+import com.xiaopeng.api.vo.vehicleConvoy.VehicleDoorStatusVo;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.dto.ServiceNameConstantsEnum;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -46,7 +45,7 @@
* @return 车辆
*/
@GetMapping("/logan/inner/vehicle/queryById")
- R<XpVehicle> queryById(@RequestParam Long id);
+ R<XpVehicle> queryById(@RequestParam("id") Long id);
/**
* 修改车辆信息
*
@@ -134,4 +133,33 @@
@PostMapping("/logan/inner/vi/vehicle/getVehicleTrunkOpenStatus")
R<Boolean> getVehicleTrunkOpenStatus(@RequestParam("uid") Long uid, @RequestParam("id") Long id);
+
+ /**
+ * 分页获取运营车辆列表
+ * @param dto
+ * @return
+ */
+ @PostMapping("/logan/inner/vehicle/getServiceVehicleList")
+ R<List<XpVehicle>> getServiceVehicleList(@RequestBody ServiceVehicleListDto dto);
+
+
+
+ /**
+ * 根据订单id查询四门三盖状态
+ * @param orderId
+ * @return
+ */
+ @GetMapping("/logan/inner/vehicle/getVehicleDoorStatus/{orderId}")
+ R<VehicleDoorStatusVo> getVehicleDoorStatus(@PathVariable Long orderId);
+
+
+ /**
+ * 根据车牌号查询数据
+ * @param plateNumber
+ * @param officialPartnerId
+ * @return
+ */
+ @PostMapping("/logan/inner/vehicle/getVehicleByPlateNumber")
+ R<XpVehicle> getVehicleByPlateNumber(@RequestParam("plateNumber") String plateNumber,
+ @RequestParam("officialPartnerId") Integer officialPartnerId);
}
--
Gitblit v1.7.1