From 7b9bb72cd616ddbcb66e7d7384ee512334e64453 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 12 三月 2024 09:40:07 +0800
Subject: [PATCH] app光电查询修提交
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 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 97d071c..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;
@@ -373,6 +374,14 @@
List<DeptAndCamerasDto> deptAndCamerasList = sysDepts.stream()
.map(sysDept -> {
List<ArdCameras> ardCameras = ardCamerasMapper.selectArdCamerasByDeptId(sysDept.getDeptId());
+ ardCameras.stream().forEach(ardCamera ->{
+ ArdChannel ardChannel = new ArdChannel();
+ ardChannel.setDeviceId(ardCamera.getId());
+ List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
+ if (ardChannels != null) {
+ ardCamera.setChannelList(ardChannels);
+ }
+ });
DeptAndCamerasDto deptAndCamerasDto = new DeptAndCamerasDto();
deptAndCamerasDto.setSysDept(sysDept);
deptAndCamerasDto.setArdCamerasList(ardCameras);
@@ -395,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<>();
}
@@ -410,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;
}
@@ -551,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