From 9e28923b8c1c333df8ce3caf741b0e16da2ed48a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 20 六月 2023 14:15:27 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
index abcfe9b..333a3af 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
@@ -451,10 +451,18 @@
@Select("select count(1) from wvp_device_channel")
int getAllChannelCount();
-
- /*=================璁惧涓诲瓙鐮佹祦閫昏緫START==============*/
+ // 璁惧涓诲瓙鐮佹祦閫昏緫START
@Update(value = {"UPDATE wvp_device_channel SET stream_id=null WHERE device_id=#{deviceId}"})
void clearPlay(String deviceId);
- /*=================璁惧涓诲瓙鐮佹祦閫昏緫END==============*/
+ // 璁惧涓诲瓙鐮佹祦閫昏緫END
+ @Select(value = {" <script>" +
+ "select * " +
+ "from device_channel " +
+ "where device_id=#{deviceId}" +
+ " <if test='parentId != null '> and parent_id = #{parentId} </if>" +
+ " <if test='parentId == null '> and parent_id is null </if>" +
+ " <if test='onlyCatalog == true '> and parental = 1 </if>" +
+ " </script>"})
+ List<DeviceChannel> getSubChannelsByDeviceId(String deviceId, String parentId, boolean onlyCatalog);
}
--
Gitblit v1.8.0