From f6fd3607f046744e86f391956d91d0f009bb3adb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 18 八月 2025 22:50:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ElectricFenceUtil.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ElectricFenceUtil.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ElectricFenceUtil.java
index 3a4b007..1941b82 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ElectricFenceUtil.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ElectricFenceUtil.java
@@ -8,6 +8,10 @@
*/
public class ElectricFenceUtil {
+// public static void main(String[] args) {
+// boolean b = monitorElectricFenc("30.96233482687816,114.0918266313389;30.688443972530024,113.79746988182933;30.278129271486836,114.13781987344977;30.250180498063333,114.57475567350305;30.513377702529993,114.74493066931328;30.755997553111357,114.7725266145798;30.966298453688317,114.5747556735030", "114.311754,30.598604");
+// System.err.println(b);
+// }
/**
@@ -22,8 +26,8 @@
List<Double> pointsX = new ArrayList<>();
List<Double> pointsY = new ArrayList<>();
for (String s : split) {
- pointsX.add(Double.valueOf(s.split(",")[0]));
- pointsY.add(Double.valueOf(s.split(",")[1]));
+ pointsX.add(Double.valueOf(s.split(",")[1]));
+ pointsY.add(Double.valueOf(s.split(",")[0]));
}
String lon1 = lonLat.split(",")[0];
String lat1 = lonLat.split(",")[1];
--
Gitblit v1.7.1