From c17dc5484bde25d032bf58d114a4f1598a301f31 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期三, 08 五月 2024 10:29:52 +0800
Subject: [PATCH] 增加用户预览位置接口
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 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 f4c899e..6149416 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
@@ -355,6 +355,7 @@
ardChannel.setDeviceId(camera.getId());
List<ArdChannel> ardChannels = ardChannelMapper.selectArdChannelList(ardChannel);
if (ardChannels != null) {
+ ardChannels.stream().sorted();
camera.setChannelList(ardChannels);
}
Map<String, Object> cameraMap = ArdTool.convertEntityToMap(camera);
@@ -563,11 +564,26 @@
}
@Override
- public List<Map<String, Object>> getCamerasByDeptId(Long deptId) {
- List<Map<String, Object>> result = ardCamerasMapper.getCamerasByDeptId(deptId);
+ public List<Map<String, Object>> getCamerasByDeptId(Long deptId,String userId) {
+ List<Long> deptIdList = new ArrayList();
+ deptIdList.add(deptId);
+ deptIdList = getOwnAndChildrenDeptIdList(deptIdList,new ArrayList());//閫掑綊鏌ヨ涓嬪睘閮ㄩ棬涓婚敭
+ //List<Map<String, Object>> result = ardCamerasMapper.getCamerasByDeptId(deptId,userId);
+ List<Map<String, Object>> result = ardCamerasMapper.getCamerasByDeptId(deptIdList,userId);
return result;
}
+ public List<Long> getOwnAndChildrenDeptIdList(List<Long> deptIdList,List<Long> deptIdListr){
+ deptIdListr.addAll(deptIdList);
+ List<Long> result = sysDeptMapper.getChildrenDeptIdList(deptIdList);
+ if(result.size() != 0){
+ deptIdListr.addAll(result);
+ result = getOwnAndChildrenDeptIdList(result,deptIdListr);
+ }
+ deptIdListr = deptIdListr.stream().distinct().collect(Collectors.toList());
+ return deptIdListr;
+ }
+
@Override
public Boolean getCameraOperationByCameraId(String id, String userId) {
Boolean result = ardCamerasMapper.getCameraOperationByCameraId(id,userId);
--
Gitblit v1.9.3