From 8a8a13eb80498e9b905b47b8dc4d52cd8fdb8497 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:36:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 af164ea..99c36f5 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,10 @@
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.IMediaService;
+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 +49,15 @@
@Resource
private ArdChannelMapper ardChannelMapper;
+ @Resource
+ private IVtduService vtduService;
+ @Resource
+ private IMediaService mediaService;
@PostConstruct
public void loadCameras() {
+
//娓呯┖鐩告満缂撳瓨
Collection<String> cacheKeys = redisCache.keys(getCacheKey("*"));
redisCache.deleteObject(cacheKeys);
@@ -78,7 +87,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;
}
/**
@@ -160,6 +178,8 @@
if (res > 0) {
for (String id : ids) {
redisCache.deleteObject(getCacheKey(id));
+ //鍒犻櫎娴佸獟浣�
+ vtduService.deleteVtduByCameraId(id);
//鍒犻櫎褰撳墠鐩告満鐨勬墍鏈夐�氶亾
ardChannelMapper.deleteArdChannelByDeviceId(id);
}
@@ -184,7 +204,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;
}
/**
--
Gitblit v1.9.3