From 2c89fae49a7655105b4e9e0138155485e6ba83b2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 23 五月 2024 17:32:15 +0800
Subject: [PATCH] Merge branch 'refs/heads/2.7.1'
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 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 4f12746..5cd50b9 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
@@ -402,23 +402,6 @@
" </script>"})
int updatePosition(DeviceChannel deviceChannel);
- @Update({"<script>" +
- "<foreach collection='deviceChannelList' item='item' separator=';'>" +
- " UPDATE" +
- " wvp_device_channel" +
- " SET gps_time=#{item.gpsTime}" +
- "<if test='item.longitude != null'>, longitude=#{item.longitude}</if>" +
- "<if test='item.latitude != null'>, latitude=#{item.latitude}</if>" +
- "<if test='item.longitudeGcj02 != null'>, longitude_gcj02=#{item.longitudeGcj02}</if>" +
- "<if test='item.latitudeGcj02 != null'>, latitude_gcj02=#{item.latitudeGcj02}</if>" +
- "<if test='item.longitudeWgs84 != null'>, longitude_wgs84=#{item.longitudeWgs84}</if>" +
- "<if test='item.latitudeWgs84 != null'>, latitude_wgs84=#{item.latitudeWgs84}</if>" +
- "WHERE device_id=#{item.deviceId} " +
- " <if test='item.channelId != null' > AND channel_id=#{item.channelId}</if>" +
- "</foreach>" +
- "</script>"})
- int batchUpdatePosition(List<DeviceChannel> deviceChannelList);
-
@Select("SELECT * FROM wvp_device_channel WHERE length(trim(stream_id)) > 0")
List<DeviceChannel> getAllChannelInPlay();
@@ -572,4 +555,24 @@
" <if test='channelId != null'> and channel_id = #{channelId} </if>" +
"</script>")
void updateChannelStreamIdentification(DeviceChannel channel);
+
+
+ @Update({"<script>" +
+ "<foreach collection='channelList' item='item' separator=';'>" +
+ " UPDATE" +
+ " wvp_device_channel" +
+ " SET update_time=#{item.updateTime}" +
+ "<if test='item.longitude != null'>, longitude=#{item.longitude}</if>" +
+ "<if test='item.latitude != null'>, latitude=#{item.latitude}</if>" +
+ "<if test='item.longitudeGcj02 != null'>, longitude_gcj02=#{item.longitudeGcj02}</if>" +
+ "<if test='item.latitudeGcj02 != null'>, latitude_gcj02=#{item.latitudeGcj02}</if>" +
+ "<if test='item.longitudeWgs84 != null'>, longitude_wgs84=#{item.longitudeWgs84}</if>" +
+ "<if test='item.latitudeWgs84 != null'>, latitude_wgs84=#{item.latitudeWgs84}</if>" +
+ "<if test='item.gpsTime != null'>, gps_time=#{item.gpsTime}</if>" +
+ "<if test='item.id > 0'>WHERE id=#{item.id}</if>" +
+ "<if test='item.id == 0'>WHERE device_id=#{item.deviceId} AND channel_id=#{item.channelId}</if>" +
+ "</foreach>" +
+ "</script>"})
+ void batchUpdatePosition(List<DeviceChannel> channelList);
+
}
--
Gitblit v1.8.0