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 | 68 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 17 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 658a47e..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;
@@ -30,14 +29,14 @@
* @param ids 车辆ID列表
* @return 车辆列表
*/
- @PostMapping("/inner/vehicle/listByIds")
+ @PostMapping("/logan/inner/vehicle/listByIds")
R<List<XpVehicle>> listByIds(@RequestBody List<Long> ids);
/**
* 查询车辆列表
*
* @return 车辆列表
*/
- @PostMapping("/inner/vehicle/listVehicle")
+ @PostMapping("/logan/inner/vehicle/listVehicle")
R<List<XpVehicle>> listVehicle();
/**
* 根据ID查询车辆信息
@@ -45,15 +44,15 @@
* @param id 车辆ID
* @return 车辆
*/
- @GetMapping("/inner/vehicle/queryById")
- R<XpVehicle> queryById(@RequestParam Long id);
+ @GetMapping("/logan/inner/vehicle/queryById")
+ R<XpVehicle> queryById(@RequestParam("id") Long id);
/**
* 修改车辆信息
*
* @param xpVehicle 车辆信息
* @return 车辆
*/
- @PostMapping("/inner/vehicle/updateVehicleById")
+ @PostMapping("/logan/inner/vehicle/updateVehicleById")
R<String> updateVehicleById(@RequestBody XpVehicle xpVehicle);
/**
@@ -61,7 +60,7 @@
* @param plateNumber
* @return
*/
- @PostMapping("/inner/vehicle/listByPlateNumber")
+ @PostMapping("/logan/inner/vehicle/listByPlateNumber")
R<List<XpVehicle>> listByPlateNumber(@RequestParam("plateNumber") String plateNumber);
@@ -69,14 +68,20 @@
* 根据围栏id查询空闲车辆
*
*/
- @GetMapping("/inner/vehicle/listByFenceId")
+ @GetMapping("/logan/inner/vehicle/listByFenceId")
R<List<XpVehicle>> listByFenceId(@RequestParam("fenceId") Long fenceId);
+
+ /**
+ * 根据围栏id查询所有绑定车辆（不过滤状态）
+ */
+ @GetMapping("/logan/inner/vehicle/listAllByFenceId")
+ R<List<XpVehicle>> listAllByFenceId(@RequestParam("fenceId") Long fenceId);
/**
* 查询车辆信息 进行筛选
*/
- @PostMapping("/inner/vehicle/queryVehiclePositionByVin")
+ @PostMapping("/logan/inner/vehicle/queryVehiclePositionByVin")
R<List<String>> queryVehiclePositionByVin(@RequestBody VehiclePositionByVinDto dto);
/**
@@ -85,7 +90,7 @@
* @param vehicleVin
* @return
*/
- @GetMapping("/inner/vehicle/findByVehicleVin")
+ @GetMapping("/logan/inner/vehicle/findByVehicleVin")
R<XpVehicle> findByVehicleVin(@RequestParam("vehicleVin") String vehicleVin);
@@ -97,7 +102,7 @@
* @param xpuid
* @return
*/
- @GetMapping("/inner/vehicle/findByVehicleXpuId")
+ @GetMapping("/logan/inner/vehicle/findByVehicleXpuId")
R<XpVehicle> findByVehicleXpuId(@RequestParam("xpuid") String xpuid);
/**
@@ -106,7 +111,7 @@
* @param updateVehicleStateDto
* @return
*/
- @PostMapping("/inner/vehicle/updateVehicleStatus")
+ @PostMapping("/logan/inner/vehicle/updateVehicleStatus")
R<?> updateVehicleStatus(@RequestBody UpdateVehicleStateDto updateVehicleStateDto);
/**
@@ -115,7 +120,7 @@
* @param vehicleId
* @return
*/
- @GetMapping("/inner/vehicle/findFleetIdByVehicleId")
+ @GetMapping("/logan/inner/vehicle/findFleetIdByVehicleId")
R<Long> findFleetIdByVehicleId(@RequestParam Long vehicleId);
@@ -125,7 +130,36 @@
* @param id
* @return
*/
- @PostMapping("/inner/vi/vehicle/getVehicleTrunkOpenStatus")
+ @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