From f3a8ace95bb141026b694b70df4d41bf284c6a7d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 11 三月 2026 21:50:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

---
 xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceAreaServiceImpl.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 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 cf8767e..71924e2 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
@@ -208,10 +208,6 @@
     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 = dto.getCityCode();
         List<XpGeoFencingPolygon> xpGeoFencingPolygons = mongoTemplate.find(new Query(Criteria.where("cityCode").is(cityCode)), XpGeoFencingPolygon.class);
         for (XpGeoFencingPolygon polygon : xpGeoFencingPolygons) {
@@ -233,7 +229,8 @@
                         if(electronicFence.getFailureType() == 2){
                             inOperationTime = isInOperationTime(operationStrategy);
                         }
-                        if(inOperationTime){
+                        XpElectronicFenceArea electronicFenceArea = this.getById(Long.valueOf(polygon.getAreaId()));
+                        if(inOperationTime && null != electronicFenceArea && !electronicFenceArea.getDeleted()){
                             vo.setStatus("inside");
                             vo.setElectronicAreaId(Long.valueOf(polygon.getAreaId()));
                             return vo;

--
Gitblit v1.7.1