From d03e8b042851d6d8ef6b113977d961a1f5814f57 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 05 一月 2023 17:49:50 +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 | 172 ++++++++++++++++++++++++++++----------------------------
1 files changed, 86 insertions(+), 86 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 386cce3..8da1a09 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
@@ -20,46 +20,46 @@
"address, parental, parentId, safetyWay, registerWay, certNum, certifiable, errCode, secrecy, " +
"ipAddress, port, password, PTZType, status, streamId, longitude, latitude, longitudeGcj02, latitudeGcj02, " +
"longitudeWgs84, latitudeWgs84, hasAudio, createTime, updateTime, businessGroupId, gpsTime) " +
- "VALUES ('${channelId}', '${deviceId}', '${name}', '${manufacture}', '${model}', '${owner}', '${civilCode}', '${block}'," +
- "'${address}', ${parental}, '${parentId}', ${safetyWay}, ${registerWay}, '${certNum}', ${certifiable}, ${errCode}, '${secrecy}', " +
- "'${ipAddress}', ${port}, '${password}', ${PTZType}, ${status}, '${streamId}', ${longitude}, ${latitude}, ${longitudeGcj02}, " +
- "${latitudeGcj02}, ${longitudeWgs84}, ${latitudeWgs84}, ${hasAudio}, '${createTime}', '${updateTime}', '${businessGroupId}', '${gpsTime}')")
+ "VALUES (#{channelId}, #{deviceId}, #{name}, #{manufacture}, #{model}, #{owner}, #{civilCode}, #{block}," +
+ "#{address}, #{parental}, #{parentId}, #{safetyWay}, #{registerWay}, #{certNum}, #{certifiable}, #{errCode}, #{secrecy}, " +
+ "#{ipAddress}, #{port}, #{password}, #{PTZType}, #{status}, #{streamId}, #{longitude}, #{latitude}, #{longitudeGcj02}, " +
+ "#{latitudeGcj02}, #{longitudeWgs84}, #{latitudeWgs84}, #{hasAudio}, #{createTime}, #{updateTime}, #{businessGroupId}, #{gpsTime})")
int add(DeviceChannel channel);
@Update(value = {" <script>" +
"UPDATE device_channel " +
- "SET updateTime='${updateTime}'" +
- "<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>" +
- "<if test='longitude != null'>, longitude=${longitude}</if>" +
- "<if test='latitude != null'>, latitude=${latitude}</if>" +
- "<if test='longitudeGcj02 != null'>, longitudeGcj02=${longitudeGcj02}</if>" +
- "<if test='latitudeGcj02 != null'>, latitudeGcj02=${latitudeGcj02}</if>" +
- "<if test='longitudeWgs84 != null'>, longitudeWgs84=${longitudeWgs84}</if>" +
- "<if test='latitudeWgs84 != null'>, latitudeWgs84=${latitudeWgs84}</if>" +
+ "SET updateTime=#{updateTime}" +
+ "<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>" +
+ "<if test='longitude != null'>, longitude=#{longitude}</if>" +
+ "<if test='latitude != null'>, latitude=#{latitude}</if>" +
+ "<if test='longitudeGcj02 != null'>, longitudeGcj02=#{longitudeGcj02}</if>" +
+ "<if test='latitudeGcj02 != null'>, latitudeGcj02=#{latitudeGcj02}</if>" +
+ "<if test='longitudeWgs84 != null'>, longitudeWgs84=#{longitudeWgs84}</if>" +
+ "<if test='latitudeWgs84 != null'>, latitudeWgs84=#{latitudeWgs84}</if>" +
"<if test='businessGroupId != null'>, businessGroupId=#{businessGroupId}</if>" +
"<if test='gpsTime != null'>, gpsTime=#{gpsTime}</if>" +
- "WHERE deviceId='${deviceId}' AND channelId='${channelId}'"+
+ "WHERE deviceId=#{deviceId} AND channelId=#{channelId}"+
" </script>"})
int update(DeviceChannel channel);
@@ -70,7 +70,7 @@
"device_channel dc " +
"WHERE " +
"dc.deviceId = #{deviceId} " +
- " <if test='query != null'> AND (dc.channelId LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
+" <if test='query != null'> AND (dc.channelId LIKE concat('%',#{query},'%') OR dc.name LIKE concat('%',#{query},'%') OR dc.name LIKE concat('%',#{query},'%'))</if> " +
" <if test='parentChannelId != null'> AND (dc.parentId=#{parentChannelId} OR dc.civilCode = #{parentChannelId}) </if> " +
" <if test='online == true' > AND dc.status=1</if>" +
" <if test='online == false' > AND dc.status=0</if>" +
@@ -113,7 +113,7 @@
" LEFT JOIN device de ON dc.deviceId = de.deviceId " +
" LEFT JOIN platform_gb_channel pgc on pgc.deviceChannelId = dc.id " +
" 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='query != null'> AND (dc.channelId LIKE concat('%',#{query},'%') OR dc.name LIKE concat('%',#{query},'%') OR dc.name LIKE concat('%',#{query},'%'))</if> " +
" <if test='online == true' > AND dc.status=1</if> " +
" <if test='online == false' > AND dc.status=0</if> " +
" <if test='hasSubChannel!= null and hasSubChannel == true' > AND dc.subCount > 0</if> " +
@@ -154,14 +154,14 @@
" longitudeWgs84, latitudeWgs84, hasAudio, createTime, updateTime, businessGroupId, gpsTime) " +
"values " +
"<foreach collection='addChannels' index='index' item='item' separator=','> " +
- "('${item.channelId}', '${item.deviceId}', '${item.name}', '${item.manufacture}', '${item.model}', " +
- "'${item.owner}', '${item.civilCode}', '${item.block}',${item.subCount}," +
- "'${item.address}', ${item.parental}, '${item.parentId}', ${item.safetyWay}, ${item.registerWay}, " +
- "'${item.certNum}', ${item.certifiable}, ${item.errCode}, '${item.secrecy}', " +
- "'${item.ipAddress}', ${item.port}, '${item.password}', ${item.PTZType}, ${item.status}, " +
- "'${item.streamId}', ${item.longitude}, ${item.latitude},${item.longitudeGcj02}, " +
- "${item.latitudeGcj02},${item.longitudeWgs84}, ${item.latitudeWgs84}, ${item.hasAudio},'${item.createTime}', '${item.updateTime}', " +
- "'${item.businessGroupId}', '${item.gpsTime}') " +
+ "(#{item.channelId}, #{item.deviceId}, #{item.name}, #{item.manufacture}, #{item.model}, " +
+ "#{item.owner}, #{item.civilCode}, #{item.block},#{item.subCount}," +
+ "#{item.address}, #{item.parental}, #{item.parentId}, #{item.safetyWay}, #{item.registerWay}, " +
+ "#{item.certNum}, #{item.certifiable}, #{item.errCode}, #{item.secrecy}, " +
+ "#{item.ipAddress}, #{item.port}, #{item.password}, #{item.PTZType}, #{item.status}, " +
+ "#{item.streamId}, #{item.longitude}, #{item.latitude},#{item.longitudeGcj02}, " +
+ "#{item.latitudeGcj02},#{item.longitudeWgs84}, #{item.latitudeWgs84}, #{item.hasAudio}, now(), now(), " +
+ "#{item.businessGroupId}, #{item.gpsTime}) " +
"</foreach> " +
"ON DUPLICATE KEY UPDATE " +
"updateTime=VALUES(updateTime), " +
@@ -206,39 +206,39 @@
"<foreach collection='updateChannels' item='item' separator=';'>" +
" UPDATE" +
" device_channel" +
- " SET updateTime='${item.updateTime}'" +
- "<if test='item.name != null'>, name='${item.name}'</if>" +
- "<if test='item.manufacture != null'>, manufacture='${item.manufacture}'</if>" +
- "<if test='item.model != null'>, model='${item.model}'</if>" +
- "<if test='item.owner != null'>, owner='${item.owner}'</if>" +
- "<if test='item.civilCode != null'>, civilCode='${item.civilCode}'</if>" +
- "<if test='item.block != null'>, block='${item.block}'</if>" +
- "<if test='item.subCount != null'>, block=${item.subCount}</if>" +
- "<if test='item.address != null'>, address='${item.address}'</if>" +
- "<if test='item.parental != null'>, parental=${item.parental}</if>" +
- "<if test='item.parentId != null'>, parentId='${item.parentId}'</if>" +
- "<if test='item.safetyWay != null'>, safetyWay=${item.safetyWay}</if>" +
- "<if test='item.registerWay != null'>, registerWay=${item.registerWay}</if>" +
- "<if test='item.certNum != null'>, certNum='${item.certNum}'</if>" +
- "<if test='item.certifiable != null'>, certifiable=${item.certifiable}</if>" +
- "<if test='item.errCode != null'>, errCode=${item.errCode}</if>" +
- "<if test='item.secrecy != null'>, secrecy='${item.secrecy}'</if>" +
- "<if test='item.ipAddress != null'>, ipAddress='${item.ipAddress}'</if>" +
- "<if test='item.port != null'>, port=${item.port}</if>" +
- "<if test='item.password != null'>, password='${item.password}'</if>" +
- "<if test='item.PTZType != null'>, PTZType=${item.PTZType}</if>" +
- "<if test='item.status != null'>, status='${item.status}'</if>" +
- "<if test='item.streamId != null'>, streamId='${item.streamId}'</if>" +
- "<if test='item.hasAudio != null'>, hasAudio=${item.hasAudio}</if>" +
- "<if test='item.longitude != null'>, longitude=${item.longitude}</if>" +
- "<if test='item.latitude != null'>, latitude=${item.latitude}</if>" +
- "<if test='item.longitudeGcj02 != null'>, longitudeGcj02=${item.longitudeGcj02}</if>" +
- "<if test='item.latitudeGcj02 != null'>, latitudeGcj02=${item.latitudeGcj02}</if>" +
- "<if test='item.longitudeWgs84 != null'>, longitudeWgs84=${item.longitudeWgs84}</if>" +
- "<if test='item.latitudeWgs84 != null'>, latitudeWgs84=${item.latitudeWgs84}</if>" +
+ " SET updateTime=#{item.updateTime}" +
+ "<if test='item.name != null'>, name=#{item.name}</if>" +
+ "<if test='item.manufacture != null'>, manufacture=#{item.manufacture}</if>" +
+ "<if test='item.model != null'>, model=#{item.model}</if>" +
+ "<if test='item.owner != null'>, owner=#{item.owner}</if>" +
+ "<if test='item.civilCode != null'>, civilCode=#{item.civilCode}</if>" +
+ "<if test='item.block != null'>, block=#{item.block}</if>" +
+ "<if test='item.subCount != null'>, block=#{item.subCount}</if>" +
+ "<if test='item.address != null'>, address=#{item.address}</if>" +
+ "<if test='item.parental != null'>, parental=#{item.parental}</if>" +
+ "<if test='item.parentId != null'>, parentId=#{item.parentId}</if>" +
+ "<if test='item.safetyWay != null'>, safetyWay=#{item.safetyWay}</if>" +
+ "<if test='item.registerWay != null'>, registerWay=#{item.registerWay}</if>" +
+ "<if test='item.certNum != null'>, certNum=#{item.certNum}</if>" +
+ "<if test='item.certifiable != null'>, certifiable=#{item.certifiable}</if>" +
+ "<if test='item.errCode != null'>, errCode=#{item.errCode}</if>" +
+ "<if test='item.secrecy != null'>, secrecy=#{item.secrecy}</if>" +
+ "<if test='item.ipAddress != null'>, ipAddress=#{item.ipAddress}</if>" +
+ "<if test='item.port != null'>, port=#{item.port}</if>" +
+ "<if test='item.password != null'>, password=#{item.password}</if>" +
+ "<if test='item.PTZType != null'>, PTZType=#{item.PTZType}</if>" +
+ "<if test='item.status != null'>, status=#{item.status}</if>" +
+ "<if test='item.streamId != null'>, streamId=#{item.streamId}</if>" +
+ "<if test='item.hasAudio != null'>, hasAudio=#{item.hasAudio}</if>" +
+ "<if test='item.longitude != null'>, longitude=#{item.longitude}</if>" +
+ "<if test='item.latitude != null'>, latitude=#{item.latitude}</if>" +
+ "<if test='item.longitudeGcj02 != null'>, longitudeGcj02=#{item.longitudeGcj02}</if>" +
+ "<if test='item.latitudeGcj02 != null'>, latitudeGcj02=#{item.latitudeGcj02}</if>" +
+ "<if test='item.longitudeWgs84 != null'>, longitudeWgs84=#{item.longitudeWgs84}</if>" +
+ "<if test='item.latitudeWgs84 != null'>, latitudeWgs84=#{item.latitudeWgs84}</if>" +
"<if test='item.businessGroupId != null'>, businessGroupId=#{item.businessGroupId}</if>" +
"<if test='item.gpsTime != null'>, gpsTime=#{item.gpsTime}</if>" +
- "WHERE deviceId='${item.deviceId}' AND channelId='${item.channelId}'"+
+ "WHERE deviceId=#{item.deviceId} AND channelId=#{item.channelId}"+
"</foreach>" +
"</script>"})
int batchUpdate(List<DeviceChannel> updateChannels);
@@ -251,7 +251,7 @@
"device_channel dc1 " +
"WHERE " +
"dc1.deviceId = #{deviceId} " +
- " <if test='query != null'> AND (dc1.channelId LIKE '%${query}%' OR dc1.name LIKE '%${query}%' OR dc1.name LIKE '%${query}%')</if> " +
+ " <if test='query != null'> AND (dc1.channelId LIKE concat('%',#{query},'%') OR dc1.name LIKE concat('%',#{query},'%') OR dc1.name LIKE concat('%',#{query},'%'))</if> " +
" <if test='parentChannelId != null'> AND dc1.parentId=#{parentChannelId} </if> " +
" <if test='online == true' > AND dc1.status=1</if>" +
" <if test='online == false' > AND dc1.status=0</if>" +
@@ -292,13 +292,13 @@
@Update(value = {" <script>" +
"UPDATE device_channel " +
"SET " +
- "latitude=${latitude}, " +
- "longitude=${longitude}, " +
- "longitudeGcj02=${longitudeGcj02}, " +
- "latitudeGcj02=${latitudeGcj02}, " +
- "longitudeWgs84=${longitudeWgs84}, " +
- "latitudeWgs84=${latitudeWgs84}, " +
- "gpsTime='${gpsTime}' " +
+ "latitude=#{latitude}, " +
+ "longitude=#{longitude}, " +
+ "longitudeGcj02=#{longitudeGcj02}, " +
+ "latitudeGcj02=#{latitudeGcj02}, " +
+ "longitudeWgs84=#{longitudeWgs84}, " +
+ "latitudeWgs84=#{latitudeWgs84}, " +
+ "gpsTime=#{gpsTime} " +
"WHERE deviceId=#{deviceId} " +
" <if test='channelId != null' > AND channelId=#{channelId}</if>" +
" </script>"})
@@ -315,10 +315,10 @@
"select * " +
"from device_channel " +
"where deviceId=#{deviceId}" +
- " <if test='parentId != null and length != null' > and parentId = #{parentId} or left(channelId, ${parentId.length()}) = #{parentId} and length(channelId)=${length} </if>" +
- " <if test='parentId == null and length != null' > and parentId = #{parentId} or length(channelId)=${length} </if>" +
+ " <if test='parentId != null and length != null' > and parentId = #{parentId} or left(channelId, #{parentId.length()}) = #{parentId} and length(channelId)=#{length} </if>" +
+ " <if test='parentId == null and length != null' > and parentId = #{parentId} or length(channelId)=#{length} </if>" +
" <if test='parentId == null and length == null' > and parentId = #{parentId} </if>" +
- " <if test='parentId != null and length == null' > and parentId = #{parentId} or left(channelId, ${parentId.length()}) = #{parentId} </if>" +
+ " <if test='parentId != null and length == null' > and parentId = #{parentId} or left(channelId, #{parentId.length()}) = #{parentId} </if>" +
" </script>"})
List<DeviceChannel> getChannelsWithCivilCodeAndLength(String deviceId, String parentId, Integer length);
--
Gitblit v1.8.0