From ad5cf165be933200311db2c24417e04c62ddd948 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期五, 13 二月 2026 22:24:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java | 65 --------------------------------
1 files changed, 1 insertions(+), 64 deletions(-)
diff --git a/xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
similarity index 89%
rename from xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
rename to xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
index 865ca65..822c6ea 100644
--- a/xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
+++ b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
@@ -6,15 +6,12 @@
import com.alibaba.fastjson2.JSONObject;
import com.xiaopeng.api.dto.map.OrderRouteAndFareDto;
import com.xiaopeng.api.dto.operation.LonLatDto;
-import com.xiaopeng.api.dto.operation.ReassignOrderDTO;
import com.xiaopeng.api.dto.order.PopOrderDto;
import com.xiaopeng.api.dto.pushMessage.PushOrderRouteDTO;
import com.xiaopeng.api.dto.pushMessage.SendMessageDTO;
import com.xiaopeng.api.feignClient.map.XpMapClient;
-import com.xiaopeng.api.feignClient.operation.ReassignOrderClient;
import com.xiaopeng.api.feignClient.order.XpOrderClient;
import com.xiaopeng.api.feignClient.pushMessage.XpPushMessageClient;
-import com.xiaopeng.api.feignClient.vehicleConvoy.UserVehicleClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.api.model.order.XpOrder;
import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
@@ -35,7 +32,6 @@
import com.xiaopeng.api.vo.automaticPilot.proto.up.xpuNavigationRequest.NavigationRequest;
import com.xiaopeng.api.vo.automaticPilot.proto.up.xpuNavigationRequest.OrderPhase;
import com.xiaopeng.api.vo.operation.RouteVo;
-import com.xiaopeng.api.vo.vehicleConvoy.CancelTaxiPassengerVo;
import com.xiaopeng.automaticPilot.util.XPUUtil;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.enums.OrderStatusEnum;
@@ -56,9 +52,6 @@
import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.TimeUnit;
-
-import static org.bouncycastle.asn1.x500.style.RFC4519Style.l;
-import static org.bouncycastle.asn1.x500.style.RFC4519Style.uid;
/**
* Kafka 消费者服务
@@ -84,13 +77,9 @@
@Autowired
public RedisTemplate redisTemplate;
- @Autowired
- private UserVehicleClient userVehicleClient;
@Resource
private XpPushMessageClient xpPushMessageClient;
- @Autowired
- private ReassignOrderClient reassignOrderClient;
@@ -195,9 +184,7 @@
Object sequence = redisTemplate.opsForValue().get(requestSeq);
if(sequence!=null){
String[] split = sequence.toString().split("_");
- String typeStr = split[0];
- // 推单处理
- if(typeStr.equals("pushOrder")){
+ if(split[0].equals("pushOrder")){
PopOrderDto dto = new PopOrderDto();
dto.setOrderId(Long.valueOf(split[1]));
dto.setXpVehicleVin(split[2]);
@@ -278,56 +265,6 @@
dto.setDuration(rtTripInfo.getRemaining_time());
dto.setDistance(rtTripInfo.getRemaining_distance().intValue());
xpPushMessageClient.pushOrderRoute(dto);
- }
- }
-
-
- /**
- * XPU发布系统运行状态---车辆实时位置
- *
- * @param msgContent
- */
- public void systemStatusXpuAndReassign(MsgContent msgContent) {
- //开始处理消息对应的业务逻辑
- SystemRuntimeStatus systemRuntimeStatus = msgContent.getContent_detail().getObject("systemRuntimeStatus", SystemRuntimeStatus.class);
- AbnormalReason abnormalReason = systemRuntimeStatus.getSystem_status().getAbnormal_reason();
- // 判断是否为故障状态
- if (abnormalReason == AbnormalReason.FAULT) {
- log.info("车辆故障，开始处理故障");
- // TODO 添加异常任务
- // 解绑用户与车辆关系
- CancelTaxiPassengerVo cancelTaxiPassengerVo = new CancelTaxiPassengerVo();
- String orderId = systemRuntimeStatus.getRunning_order_status_info().getOrder_id();
- XpOrder xpOrder = xpOrderClient.queryOrderById(Long.parseLong(orderId)).getData();
- XpVehicle vehicle = xpVehicleClient.queryById(xpOrder.getVehicleId()).getData();
- if (vehicle != null) {
- // 修改车辆状态
- vehicle.setOperatingStatus(4);
- xpVehicleClient.updateVehicleById(vehicle);
- cancelTaxiPassengerVo.setVin(vehicle.getVehicleVin());
- cancelTaxiPassengerVo.setUid(xpOrder.getAppUserId().toString());
- cancelTaxiPassengerVo.setOrderNo(xpOrder.getOrderNumber());
- // TODO
-// cancelTaxiPassengerVo.setAppId();
- userVehicleClient.cancelTaxiPassenger(cancelTaxiPassengerVo);
- }
- // 取消订单
- R<?> r = xpOrderClient.cancelOrder(String.valueOf(xpOrder.getId()));
- if (r.getCode() == R.SUCCESS){
- log.info("取消订单成功");
- // 重新派单
- ReassignOrderDTO reassignOrderDTO = new ReassignOrderDTO();
- reassignOrderDTO.setUid(xpOrder.getAppUserId().toString());
- reassignOrderDTO.setOrderNo(xpOrder.getOrderNumber());
- reassignOrderDTO.setCount(10);
- RealtimePose pose = systemRuntimeStatus.getPose();
- Wgs naviPose = pose.getNavi_pose();
- Double latitude = naviPose.getLatitude();
- Double longitude = naviPose.getLongitude();
- reassignOrderDTO.setLongitude(longitude);
- reassignOrderDTO.setLatitude(latitude);
- reassignOrderClient.reassignOrder(reassignOrderDTO);
- }
}
}
--
Gitblit v1.7.1