From f33eaf279fdae3a5cae7775dc2a67e2d080dd5e0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 五月 2026 00:03:14 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpVehicleController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 e21bdbc..85d95f2 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
@@ -20,6 +20,7 @@
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.api.model.account.XpOperationsUser;import com.xiaopeng.api.model.maintenance.XpTask;
import com.xiaopeng.api.model.maintenance.XpTaskRule;
+import com.xiaopeng.api.model.maintenance.XpVehicleModel;
import com.xiaopeng.api.model.operation.XpOfficialPartner;
import com.xiaopeng.api.model.vehicleConvoy.XpFleet;
import com.xiaopeng.api.model.vehicleConvoy.XpFleetVehicle;
@@ -121,6 +122,9 @@
private final XpVehicleRepairClient xpVehicleRepairClient;
private final AliOssService aliOssService;
private final AliOssDownloadUtil aliOssDownloadUtil;
+
+ @Resource
+ private XpVehicleModelClient xpVehicleModelClient;
/**
* 根据ID列表批量查询车辆信息（内部接口）
@@ -976,6 +980,10 @@
public R<XpVehicleVO> vehicleDetail(@RequestParam Long id) {
// 查询车辆
XpVehicle xpVehicle = xpVehicleService.getById(id);
+ List<XpVehicleModel> vehicleModels = xpVehicleModelClient.listByIds(Arrays.asList(xpVehicle.getVehicleModel())).getData();
+ if(null != vehicleModels && vehicleModels.size() > 0){
+ xpVehicle.setVehicleModelName(vehicleModels.get(0).getName());
+ }
XpVehicleVO xpVehicleVO = new XpVehicleVO();
BeanUtils.copyProperties(xpVehicle, xpVehicleVO);
// 查询运维规则 保养周期
--
Gitblit v1.7.1