From 603be7bb343df3ca5fed40df01d191089c651d1b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 25 三月 2026 15:39:32 +0800
Subject: [PATCH] 切换服务
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpTestPlanController.java | 6 ++++--
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpTestPointManagementController.java | 11 +++++++++++
xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpTestPointClient.java | 9 +++++++++
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPlanServiceImpl.java | 7 +++++--
xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/operation/XpTestPointClientFallbackFactory.java | 9 +++++++++
5 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/operation/XpTestPointClientFallbackFactory.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/operation/XpTestPointClientFallbackFactory.java
index e042708..3ccca91 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/operation/XpTestPointClientFallbackFactory.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/operation/XpTestPointClientFallbackFactory.java
@@ -7,6 +7,8 @@
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
+import java.util.List;
+
@Slf4j
@Component
public class XpTestPointClientFallbackFactory implements FallbackFactory<XpTestPointClient> {
@@ -19,6 +21,13 @@
log.error("获取点位详情失败:{}", cause.getMessage());
return R.fail("获取点位详情失败");
}
+
+ @Override
+ public R<List<XpTestPoint>> queryByIds(List<Long> ids) {
+ log.error("获取点位详情失败:{}", cause.getMessage());
+ return R.fail("获取点位详情失败");
+ }
+
@Override
public R<Boolean> nowInTimePoint(Long pointId) {
log.error("判断点位是在有效期内失败:{}", cause.getMessage());
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpTestPointClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpTestPointClient.java
index 28a1a8e..1bb6459 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpTestPointClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpTestPointClient.java
@@ -8,6 +8,8 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import java.util.List;
+
@FeignClient(contextId = "XpTestPointClient", value = ServiceNameConstantsEnum.XP_OPERATION_SERVICE, fallbackFactory = XpTestPointClientFallbackFactory.class)
public interface XpTestPointClient {
@@ -20,6 +22,13 @@
R<XpTestPoint> queryById(@RequestParam Long id);
+ /**
+ * 点位详情
+ */
+ @GetMapping("/api/v1/testPoint/queryPointById")
+ R<List<XpTestPoint>> queryByIds(@RequestParam List<Long> ids);
+
+
/**
* 判断点位是在有效期内
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpTestPointManagementController.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpTestPointManagementController.java
index 50685ca..a658496 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpTestPointManagementController.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpTestPointManagementController.java
@@ -212,4 +212,15 @@
public R<Boolean> nowInTimePoint(@RequestParam Long pointId){
return R.ok(xpTestPointService.nowInTimePoint(pointId));
}
+
+
+
+ /**
+ * 点位详情
+ */
+ @GetMapping("/api/v1/testPoint/queryPointById")
+ public R<List<XpTestPoint>> queryByIds(@RequestParam List<Long> ids){
+ List<XpTestPoint> xpTestPoints = xpTestPointService.listByIds(ids);
+ return R.ok(xpTestPoints);
+ }
}
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpTestPlanController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpTestPlanController.java
index 75c7784..8d9da05 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpTestPlanController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpTestPlanController.java
@@ -1,7 +1,9 @@
package com.xiaopeng.operation.controller;
+import com.xiaopeng.api.feignClient.operation.XpTestPointClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
+import com.xiaopeng.api.model.map.XpTestPoint;
import com.xiaopeng.api.model.operation.XpTestPlan;
import com.xiaopeng.api.model.operation.XpTestPlanPoint;
import com.xiaopeng.api.model.operation.XpTestPlanVehicle;
@@ -39,7 +41,7 @@
private final IXpTestPlanService xpTestPlanService;
private final XpVehicleClient xpVehicleClient;
private final IXpTestPlanPointService xpTestPlanPointService;
- private final XpTestPointService xpTestPointService;
+ private final XpTestPointClient xpTestPointService;
private final IXpTestPlanVehicleService xpTestPlanVehicleService;
@@ -111,7 +113,7 @@
*/
@PostMapping("/inner/v1/xp-test-plan/getXpTestPointById")
public R<XpTestPoint> getXpTestPointById(@RequestParam Long id){
- XpTestPoint xpTestPoint = xpTestPointService.getById(id);
+ XpTestPoint xpTestPoint = xpTestPointService.queryById(id).getData();
return R.ok(xpTestPoint);
}
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPlanServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPlanServiceImpl.java
index 3a90b4c..48861b9 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPlanServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPlanServiceImpl.java
@@ -4,9 +4,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
+import com.xiaopeng.api.feignClient.operation.XpTestPointClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetVehicleClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
+import com.xiaopeng.api.model.map.XpTestPoint;
import com.xiaopeng.api.model.operation.XpTestPlanPoint;
import com.xiaopeng.api.model.operation.XpTestPlanVehicle;
import com.xiaopeng.api.model.operation.XpTestPlan;
@@ -47,7 +49,7 @@
private final IXpTestPlanPointService xpTestPlanPointService;
private final IXpTestPlanVehicleService xpTestPlanVehicleService;
- private final XpTestPointService xpTestPointService;
+ private final XpTestPointClient testPointClient;
private final XpVehicleClient xpVehicleClient;
private final XpFleetVehicleClient xpFleetVehicleClient;
private final XpFleetClient xpFleetClient;
@@ -176,8 +178,9 @@
.filter(Objects::nonNull)
.collect(Collectors.toList());
pointIds.addAll(pointIds1);
+ List<XpTestPoint> data = testPointClient.queryByIds(pointIds).getData();
Map<Long, XpTestPoint> pointMap = CollUtil.isNotEmpty(pointIds)
- ? xpTestPointService.listByIds(pointIds).stream()
+ ? data.stream()
.collect(Collectors.toMap(XpTestPoint::getId, v -> v))
: Collections.emptyMap();
List<XpTestPlanPointVO> pointList = planPoints.stream().map(planPoint -> {
--
Gitblit v1.7.1