From 9adef3dd7723930d44f72713c3cf28e50b002055 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 01 四月 2026 15:45:19 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
index c3ebd12..dfeca09 100644
--- a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
+++ b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java
@@ -42,10 +42,7 @@
import com.xiaopeng.vehicleConvoy.service.IXpFleetVehicleService;
import com.xiaopeng.vehicleConvoy.service.IXpVehicleAnnualRecordService;
import com.xiaopeng.vehicleConvoy.service.IXpVehicleService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -836,9 +833,12 @@
*/
@ApiOperation(value = "查询可改派的车辆列表", tags = {"管理后台-订单管理"})
@GetMapping("/api/v1/vehicle/availableList")
- @ApiImplicitParam(name = "orderId", value = "订单ID", required = true, dataTypeClass = Long.class)
- public R<List<XpVehicle>> listAvailableVehicles(@RequestParam Long orderId) {
- List<XpVehicle> list = xpVehicleService.listAvailableVehicles(orderId);
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "orderId", value = "订单ID", required = true, dataTypeClass = Long.class),
+ @ApiImplicitParam(name = "orderType", value = "订单类型（1=用户单，2=测试单）", required = true, dataTypeClass = Integer.class)
+ })
+ public R<List<XpVehicle>> listAvailableVehicles(@RequestParam Long orderId, Integer orderType) {
+ List<XpVehicle> list = xpVehicleService.listAvailableVehicles(orderId, orderType);
return R.ok(list);
}
--
Gitblit v1.7.1