From 8a932b7079ffcd0e445924ad699fb9ef719f304c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 27 三月 2026 20:50:24 +0800
Subject: [PATCH] 修改bug
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/dto/XpTestPlanAddDTO.java | 6 ++++++
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpTestPlanServiceImpl.java | 7 +++++--
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java | 7 +++----
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpTestPlanPoint.java | 3 ---
4 files changed, 14 insertions(+), 9 deletions(-)
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 18a7e8a..5f90909 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
@@ -44,9 +44,6 @@
@ApiModelProperty(value = "是否停车 0-否 1-是")
private Integer stopFlag;
- @ApiModelProperty(value = "测试订单id")
- private Long testOrderId;
-
@ApiModelProperty(value = "测试订单类型（1=测试单，2=巡游单）")
private Long testOrderType;
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/dto/XpTestPlanAddDTO.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/dto/XpTestPlanAddDTO.java
index e98e653..252ab8f 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/dto/XpTestPlanAddDTO.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/dto/XpTestPlanAddDTO.java
@@ -40,6 +40,12 @@
@ApiModelProperty(value = "点位ID")
private Long endTestPointId;
+
+ @ApiModelProperty("是否停车")
+ private Integer stopFlag;
+
+ @ApiModelProperty("订单类型(1=测试单，2=巡游单)")
+ private Long testOrderType;
}
}
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 2418c05..32de1e0 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
@@ -77,12 +77,12 @@
.list().stream().collect(Collectors.groupingBy(XpTestPlanVehicle::getTestPlanId)) : Collections.emptyMap();
page.getRecords().forEach(plan -> {
if(pointMap.size() > 0){
- plan.setPointNum(pointMap.get(plan.getId()).size());
+ plan.setPointNum(null == pointMap.get(plan.getId()) ? 0 : pointMap.get(plan.getId()).size());
}else{
plan.setPointNum(0);
}
if(vehicleMap.size() > 0){
- plan.setVehicleNum(vehicleMap.get(plan.getId()).size());
+ plan.setVehicleNum(null == vehicleMap.get(plan.getId()) ? 0 : vehicleMap.get(plan.getId()).size());
}else{
plan.setVehicleNum(0);
}
@@ -217,6 +217,7 @@
vo.setEndTestPointName(point1.getPointName());
vo.setEndTestPointAddress(point1.getPointAddress());
}
+ vo.setStopFlag(planPoint.getStopFlag());
return vo;
}).collect(Collectors.toList());
@@ -380,6 +381,8 @@
point.setTestPlanId(planId);
point.setStartTestPointId(pointDTO.getStartTestPointId());
point.setEndTestPointId(pointDTO.getEndTestPointId());
+ point.setStopFlag(pointDTO.getStopFlag());
+ point.setTestOrderType(pointDTO.getTestOrderType());
result.add(point);
}
return result;
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 7cf9015..7e58c51 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
@@ -590,7 +590,6 @@
* 取消订单
*/
private void cancelOrder(XpTestOrder order) {
- redisService.removeByPattern(order.getQueueName(), order.getOrderNumber());
//判断还原车辆状态
if (null == order.getVehicleId()) {
Object cacheObject1 = redisService.getCacheObject("CREATE_ORDER:" + order.getId().toString());
@@ -720,9 +719,9 @@
// 运营状态：1=运营中 2=维修中 3=已收车 4=车辆异常
// 当前模式：1=接单 2=测试
// 模式状态：1=开始接单/开始测试 2=停止接单/停止测试
- if (Objects.isNull(newVehicle.getStatus()) || newVehicle.getStatus() == 3) {
- throw new ServiceException("新车辆保险或年检已过期，无法接单", I18nKeyConstant.ORDER_REASSIGN_NEW_VEHICLE_STATUS_INVALID);
- }
+// if (Objects.isNull(newVehicle.getStatus()) || newVehicle.getStatus() == 3) {
+// throw new ServiceException("新车辆保险或年检已过期，无法接单", I18nKeyConstant.ORDER_REASSIGN_NEW_VEHICLE_STATUS_INVALID);
+// }
if (Objects.isNull(newVehicle.getOperatingStatus()) || newVehicle.getOperatingStatus() != 1) {
throw new ServiceException("新车辆运营状态异常，无法接单", I18nKeyConstant.ORDER_REASSIGN_NEW_VEHICLE_OPERATING_STATUS_INVALID);
}
--
Gitblit v1.7.1