From 48af67d016ceca5d8bd598c478b70c54ed099bf0 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 12 三月 2024 11:25:07 +0800
Subject: [PATCH] 大华设备增加getPTZ

---
 ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java |   11 +++++++++--
 1 files changed, 9 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 1b7b893..a1811dd 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
@@ -3,6 +3,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.ruoyi.alarm.global.domain.GuidePoint;
 import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.constant.CameraConstants;
@@ -403,7 +404,7 @@
     public TreeMap getNearCamerasBycoordinate(CameraCmd cmd) {
         try {
             double[] targetPosition = cmd.getTargetPosition();
-            if (targetPosition == null || (targetPosition != null && targetPosition.length == 0)) {
+            if (targetPosition == null) {
                 log.debug("鐩爣浣嶇疆涓虹┖");
                 return new TreeMap<>();
             }
@@ -418,7 +419,7 @@
                     continue;
                 }
                 double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
-                double distance = GisUtil.getDistance(cmd.getTargetPosition(), camPosition);
+                double distance = GisUtil.getDistance(targetPosition, camPosition);
                 if (camera.getCamMaxVisibleDistance() == null) {
                     continue;
                 }
@@ -559,4 +560,10 @@
         }
         return CameraConstants.UNIQUE;
     }
+
+    @Override
+    public List<Map<String, Object>> getCamerasByDeptId(Long deptId) {
+        List<Map<String, Object>> result = ardCamerasMapper.getCamerasByDeptId(deptId);
+        return result;
+    }
 }

--
Gitblit v1.9.3