From f32c25a67a7f3ce0bde1f266b9f8abd6379b7378 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 21 八月 2023 16:06:56 +0800
Subject: [PATCH] 增加派警管理业务 获取部门和相机接口增加通道list
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 10 ++++++++--
1 files changed, 8 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 88b4637..eeac1a7 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
@@ -47,8 +47,7 @@
private SysDeptMapper sysDeptMapper;
@Resource
private RedisCache redisCache;
- @Resource
- private IHikClientService hikClientService;
+
@Resource
private ArdChannelMapper ardChannelMapper;
@@ -235,6 +234,13 @@
}
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);
}
--
Gitblit v1.9.3