From eb14cc836d7fa3dc9d093be450463c68cb64af6e Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 04 七月 2023 16:00:45 +0800
Subject: [PATCH] websocket推送ptz增加剩余秒数
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 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 9a12c39..cbd7f4e 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
@@ -136,25 +136,26 @@
*/
@Override
- public Map getChildDeptAndCamera() {
+ public Map getChildDeptAndCamera(Boolean disabled) {
Long deptId = SecurityUtils.getDeptId();
SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
- Map<String, Object> map = fetchChildDepartments(sysDept);
+ Map<String, Object> map = fetchChildDepartments(sysDept,disabled);
return map;
}
+
/**
* @鎻忚堪 閫掑綊鏌ヨ
* @鍙傛暟 [sysDept]
- * @杩斿洖鍊� java.util.Map<java.lang.String,java.lang.Object>
+ * @杩斿洖鍊� java.util.Map<java.lang.String, java.lang.Object>
* @鍒涘缓浜� 鍒樿嫃涔�
* @鍒涘缓鏃堕棿 2023/6/2 14:38
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
- public Map<String, Object> fetchChildDepartments(SysDept sysDept) {
+ public Map<String, Object> fetchChildDepartments(SysDept sysDept,Boolean disabled) {
Map<String, Object> map = new HashMap<>();
map.put("name", sysDept.getDeptName());
map.put("deptId", sysDept.getDeptId());
- map.put("disabled", true);
+ map.put("disabled", disabled);
List<SysDept> sysDepts = sysDeptMapper.selectNextChildrenDeptById(sysDept.getDeptId());
List<ArdCameras> ardCameras = ardCamerasMapper.selectArdCamerasByDeptId(sysDept.getDeptId());
List<Object> childList = new ArrayList<>();
@@ -162,8 +163,8 @@
Map<String, Object> childMap = new HashMap<>();
childMap.put("name", childDept.getDeptName());
childMap.put("deptId", childDept.getDeptId());
- childMap.put("disabled", true);
- Map<String, Object> map1 = fetchChildDepartments(childDept);
+ childMap.put("disabled", disabled);
+ Map<String, Object> map1 = fetchChildDepartments(childDept,disabled);
childMap.putAll(map1);
childList.add(childMap);
}
@@ -177,6 +178,7 @@
return map;
}
+
/**
* @鎻忚堪 閫氳繃鍧愭爣鑾峰彇闄勮繎鐨勭浉鏈�
* @鍙傛暟 [cmd]
@@ -188,24 +190,36 @@
@Override
public TreeMap getNearCamerasBycoordinate(CameraCmd cmd) {
try {
+ double[] targetPosition = cmd.getTargetPosition();
+ if (targetPosition == null || (targetPosition != null && targetPosition.length == 0)) {
+ log.debug("鐩爣浣嶇疆涓虹┖");
+ return new TreeMap<>();
+ }
String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
//鑾峰彇鎵�鏈夊ぇ鍏夌數
List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(new ArdCameras("1"));
//缁熻鎵�鏈夊ぇ鍏夌數鍙鑼冨洿鍐呬笌鎶ヨ鐐圭殑璺濈
Map<String, Double> distanceMap = new HashMap<>();
- TreeMap<Double,ArdCameras> ardCameras = new TreeMap<>();
+ TreeMap<Double, ArdCameras> ardCameras = new TreeMap<>();
for (ArdCameras camera : ardCamerasList) {
+ if (camera.getLongitude() == null && camera.getLatitude() == null) {
+ continue;
+ }
double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
double distance = GisTool.getDistance(cmd.getTargetPosition(), camPosition);
+ if (camera.getCamMaxVisibleDistance() == null) {
+ continue;
+ }
if (distance != 0.0 && distance <= camera.getCamMaxVisibleDistance()) {
distanceMap.put(camera.getId(), distance);
camera.setChannel(ArdTool.getChannelBydayNightTime(dayNightTime));
- ardCameras.put(distance,camera);
+ ardCameras.put(distance, camera);
}
+
}
return ardCameras;
} catch (Exception ex) {
- log.error("寮曞寮傚父:" + ex.getMessage());
+ log.error("鑾峰彇闄勮繎鐩告満寮傚父:" + ex.getMessage());
}
return null;
}
--
Gitblit v1.9.3