From d597b03477f904bc87bc9c3a984f9bfa485a906d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 三月 2026 18:53:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPlanServiceImpl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
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 3259ec5..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,12 +4,13 @@
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.XpTestPoint;
import com.xiaopeng.api.model.operation.XpTestPlan;
import com.xiaopeng.api.model.vehicleConvoy.XpFleet;
import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
@@ -17,12 +18,9 @@
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.operation.constant.I18nKeyConstant;
-import com.xiaopeng.operation.dto.XpCruisePlanAddDTO;
-import com.xiaopeng.operation.dto.XpCruisePlanEditDTO;
import com.xiaopeng.operation.dto.XpTestPlanAddDTO;
import com.xiaopeng.operation.dto.XpTestPlanEditDTO;
import com.xiaopeng.operation.mapper.XpTestPlanMapper;
-import com.xiaopeng.operation.query.CruisePlanQuery;
import com.xiaopeng.operation.query.TestPlanQuery;
import com.xiaopeng.operation.service.*;
import com.xiaopeng.operation.vo.*;
@@ -51,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;
@@ -180,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