From aaa07634fa899b7346dfd61c6f70962adbc1dca5 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 20 十月 2023 08:55:02 +0800
Subject: [PATCH] 1. 增加聚焦值和获取接口。 2. 增加视频编码获取接口。 3. 流媒体通过编码自动切换是否转码。
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 86 +++++++++++++++++++++++--------------------
1 files changed, 46 insertions(+), 40 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 fd602a2..8fb5c0d 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,7 +1,5 @@
package com.ruoyi.device.camera.service.impl;
-import java.awt.geom.Point2D;
-import java.time.LocalTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -14,20 +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.ruoyi.utils.tools.Point;
-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;
@@ -52,10 +48,15 @@
@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);
@@ -93,7 +94,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;
}
/**
@@ -120,20 +132,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);
}
/**
@@ -165,6 +164,8 @@
if (res > 0) {
for (String id : ids) {
redisCache.deleteObject(getCacheKey(id));
+ //鍒犻櫎娴佸獟浣�
+ vtduService.deleteVtduByCameraId(id);
//鍒犻櫎褰撳墠鐩告満鐨勬墍鏈夐�氶亾
ardChannelMapper.deleteArdChannelByDeviceId(id);
}
@@ -236,11 +237,10 @@
}
if (ardCameras.size() > 0) {
for (ArdCameras camera : ardCameras) {
- ArdChannel ardChannel=new ArdChannel();
+ ArdChannel ardChannel = new ArdChannel();
ardChannel.setDeviceId(camera.getId());
List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
- if(ardChannels!=null)
- {
+ if (ardChannels != null) {
camera.setChannelList(ardChannels);
}
Map<String, Object> cameraMap = ArdTool.convertEntityToMap(camera);
@@ -279,7 +279,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;
}
@@ -288,7 +288,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) {
@@ -305,7 +311,7 @@
@Override
public List<ArdCameras> getNearCameras(SchedulingParam param) {
try {
- Long deptId=SecurityUtils.getLoginUser().getUser().getDeptId();
+ Long deptId = SecurityUtils.getLoginUser().getUser().getDeptId();
Double longitude = param.getLongitude();
Double latitude = param.getLatitude();
if (longitude == null && latitude == null) {
@@ -319,7 +325,7 @@
}
String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
//鑾峰彇鎵�鏈夊厜鐢�(鎸夐儴闂�)
- ArdCameras cameras= new ArdCameras();
+ ArdCameras cameras = new ArdCameras();
cameras.setDeptId(deptId);
List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(cameras);
//缁熻鎵�鏈夊厜鐢靛彲瑙嗚寖鍥村唴涓庢姤璀︾偣鐨勮窛绂�
@@ -329,10 +335,10 @@
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) {
/*鑾峰彇閫氶亾鍒楄〃*/
- ArdChannel ardChannel=new ArdChannel();
+ ArdChannel ardChannel = new ArdChannel();
ardChannel.setDeviceId(camera.getId());
List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
camera.setChannelList(ardChannels);
@@ -349,6 +355,7 @@
}
return null;
}
+
/**
* 鑾峰彇鐩戞帶鍦堝唴鎵�鏈夊湪绾垮厜鐢�
* 鍒樿嫃涔�
@@ -357,16 +364,15 @@
@Override
public List<ArdCameras> getNearCamerasWithPolygon(SchedulingParam param) {
try {
- Long deptId=SecurityUtils.getLoginUser().getUser().getDeptId();
+ Long deptId = SecurityUtils.getLoginUser().getUser().getDeptId();
List<Point> partitionLocation = param.getPartitionLocation();
- if(partitionLocation==null)
- {
+ if (partitionLocation == null) {
log.debug("澶氳竟褰㈠潗鏍囬泦鍚堜负绌�");
return null;
}
String dayNightTime = redisCache.getCacheObject("sys_config:dayNightTime");
//鑾峰彇鎵�鏈夊厜鐢�(鎸夐儴闂�)
- ArdCameras cameras= new ArdCameras();
+ ArdCameras cameras = new ArdCameras();
cameras.setDeptId(deptId);
List<ArdCameras> ardCamerasList = ardCamerasMapper.selectArdCamerasList(cameras);
List<ArdCameras> ardCameras = new ArrayList<>();
@@ -375,11 +381,11 @@
continue;
}
/*鍒ゆ柇鍧愭爣鏄惁鍦ㄥ杈瑰舰鑼冨洿鍐�*/
- Point camPosition=new Point(camera.getLongitude(),camera.getLatitude());
- boolean inPolygon = GisTool.isInPolygon(camPosition, partitionLocation);
+ Point camPosition = new Point(camera.getLongitude(), camera.getLatitude());
+ boolean inPolygon = GisUtil.isInPolygon(camPosition, partitionLocation);
if (inPolygon) {
/*鑾峰彇閫氶亾鍒楄〃*/
- ArdChannel ardChannel=new ArdChannel();
+ ArdChannel ardChannel = new ArdChannel();
ardChannel.setDeviceId(camera.getId());
List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
camera.setChannelList(ardChannels);
--
Gitblit v1.9.3