From d85713cca5443547a7d4646d4e80abfce136eff8 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 02 七月 2024 15:54:17 +0800
Subject: [PATCH] 电磁锁根据三一车辆主键删除提交

---
 ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
index e7a7999..78083d2 100644
--- a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
@@ -349,7 +349,7 @@
                   ac.gdtype,ac.state,sdd.dict_label as "dictLabel",sdd0.dict_label as factory,
                   case sdd0.dict_label
                       when '娴峰悍' then concat('rtsp://',ac.username,':',ac.password,'@',ac.ip,':',ac.rtsp_port,'/h264/ch1/main/av_stream')
-                      when '澶у崕' then concat('rtsp://',ac.username,':',ac.password,'@',ac.ip,':',ac.rtsp_port,'/cam/realmonitor?channel=1&amp;subtype=1')
+                      when '澶у崕' then concat('rtsp://',ac.username,':',ac.password,'@',ac.ip,':',ac.rtsp_port,'/cam/realmonitor?channel=1&amp;subtype=0')
                       end as rtsp
            from  ard_cameras ac
                     inner join sys_dict_data sdd on ac.gdtype = sdd.dict_value
@@ -367,7 +367,7 @@
                   ac.gdtype,ac.state,sdd.dict_label as "dictLabel",sdd0.dict_label as factory,
                   case sdd0.dict_label
                       when '娴峰悍' then concat('rtsp://',ac.username,':',ac.password,'@',ac.ip,':',ac.rtsp_port,'/h264/ch1/main/av_stream')
-                      when '澶у崕' then concat('rtsp://',ac.username,':',ac.password,'@',ac.ip,':',ac.rtsp_port,'/cam/realmonitor?channel=1&amp;subtype=1')
+                      when '澶у崕' then concat('rtsp://',ac.username,':',ac.password,'@',ac.ip,':',ac.rtsp_port,'/cam/realmonitor?channel=1&amp;subtype=0')
                       end as rtsp from sys_user_role sur
                                            inner join sys_role_dept srd on sur.role_id = srd.role_id
                                            inner join ard_cameras ac on srd.dept_id = ac.dept_id
@@ -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