From 6e4a8cac04432f5a36d5c5e3c5eb3d28d2295a5c Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期二, 12 一月 2021 09:36:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 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 9312f23..ff1a7e1 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
@@ -1,6 +1,8 @@
package com.genersoft.iot.vmp.storager.dao;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce;
import org.apache.ibatis.annotations.*;
import java.util.List;
@@ -18,15 +20,6 @@
"'${address}', ${parental}, '${parentId}', ${safetyWay}, ${registerWay}, '${certNum}', ${certifiable}, ${errCode}, '${secrecy}', " +
"'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status})")
int add(DeviceChannel channel);
-
-// @Update("UPDATE device_channel " +
-// "SET name=#{name}, manufacture=#{manufacture}, model=#{model}, owner=#{owner}, civilCode=#{civilCode}, " +
-// "block=#{block}, address=#{address}, parental=#{parental}, parentId=#{parentId}, safetyWay=#{safetyWay}, " +
-// "registerWay=#{registerWay}, certNum=#{certNum}, certifiable=#{certifiable}, errCode=#{errCode}, secrecy=#{secrecy}, " +
-// "ipAddress=#{ipAddress}, port=#{port}, password=#{password}, PTZType=#{PTZType}, status=#{status}, streamId=#{streamId}, " +
-// "hasAudio=#{hasAudio}" +
-// "WHERE deviceId=#{deviceId} AND channelId=#{channelId}")
-
@Update(value = {" <script>" +
"UPDATE device_channel " +
@@ -77,4 +70,27 @@
@Delete("DELETE FROM device_channel WHERE deviceId=#{deviceId}")
int cleanChannelsByDeviceId(String deviceId);
+ @Update(value = {"UPDATE device_channel SET streamId=null WHERE deviceId=#{deviceId} AND channelId=#{channelId}"})
+ void stopPlay(String deviceId, String channelId);
+
+ @Update(value = {"UPDATE device_channel SET streamId=#{streamId} WHERE deviceId=#{deviceId} AND channelId=#{channelId}"})
+ void startPlay(String deviceId, String channelId, String streamId);
+
+
+ @Select(value = {" <script>" +
+ "SELECT * FROM ( "+
+ " SELECT dc.channelId, dc.deviceId, dc.name, de.manufacturer, de.hostAddress, " +
+ "(SELECT count(0) FROM device_channel WHERE parentId=dc.channelId) as subCount " +
+ "FROM device_channel dc LEFT JOIN device de ON dc.deviceId = de.deviceId" +
+ " WHERE 1=1 " +
+ " <if test=\"query != null\"> AND (dc.channelId LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
+ " <if test=\"parentChannelId != null\"> AND dc.parentId=#{parentChannelId} </if> " +
+ " <if test=\"online == true\" > AND dc.status=1</if>" +
+ " <if test=\"online == false\" > AND dc.status=0</if>) dcr" +
+ " WHERE 1=1 " +
+ " <if test=\"hasSubChannel == true\" > AND subCount >0</if>" +
+ " <if test=\"hasSubChannel == false\" > AND subCount=0</if>" +
+ " </script>"})
+
+ List<ChannelReduce> queryChannelListInAll(String query, Boolean online, Boolean hasSubChannel, String parentChannelId);
}
--
Gitblit v1.8.0