合并代码

puzhibing

2026-05-18 f33eaf279fdae3a5cae7775dc2a67e2d080dd5e0

 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);
        // 查询运维规则 保养周期