From d6c0f2ed698d6cdf86a0a3a8893b4d9717f3b7b1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 08 五月 2026 14:51:54 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceServiceImpl.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceServiceImpl.java b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceServiceImpl.java
index e32a692..0a63e56 100644
--- a/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceServiceImpl.java
+++ b/xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpElectronicFenceServiceImpl.java
@@ -297,20 +297,20 @@
}
//根据经纬度获取当前城市code
-// XpElectronicFenceArea xpElectronicFenceArea = dto.getElectronicFenceAreas().get(0);
-// String[] split = xpElectronicFenceArea.getFencePoints().split(",");
-// Coordinate[] coordinates = new Coordinate[split.length + 1];
-// for (int i = 0; i < split.length; i++) {
-// String[] split1 = split[i].split("_");
-// coordinates[i] = new Coordinate(Double.parseDouble(split1[0]), Double.parseDouble(split1[1]));
-// }
-// org.locationtech.jts.geom.Point point = calculateCentroid(coordinates);
-// Map<String, String> geocode = gdMapGeocodingUtil.geocode(point.getX() + "", point.getY() + "");
-// if (null == geocode) {
-// return R.fail("经纬度转换城市code失败");
-// }
-// String cityCode = geocode.get("cityCode");
-// dto.setCityCode(cityCode);
+ XpElectronicFenceArea xpElectronicFenceArea = dto.getElectronicFenceAreas().get(0);
+ String[] split = xpElectronicFenceArea.getFencePoints().split(",");
+ Coordinate[] coordinates = new Coordinate[split.length + 1];
+ for (int i = 0; i < split.length; i++) {
+ String[] split1 = split[i].split("_");
+ coordinates[i] = new Coordinate(Double.parseDouble(split1[0]), Double.parseDouble(split1[1]));
+ }
+ org.locationtech.jts.geom.Point point = calculateCentroid(coordinates);
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(point.getX() + "", point.getY() + "");
+ if (null == geocode) {
+ return R.fail("经纬度转换城市code失败");
+ }
+ String cityCode = geocode.get("cityCode");
+ dto.setCityCode(cityCode);
xpElectronicFence.setCityCode(dto.getCityCode());
@@ -446,7 +446,7 @@
QuartzManager.removeJob((ElectronicEffectJob.effect + xpElectronicFence.getId()).toUpperCase(), TimeJobType.ELECTRONIC_EFFECT);
QuartzManager.removeJob((ElectronicEffectJob.failure + xpElectronicFence.getId()).toUpperCase(), TimeJobType.ELECTRONIC_FAILURE);
}
- /*
+
//根据经纬度获取当前城市code
XpElectronicFenceArea electronicFenceArea = dto.getElectronicFenceAreas().get(0);
String[] split = electronicFenceArea.getFencePoints().split(",");
@@ -462,7 +462,6 @@
}
String cityCode = geocode.get("cityCode");
dto.setCityCode(cityCode);
- */
xpElectronicFence.setCityCode(dto.getCityCode());
--
Gitblit v1.7.1