From 8a87e4226aa802d6a0e3566c66824fedf68e77da Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:30:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 149 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 117 insertions(+), 32 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 88b4637..22b1c04 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,6 +1,5 @@
package com.ruoyi.device.camera.service.impl;
-import java.time.LocalTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -13,19 +12,18 @@
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.media.domain.Vtdu;
+import com.ruoyi.media.service.IVtduService;
import com.ruoyi.scheduling.domian.SchedulingParam;
-import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.utils.gis.GisUtil;
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 com.ruoyi.utils.gis.Point;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -47,14 +45,18 @@
private SysDeptMapper sysDeptMapper;
@Resource
private RedisCache redisCache;
- @Resource
- private IHikClientService hikClientService;
+
@Resource
private ArdChannelMapper ardChannelMapper;
-
+ @Resource
+ private IVtduService vtduService;
@PostConstruct
public void loadCameras() {
+ //娓呯┖鐩告満缂撳瓨
+ Collection<String> cacheKeys = redisCache.keys(getCacheKey("*"));
+ redisCache.deleteObject(cacheKeys);
+ //閲嶆柊鍔犺浇鐩告満鍒扮紦瀛�
List<ArdCameras> ardCameras = selectArdCamerasListNoDataScope(new ArdCameras());
for (ArdCameras ardCamera : ardCameras) {
redisCache.setCacheObject(getCacheKey(ardCamera.getId()), ardCamera);
@@ -80,7 +82,16 @@
*/
@Override
public ArdCameras selectArdCamerasById(String id) {
- return ardCamerasMapper.selectArdCamerasById(id);
+ ArdCameras ardCameras = ardCamerasMapper.selectArdCamerasById(id);
+ if (ardCameras != null) {
+ ArdChannel ardChannel = new ArdChannel();
+ ardChannel.setDeviceId(ardCameras.getId());
+ List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
+ if (ardChannels != null) {
+ ardCameras.setChannelList(ardChannels);
+ }
+ }
+ return ardCameras;
}
/**
@@ -92,7 +103,18 @@
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<ArdCameras> selectArdCamerasList(ArdCameras ardCameras) {
- return ardCamerasMapper.selectArdCamerasList(ardCameras);
+ List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(ardCameras);
+ if (ardCamerasList.size() > 0) {
+ for (ArdCameras camera : ardCamerasList) {
+ ArdChannel ardChannel = new ArdChannel();
+ ardChannel.setDeviceId(camera.getId());
+ List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
+ if (ardChannels != null) {
+ camera.setChannelList(ardChannels);
+ }
+ }
+ }
+ return ardCamerasList;
}
/**
@@ -119,20 +141,7 @@
ardCameras.setCreateTime(DateUtils.getNowDate());
ardCameras.setUserId(SecurityUtils.getUserId());
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;
+ return ardCamerasMapper.insertArdCameras(ardCameras);
}
/**
@@ -164,6 +173,8 @@
if (res > 0) {
for (String id : ids) {
redisCache.deleteObject(getCacheKey(id));
+ //鍒犻櫎娴佸獟浣�
+ vtduService.deleteVtduByCameraId(id);
//鍒犻櫎褰撳墠鐩告満鐨勬墍鏈夐�氶亾
ardChannelMapper.deleteArdChannelByDeviceId(id);
}
@@ -188,7 +199,15 @@
}
public List findOptions(ArdCameras ardCameras) {
- return ardCamerasMapper.findOptions(ardCameras);
+ List<ArdCameras> options = ardCamerasMapper.findOptions(ardCameras);
+ for (ArdCameras camera :
+ options) {
+ ArdChannel ardChannel = new ArdChannel();
+ ardChannel.setDeviceId(camera.getId());
+ List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
+ camera.setChannelList(ardChannels);
+ }
+ return options;
}
/**
@@ -235,6 +254,12 @@
}
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);
}
@@ -271,7 +296,7 @@
continue;
}
double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
- double distance = GisTool.getDistance(cmd.getTargetPosition(), camPosition);
+ double distance = GisUtil.getDistance(cmd.getTargetPosition(), camPosition);
if (camera.getCamMaxVisibleDistance() == null) {
continue;
}
@@ -280,7 +305,13 @@
camera.setChanNo(ArdTool.getChannelBydayNightTime(dayNightTime));
ardCameras.put(distance, camera);
}
-
+ //鑾峰彇閫氶亾鍒楄〃
+ ArdChannel ardChannel = new ArdChannel();
+ ardChannel.setDeviceId(camera.getId());
+ List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
+ if (ardChannels != null) {
+ camera.setChannelList(ardChannels);
+ }
}
return ardCameras;
} catch (Exception ex) {
@@ -297,6 +328,7 @@
@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) {
@@ -309,8 +341,10 @@
return null;
}
String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
- //鑾峰彇鎵�鏈夊厜鐢�
- List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(new ArdCameras());
+ //鑾峰彇鎵�鏈夊厜鐢�(鎸夐儴闂�)
+ ArdCameras cameras = new ArdCameras();
+ cameras.setDeptId(deptId);
+ List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(cameras);
//缁熻鎵�鏈夊厜鐢靛彲瑙嗚寖鍥村唴涓庢姤璀︾偣鐨勮窛绂�
List<ArdCameras> ardCameras = new ArrayList<>();
for (ArdCameras camera : ardCamerasList) {
@@ -318,9 +352,60 @@
continue;
}
double[] camPosition = new double[]{camera.getLongitude(), camera.getLatitude()};
- double distance = GisTool.getDistance(new double[]{longitude, latitude}, camPosition);
+ double distance = GisUtil.getDistance(new double[]{longitude, latitude}, camPosition);
if (distance <= radius) {
- camera.setChanNo(ArdTool.getChannelBydayNightTime(dayNightTime));
+ /*鑾峰彇閫氶亾鍒楄〃*/
+ ArdChannel ardChannel = new ArdChannel();
+ ardChannel.setDeviceId(camera.getId());
+ List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
+ camera.setChannelList(ardChannels);
+ 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;
+ }
+
+ /**
+ * 鑾峰彇鐩戞帶鍦堝唴鎵�鏈夊湪绾垮厜鐢�
+ * 鍒樿嫃涔�
+ * 2023/8/17 13:57:21
+ */
+ @Override
+ public List<ArdCameras> getNearCamerasWithPolygon(SchedulingParam param) {
+ try {
+ Long deptId = SecurityUtils.getLoginUser().getUser().getDeptId();
+ List<Point> partitionLocation = param.getPartitionLocation();
+ if (partitionLocation == 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;
+ }
+ /*鍒ゆ柇鍧愭爣鏄惁鍦ㄥ杈瑰舰鑼冨洿鍐�*/
+ Point camPosition = new Point(camera.getLongitude(), camera.getLatitude());
+ boolean inPolygon = GisUtil.isInPolygon(camPosition, partitionLocation);
+ if (inPolygon) {
+ /*鑾峰彇閫氶亾鍒楄〃*/
+ ArdChannel ardChannel = new ArdChannel();
+ ardChannel.setDeviceId(camera.getId());
+ List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
+ camera.setChannelList(ardChannels);
ardCameras.add(camera);
}
}
--
Gitblit v1.9.3