From 5edd84c3d79263a32afdd9564ad0373fc253389f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 11 九月 2025 15:03:22 +0800
Subject: [PATCH] 日志打印
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/SiteServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 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 3aef32f..0cffd35 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
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.crossCity.dao.LineSiteMapper;
import com.stylefeng.guns.modular.crossCity.dao.LocationMapper;
import com.stylefeng.guns.modular.crossCity.dao.SiteMapper;
+import com.stylefeng.guns.modular.crossCity.model.LineSite;
import com.stylefeng.guns.modular.crossCity.model.Site;
import com.stylefeng.guns.modular.crossCity.server.ISiteService;
import com.stylefeng.guns.modular.crossCity.warpper.SiteWarpper;
@@ -25,6 +27,9 @@
@Resource
private LocationMapper locationMapper;
+ @Resource
+ private LineSiteMapper lineSiteMapper;
+
@Autowired
private GDMapElectricFenceUtil gdMapElectricFenceUtil;
@@ -40,7 +45,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) {
@@ -113,6 +120,43 @@
}
return false;
}
+ @Override
+ public boolean areaMonitoring1(Integer lineId, Integer code, String lonLat) throws Exception {
+ List<Integer> lineSites = lineSiteMapper.areaMonitoring1(lineId);
+ for (Integer lineSite : lineSites) {
+ List<Map<String, Object>> list = this.queryLocation(lineSite);
+ String province = code.toString().substring(0, 2) + "0000";
+ String city = code.toString().substring(0, 4) + "00";
+ for (Map<String, Object> map : list) {
+ if (Integer.valueOf(map.get("type").toString()) == 1) {//行政区域
+ if (null != map.get("districtCode")) {
+ if (code.toString().equals(map.get("districtCode").toString())) {
+ return true;
+ }
+ continue;
+ }
+ if (null != map.get("cityCode")) {
+ if (city.equals(map.get("cityCode").toString())) {
+ return true;
+ }
+ continue;
+ }
+ if (null != map.get("provinceCode")) {
+ if (province.equals(map.get("provinceCode").toString())) {
+ return true;
+ }
+ continue;
+ }
+ }
+ if (Integer.valueOf(map.get("type").toString()) == 2) {//电子围栏
+ String coordinate = map.get("coordinate").toString();
+ return ElectricFenceUtil.monitorElectricFenc(coordinate, lonLat);
+ }
+ }
+ }
+ return false;
+
+ }
/**
* 根据站点id获取地点区域
--
Gitblit v1.7.1