From e48fa711a3664bece9b3e58840a75fe7c05bc47c Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期六, 08 五月 2021 17:14:05 +0800
Subject: [PATCH] 添加截图（快照）功能
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 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 ff1a7e1..d11f70b 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,9 +1,9 @@
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 com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Repository;
import java.util.List;
@@ -11,14 +11,15 @@
* 鐢ㄤ簬瀛樺偍璁惧閫氶亾淇℃伅
*/
@Mapper
+@Repository
public interface DeviceChannelMapper {
@Insert("INSERT INTO device_channel (channelId, deviceId, name, manufacture, model, owner, civilCode, block, " +
"address, parental, parentId, safetyWay, registerWay, certNum, certifiable, errCode, secrecy, " +
- "ipAddress, port, password, PTZType, status) " +
+ "ipAddress, port, password, PTZType, status, streamId) " +
"VALUES ('${channelId}', '${deviceId}', '${name}', '${manufacture}', '${model}', '${owner}', '${civilCode}', '${block}'," +
"'${address}', ${parental}, '${parentId}', ${safetyWay}, ${registerWay}, '${certNum}', ${certifiable}, ${errCode}, '${secrecy}', " +
- "'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status})")
+ "'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status}, '${streamId}')")
int add(DeviceChannel channel);
@Update(value = {" <script>" +
@@ -45,7 +46,7 @@
"<if test=\"PTZType != null\">, PTZType=${PTZType}</if>" +
"<if test=\"status != null\">, status='${status}'</if>" +
"<if test=\"streamId != null\">, streamId='${streamId}'</if>" +
- "<if test=\"hasAudio != null\">, hasAudio='${hasAudio}'</if>" +
+ "<if test=\"hasAudio != null\">, hasAudio=${hasAudio}</if>" +
"WHERE deviceId='${deviceId}' AND channelId='${channelId}'"+
" </script>"})
int update(DeviceChannel channel);
@@ -61,6 +62,7 @@
" WHERE 1=1 " +
" <if test=\"hasSubChannel == true\" > AND subCount >0</if>" +
" <if test=\"hasSubChannel == false\" > AND subCount=0</if>" +
+ " ORDER BY channelId ASC" +
" </script>"})
List<DeviceChannel> queryChannelsByDeviceId(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online);
@@ -79,18 +81,23 @@
@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" +
+ " SELECT dc.channelId, dc.deviceId, dc.name, de.manufacturer, de.hostAddress, " +
+ "(SELECT count(0) FROM device_channel WHERE parentId=dc.channelId) as subCount, " +
+ "(SELECT pc.platformId FROM platform_gb_channel pc WHERE pc.deviceId=dc.deviceId AND pc.channelId = dc.channelId ) as platformId " +
+ "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=\"online == true\" > AND dc.status=1</if> " +
+ " <if test=\"online == false\" > AND dc.status=0</if> " +
+ ") dcr" +
" 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>" +
+ " <if test=\"hasSubChannel!= null and hasSubChannel == true\" > AND subCount >0</if> " +
+ " <if test=\"hasSubChannel!= null and hasSubChannel == false\" > AND subCount=0</if> " +
+ " <if test=\"platformId != null and inPlatform == true \" > AND platformId='${platformId}'</if> " +
+ " <if test=\"platformId != null and inPlatform == false \" > AND (platformId != '${platformId}' OR platformId is NULL ) </if> " +
+ " ORDER BY deviceId, channelId ASC" +
" </script>"})
- List<ChannelReduce> queryChannelListInAll(String query, Boolean online, Boolean hasSubChannel, String parentChannelId);
+ List<ChannelReduce> queryChannelListInAll(String query, Boolean online, Boolean hasSubChannel, String platformId, Boolean inPlatform);
}
--
Gitblit v1.8.0