From 5f68123b7374c5ed70ff5e49bfb53d4299fcfe04 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 27 三月 2026 18:37:56 +0800
Subject: [PATCH] 修改bug
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpTestPointClient.java | 4 ++--
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/model/query/XpTestOrderPageQuery.java | 3 +++
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPlanServiceImpl.java | 12 ++++++++++--
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java | 5 +++++
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpTestPlanPoint.java | 2 +-
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpOpenCityServiceImpl.java | 5 +++--
6 files changed, 24 insertions(+), 7 deletions(-)
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 20868c8..e4de393 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
@@ -13,7 +13,7 @@
import java.util.List;
-@FeignClient(contextId = "XpTestPointClient", value = ServiceNameConstantsEnum.XP_OPERATION_SERVICE, fallbackFactory = XpTestPointClientFallbackFactory.class)
+@FeignClient(contextId = "XpTestPointClient", value = ServiceNameConstantsEnum.XP_MAP_SERVICE, fallbackFactory = XpTestPointClientFallbackFactory.class)
public interface XpTestPointClient {
@@ -39,6 +39,6 @@
* @param pointId
* @return
*/
- @PostMapping("/inner/v1/testPoint/nowInTimePoint")
+ @GetMapping("/inner/v1/testPoint/nowInTimePoint")
R<Boolean> nowInTimePoint(@RequestParam Long pointId);
}
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpTestPlanPoint.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpTestPlanPoint.java
index 0cd3f0f..18a7e8a 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpTestPlanPoint.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpTestPlanPoint.java
@@ -29,7 +29,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "自增id")
- @TableId(value = "id", type = IdType.NONE)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "测试计划ID")
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpOpenCityServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpOpenCityServiceImpl.java
index ae5f333..07a4bd8 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpOpenCityServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpOpenCityServiceImpl.java
@@ -174,12 +174,13 @@
.eq(XpOpenCity::getDistrictCode, districtCode));
if (Objects.isNull(xpOpenCity)) {
xpOpenCity = this.baseMapper.selectOne(new LambdaQueryWrapper<XpOpenCity>()
- .eq(XpOpenCity::getCityCode, cityCode).isNull(XpOpenCity::getDistrictCode));
+ .eq(XpOpenCity::getCityCode, cityCode).eq(XpOpenCity::getDistrictCode, ""));
}
if (Objects.isNull(xpOpenCity)) {
xpOpenCity = this.baseMapper.selectOne(new LambdaQueryWrapper<XpOpenCity>()
.eq(XpOpenCity::getProvinceCode, provinceCode)
- .isNull(XpOpenCity::getCityCode).isNull(XpOpenCity::getDistrictCode));
+ .eq(XpOpenCity::getCityCode, "")
+ .eq(XpOpenCity::getDistrictCode, ""));
}
return xpOpenCity;
}
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 e54c4d1..2418c05 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
@@ -76,8 +76,16 @@
Map<Long, List<XpTestPlanVehicle>> vehicleMap = CollUtil.isNotEmpty(planIds) ? xpTestPlanVehicleService.lambdaQuery().in(XpTestPlanVehicle::getTestPlanId, planIds)
.list().stream().collect(Collectors.groupingBy(XpTestPlanVehicle::getTestPlanId)) : Collections.emptyMap();
page.getRecords().forEach(plan -> {
- plan.setPointNum(pointMap.get(plan.getId()).size());
- plan.setVehicleNum(vehicleMap.get(plan.getId()).size());
+ if(pointMap.size() > 0){
+ plan.setPointNum(pointMap.get(plan.getId()).size());
+ }else{
+ plan.setPointNum(0);
+ }
+ if(vehicleMap.size() > 0){
+ plan.setVehicleNum(vehicleMap.get(plan.getId()).size());
+ }else{
+ plan.setVehicleNum(0);
+ }
Long testOrder = xpTestOrderClient.queryCountByTestPlanId(plan.getId()).getData();
plan.setOrderNum(testOrder.intValue());
});
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/model/query/XpTestOrderPageQuery.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/model/query/XpTestOrderPageQuery.java
index 316c7c3..642b4e2 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/model/query/XpTestOrderPageQuery.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/model/query/XpTestOrderPageQuery.java
@@ -19,6 +19,9 @@
@ApiModel(value = "订单分页查询请求", description = "订单分页查询参数")
public class XpTestOrderPageQuery extends BasePage {
+ @ApiModelProperty(value = "测试计划id")
+ private Long testPlanId;
+
@ApiModelProperty(value = "订单号")
private String orderNumber;
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java
index edce8c6..7cf9015 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java
@@ -227,6 +227,9 @@
xpOrder.setMileageKilometers(0.0);
xpOrder.setOrderNumber("XP" + System.currentTimeMillis());
xpOrder.setCityId(openCity.getId());
+ xpOrder.setPlacementLat(xpPoint.getPointLat());
+ xpOrder.setPlacementLon(xpPoint.getPointLon());
+ xpOrder.setPlacementAddress(xpPoint.getPointAddress());
xpOrder.setStartLon(xpPoint.getPointLon());
xpOrder.setStartLat(xpPoint.getPointLat());
xpOrder.setBoardingLon(xpPoint.getPointLon());
@@ -344,6 +347,7 @@
}
// 1. 构建查询条件
LambdaQueryWrapper<XpTestOrder> wrapper = buildQueryWrapper(query);
+ wrapper.eq(XpTestOrder::getTestPlanId, query.getTestPlanId());
if (CollUtil.isNotEmpty(vehicleIdsFilter)) {
wrapper.in(XpTestOrder::getVehicleId, vehicleIdsFilter);
}
@@ -559,6 +563,7 @@
Map<Long, XpFleet> fleetMap) {
XpTestOrderPageVO vo = new XpTestOrderPageVO();
vo.setId(order.getId());
+ vo.setOrderType(order.getOrderType());
vo.setOrderNumber(order.getOrderNumber());
vo.setCreateTime(order.getCreateTime());
vo.setOrderSource(order.getOrderSource());
--
Gitblit v1.7.1