From 764d04b497356ba6bcbb75fd42b51eca750f7223 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 五月 2024 15:02:51 +0800
Subject: [PATCH] 调整上级观看消息的发送
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 296 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 212 insertions(+), 84 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
old mode 100644
new mode 100755
index 7940011..5cd50b9
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
@@ -3,7 +3,6 @@
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannelInPlatform;
-import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import com.genersoft.iot.vmp.web.gb28181.dto.DeviceChannelExtend;
import org.apache.ibatis.annotations.*;
@@ -21,17 +20,17 @@
@Insert("INSERT INTO wvp_device_channel (channel_id, device_id, name, manufacture, model, owner, civil_code, block, " +
"address, parental, parent_id, safety_way, register_way, cert_num, certifiable, err_code, secrecy, " +
"ip_address, port, password, ptz_type, status, stream_id, longitude, latitude, longitude_gcj02, latitude_gcj02, " +
- "longitude_wgs84, latitude_wgs84, has_audio, create_time, update_time, business_group_id, gps_time) " +
+ "longitude_wgs84, latitude_wgs84, has_audio, create_time, update_time, business_group_id, gps_time, stream_identification) " +
"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})")
+ "#{ipAddress}, #{port}, #{password}, #{ptzType}, #{status}, #{streamId}, #{longitude}, #{latitude}, #{longitudeGcj02}, " +
+ "#{latitudeGcj02}, #{longitudeWgs84}, #{latitudeWgs84}, #{hasAudio}, #{createTime}, #{updateTime}, #{businessGroupId}, #{gpsTime}, #{streamIdentification})")
int add(DeviceChannel channel);
@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>" +
@@ -49,33 +48,77 @@
"<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>" +
+ "<if test='customLongitude != null'>, custom_longitude=#{customLongitude}</if>" +
+ "<if test='customLatitude != null'>, custom_latitude=#{customLatitude}</if>" +
"<if test='longitudeGcj02 != null'>, longitude_gcj02=#{longitudeGcj02}</if>" +
"<if test='latitudeGcj02 != null'>, latitude_gcj02=#{latitudeGcj02}</if>" +
"<if test='longitudeWgs84 != null'>, longitude_wgs84=#{longitudeWgs84}</if>" +
"<if test='latitudeWgs84 != null'>, latitude_wgs84=#{latitudeWgs84}</if>" +
"<if test='businessGroupId != null'>, business_group_id=#{businessGroupId}</if>" +
"<if test='gpsTime != null'>, gps_time=#{gpsTime}</if>" +
+ "<if test='streamIdentification != null'>, stream_identification=#{streamIdentification}</if>" +
"WHERE device_id=#{deviceId} AND channel_id=#{channelId}"+
" </script>"})
int update(DeviceChannel channel);
@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, " +
+ "dc.longitude, " +
+ "dc.latitude, " +
+ "dc.custom_longitude, " +
+ "dc.custom_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.stream_identification, " +
+ "dc.gps_time " +
"from " +
"wvp_device_channel dc " +
"WHERE " +
"dc.device_id = #{deviceId} " +
-" <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='query != null'> AND (" +
+ "dc.channel_id LIKE concat('%',#{query},'%') " +
+ "OR dc.name LIKE concat('%',#{query},'%') " +
+ "OR dc.custom_name LIKE concat('%',#{query},'%')" +
+ ")</if> " +
" <if test='parentChannelId != null'> AND (dc.parent_id=#{parentChannelId} OR dc.civil_code = #{parentChannelId}) </if> " +
- " <if test='online == true' > AND dc.status=1</if>" +
- " <if test='online == false' > AND dc.status=0</if>" +
+ " <if test='online == true' > AND dc.status= true</if>" +
+ " <if test='online == false' > AND dc.status= false</if>" +
" <if test='hasSubChannel == true' > AND dc.sub_count > 0 </if>" +
" <if test='hasSubChannel == false' > AND dc.sub_count = 0 </if>" +
"<if test='channelIds != null'> AND dc.channel_id in <foreach item='item' index='index' collection='channelIds' open='(' separator=',' close=')'>" +
@@ -83,37 +126,13 @@
"</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 " +
"dc.*, " +
"de.name as device_name, " +
- "de.online as device_online " +
- "from " +
- "wvp_device_channel dc " +
- "LEFT JOIN wvp_device de ON dc.device_id = de.device_id " +
- "WHERE 1=1" +
- " <if test='device_id != null'> AND dc.device_id = #{deviceId} </if> " +
- " <if test='query != null'> AND (dc.channel_id LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
- " <if test='parentChannelId != null'> AND dc.parent_id=#{parentChannelId} </if> " +
- " <if test='online == true' > AND dc.status=1</if>" +
- " <if test='online == false' > AND dc.status=0</if>" +
- " <if test='hasSubChannel == true' > AND dc.sub_count > 0 </if>" +
- " <if test='hasSubChannel == false' > AND dc.sub_count = 0 </if>" +
- "<if test='channelIds != null'> AND dc.channel_id in <foreach item='item' index='index' collection='channelIds' open='(' separator=',' close=')'>" +
- "#{item} " +
- "</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);
-
-
- @Select(value = {" <script>" +
- "SELECT " +
- "dc.*, " +
- "de.name as device_name, " +
- "de.online as device_online " +
+ "de.on_line as device_online " +
"from " +
"wvp_device_channel dc " +
"LEFT JOIN wvp_device de ON dc.device_id = de.device_id " +
@@ -121,8 +140,32 @@
" <if test='deviceId != null'> AND dc.device_id = #{deviceId} </if> " +
" <if test='query != null'> AND (dc.channel_id LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
" <if test='parentChannelId != null'> AND dc.parent_id=#{parentChannelId} </if> " +
- " <if test='online == true' > AND dc.status=1</if>" +
- " <if test='online == false' > AND dc.status=0</if>" +
+ " <if test='online == true' > AND dc.status=true</if>" +
+ " <if test='online == false' > AND dc.status=false</if>" +
+ " <if test='hasSubChannel == true' > AND dc.sub_count > 0 </if>" +
+ " <if test='hasSubChannel == false' > AND dc.sub_count = 0 </if>" +
+ "<if test='channelIds != null'> AND dc.channel_id in <foreach item='item' index='index' collection='channelIds' open='(' separator=',' close=')'>" +
+ "#{item} " +
+ "</foreach> </if>" +
+ "ORDER BY dc.channel_id ASC" +
+ " </script>"})
+ 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>" +
+ "SELECT " +
+ "dc.*, " +
+ "de.name as device_name, " +
+ "de.on_line as device_online " +
+ "from " +
+ "wvp_device_channel dc " +
+ "LEFT JOIN wvp_device de ON dc.device_id = de.device_id " +
+ "WHERE 1=1" +
+ " <if test='deviceId != null'> AND dc.device_id = #{deviceId} </if> " +
+ " <if test='query != null'> AND (dc.channel_id LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
+ " <if test='parentChannelId != null'> AND dc.parent_id=#{parentChannelId} </if> " +
+ " <if test='online == true' > AND dc.status=true</if>" +
+ " <if test='online == false' > AND dc.status=false</if>" +
" <if test='hasSubChannel == true' > AND dc.sub_count > 0 </if>" +
" <if test='hasSubChannel == false' > AND dc.sub_count = 0 </if>" +
"<if test='channelIds != null'> AND dc.channel_id in <foreach item='item' index='index' collection='channelIds' open='(' separator=',' close=')'>" +
@@ -131,30 +174,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" +
@@ -165,15 +208,15 @@
" LEFT JOIN wvp_platform_gb_channel pgc on pgc.device_channel_id = dc.id " +
" WHERE 1=1 " +
" <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=1</if> " +
- " <if test='online == false' > AND dc.status=0</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='online == true' > AND dc.status=true</if> " +
+ " <if test='online == false' > AND dc.status=false</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,10 +234,10 @@
@Select("SELECT * FROM wvp_device_channel WHERE channel_id=#{channelId}")
List<DeviceChannel> queryChannelByChannelId( String channelId);
- @Update(value = {"UPDATE wvp_device_channel SET status=0 WHERE device_id=#{deviceId} AND channel_id=#{channelId}"})
- void offline(String deviceId, String channelId);
+ @Update(value = {"UPDATE wvp_device_channel SET status=false WHERE device_id=#{deviceId} AND channel_id=#{channelId}"})
+ void offline(@Param("deviceId") String deviceId, @Param("channelId") String channelId);
- @Update(value = {"UPDATE wvp_device_channel SET status=0 WHERE device_id=#{deviceId}"})
+ @Update(value = {"UPDATE wvp_device_channel SET status=false WHERE device_id=#{deviceId}"})
void offlineByDeviceId(String deviceId);
@Insert("<script> " +
@@ -202,20 +245,20 @@
"(channel_id, device_id, name, manufacture, model, owner, civil_code, block, sub_count, " +
" address, parental, parent_id, safety_way, register_way, cert_num, certifiable, err_code, secrecy, " +
" ip_address,port,password,ptz_type,status,stream_id,longitude,latitude,longitude_gcj02,latitude_gcj02,"+
- " longitude_wgs84,latitude_wgs84,has_audio,create_time,update_time,business_group_id,gps_time)"+
+ " longitude_wgs84,latitude_wgs84,has_audio,create_time,update_time,business_group_id,gps_time,stream_identification)"+
"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.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}) " +
+ "#{item.businessGroupId}, #{item.gpsTime}, #{item.streamIdentification}) " +
"</foreach> " +
"</script>")
- int batchAdd(List<DeviceChannel> addChannels);
+ int batchAdd(@Param("addChannels") List<DeviceChannel> addChannels);
@Insert("<script> " +
@@ -230,7 +273,7 @@
"#{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.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}) " +
@@ -271,8 +314,8 @@
"</script>")
int batchAddOrUpdate(List<DeviceChannel> addChannels);
- @Update(value = {"UPDATE wvp_device_channel SET status=1 WHERE device_id=#{deviceId} AND channel_id=#{channelId}"})
- void online(String deviceId, String channelId);
+ @Update(value = {"UPDATE wvp_device_channel SET status=true WHERE device_id=#{deviceId} AND channel_id=#{channelId}"})
+ void online(@Param("deviceId") String deviceId, @Param("channelId") String channelId);
@Update({"<script>" +
"<foreach collection='updateChannels' item='item' separator=';'>" +
@@ -283,7 +326,7 @@
"<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.civil_code != null'>, civil_code=#{item.civilCode}</if>" +
+ "<if test='item.civilCode != null'>, civil_code=#{item.civilCode}</if>" +
"<if test='item.block != null'>, block=#{item.block}</if>" +
"<if test='item.subCount != null'>, sub_count=#{item.subCount}</if>" +
"<if test='item.address != null'>, address=#{item.address}</if>" +
@@ -298,26 +341,30 @@
"<if test='item.ipAddress != null'>, ip_address=#{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'>, ptz_type=#{item.PTZType}</if>" +
+ "<if test='item.ptzType != null'>, ptz_type=#{item.ptzType}</if>" +
"<if test='item.status != null'>, status=#{item.status}</if>" +
"<if test='item.streamId != null'>, stream_id=#{item.streamId}</if>" +
"<if test='item.hasAudio != null'>, has_audio=#{item.hasAudio}</if>" +
"<if test='item.longitude != null'>, longitude=#{item.longitude}</if>" +
"<if test='item.latitude != null'>, latitude=#{item.latitude}</if>" +
+ "<if test='item.customLongitude != null'>, custom_longitude=#{item.customLongitude}</if>" +
+ "<if test='item.customLatitude != null'>, custom_latitude=#{item.customLatitude}</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.businessGroupId != null'>, business_group_id=#{item.businessGroupId}</if>" +
"<if test='item.gpsTime != null'>, gps_time=#{item.gpsTime}</if>" +
+ "<if test='item.streamIdentification != null'>, stream_identification=#{item.streamIdentification}</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>" +
+ "<if test='item.id == 0 and item.channelId != null '>WHERE device_id=#{item.deviceId} AND channel_id=#{item.channelId}</if>" +
+ "<if test='item.id == 0 and item.channelId == null '>WHERE device_id=#{item.deviceId}</if>" +
"</foreach>" +
"</script>"})
int batchUpdate(List<DeviceChannel> updateChannels);
- @Select("SELECT * FROM wvp_device_channel WHERE device_id=#{deviceId} AND status=1")
+ @Select("SELECT * FROM wvp_device_channel WHERE device_id=#{deviceId} AND status=true")
List<DeviceChannel> queryOnlineChannelsByDeviceId(String deviceId);
@Delete(value = {" <script>" +
@@ -329,7 +376,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 *" +
@@ -338,7 +385,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 " +
@@ -353,7 +400,7 @@
"WHERE device_id=#{deviceId} " +
" <if test='channelId != null' > AND channel_id=#{channelId}</if>" +
" </script>"})
- void updatePosition(DeviceChannel deviceChannel);
+ int updatePosition(DeviceChannel deviceChannel);
@Select("SELECT * FROM wvp_device_channel WHERE length(trim(stream_id)) > 0")
List<DeviceChannel> getAllChannelInPlay();
@@ -371,14 +418,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 " +
@@ -390,12 +437,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" +
@@ -405,9 +452,6 @@
@Select("select * from wvp_device_channel where device_id = #{deviceId}")
List<DeviceChannel> queryAllChannels(String deviceId);
-
- @Select("select count(1) as total, sum(status) as online from wvp_device_channel")
- ResourceBaceInfo getOverview();
@Select("select channelId" +
", device_id" +
@@ -420,7 +464,7 @@
"from wvp_device_channel where device_id = #{deviceId} " +
"and latitude != 0 " +
"and longitude != 0 " +
- "and(latitude_gcj02=0orlatitude_wgs84=0orlongitude_wgs84= 0 or longitude_gcj02 = 0)")
+ "and(latitude_gcj02=0 or latitude_wgs84=0 or longitude_wgs84= 0 or longitude_gcj02 = 0)")
List<DeviceChannel> getChannelsWithoutTransform(String deviceId);
@Select("select de.* from wvp_device de left join wvp_device_channel dc on de.device_id = dc.deviceId where dc.channel_id=#{channelId}")
@@ -432,19 +476,103 @@
"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=1 WHERE device_id=#{item.deviceId} AND channel_id=#{item.channelId}" +
+ "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=';'>" +
- "UPDATE wvp_device_channel SET status=0 WHERE device_id=#{item.deviceId} AND channel_id=#{item.channelId}" +
+ "UPDATE wvp_device_channel SET status= false WHERE device_id=#{item.deviceId} AND channel_id=#{item.channelId}" +
"</foreach>" +
"</script>"})
int batchOffline(List<DeviceChannel> channels);
+
+
+ @Select("select count(1) from wvp_device_channel where status = true")
+ int getOnlineCount();
+
+ @Select("select count(1) from wvp_device_channel")
+ int getAllChannelCount();
+
+ // 璁惧涓诲瓙鐮佹祦閫昏緫START
+ @Update(value = {"UPDATE wvp_device_channel SET stream_id=null WHERE device_id=#{deviceId}"})
+ void clearPlay(String deviceId);
+ // 璁惧涓诲瓙鐮佹祦閫昏緫END
+ @Select(value = {" <script>" +
+ "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(@Param("deviceId") String deviceId, @Param("parentId") String parentId, @Param("onlyCatalog") boolean onlyCatalog);
+
+ @Update("<script>" +
+ "UPDATE wvp_device_channel SET stream_identification=#{streamIdentification} WHERE device_id=#{deviceId}" +
+ " <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