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, 8 insertions(+), 3 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 be6a3b9..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
@@ -403,8 +403,8 @@
@Override
public TreeMap getNearCamerasBycoordinate(CameraCmd cmd) {
try {
- GuidePoint guidePoint = cmd.getTargetPosition();
- if (guidePoint == null) {
+ double[] targetPosition = cmd.getTargetPosition();
+ if (targetPosition == null) {
log.debug("鐩爣浣嶇疆涓虹┖");
return new TreeMap<>();
}
@@ -419,7 +419,6 @@
continue;
}
double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
- double[] targetPosition = new double[]{guidePoint.getLongitude(), guidePoint.getLatitude()};
double distance = GisUtil.getDistance(targetPosition, camPosition);
if (camera.getCamMaxVisibleDistance() == null) {
continue;
@@ -561,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