From 629c5b1816332300fd164a2e85551b212c62b0d4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 19 八月 2025 17:28:02 +0800
Subject: [PATCH] 跨城的多站点用户接口
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/SiteServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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..3d22c45 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;
@@ -39,7 +40,9 @@
if(null == startSiteId){
sites = siteMapper.querySite(null);
}else{
- sites = siteMapper.querySite(startSiteId);
+// sites = siteMapper.querySite(startSiteId);
+ // 查询终点和经停站
+ sites = siteMapper.querySite_(startSiteId);
}
Set<String> set = new HashSet<>();
for(Map<String, Object> site : sites) {
@@ -106,12 +109,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