From 4a293865ac437a812eea8800cc0b04314efbd210 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 24 十月 2023 10:06:24 +0800
Subject: [PATCH] 异步登录增加延迟时间避免接口频繁 修改大华通道数量获取
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 15 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 e79c3ec..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
@@ -12,6 +12,9 @@
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.hiksdk.service.IHikClientService;
+import com.ruoyi.media.domain.Vtdu;
+import com.ruoyi.media.service.IVtduService;
import com.ruoyi.scheduling.domian.SchedulingParam;
import com.ruoyi.utils.gis.GisUtil;
import com.ruoyi.utils.tools.ArdTool;
@@ -45,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);
@@ -86,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;
}
/**
@@ -145,6 +164,8 @@
if (res > 0) {
for (String id : ids) {
redisCache.deleteObject(getCacheKey(id));
+ //鍒犻櫎娴佸獟浣�
+ vtduService.deleteVtduByCameraId(id);
//鍒犻櫎褰撳墠鐩告満鐨勬墍鏈夐�氶亾
ardChannelMapper.deleteArdChannelByDeviceId(id);
}
@@ -216,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);
@@ -268,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) {
@@ -285,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) {
@@ -299,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);
//缁熻鎵�鏈夊厜鐢靛彲瑙嗚寖鍥村唴涓庢姤璀︾偣鐨勮窛绂�
@@ -312,7 +338,7 @@
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);
@@ -329,6 +355,7 @@
}
return null;
}
+
/**
* 鑾峰彇鐩戞帶鍦堝唴鎵�鏈夊湪绾垮厜鐢�
* 鍒樿嫃涔�
@@ -337,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<>();
@@ -355,11 +381,11 @@
continue;
}
/*鍒ゆ柇鍧愭爣鏄惁鍦ㄥ杈瑰舰鑼冨洿鍐�*/
- Point camPosition=new Point(camera.getLongitude(),camera.getLatitude());
+ 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