From bc8e23df36bb6fd70732963c18b98b3ca8970ec1 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 20 三月 2026 19:17:24 +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/service/impl/XpOrderServiceImpl.java | 21 ++++++++++
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/utils/GDMapGeocodingUtil.java | 90 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 110 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index 1c768a9..4dfabba 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -89,6 +89,7 @@
import com.xiaopeng.order.service.IXpOrderEvaluateService;
import com.xiaopeng.order.service.IXpOrderReassignService;
import com.xiaopeng.order.service.IXpOrderService;
+import com.xiaopeng.order.utils.GDMapGeocodingUtil;
import com.xiaopeng.order.utils.TaxiPricingDemoService;
import com.xiaopeng.order.utils.RegionCodeFilterUtil;
import com.xiaopeng.order.utils.XpPricingUtil;
@@ -104,6 +105,7 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
@@ -155,6 +157,7 @@
private final XpTaskRuleClient xpTaskRuleClient;
private final XpCruisePlanClient xpCruisePlanClient;
private final XpPricingUtil xpPricingUtil;
+ private final GDMapGeocodingUtil gdMapGeocodingUtil;
@Autowired
@@ -1494,7 +1497,9 @@
xpOrder.setArrivalTime(LocalDateTime.now());
break;
case 5:
- xpOrder.setBoardingTime(LocalDateTime.now());
+ LocalDateTime now = LocalDateTime.now();
+ xpOrder.setBoardingTime(now);
+ xpOrder.setRideTime(now);
// 删除定时任务job
QuartzManager.removeJob((OrderCancelJob.name + xpOrder.getId()).toUpperCase(), TimeJobType.ORDER_CANCEL);
break;
@@ -1503,6 +1508,20 @@
xpOrder.setTripBegin(LocalDateTime.now());
break;
case 7:
+ xpOrder.setGetoffTime(LocalDateTime.now());
+ // 解析下车地点
+ // 查询车辆
+ XpVehicle xpVehicle = xpVehicleClient.queryById(xpOrder.getVehicleId()).getData();
+ VehiclePosition vehiclePosition = mongoTemplate.findOne(new Query(Criteria.where("vin").is(xpVehicle.getVehicleVin())), VehiclePosition.class);
+ if(Objects.nonNull(vehiclePosition)){
+ GeoJsonPoint point = vehiclePosition.getPoint();
+ if(Objects.nonNull(point)){
+ double x = point.getX();
+ double y = point.getY();
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(String.valueOf(x), String.valueOf(y));
+ xpOrder.setGetoffAddress(geocode.get("address"));
+ }
+ }
// 推送倒计时消息
Map<String, Object> params = new HashMap<>();
Map<String, Object> content = new HashMap<>();
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/utils/GDMapGeocodingUtil.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/utils/GDMapGeocodingUtil.java
new file mode 100644
index 0000000..28172c0
--- /dev/null
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/utils/GDMapGeocodingUtil.java
@@ -0,0 +1,90 @@
+package com.xiaopeng.order.utils;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.xiaopeng.common.core.utils.HttpUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 高德地图的地理编码工具类
+ */
+@Slf4j
+@Component
+@Lazy
+public class GDMapGeocodingUtil {
+
+ private String key = "66ae577f63898dae3016d599fda57221";
+
+
+ public static void main(String[] args) {
+ String url = "https://tsapi.amap.com/v1/route/price?key=" + "66ae577f63898dae3016d599fda57221" + "&extensions=all&start=" +"113.384932" + "," + "23.155455";
+ HashMap<String, Object> params = new HashMap<>();
+ params.put("extensions", "all");
+ params.put("start", "113.384932" + "," + "23.155455");
+ params.put("end", "113.388209" + "," + "23.163455");
+ params.put("routeUserType",2);
+ log.info("高德地图接口：{}", url);
+ log.info("高德地图参数：{}", params);
+ String post = HttpUtils.post(url, JSON.toJSONString(params));
+ log.info("高德地图返回结果："+ post);
+ JSONObject jsonObject = JSON.parseObject(post);
+ System.out.println(jsonObject);
+ }
+
+
+ /**
+ * 线路还原接口
+ * 车端使用的数据
+ * @param routeID
+ * @return
+ */
+ public String routed(String routeID){
+ String url = "https://tsapi.amap.com/v1/route/query/routeid?key=" + key;
+ HashMap<String, Object> params = new HashMap<>();
+ params.put("routeID", routeID);
+ params.put("sdkVersion", "9.850.152.3.532");
+ params.put("encoderVersion", "5.1");
+ String post = HttpUtils.post(url, JSON.toJSONString(params));
+ log.info("高德地图返回结果："+ post);
+ return post;
+ }
+
+
+
+ /**
+ * 根据经纬度获取行政区域信息
+ * @param lon
+ * @param lan
+ * @return
+ * @throws Exception
+ */
+ public Map<String, String> geocode(String lon, String lan) {
+ String url = "https://restapi.amap.com/v3/geocode/regeo?key=" + key + "&location=" + lon + "," + lan;
+ String forObject = HttpUtils.sendGet(url);
+ JSONObject jsonObject = JSON.parseObject(forObject);
+ Map<String, String> map = new HashMap<>();
+ if(jsonObject.getString("status").equals("1")){
+ JSONObject regeocode = jsonObject.getJSONObject("regeocode");
+ JSONObject addressComponent = regeocode.getJSONObject("addressComponent");
+ String address = regeocode.getString("formatted_address");
+ map.put("address", address);
+ String code = addressComponent.getString("adcode");
+ String province = addressComponent.getString("province");
+ String city = addressComponent.getString("city");
+ String district = addressComponent.getString("district");
+ map.put("province", province);
+ map.put("provinceCode", code.substring(0, 2) + "0000");
+ map.put("city", city);
+ map.put("cityCode", code.substring(0, 4) + "00");
+ map.put("district", district);
+ map.put("districtCode", code);
+ }
+ return map;
+ }
+
+}
--
Gitblit v1.7.1