From a426b9bc53d0029c1dcb341a6dd30308ca079243 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 01 九月 2023 09:19:55 +0800
Subject: [PATCH] Merge pull request #1036 from daniel10917/fix-channel-catalog
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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
old mode 100644
new mode 100755
index abcfe9b..d48b802
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
@@ -193,7 +193,7 @@
@Update(value = {"UPDATE wvp_device_channel SET status=false WHERE device_id=#{deviceId} AND channel_id=#{channelId}"})
void offline(String deviceId, String channelId);
- @Update(value = {"UPDATE wvp_device_channel SET status=fasle WHERE device_id=#{deviceId}"})
+ @Update(value = {"UPDATE wvp_device_channel SET status=false WHERE device_id=#{deviceId}"})
void offlineByDeviceId(String deviceId);
@Insert("<script> " +
@@ -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 wvp_device_channel " +
+ "where device_id=#{deviceId}" +
+ " <if test='parentId != null and parentId != deviceId'> and parent_id = #{parentId} </if>" +
+ " <if test='parentId == null or parentId == deviceId'> and parent_id is null or parent_id = #{deviceId}</if>" +
+ " <if test='onlyCatalog == true '> and parental = 1 </if>" +
+ " </script>"})
+ List<DeviceChannel> getSubChannelsByDeviceId(String deviceId, String parentId, boolean onlyCatalog);
}
--
Gitblit v1.8.0