From ffbead22a45b907130c496883890470b5413f098 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 13 三月 2024 09:19:19 +0800
Subject: [PATCH] app光电查询当前通道提交
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 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..f4c899e 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
@@ -1,8 +1,10 @@
package com.ruoyi.device.camera.service.impl;
+import java.text.SimpleDateFormat;
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 +375,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 +405,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 +420,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 +561,53 @@
}
return CameraConstants.UNIQUE;
}
+
+ @Override
+ public List<Map<String, Object>> getCamerasByDeptId(Long deptId) {
+ List<Map<String, Object>> result = ardCamerasMapper.getCamerasByDeptId(deptId);
+ return result;
+ }
+
+ @Override
+ public Boolean getCameraOperationByCameraId(String id, String userId) {
+ Boolean result = ardCamerasMapper.getCameraOperationByCameraId(id,userId);
+ return result;
+ }
+
+ @Override
+ public Map<String, Object> getChannelByCameraId(String id) {
+ List<Map<String,Object>> result = ardCamerasMapper.getChannelByCameraId(id);
+ Map<String,Object> resultMap = new HashMap();
+ if(result.size() == 1){
+ resultMap.put("chanNo", result.get(0).get("chan_no"));
+ return resultMap;
+ }else{
+ String configValue = (String) result.get(0).get("config_value");
+ String beginTime = configValue.split("-")[0];
+ String endTime = configValue.split("-")[1];
+ Date now = new Date();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String nowDay = sdf.format(now);
+ try{
+ Long beginDate = sdf.parse(nowDay).getTime()
+ + Integer.parseInt(beginTime.split(":")[0]) * 60 * 60 *1000
+ + Integer.parseInt(beginTime.split(":")[1]) * 60 *1000;
+ Long endDate = sdf.parse(nowDay).getTime()
+ + Integer.parseInt(endTime.split(":")[0]) * 60 * 60 *1000
+ + Integer.parseInt(endTime.split(":")[1]) * 60 *1000;
+ if(now.getTime() >= beginDate && now.getTime() <= endDate){
+ result = result.stream().filter(map -> ((Integer)map.get("chan_no")) == 1).collect(Collectors.toList());
+ resultMap.put("chanNo", result.get(0).get("chan_no"));
+ return resultMap;
+ }else{
+ result = result.stream().filter(map -> ((Integer)map.get("chan_no")) == 2).collect(Collectors.toList());
+ resultMap.put("chanNo", result.get(0).get("chan_no"));
+ return resultMap;
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ return resultMap;
+ }
+ }
+ }
}
--
Gitblit v1.9.3