From 20439bc0fa1ff714ed5f61e711272deebb76e2c9 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 17 八月 2023 16:40:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 98 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 90 insertions(+), 8 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 afd8684..85cf727 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
@@ -2,13 +2,17 @@
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.uuid.IdUtils;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.hiksdk.common.GlobalVariable;
+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;
@@ -17,6 +21,7 @@
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;
@@ -39,6 +44,25 @@
@Resource
private RedisCache redisCache;
+
+ @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;
+ }
/**
* 鏌ヨ鐩告満璁惧
@@ -82,9 +106,11 @@
*/
@Override
public int insertArdCameras(ArdCameras ardCameras) {
+ ardCameras.setId(IdUtils.simpleUUID());
ardCameras.setCreateBy(SecurityUtils.getUsername());
ardCameras.setCreateTime(DateUtils.getNowDate());
ardCameras.setUserId(SecurityUtils.getUserId());
+ redisCache.setCacheObject(getCacheKey(ardCameras.getId()), ardCameras);
return ardCamerasMapper.insertArdCameras(ardCameras);
}
@@ -97,7 +123,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;
}
/**
@@ -108,7 +139,13 @@
*/
@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));
+ }
+ }
+ return res;
}
/**
@@ -136,10 +173,10 @@
*/
@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;
}
@@ -151,11 +188,11 @@
* @鍒涘缓鏃堕棿 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<>();
@@ -163,8 +200,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);
}
@@ -224,5 +261,50 @@
return null;
}
+ /**
+ * 鑾峰彇鐩戞帶鍦堝唴鎵�鏈夊湪绾垮厜鐢�
+ * 鍒樿嫃涔�
+ * 2023/8/17 13:57:21
+ */
+ @Override
+ public List<ArdCameras> getNearCameras(SchedulingParam param) {
+ try {
+ 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");
+ //鑾峰彇鎵�鏈夊厜鐢�
+ List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(new ArdCameras());
+ //缁熻鎵�鏈夊厜鐢靛彲瑙嗚寖鍥村唴涓庢姤璀︾偣鐨勮窛绂�
+ 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.setChannel(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