From 996431875b7f42bdd2e772c847bd6028a20aaf65 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 15 三月 2026 16:23:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
index 78a51cb..1af1cbf 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
@@ -6,6 +6,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.xiaopeng.api.dto.QueryOrderRouteDTO;
+import com.xiaopeng.api.dto.operation.LonLatDto;
import com.xiaopeng.api.dto.order.AddCruiseMissionDto;
import com.xiaopeng.api.dto.order.GetOrderNumDto;
import com.xiaopeng.api.dto.order.PopOrderDto;
@@ -47,6 +48,7 @@
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.util.CollectionUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -56,6 +58,7 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLEncoder;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -533,15 +536,28 @@
* 订单查询轨迹路线
*/
@ApiOperation(value = "订单查询轨迹路线")
- @PostMapping("/api/v1/mini-program/order/queryOrderTrajectory")
- public R<List<OrderTrajectory>> queryOrderTrajectory(@RequestParam String orderId, HttpServletRequest request) {
+ @GetMapping("/api/v1/mini-program/order/queryOrderTrajectory")
+ public R<RouteVo> queryOrderTrajectory(@RequestParam String orderId, HttpServletRequest request) {
String uid = request.getHeader("XP-Uid");
List<OrderTrajectory> trajectories = mongoTemplate.find(
- new Query(Criteria.where("orderId").is(orderId))
+ new Query(Criteria.where("orderId").is(Long.valueOf(orderId)))
.with(Sort.by(Sort.Direction.ASC, "locatetime")),
OrderTrajectory.class
);
- return R.ok(trajectories);
+ // 封装信息
+ RouteVo routeVo = new RouteVo();
+ List<LonLatDto> polyline = new ArrayList<>();
+ if(!CollectionUtils.isEmpty(trajectories)){
+ for (OrderTrajectory trajectory : trajectories) {
+ LonLatDto lonLatDto = new LonLatDto();
+ String[] split = trajectory.getLocation().split(",");
+ lonLatDto.setLongitude(Double.valueOf(split[0]));
+ lonLatDto.setLatitude(Double.valueOf(split[1]));
+ polyline.add(lonLatDto);
+ }
+ }
+ routeVo.setPolyline(polyline);
+ return R.ok(routeVo);
}
}
--
Gitblit v1.7.1