From a8846f9a399ad3356e9b54d51f6ef8147b0bb9e1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 三月 2026 09:22:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java
index 3035b0e..cf8767e 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java
@@ -5,6 +5,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xiaopeng.api.dto.map.RouteAndFareDto;
+import com.xiaopeng.api.dto.operation.LonLatCityCodeDto;
 import com.xiaopeng.api.dto.operation.LonLatDto;
 import com.xiaopeng.api.feignClient.operation.XpElectronicFenceClient;
 import com.xiaopeng.api.feignClient.operation.XpSystemSettingClient;
@@ -204,14 +205,14 @@
      * @return
      */
     @Override
-    public IsInOperationAreaVo isInOperationArea(LonLatDto dto) {
+    public IsInOperationAreaVo isInOperationArea(LonLatCityCodeDto dto) {
 
         IsInOperationAreaVo vo = new IsInOperationAreaVo();
-        Map<String, String> geocode = gdMapGeocodingUtil.geocode(dto.getLongitude().toString(), dto.getLatitude().toString());
-        if(null == geocode){
-            throw new RuntimeException("经纬度转换城市code失败");
-        }
-        String cityCode = geocode.get("cityCode");
+//        Map<String, String> geocode = gdMapGeocodingUtil.geocode(dto.getLongitude().toString(), dto.getLatitude().toString());
+//        if(null == geocode){
+//            throw new RuntimeException("经纬度转换城市code失败");
+//        }
+        String cityCode = dto.getCityCode();
         List<XpGeoFencingPolygon> xpGeoFencingPolygons = mongoTemplate.find(new Query(Criteria.where("cityCode").is(cityCode)), XpGeoFencingPolygon.class);
         for (XpGeoFencingPolygon polygon : xpGeoFencingPolygons) {
             if (polygon.getPoints() != null && polygon.getPoints().getCoordinates() != null) {

--
Gitblit v1.7.1