From c223d4e4ec4e908d12776f22f48b99ff4525aed1 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期三, 27 一月 2021 15:31:31 +0800
Subject: [PATCH] 增加数据格式检验，避免设备返回错误格式造成抛错误
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 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 072b1bf..11b728a 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
@@ -19,12 +19,33 @@
"'${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} " +
- "WHERE deviceId=#{deviceId} AND channelId=#{channelId}")
+ @Update(value = {" <script>" +
+ "UPDATE device_channel " +
+ "SET deviceId='${deviceId}'" +
+ "<if test=\"name != null\">, name='${name}'</if>" +
+ "<if test=\"manufacture != null\">, manufacture='${manufacture}'</if>" +
+ "<if test=\"model != null\">, model='${model}'</if>" +
+ "<if test=\"owner != null\">, owner='${owner}'</if>" +
+ "<if test=\"civilCode != null\">, civilCode='${civilCode}'</if>" +
+ "<if test=\"block != null\">, block='${block}'</if>" +
+ "<if test=\"address != null\">, address='${address}'</if>" +
+ "<if test=\"parental != null\">, parental=${parental}</if>" +
+ "<if test=\"parentId != null\">, parentId='${parentId}'</if>" +
+ "<if test=\"safetyWay != null\">, safetyWay=${safetyWay}</if>" +
+ "<if test=\"registerWay != null\">, registerWay=${registerWay}</if>" +
+ "<if test=\"certNum != null\">, certNum='${certNum}'</if>" +
+ "<if test=\"certifiable != null\">, certifiable=${certifiable}</if>" +
+ "<if test=\"errCode != null\">, errCode=${errCode}</if>" +
+ "<if test=\"secrecy != null\">, secrecy='${secrecy}'</if>" +
+ "<if test=\"ipAddress != null\">, ipAddress='${ipAddress}'</if>" +
+ "<if test=\"port != null\">, port=${port}</if>" +
+ "<if test=\"password != null\">, password='${password}'</if>" +
+ "<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>" +
+ "WHERE deviceId='${deviceId}' AND channelId='${channelId}'"+
+ " </script>"})
int update(DeviceChannel channel);
@Select(value = {" <script>" +
@@ -38,6 +59,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);
@@ -47,4 +69,9 @@
@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);
}
--
Gitblit v1.8.0