From 9af8c942ba5083b6953e7c51f20a1b820a71746f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 18 八月 2025 21:12:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing into dev
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/SiteServiceImpl.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/SiteServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/SiteServiceImpl.java
index bf29d11..3aef32f 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/SiteServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/SiteServiceImpl.java
@@ -7,6 +7,7 @@
import com.stylefeng.guns.modular.crossCity.model.Site;
import com.stylefeng.guns.modular.crossCity.server.ISiteService;
import com.stylefeng.guns.modular.crossCity.warpper.SiteWarpper;
+import com.stylefeng.guns.modular.system.util.ElectricFenceUtil;
import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -106,12 +107,8 @@
}
}
if(Integer.valueOf(map.get("type").toString()) == 2){//电子围栏
- String gid = map.get("gid").toString();
- List<String> list1 = gdMapElectricFenceUtil.monitorElectricFenc("", lonLat);
- if(list1.contains(gid)){
- return true;
- }
- continue;
+ String coordinate = map.get("coordinate").toString();
+ return ElectricFenceUtil.monitorElectricFenc(coordinate, lonLat);
}
}
return false;
--
Gitblit v1.7.1