From 7f007d0f4d74e298ed914b309e3f10314dd090a6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 01 三月 2026 04:54:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
index 3242179..895d4d1 100644
--- a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
+++ b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
@@ -32,6 +32,7 @@
import com.xiaopeng.common.redis.service.RedisService;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.geo.Point;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
import org.springframework.data.mongodb.core.query.Criteria;
@@ -196,14 +197,6 @@
log.error("推送消息失败：{}", stringR.getMsg());
}
xpOrderClient.updateOrderStatus(orderId, OrderStatusEnum.PICK_UP.getCode());
- PushOrderRouteDTO dto3 = new PushOrderRouteDTO();
- dto3.setOrderId(orderId);
- dto3.setRouteType(1);
- dto3.setLongitude(startLon);
- dto3.setLatitude(startLat);
- dto3.setDuration(10);
- dto3.setDistance(2);
- xpPushMessageClient.pushOrderRoute(dto3);
return r;
}
@@ -236,7 +229,7 @@
Double longitude = lonLatDto.getLongitude();
//保存车辆实时位置到redis
- redisTemplate.opsForGeo().add("vehiclePosition:" + vin, new GeoJsonPoint(longitude, latitude), vin);
+ redisTemplate.opsForGeo().add("vehiclePosition:" + vin, new Point(longitude, latitude), vin);
//保存车辆实时信息到mongodb
VehiclePosition vehiclePosition = mongoTemplate.findOne(new Query(Criteria.where("vin").is(vin)), VehiclePosition.class);
@@ -262,10 +255,11 @@
dto.setLatitude(latitude);
dto.setDuration(10);
dto.setDistance(2);
+ dto.setDirection(60);
xpPushMessageClient.pushOrderRoute(dto);
}
- //5秒钟循环一次
+ //2秒钟循环一次
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
@@ -354,7 +348,7 @@
Double longitude = lonLatDto.getLongitude();
//保存车辆实时位置到redis
- redisTemplate.opsForGeo().add("vehiclePosition:" + vin, new GeoJsonPoint(longitude, latitude), vin);
+ redisTemplate.opsForGeo().add("vehiclePosition:" + vin, new Point(longitude, latitude), vin);
//保存车辆实时信息到mongodb
VehiclePosition vehiclePosition = mongoTemplate.findOne(new Query(Criteria.where("vin").is(vin)), VehiclePosition.class);
@@ -380,6 +374,7 @@
dto.setLatitude(latitude);
dto.setDuration(20);
dto.setDistance(10);
+ dto.setDirection(60);
xpPushMessageClient.pushOrderRoute(dto);
}
--
Gitblit v1.7.1