From ccc0a99d6894844d83d751b924cfebe74da7826c Mon Sep 17 00:00:00 2001
From: ‘sxh’ <1632740646@qq.com>
Date: 星期四, 15 六月 2023 11:20:43 +0800
Subject: [PATCH] 同步主线的代码，保持一致性
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 13 ++++++++++---
1 files changed, 10 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 5628be9..abcfe9b 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
@@ -88,12 +88,12 @@
"SELECT " +
"dc.*, " +
"de.name as device_name, " +
- "de.online as device_online " +
+ "de.on_line as device_online " +
"from " +
"wvp_device_channel dc " +
"LEFT JOIN wvp_device de ON dc.device_id = de.device_id " +
"WHERE 1=1" +
- " <if test='device_id != null'> AND dc.device_id = #{deviceId} </if> " +
+ " <if test='deviceId != null'> AND dc.device_id = #{deviceId} </if> " +
" <if test='query != null'> AND (dc.channel_id LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
" <if test='parentChannelId != null'> AND dc.parent_id=#{parentChannelId} </if> " +
" <if test='online == true' > AND dc.status=true</if>" +
@@ -112,7 +112,7 @@
"SELECT " +
"dc.*, " +
"de.name as device_name, " +
- "de.online as device_online " +
+ "de.on_line as device_online " +
"from " +
"wvp_device_channel dc " +
"LEFT JOIN wvp_device de ON dc.device_id = de.device_id " +
@@ -450,4 +450,11 @@
@Select("select count(1) from wvp_device_channel")
int getAllChannelCount();
+
+
+ /*=================璁惧涓诲瓙鐮佹祦閫昏緫START==============*/
+ @Update(value = {"UPDATE wvp_device_channel SET stream_id=null WHERE device_id=#{deviceId}"})
+ void clearPlay(String deviceId);
+ /*=================璁惧涓诲瓙鐮佹祦閫昏緫END==============*/
+
}
--
Gitblit v1.8.0