From 1632956ff51882192bb01dbfc5a3761482ff4603 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 17 四月 2026 10:34:02 +0800
Subject: [PATCH] 合并线上代码
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java
index bfb5b6f..26e5f69 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/controller/XpMapController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.xiaopeng.api.dto.map.HistoryPointDto;
import com.xiaopeng.api.dto.map.OrderRouteAndFareDto;
import com.xiaopeng.api.dto.map.RouteAndFareDto;
@@ -30,6 +31,7 @@
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -66,7 +68,7 @@
List<Document> pointsInFence = xpGeoFencingPolygonService.findPointsByParentId(fenceId, "fenceId", "prohibited_area");
// 避让区域
- ArrayList<String> pointStrParam = new ArrayList<>();
+ ArrayList<JSONObject> pointStrParam = new ArrayList<>();
try {
for (Document document : pointsInFence) {
// 获取points字段（它是GeoJSON对象）
@@ -79,25 +81,31 @@
if (coordinates != null && !coordinates.isEmpty()) {
// 获取第一个多边形环（通常只有一个）
List<List<Double>> polygonPoints = coordinates.get(0);
-
+ List<String> coordinatesList = new ArrayList<>();
// 转换为经纬度字符串
for (List<Double> point : polygonPoints) {
if (point.size() >= 2) {
- pointStrParam.add(point.get(0) + "," + point.get(1));
+ coordinatesList.add(point.get(0) + "," + point.get(1));
}
}
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("coordinates", coordinatesList);
+ pointStrParam.add(jsonObject);
}
}
}
List<HistoryPointDto> history = new ArrayList<>();
if(null != dto.getVehicleId()){
- history = redisService.getCacheList("VEHICLE_HISTORY_POINT_LIST:" + dto.getVehicleId());
+// history = redisService.getCacheList("VEHICLE_HISTORY_POINT_LIST:" + dto.getVehicleId());
+// if(history.size() > 10){
+// history = history.subList(history.size() - 10, history.size());
+// }
+// history.forEach(s->{
+// s.setDirection(new BigDecimal(s.getDirection()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+// });
+// redisService.setCacheList("VEHICLE_HISTORY_POINT_LIST:" + dto.getVehicleId(), history);
}
- if(history.size() > 10){
- history = history.subList(history.size() - 10, history.size());
- }
- redisService.setCacheList("VEHICLE_HISTORY_POINT_LIST:" + dto.getVehicleId(), history);
RouteVo routeVo = gdMapGeocodingUtil.getDistanceAndTime(dto.getOrigin(), dto.getDestination(), pointStrParam, fenceId,dto.getRoutePlanRule(), history);
if(routeVo==null){
return R.fail("没有找到路线");
@@ -124,27 +132,34 @@
GeoPoint startPoint = new GeoPoint(dto.getOrigin().getLongitude(),dto.getOrigin().getLatitude());
List<String> operatingArea = xpGeoFencingPolygonService.findFencesContainingPoint(startPoint, "operating_area", "points");
// 避让区域
- ArrayList<String> pointStrParam = new ArrayList<>();
+ ArrayList<JSONObject> pointStrParam = new ArrayList<>();
String fenceId = null;
if(!operatingArea.isEmpty()){
fenceId = operatingArea.get(0);
List<Document> pointsInFence = xpGeoFencingPolygonService.findPointsByParentId(fenceId, "parentId", "prohibited_area");
for (Document document : pointsInFence) {
List<GeoPoint> points = document.getList("points", GeoPoint.class);
+ List<String> coordinatesList = new ArrayList<>();
// 一个区域的点位
for (GeoPoint point : points) {
- pointStrParam.add(point.getLongitude()+","+point.getLatitude());
+ coordinatesList.add(point.getLongitude()+","+point.getLatitude());
}
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("coordinates", coordinatesList);
+ pointStrParam.add(jsonObject);
}
}
List<HistoryPointDto> history = new ArrayList<>();
if(null != dto.getVehicleId()){
- history = redisService.getCacheList("VEHICLE_HISTORY_POINT_LIST:" + dto.getVehicleId());
+// history = redisService.getCacheList("VEHICLE_HISTORY_POINT_LIST:" + dto.getVehicleId());
+// if(history.size() > 10){
+// history = history.subList(history.size() - 10, history.size());
+// }
+// history.forEach(s->{
+// s.setDirection(new BigDecimal(s.getDirection()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+// });
+// redisService.setCacheList("VEHICLE_HISTORY_POINT_LIST:" + dto.getVehicleId(), history);
}
- if(history.size() > 10){
- history = history.subList(history.size() - 10, history.size());
- }
- redisService.setCacheList("VEHICLE_HISTORY_POINT_LIST:" + dto.getVehicleId(), history);
RouteVo routeVo = gdMapGeocodingUtil.getDistanceAndTime(dto.getOrigin(), dto.getDestination(), pointStrParam, fenceId,dto.getRoutePlanRule(), history);
if(routeVo==null){
return R.fail("没有找到路线");
--
Gitblit v1.7.1