From 6d4312e383c4d779ab8aa29ea895d741bf617e49 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 07 六月 2022 11:12:22 +0800
Subject: [PATCH] Merge pull request #473 from AlphaWu/Zafu-Dev
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 312d3e0..6db08d1 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
@@ -67,7 +67,7 @@
" <if test='online == false' > AND dc.status=0</if>" +
" <if test='hasSubChannel == true' > AND dc.subCount > 0 </if>" +
" <if test='hasSubChannel == false' > AND dc.subCount = 0 </if>" +
- "GROUP BY dc.channelId " +
+ "ORDER BY dc.channelId " +
" </script>"})
List<DeviceChannel> queryChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online);
@@ -257,4 +257,8 @@
@Update(value = {"UPDATE device_channel SET latitude=${latitude}, longitude=${longitude} WHERE deviceId=#{deviceId} AND channelId=#{channelId}"})
void updatePotion(String deviceId, String channelId, double longitude, double latitude);
+
+ @Select("SELECT * FROM device_channel WHERE length(trim(streamId)) > 0")
+ List<DeviceChannel> getAllChannelInPlay();
+
}
--
Gitblit v1.8.0