From 9091740e4964c6065c6549cd1599624d0fb24cbd Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 31 五月 2024 16:32:30 +0800
Subject: [PATCH] 巡检需要的大光电查询修改提交
---
ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java | 2 ++
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java | 10 +++++++++-
ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml | 8 ++++++++
3 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java b/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java
index 34d793f..6894ece 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/mapper/ArdCamerasMapper.java
@@ -96,4 +96,6 @@
public Boolean getCameraOperationByCameraId(@Param("id") String id, @Param("userId") String userId);
public List<Map<String, Object>> getChannelByCameraId(String id);
+
+ public List<ArdCameras> findTowerCamerasBySubAndOwnDeptIds(@Param("deptIdList")List<Long> deptIdList);
}
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 a9f53ab..9fd6321 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
@@ -292,7 +292,15 @@
}
public List findOptions(ArdCameras ardCameras) {
- List<ArdCameras> options = ardCamerasMapper.findOptions(ardCameras);
+ //List<ArdCameras> options = ardCamerasMapper.findOptions(ardCameras);
+ List<Long> subDeptIdList = sysDeptMapper.selectDeptIdBySub(SecurityUtils.getDeptId());//涓嬪睘鍙婃湰鏉冮檺
+ List<Long> ownDeptIdList= sysDeptMapper.selectRoleDeptIdByUsersId(SecurityUtils.getUserId());//鑷畾涔夋潈闄�
+ HashSet<Long> deptIdSet = new HashSet();//鍘婚噸
+ deptIdSet.addAll(subDeptIdList);
+ deptIdSet.addAll(ownDeptIdList);
+ List<Long> deptIdList = new ArrayList();
+ deptIdList.addAll(deptIdSet);//绗﹀悎鏉′欢鐨勫叏閮ㄦ潈闄�
+ List<ArdCameras> options = ardCamerasMapper.findTowerCamerasBySubAndOwnDeptIds(deptIdList);
for (ArdCameras camera :
options) {
ArdChannel ardChannel = new ArdChannel();
diff --git a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
index 3936502..78083d2 100644
--- a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
@@ -398,4 +398,12 @@
inner join sys_config sc on sc.config_key = 'dayNightTime'
where ac.device_id = #{id}
</select>
+ <select id="findTowerCamerasBySubAndOwnDeptIds" parameterType="java.lang.String" resultMap = "ArdCamerasResult">
+ select * from ard_cameras where dept_id in
+ <foreach item="deptId" collection="deptIdList" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ and tower_id is not null
+ order by create_time desc
+ </select>
</mapper>
--
Gitblit v1.9.3