From 900f2e86e31b45239cef7e3e46ee5c2541a9eb99 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 22 四月 2026 21:55:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/controller/ActiveOrderController.java | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/controller/ActiveOrderController.java b/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/controller/ActiveOrderController.java
index f2b07e6..e2e48f7 100644
--- a/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/controller/ActiveOrderController.java
+++ b/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/controller/ActiveOrderController.java
@@ -2,8 +2,11 @@
import com.xiaopeng.api.dto.map.RouteAndFareDto;
import com.xiaopeng.api.dto.order.OrderChangeDto;
-import com.xiaopeng.api.vo.automaticPilot.VehiclePosition;
+import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
+import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
import com.xiaopeng.api.vo.operation.RouteAndFareVo;
+import com.xiaopeng.api.vo.operation.VehiclePositionVo;
+import com.xiaopeng.api.vo.vehicleConvoy.XpVehicleVO;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.itinerary.service.ActiveOrderService;
import com.xiaopeng.itinerary.service.XpPricingService;
@@ -11,6 +14,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.data.geo.Distance;
import org.springframework.data.geo.Metrics;
import org.springframework.data.geo.Point;
@@ -23,7 +27,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
+import java.util.Comparator;
import java.util.List;
+import java.util.stream.Collectors;
/**
@@ -76,24 +82,7 @@
return R.ok();
}
- /**
- * 周围车辆点位查询
- */
- @ApiOperation(value = "周围车辆点位查询", notes = "", tags = {"小程序-周围车辆点位查询"})
- @GetMapping("/api/v1/mini-program/nearby/cars")
- @XpClientCheck(checkToken = false, checkOtpToken = true)
- public R<List<VehiclePosition>> carAround(@RequestParam double lon,@RequestParam double lat,@RequestParam double distanceMeters,HttpServletRequest request) {
- String uid = request.getHeader("XP-Uid");
-
- Point point = new Point(lon, lat);
- Distance distance = new Distance(distanceMeters / 1000.0, Metrics.KILOMETERS);
- Criteria criteria = Criteria.where("point")
- .nearSphere(point)
- .maxDistance(distance.getNormalizedValue());
- Query query = new Query(criteria);
- return R.ok(mongoTemplate.find(query, VehiclePosition.class));
- }
@Resource
private MongoTemplate mongoTemplate;
--
Gitblit v1.7.1