From e07cc12a2c219fceeaecd96e77ed642037552fda Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 04 七月 2023 14:45:37 +0800
Subject: [PATCH] websocket推送ptz增加当前操作用户中文名
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 83 +++++++++++++++++++++++++++++++++--------
1 files changed, 67 insertions(+), 16 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 1b42fc8..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
@@ -1,25 +1,26 @@
package com.ruoyi.device.camera.service.impl;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalTime;
+import java.util.*;
import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.bean.BeanUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.common.utils.tools.ArdTool;
+import com.ruoyi.device.camera.domain.CameraCmd;
+import com.ruoyi.device.hiksdk.common.GlobalVariable;
+import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.utils.tools.ArdTool;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.system.mapper.SysDeptMapper;
+import com.ruoyi.utils.tools.GisTool;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
import javax.annotation.Resource;
/**
@@ -29,11 +30,15 @@
* @date 2023-02-11
*/
@Service
+@Slf4j
public class ArdCamerasServiceImpl implements IArdCamerasService {
@Resource
private ArdCamerasMapper ardCamerasMapper;
@Resource
private SysDeptMapper sysDeptMapper;
+ @Resource
+ private RedisCache redisCache;
+
/**
* 鏌ヨ鐩告満璁惧
@@ -131,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<>();
@@ -157,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);
}
@@ -173,5 +179,50 @@
}
+ /**
+ * @鎻忚堪 閫氳繃鍧愭爣鑾峰彇闄勮繎鐨勭浉鏈�
+ * @鍙傛暟 [cmd]
+ * @杩斿洖鍊� java.util.Map
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/6/17 11:55
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
+ @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<>();
+ 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);
+ }
+
+ }
+ return ardCameras;
+ } catch (Exception ex) {
+ log.error("鑾峰彇闄勮繎鐩告満寮傚父:" + ex.getMessage());
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.3