From fdbb8d1d091524727456bf63d86b9612d39f822d Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期一, 21 八月 2023 17:18:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 210 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 190 insertions(+), 20 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..e14f950 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,35 @@
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 java.util.stream.Collectors;
+import com.ruoyi.common.constant.CacheConstants;
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.common.utils.uuid.IdUtils;
+import com.ruoyi.device.camera.domain.CameraCmd;
+import com.ruoyi.device.channel.domain.ArdChannel;
+import com.ruoyi.device.channel.mapper.ArdChannelMapper;
+import com.ruoyi.device.channel.service.IArdChannelService;
+import com.ruoyi.device.hiksdk.common.GlobalVariable;
+import com.ruoyi.device.hiksdk.service.IHikClientService;
+import com.ruoyi.scheduling.domian.SchedulingParam;
+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 com.sun.org.apache.bcel.internal.generic.NEW;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
import javax.annotation.Resource;
/**
@@ -29,11 +39,37 @@
* @date 2023-02-11
*/
@Service
+@Slf4j
public class ArdCamerasServiceImpl implements IArdCamerasService {
@Resource
private ArdCamerasMapper ardCamerasMapper;
@Resource
private SysDeptMapper sysDeptMapper;
+ @Resource
+ private RedisCache redisCache;
+
+ @Resource
+ private ArdChannelMapper ardChannelMapper;
+
+
+ @PostConstruct
+ public void loadCameras() {
+ List<ArdCameras> ardCameras = selectArdCamerasListNoDataScope(new ArdCameras());
+ for (ArdCameras ardCamera : ardCameras) {
+ redisCache.setCacheObject(getCacheKey(ardCamera.getId()), ardCamera);
+ }
+
+ }
+
+ /**
+ * 璁剧疆cache key
+ *
+ * @param configKey 鍙傛暟閿�
+ * @return 缂撳瓨閿甼ey
+ */
+ private String getCacheKey(String configKey) {
+ return CacheConstants.CAMERA_LIST_KEY + configKey;
+ }
/**
* 鏌ヨ鐩告満璁惧
@@ -77,10 +113,25 @@
*/
@Override
public int insertArdCameras(ArdCameras ardCameras) {
+ ardCameras.setId(IdUtils.simpleUUID());
ardCameras.setCreateBy(SecurityUtils.getUsername());
ardCameras.setCreateTime(DateUtils.getNowDate());
ardCameras.setUserId(SecurityUtils.getUserId());
- return ardCamerasMapper.insertArdCameras(ardCameras);
+ redisCache.setCacheObject(getCacheKey(ardCameras.getId()), ardCameras);
+ int i = ardCamerasMapper.insertArdCameras(ardCameras);
+ if (i > 0) {
+// //鍒犻櫎褰撳墠鐩告満鐨勬墍鏈夐�氶亾
+// ardChannelMapper.deleteArdChannelByDeviceId(ardCameras.getId());
+// //鑾峰彇鐩告満閫氶亾
+// List<ArdChannel> ipChannelList = hikClientService.getCameraChannelList(ardCameras);
+// if (ipChannelList.size() > 0) {
+// for (ArdChannel channel : ipChannelList) {
+// channel.setId(IdUtils.simpleUUID());
+// ardChannelMapper.insertArdChannel(channel);
+// }
+// }
+ }
+ return i;
}
/**
@@ -92,7 +143,12 @@
@Override
public int updateArdCameras(ArdCameras ardCameras) {
ardCameras.setUpdateTime(DateUtils.getNowDate());
- return ardCamerasMapper.updateArdCameras(ardCameras);
+ int res = ardCamerasMapper.updateArdCameras(ardCameras);
+ if (res > 0) {
+ redisCache.deleteObject(getCacheKey(ardCameras.getId()));
+ redisCache.setCacheObject(getCacheKey(ardCameras.getId()), ardCameras);
+ }
+ return res;
}
/**
@@ -103,7 +159,15 @@
*/
@Override
public int deleteArdCamerasByIds(String[] ids) {
- return ardCamerasMapper.deleteArdCamerasByIds(ids);
+ int res = ardCamerasMapper.deleteArdCamerasByIds(ids);
+ if (res > 0) {
+ for (String id : ids) {
+ redisCache.deleteObject(getCacheKey(id));
+ //鍒犻櫎褰撳墠鐩告満鐨勬墍鏈夐�氶亾
+ ardChannelMapper.deleteArdChannelByDeviceId(id);
+ }
+ }
+ return res;
}
/**
@@ -114,7 +178,12 @@
*/
@Override
public int deleteArdCamerasById(String id) {
- return ardCamerasMapper.deleteArdCamerasById(id);
+ int i = ardCamerasMapper.deleteArdCamerasById(id);
+ if (i > 0) {
+ //鍒犻櫎褰撳墠鐩告満鐨勬墍鏈夐�氶亾
+ ardChannelMapper.deleteArdChannelByDeviceId(id);
+ }
+ return i;
}
public List findOptions(ArdCameras ardCameras) {
@@ -131,25 +200,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,13 +227,20 @@
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);
}
if (ardCameras.size() > 0) {
for (ArdCameras camera : ardCameras) {
+ ArdChannel ardChannel=new ArdChannel();
+ ardChannel.setDeviceId(camera.getId());
+ List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
+ if(ardChannels!=null)
+ {
+ camera.setChannelList(ardChannels);
+ }
Map<String, Object> cameraMap = ArdTool.convertEntityToMap(camera);
childList.add(cameraMap);
}
@@ -173,5 +250,98 @@
}
+ /**
+ * @鎻忚堪 閫氳繃鍧愭爣鑾峰彇闄勮繎鐨勭浉鏈�
+ * @鍙傛暟 [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.setChanNo(ArdTool.getChannelBydayNightTime(dayNightTime));
+ ardCameras.put(distance, camera);
+ }
+
+ }
+ return ardCameras;
+ } catch (Exception ex) {
+ log.error("鑾峰彇闄勮繎鐩告満寮傚父:" + ex.getMessage());
+ }
+ return null;
+ }
+
+ /**
+ * 鑾峰彇鐩戞帶鍦堝唴鎵�鏈夊湪绾垮厜鐢�
+ * 鍒樿嫃涔�
+ * 2023/8/17 13:57:21
+ */
+ @Override
+ public List<ArdCameras> getNearCameras(SchedulingParam param) {
+ try {
+ Long deptId=SecurityUtils.getLoginUser().getUser().getDeptId();
+ Double longitude = param.getLongitude();
+ Double latitude = param.getLatitude();
+ if (longitude == null && latitude == null) {
+ log.debug("鍘熺偣鍧愭爣涓虹┖");
+ return null;
+ }
+ Integer radius = param.getMonitoringRadius();
+ if (radius == null) {
+ log.debug("鐩戞帶鍦堝崐寰勮窛绂讳负绌�");
+ return null;
+ }
+ String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
+ //鑾峰彇鎵�鏈夊厜鐢�(鎸夐儴闂�)
+ ArdCameras cameras= new ArdCameras();
+ cameras.setDeptId(deptId);
+ List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(cameras);
+ //缁熻鎵�鏈夊厜鐢靛彲瑙嗚寖鍥村唴涓庢姤璀︾偣鐨勮窛绂�
+ List<ArdCameras> ardCameras = new ArrayList<>();
+ for (ArdCameras camera : ardCamerasList) {
+ if (camera.getLongitude() == null && camera.getLatitude() == null) {
+ continue;
+ }
+ double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
+ double distance = GisTool.getDistance(new double[]{longitude, latitude}, camPosition);
+ if (distance <= radius) {
+ camera.setChanNo(ArdTool.getChannelBydayNightTime(dayNightTime));
+ ardCameras.add(camera);
+ }
+ }
+ //杩囨护鍦ㄧ嚎鐩告満
+ List<ArdCameras> onlineList = ardCameras.stream()
+ .filter(ardCamera -> (!ardCamera.getLoginId().equals(-1)))
+ .collect(Collectors.toList());
+ return onlineList;
+ } catch (Exception ex) {
+ log.error("鑾峰彇闄勮繎鐩告満寮傚父:" + ex.getMessage());
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3