From df7cbd4d9b23b44c8aca4c32d85551dd0706b7f0 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 22 八月 2023 10:56:21 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ruoyi/utils/tools/Point.java | 5 -----
ard-work/src/main/java/com/ruoyi/utils/tools/GisTool.java | 18 +++++++++---------
ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java | 4 +++-
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 4 +++-
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java | 2 +-
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 4 +++-
6 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
index a9d10ef..3a88178 100644
--- a/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java
@@ -202,7 +202,9 @@
if (lon == null || lat == null) {
continue;
}
- Point point2D=new Point(lon,lat);
+ Point point2D=new Point();
+ point2D.setLongitude(lon);
+ point2D.setLatitude(lat);
boolean inPolygon = GisTool.isInPolygon(point2D, partitionLocation);
if (inPolygon) {
Map<String, Object> params = new HashMap<>();
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
index 1af864c..6e25a85 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java
@@ -375,7 +375,9 @@
continue;
}
/*鍒ゆ柇鍧愭爣鏄惁鍦ㄥ杈瑰舰鑼冨洿鍐�*/
- Point camPosition=new Point(camera.getLongitude(), camera.getLatitude());
+ Point camPosition=new Point();
+ camPosition.setLongitude(camera.getLongitude());
+ camPosition.setLatitude(camera.getLatitude());
boolean inPolygon = GisTool.isInPolygon(camPosition, partitionLocation);
if (inPolygon) {
/*鑾峰彇閫氶亾鍒楄〃*/
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index 6624a81..4cf89fa 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -1143,7 +1143,9 @@
List<Map<String, Object>> carGPSMap = (List<Map<String, Object>>) carGPSTrack.get("list");
Double lng = Double.valueOf((String) carGPSMap.get(0).get("lng"));
Double lat = Double.valueOf((String) carGPSMap.get(0).get("lat"));
- Point point = new Point(lng, lat);
+ Point point = new Point();
+ point.setLongitude(lng);
+ point.setLatitude(lat);
boolean inPolygon = GisTool.isInPolygon(point, partitionLocation);
if (inPolygon) {
carMap.put("longitude", lng);
diff --git a/ard-work/src/main/java/com/ruoyi/utils/tools/GisTool.java b/ard-work/src/main/java/com/ruoyi/utils/tools/GisTool.java
index 4682ff7..48c156f 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/tools/GisTool.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/tools/GisTool.java
@@ -35,15 +35,15 @@
}
public static void main(String[] args) {
- // 琚娴嬬殑缁忕含搴︾偣
- Point point= new Point(126.649261,45.687377);
- // 鍟嗕笟鍖哄煙锛堢櫨搴﹀杈瑰舰鍖哄煙缁忕含搴﹂泦鍚堬級
- List<Point> partitionLocation = new ArrayList<>();
- partitionLocation.add(new Point(126.64459,45.688548));
- partitionLocation.add(new Point(126.653376,45.68938));
- partitionLocation.add(new Point(126.645776,45.685048));
- partitionLocation.add(new Point(126.654184,45.685778));
- System.out.println(isInPolygon(point,partitionLocation));
+// // 琚娴嬬殑缁忕含搴︾偣
+// Point point= new Point(126.649261,45.687377);
+// // 鍟嗕笟鍖哄煙锛堢櫨搴﹀杈瑰舰鍖哄煙缁忕含搴﹂泦鍚堬級
+// List<Point> partitionLocation = new ArrayList<>();
+// partitionLocation.add(new Point(126.64459,45.688548));
+// partitionLocation.add(new Point(126.653376,45.68938));
+// partitionLocation.add(new Point(126.645776,45.685048));
+// partitionLocation.add(new Point(126.654184,45.685778));
+// System.out.println(isInPolygon(point,partitionLocation));
}
/**
diff --git a/ard-work/src/main/java/com/ruoyi/utils/tools/Point.java b/ard-work/src/main/java/com/ruoyi/utils/tools/Point.java
index 6035a64..eb1daf8 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/tools/Point.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/tools/Point.java
@@ -15,9 +15,4 @@
private static final long serialVersionUID = 1L;
private Double longitude;
private Double latitude;
-
- public Point(Double x, Double y) {
- this.longitude = x;
- this.latitude = y;
- }
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java
index 79b736c..32d77f4 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java
@@ -102,7 +102,7 @@
SysUser sysUser = sysUserService.selectUserById(currentOperator);
if(StringUtils.isNull(sysUser))
{
- return false;
+ return true;
}
currentLevel = Integer.valueOf(sysUser.getCameraPriority());
}
--
Gitblit v1.9.3