From 244228feba355b4df8e160fd4c7c353f674044f1 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期六, 14 二月 2026 17:08:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpFleetController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpFleetController.java b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpFleetController.java
index caa1d22..5342964 100644
--- a/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpFleetController.java
+++ b/xp-robotaxi-vehicle-convoy-boot/src/main/java/com/xiaopeng/vehicleConvoy/controller/XpFleetController.java
@@ -1,6 +1,8 @@
package com.xiaopeng.vehicleConvoy.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.xiaopeng.api.model.vehicleConvoy.XpFleet;
+import com.xiaopeng.api.model.vehicleConvoy.XpFleetOperations;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.vehicleConvoy.model.dto.FleetAddDTO;
@@ -9,6 +11,7 @@
import com.xiaopeng.vehicleConvoy.model.query.FleetUserPageQuery;
import com.xiaopeng.vehicleConvoy.model.query.FleetVehiclePageQuery;
import com.xiaopeng.vehicleConvoy.model.vo.*;
+import com.xiaopeng.vehicleConvoy.service.IXpFleetOperationsService;
import com.xiaopeng.vehicleConvoy.service.IXpFleetService;
import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor;
@@ -19,6 +22,7 @@
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -34,6 +38,7 @@
public class XpFleetController {
private final IXpFleetService xpFleetService;
+ private final IXpFleetOperationsService xpFleetOperationsService;
/**
* 根据ID列表批量查询车队信息（内部接口）
@@ -49,6 +54,28 @@
}
return R.ok(xpFleetService.listByIds(ids));
}
+ /**
+ * 通过运营人员id查询车队信息
+ *
+ * @param operationsUserId 运营人员id
+ * @return 车队信息
+ */
+ @ApiOperation(value = "通过运维人员id查询车队信息", tags = {"内部接口"})
+ @GetMapping("/inner/v1/fleet/getFleetByOperationsUserId")
+ public R<XpFleet> getFleetByOperationsUserId(@RequestParam Long operationsUserId) {
+ if (Objects.isNull(operationsUserId)) {
+ return R.ok();
+ }
+ // 查询车队人员关联关系
+ XpFleetOperations fleetOperations = xpFleetOperationsService.getOne(Wrappers.lambdaQuery(XpFleetOperations.class)
+ .eq(XpFleetOperations::getOperationsUserId, operationsUserId)
+ .last("LIMIT 1"));
+ if (Objects.isNull(fleetOperations)) {
+ return R.ok();
+ }
+ XpFleet xpFleet = xpFleetService.getById(fleetOperations.getFleetId());
+ return R.ok(xpFleet);
+ }
/**
* 添加车队
--
Gitblit v1.7.1