From 2118a0969c631a5aaaec5e97693cfcf763b401f5 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 22 八月 2023 14:19:45 +0800
Subject: [PATCH] 获取封控圈内所有在线app用户改app单兵端

---
 ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

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 6792122..fd602a2 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
@@ -26,6 +26,7 @@
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.utils.tools.GisTool;
+import com.ruoyi.utils.tools.Point;
 import com.sun.org.apache.bcel.internal.generic.NEW;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -357,7 +358,7 @@
     public List<ArdCameras> getNearCamerasWithPolygon(SchedulingParam param) {
         try {
             Long deptId=SecurityUtils.getLoginUser().getUser().getDeptId();
-            List<Point2D> partitionLocation = param.getPartitionLocation();
+            List<Point> partitionLocation = param.getPartitionLocation();
             if(partitionLocation==null)
             {
                 log.debug("澶氳竟褰㈠潗鏍囬泦鍚堜负绌�");
@@ -374,7 +375,7 @@
                     continue;
                 }
                 /*鍒ゆ柇鍧愭爣鏄惁鍦ㄥ杈瑰舰鑼冨洿鍐�*/
-                Point2D camPosition=new Point2D.Double(camera.getLongitude(), camera.getLatitude());
+                Point camPosition=new Point(camera.getLongitude(),camera.getLatitude());
                 boolean inPolygon = GisTool.isInPolygon(camPosition, partitionLocation);
                 if (inPolygon) {
                     /*鑾峰彇閫氶亾鍒楄〃*/

--
Gitblit v1.9.3