From 98d12ecd6bdc49e6bed86eda4f55ab75e940ca36 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 11 三月 2022 09:49:48 +0800
Subject: [PATCH] Merge pull request #388 from AbnerSC/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 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 d4cace4..5e6ffed 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
@@ -135,6 +135,32 @@
"'${item.ipAddress}', ${item.port}, '${item.password}', ${item.PTZType}, ${item.status}, " +
"'${item.streamId}', ${item.longitude}, ${item.latitude},'${item.createTime}', '${item.updateTime}')" +
"</foreach> " +
+ "ON DUPLICATE KEY UPDATE " +
+ "updateTime=VALUES(updateTime), " +
+ "name=VALUES(name), " +
+ "manufacture=VALUES(manufacture), " +
+ "model=VALUES(model), " +
+ "owner=VALUES(owner), " +
+ "civilCode=VALUES(civilCode), " +
+ "block=VALUES(block), " +
+ "subCount=VALUES(subCount), " +
+ "address=VALUES(address), " +
+ "parental=VALUES(parental), " +
+ "parentId=VALUES(parentId), " +
+ "safetyWay=VALUES(safetyWay), " +
+ "registerWay=VALUES(registerWay), " +
+ "certNum=VALUES(certNum), " +
+ "certifiable=VALUES(certifiable), " +
+ "errCode=VALUES(errCode), " +
+ "secrecy=VALUES(secrecy), " +
+ "ipAddress=VALUES(ipAddress), " +
+ "port=VALUES(port), " +
+ "password=VALUES(password), " +
+ "PTZType=VALUES(PTZType), " +
+ "status=VALUES(status), " +
+ "streamId=VALUES(streamId), " +
+ "longitude=VALUES(longitude), " +
+ "latitude=VALUES(latitude)" +
"</script>")
int batchAdd(List<DeviceChannel> addChannels);
@@ -205,10 +231,20 @@
" name as title,\n" +
" channelId as \"value\",\n" +
" channelId as \"key\",\n" +
- " channelId,\n" +
" longitude,\n" +
" latitude\n" +
" from device_channel\n" +
" where deviceId = #{deviceId}")
List<DeviceChannelTree> tree(String deviceId);
+
+ @Delete(value = {" <script>" +
+ "DELETE " +
+ "from " +
+ "device_channel " +
+ "WHERE " +
+ "deviceId = #{deviceId} " +
+ " AND channelId NOT IN " +
+ "<foreach collection='channels' item='item' open='(' separator=',' close=')' > #{item.channelId}</foreach>" +
+ " </script>"})
+ int cleanChannelsNotInList(String deviceId, List<DeviceChannel> channels);
}
--
Gitblit v1.8.0