From db493e262566c2ed2ac046e6f610b2da6cf61682 Mon Sep 17 00:00:00 2001
From: fine <54142345+criver31@users.noreply.github.com>
Date: 星期二, 09 一月 2024 11:50:26 +0800
Subject: [PATCH] 修复单端口下历史回放暂停和恢复发送的流ID与zlm不一致
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 139 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 106 insertions(+), 33 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 d48b802..608bc27 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
@@ -30,7 +30,7 @@
@Update(value = {" <script>" +
"UPDATE wvp_device_channel " +
"SET update_time=#{updateTime}" +
- "<if test='name != null'>, name=#{name}</if>" +
+ ", custom_name=#{name}" +
"<if test='manufacture != null'>, manufacture=#{manufacture}</if>" +
"<if test='model != null'>, model=#{model}</if>" +
"<if test='owner != null'>, owner=#{owner}</if>" +
@@ -48,12 +48,12 @@
"<if test='ipAddress != null'>, ip_address=#{ipAddress}</if>" +
"<if test='port != null'>, port=#{port}</if>" +
"<if test='password != null'>, password=#{password}</if>" +
- "<if test='PTZType != null'>, ptz_type=#{PTZType}</if>" +
+ "<if test='PTZType != null'>, custom_ptz_type=#{PTZType}</if>" +
"<if test='status != null'>, status=#{status}</if>" +
"<if test='streamId != null'>, stream_id=#{streamId}</if>" +
"<if test='hasAudio != null'>, has_audio=#{hasAudio}</if>" +
- "<if test='longitude != null'>, longitude=#{longitude}</if>" +
- "<if test='latitude != null'>, latitude=#{latitude}</if>" +
+ ", custom_longitude=#{longitude}" +
+ ", custom_latitude=#{latitude}" +
"<if test='longitudeGcj02 != null'>, longitude_gcj02=#{longitudeGcj02}</if>" +
"<if test='latitudeGcj02 != null'>, latitude_gcj02=#{latitudeGcj02}</if>" +
"<if test='longitudeWgs84 != null'>, longitude_wgs84=#{longitudeWgs84}</if>" +
@@ -66,7 +66,43 @@
@Select(value = {" <script>" +
"SELECT " +
- "dc.* " +
+ "dc.id, " +
+ "dc.channel_id, " +
+ "COALESCE(dc.custom_name, dc.name) AS name, " +
+ "dc.manufacture, " +
+ "dc.model, " +
+ "dc.owner, " +
+ "dc.civil_code, " +
+ "dc.block, " +
+ "dc.address, " +
+ "dc.parent_id, " +
+ "dc.safety_way, " +
+ "dc.register_way, " +
+ "dc.cert_num, " +
+ "dc.certifiable, " +
+ "dc.err_code, " +
+ "dc.end_time, " +
+ "dc.secrecy, " +
+ "dc.ip_address, " +
+ "dc.port, " +
+ "dc.password, " +
+ "COALESCE(dc.custom_ptz_type, dc.ptz_type) AS ptz_type, " +
+ "dc.status, " +
+ "COALESCE(dc.custom_longitude, dc.longitude) AS longitude, " +
+ "COALESCE(dc.custom_latitude, dc.latitude) AS latitude, " +
+ "dc.stream_id, " +
+ "dc.device_id, " +
+ "dc.parental, " +
+ "dc.has_audio, " +
+ "dc.create_time, " +
+ "dc.update_time, " +
+ "dc.sub_count, " +
+ "dc.longitude_gcj02, " +
+ "dc.latitude_gcj02, " +
+ "dc.longitude_wgs84, " +
+ "dc.latitude_wgs84, " +
+ "dc.business_group_id, " +
+ "dc.gps_time " +
"from " +
"wvp_device_channel dc " +
"WHERE " +
@@ -82,7 +118,7 @@
"</foreach> </if>" +
"ORDER BY dc.channel_id " +
" </script>"})
- List<DeviceChannel> queryChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online, List<String> channelIds);
+ List<DeviceChannel> queryChannels(@Param("deviceId") String deviceId, @Param("parentChannelId") String parentChannelId, @Param("query") String query, @Param("hasSubChannel") Boolean hasSubChannel, @Param("online") Boolean online, @Param("channelIds") List<String> channelIds);
@Select(value = {" <script>" +
"SELECT " +
@@ -105,7 +141,7 @@
"</foreach> </if>" +
"ORDER BY dc.channel_id ASC" +
" </script>"})
- List<DeviceChannelExtend> queryChannelsWithDeviceInfo(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online, List<String> channelIds);
+ List<DeviceChannelExtend> queryChannelsWithDeviceInfo(@Param("deviceId") String deviceId, @Param("parentChannelId") String parentChannelId, @Param("query") String query, @Param("hasSubChannel") Boolean hasSubChannel, @Param("online") Boolean online, @Param("channelIds") List<String> channelIds);
@Select(value = {" <script>" +
@@ -130,30 +166,30 @@
"ORDER BY dc.channel_id ASC " +
"Limit #{limit} OFFSET #{start}" +
" </script>"})
- List<DeviceChannelExtend> queryChannelsByDeviceIdWithStartAndLimit(String deviceId,List<String> channelIds, String parentChannelId, String query,
- Boolean hasSubChannel, Boolean online, int start, int limit);
+ List<DeviceChannelExtend> queryChannelsByDeviceIdWithStartAndLimit(@Param("deviceId") String deviceId, @Param("channelIds") List<String> channelIds, @Param("parentChannelId") String parentChannelId, @Param("query") String query, @Param("hasSubChannel") Boolean hasSubChannel, @Param("online") Boolean online, @Param("start") int start, @Param("limit") int limit);
@Select("SELECT * FROM wvp_device_channel WHERE device_id=#{deviceId} AND channel_id=#{channelId}")
- DeviceChannel queryChannel(String deviceId, String channelId);
+ DeviceChannel queryChannel(@Param("deviceId") String deviceId,@Param("channelId") String channelId);
@Delete("DELETE FROM wvp_device_channel WHERE device_id=#{deviceId}")
- int cleanChannelsByDeviceId(String deviceId);
+ int cleanChannelsByDeviceId(@Param("deviceId") String deviceId);
@Delete("DELETE FROM wvp_device_channel WHERE device_id=#{deviceId} AND channel_id=#{channelId}")
- int del(String deviceId, String channelId);
+ int del(@Param("deviceId") String deviceId, @Param("channelId") String channelId);
@Update(value = {"UPDATE wvp_device_channel SET stream_id=null WHERE device_id=#{deviceId} AND channel_id=#{channelId}"})
- void stopPlay(String deviceId, String channelId);
+ void stopPlay(@Param("deviceId") String deviceId, @Param("channelId") String channelId);
@Update(value = {"UPDATE wvp_device_channel SET stream_id=#{streamId} WHERE device_id=#{deviceId} AND channel_id=#{channelId}"})
- void startPlay(String deviceId, String channelId, String streamId);
+ void startPlay(@Param("deviceId") String deviceId, @Param("channelId") String channelId, @Param("streamId") String streamId);
+
@Select(value = {" <script>" +
"SELECT " +
" dc.id,\n" +
" dc.channel_id,\n" +
" dc.device_id,\n" +
- " dc.name,\n" +
+ " COALESCE(dc.custom_name, dc.name) AS name,\n" +
" de.manufacturer,\n" +
" de.host_address,\n" +
" dc.sub_count,\n" +
@@ -166,13 +202,13 @@
" <if test='query != null'> AND (dc.channel_id LIKE concat('%',#{query},'%') OR dc.name LIKE concat('%',#{query},'%') OR dc.name LIKE concat('%',#{query},'%'))</if> " +
" <if test='online == true' > AND dc.status=true</if> " +
" <if test='online == false' > AND dc.status=false</if> " +
- " <if test='hasSubChannel!= null and has_sub_channel == true' > AND dc.sub_count > 0</if> " +
- " <if test='hasSubChannel!= null and has_sub_channel == false' > AND dc.sub_count = 0</if> " +
+ " <if test='hasSubChannel!= null and hasSubChannel == true' > AND dc.sub_count > 0</if> " +
+ " <if test='hasSubChannel!= null and hasSubChannel == false' > AND dc.sub_count = 0</if> " +
" <if test='catalogId == null ' > AND dc.id not in (select device_channel_id from wvp_platform_gb_channel where platform_id=#{platformId} ) </if> " +
" <if test='catalogId != null ' > AND pgc.platform_id = #{platformId} and pgc.catalog_id=#{catalogId} </if> " +
" ORDER BY dc.device_id, dc.channel_id ASC" +
" </script>"})
- List<ChannelReduce> queryChannelListInAll(String query, Boolean online, Boolean hasSubChannel, String platformId, String catalogId);
+ List<ChannelReduce> queryChannelListInAll(@Param("query") String query, @Param("online") Boolean online, @Param("hasSubChannel") Boolean hasSubChannel, @Param("platformId") String platformId, @Param("catalogId") String catalogId);
@Select(value = {" <script>" +
"SELECT " +
@@ -191,7 +227,7 @@
List<DeviceChannel> queryChannelByChannelId( String channelId);
@Update(value = {"UPDATE wvp_device_channel SET status=false WHERE device_id=#{deviceId} AND channel_id=#{channelId}"})
- void offline(String deviceId, String channelId);
+ void offline(@Param("deviceId") String deviceId, @Param("channelId") String channelId);
@Update(value = {"UPDATE wvp_device_channel SET status=false WHERE device_id=#{deviceId}"})
void offlineByDeviceId(String deviceId);
@@ -214,7 +250,7 @@
"#{item.businessGroupId}, #{item.gpsTime}) " +
"</foreach> " +
"</script>")
- int batchAdd(List<DeviceChannel> addChannels);
+ int batchAdd(@Param("addChannels") List<DeviceChannel> addChannels);
@Insert("<script> " +
@@ -271,7 +307,7 @@
int batchAddOrUpdate(List<DeviceChannel> addChannels);
@Update(value = {"UPDATE wvp_device_channel SET status=true WHERE device_id=#{deviceId} AND channel_id=#{channelId}"})
- void online(String deviceId, String channelId);
+ void online(@Param("deviceId") String deviceId, @Param("channelId") String channelId);
@Update({"<script>" +
"<foreach collection='updateChannels' item='item' separator=';'>" +
@@ -328,7 +364,7 @@
" AND channel_id NOT IN " +
"<foreach collection='channels' item='item' open='(' separator=',' close=')' > #{item.channelId}</foreach>" +
" </script>"})
- int cleanChannelsNotInList(String deviceId, List<DeviceChannel> channels);
+ int cleanChannelsNotInList(@Param("deviceId") String deviceId, @Param("channels") List<DeviceChannel> channels);
@Update(" update wvp_device_channel" +
" set sub_count = (select *" +
@@ -337,7 +373,7 @@
" where device_id = #{deviceId} and parent_id = #{channelId}) as temp)" +
" where device_id = #{deviceId} " +
" and channel_id = #{channelId}")
- int updateChannelSubCount(String deviceId, String channelId);
+ int updateChannelSubCount(@Param("deviceId") String deviceId, @Param("channelId") String channelId);
@Update(value = {" <script>" +
"UPDATE wvp_device_channel " +
@@ -370,14 +406,14 @@
" <if test='parentId == null and length == null' > and parent_id= #{parentId} </if>" +
" <if test='parentId != null and length == null' > and parent_id= #{parentId} or left(channel_id, LENGTH(#{parentId})) = #{parentId} </if>" +
" </script>"})
- List<DeviceChannel> getChannelsWithCivilCodeAndLength(String deviceId, String parentId, Integer length);
+ List<DeviceChannel> getChannelsWithCivilCodeAndLength(@Param("deviceId") String deviceId, @Param("parentId") String parentId, @Param("length") Integer length);
@Select(value = {" <script>" +
"select * " +
"from wvp_device_channel " +
"where device_id=#{deviceId} and length(channel_id)>14 and civil_code=#{parentId}" +
" </script>"})
- List<DeviceChannel> getChannelsByCivilCode(String deviceId, String parentId);
+ List<DeviceChannel> getChannelsByCivilCode(@Param("deviceId") String deviceId, @Param("parentId") String parentId);
@Select("select min(length(channel_id)) as minLength " +
"from wvp_device_channel " +
@@ -389,12 +425,12 @@
List<DeviceChannel> getChannelWithoutCivilCode(String deviceId);
@Select("select * from wvp_device_channel where device_id=#{deviceId} and SUBSTRING(channel_id, 11, 3)=#{typeCode}")
- List<DeviceChannel> getBusinessGroups(String deviceId, String typeCode);
+ List<DeviceChannel> getBusinessGroups(@Param("deviceId") String deviceId, @Param("typeCode") String typeCode);
- @Select("select dc.id, dc.channel_id, dc.device_id, dc.name, dc.manufacture,dc.model,dc.owner, pc.civil_code,dc.block, " +
+ @Select("select dc.id, dc.channel_id, dc.device_id, COALESCE(dc.custom_name, dc.name) AS name, dc.manufacture,dc.model,dc.owner, pc.civil_code,dc.block, " +
" dc.address, '0' as parental,'0' as channel_type, pc.id as parent_id, dc.safety_way, dc.register_way,dc.cert_num, dc.certifiable, " +
- " dc.err_code,dc.end_time, dc.secrecy, dc.ip_address, dc.port, dc.ptz_type, dc.password, dc.status, " +
- " dc.longitude_wgs84 as longitude, dc.latitude_wgs84 as latitude, pc.business_group_id " +
+ " dc.err_code,dc.end_time, dc.secrecy, dc.ip_address, dc.port, COALESCE(dc.custom_ptz_type, dc.ptz_type) AS ptz_type, dc.password, dc.status, " +
+ " COALESCE(dc.custom_longitude, dc.longitude) AS longitude, COALESCE(dc.custom_latitude, dc.latitude) AS latitude, pc.business_group_id " +
" from wvp_device_channel dc" +
" LEFT JOIN wvp_platform_gb_channel pgc on dc.id = pgc.device_channel_id" +
" LEFT JOIN wvp_platform_catalog pc on pgc.catalog_id = pc.id and pgc.platform_id = pc.platform_id" +
@@ -428,14 +464,14 @@
"DELETE FROM wvp_device_channel WHERE device_id=#{item.deviceId} AND channel_id=#{item.channelId}" +
"</foreach>" +
"</script>"})
- int batchDel(List<DeviceChannel> deleteChannelList);
+ int batchDel(@Param("deleteChannelList") List<DeviceChannel> deleteChannelList);
@Update({"<script>" +
"<foreach collection='channels' item='item' separator=';'>" +
"UPDATE wvp_device_channel SET status=true WHERE device_id=#{item.deviceId} AND channel_id=#{item.channelId}" +
"</foreach>" +
"</script>"})
- int batchOnline(List<DeviceChannel> channels);
+ int batchOnline(@Param("channels") List<DeviceChannel> channels);
@Update({"<script>" +
"<foreach collection='channels' item='item' separator=';'>" +
@@ -456,13 +492,50 @@
void clearPlay(String deviceId);
// 璁惧涓诲瓙鐮佹祦閫昏緫END
@Select(value = {" <script>" +
- "select * " +
+ "SELECT id,\n" +
+ " channel_id,\n" +
+ " COALESCE(custom_name, name) AS name,\n" +
+ " custom_name,\n" +
+ " manufacture,\n" +
+ " model,\n" +
+ " owner,\n" +
+ " civil_code,\n" +
+ " block,\n" +
+ " address,\n" +
+ " parent_id,\n" +
+ " safety_way,\n" +
+ " register_way,\n" +
+ " cert_num,\n" +
+ " certifiable,\n" +
+ " err_code,\n" +
+ " end_time,\n" +
+ " secrecy,\n" +
+ " ip_address,\n" +
+ " port,\n" +
+ " password,\n" +
+ " COALESCE(custom_ptz_type, ptz_type) AS ptz_type,\n" +
+ " status,\n" +
+ " COALESCE(custom_longitude, longitude) AS longitude,\n" +
+ " COALESCE(custom_latitude, latitude) AS latitude,\n" +
+ " stream_id,\n" +
+ " device_id,\n" +
+ " parental,\n" +
+ " has_audio,\n" +
+ " create_time,\n" +
+ " update_time,\n" +
+ " sub_count,\n" +
+ " longitude_gcj02,\n" +
+ " latitude_gcj02,\n" +
+ " longitude_wgs84,\n" +
+ " latitude_wgs84,\n" +
+ " business_group_id,\n" +
+ " gps_time\n" +
"from wvp_device_channel " +
"where device_id=#{deviceId}" +
" <if test='parentId != null and parentId != deviceId'> and parent_id = #{parentId} </if>" +
" <if test='parentId == null or parentId == deviceId'> and parent_id is null or parent_id = #{deviceId}</if>" +
" <if test='onlyCatalog == true '> and parental = 1 </if>" +
" </script>"})
- List<DeviceChannel> getSubChannelsByDeviceId(String deviceId, String parentId, boolean onlyCatalog);
+ List<DeviceChannel> getSubChannelsByDeviceId(@Param("deviceId") String deviceId, @Param("parentId") String parentId, @Param("onlyCatalog") boolean onlyCatalog);
}
--
Gitblit v1.8.0