From c7d15150237c946fbb4f5547dab0018a5f573d88 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 27 六月 2023 15:34:38 +0800
Subject: [PATCH] 增加redis通道
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 212 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 183 insertions(+), 29 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 8da1a09..23333f7 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
@@ -1,9 +1,11 @@
package com.genersoft.iot.vmp.storager.dao;
+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.*;
import org.springframework.stereotype.Repository;
@@ -81,7 +83,56 @@
"</foreach> </if>" +
"ORDER BY dc.channelId " +
" </script>"})
- List<DeviceChannel> queryChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online,List<String> channelIds);
+ List<DeviceChannel> queryChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online, List<String> channelIds);
+
+ @Select(value = {" <script>" +
+ "SELECT " +
+ "dc.*, " +
+ "de.name as deviceName, " +
+ "de.online as deviceOnline " +
+ "from " +
+ "device_channel dc " +
+ "LEFT JOIN device de ON dc.deviceId = de.deviceId " +
+ "WHERE 1=1" +
+ " <if test='deviceId != null'> AND dc.deviceId = #{deviceId} </if> " +
+ " <if test='query != null'> AND (dc.channelId LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
+ " <if test='parentChannelId != null'> AND dc.parentId=#{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.subCount > 0 </if>" +
+ " <if test='hasSubChannel == false' > AND dc.subCount = 0 </if>" +
+ "<if test='channelIds != null'> AND dc.channelId in <foreach item='item' index='index' collection='channelIds' open='(' separator=',' close=')'>" +
+ "#{item} " +
+ "</foreach> </if>" +
+ "ORDER BY dc.channelId 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 deviceName, " +
+ "de.online as deviceOnline " +
+ "from " +
+ "device_channel dc " +
+ "LEFT JOIN device de ON dc.deviceId = de.deviceId " +
+ "WHERE 1=1" +
+ " <if test='deviceId != null'> AND dc.deviceId = #{deviceId} </if> " +
+ " <if test='query != null'> AND (dc.channelId LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " +
+ " <if test='parentChannelId != null'> AND dc.parentId=#{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.subCount > 0 </if>" +
+ " <if test='hasSubChannel == false' > AND dc.subCount = 0 </if>" +
+ "<if test='channelIds != null'> AND dc.channelId in <foreach item='item' index='index' collection='channelIds' open='(' separator=',' close=')'>" +
+ "#{item} " +
+ "</foreach> </if>" +
+ "ORDER BY dc.channelId 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);
@Select("SELECT * FROM device_channel WHERE deviceId=#{deviceId} AND channelId=#{channelId}")
DeviceChannel queryChannel(String deviceId, String channelId);
@@ -146,6 +197,81 @@
@Update(value = {"UPDATE device_channel SET status=0 WHERE deviceId=#{deviceId}"})
void offlineByDeviceId(String deviceId);
+// @Insert("<script> " +
+// "insert into device_channel " +
+// "(channelId, deviceId, name, manufacture, model, owner, civilCode, block, subCount, " +
+// " 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 " +
+// "<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}, now(), now(), " +
+// "#{item.businessGroupId}, #{item.gpsTime}) " +
+// "</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), " +
+// "longitudeGcj02=VALUES(longitudeGcj02), " +
+// "latitudeGcj02=VALUES(latitudeGcj02), " +
+// "longitudeWgs84=VALUES(longitudeWgs84), " +
+// "latitudeWgs84=VALUES(latitudeWgs84), " +
+// "hasAudio=VALUES(hasAudio), " +
+// "businessGroupId=VALUES(businessGroupId), " +
+// "gpsTime=VALUES(gpsTime)" +
+// "</script>")
+// int batchAdd(List<DeviceChannel> addChannels);
+
+
+ @Insert("<script> " +
+ "insert into device_channel " +
+ "(channelId, deviceId, name, manufacture, model, owner, civilCode, block, subCount, " +
+ " 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 " +
+ "<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}, now(), now(), " +
+ "#{item.businessGroupId}, #{item.gpsTime}) " +
+ "</foreach> " +
+ "</script>")
+ int batchAdd(List<DeviceChannel> addChannels);
+
+
@Insert("<script> " +
"insert into device_channel " +
"(channelId, deviceId, name, manufacture, model, owner, civilCode, block, subCount, " +
@@ -197,7 +323,7 @@
"businessGroupId=VALUES(businessGroupId), " +
"gpsTime=VALUES(gpsTime)" +
"</script>")
- int batchAdd(List<DeviceChannel> addChannels);
+ int batchAddOrUpdate(List<DeviceChannel> addChannels);
@Update(value = {"UPDATE device_channel SET status=1 WHERE deviceId=#{deviceId} AND channelId=#{channelId}"})
void online(String deviceId, String channelId);
@@ -213,7 +339,7 @@
"<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.subCount != null'>, subCount=#{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>" +
@@ -238,33 +364,12 @@
"<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}"+
+ "<if test='item.id > 0'>WHERE id=#{item.id}</if>" +
+ "<if test='item.id == 0'>WHERE deviceId=#{item.deviceId} AND channelId=#{item.channelId}</if>" +
"</foreach>" +
"</script>"})
int batchUpdate(List<DeviceChannel> updateChannels);
-
- @Select(value = {" <script>" +
- "SELECT " +
- "dc1.* " +
- "from " +
- "device_channel dc1 " +
- "WHERE " +
- "dc1.deviceId = #{deviceId} " +
- " <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>" +
- " <if test='hasSubChannel == true' > AND dc1.subCount >0</if>" +
- " <if test='hasSubChannel == false' > AND dc1.subCount=0</if>" +
- "<if test='channelIds != null'> AND dc1.channelId in <foreach item='item' index='index' collection='channelIds' open='(' separator=',' close=')'>" +
- "#{item} " +
- "</foreach> </if>" +
- "ORDER BY dc1.channelId ASC " +
- "Limit #{limit} OFFSET #{start}" +
- " </script>"})
- List<DeviceChannel> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, String parentChannelId, String query,
- Boolean hasSubChannel, Boolean online, int start, int limit,List<String> channelIds);
@Select("SELECT * FROM device_channel WHERE deviceId=#{deviceId} AND status=1")
List<DeviceChannel> queryOnlineChannelsByDeviceId(String deviceId);
@@ -315,10 +420,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 left(channelId, LENGTH(#{parentId})) = #{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, LENGTH(#{parentId})) = #{parentId} </if>" +
" </script>"})
List<DeviceChannel> getChannelsWithCivilCodeAndLength(String deviceId, String parentId, Integer length);
@@ -342,7 +447,7 @@
List<DeviceChannel> getBusinessGroups(String deviceId, String typeCode);
@Select("select dc.id, dc.channelId, dc.deviceId, dc.name, dc.manufacture,dc.model,dc.owner, pc.civilCode,dc.block, " +
- " dc.address, '0' as parental,'0' as channelType, pc.id as parentId, dc.safetyWay, dc.registerWay,dc.certNum, dc.certifiable, " +
+ " dc.address, '0' as parental,'0' as channelType, pc.id as parentId, pc.businessGroupId as businessGroupId, dc.safetyWay, dc.registerWay,dc.certNum, dc.certifiable, " +
" dc.errCode,dc.endTime, dc.secrecy, dc.ipAddress, dc.port, dc.PTZType, dc.password, dc.status, " +
" dc.longitudeWgs84 as longitude, dc.latitudeWgs84 as latitude, pc.businessGroupId " +
" from device_channel dc" +
@@ -357,4 +462,53 @@
@Select("select count(1) as total, sum(status) as online from device_channel")
ResourceBaceInfo getOverview();
+
+ @Select("select channelId" +
+ ", deviceId" +
+ ", latitude" +
+ ", longitude" +
+ ", latitudeWgs84" +
+ ", longitudeWgs84" +
+ ", latitudeGcj02" +
+ ", longitudeGcj02 " +
+ "from device_channel where deviceId = #{deviceId} " +
+ "and latitude != 0 " +
+ "and longitude != 0 " +
+ "and (latitudeGcj02 = 0 or latitudeWgs84 = 0 or longitudeWgs84 = 0 or longitudeGcj02 = 0)")
+ List<DeviceChannel> getChannelsWithoutTransform(String deviceId);
+
+ @Select("select de.* from device de left join device_channel dc on de.deviceId = dc.deviceId where dc.channelId=#{channelId}")
+ List<Device> getDeviceByChannelId(String channelId);
+
+
+ @Delete({"<script>" +
+ "<foreach collection='deleteChannelList' item='item' separator=';'>" +
+ "DELETE FROM device_channel WHERE deviceId=#{item.deviceId} AND channelId=#{item.channelId}" +
+ "</foreach>" +
+ "</script>"})
+ int batchDel(List<DeviceChannel> deleteChannelList);
+
+ @Update({"<script>" +
+ "<foreach collection='channels' item='item' separator=';'>" +
+ "UPDATE device_channel SET status=1 WHERE deviceId=#{item.deviceId} AND channelId=#{item.channelId}" +
+ "</foreach>" +
+ "</script>"})
+ int batchOnline(List<DeviceChannel> channels);
+
+ @Update({"<script>" +
+ "<foreach collection='channels' item='item' separator=';'>" +
+ "UPDATE device_channel SET status=0 WHERE deviceId=#{item.deviceId} AND channelId=#{item.channelId}" +
+ "</foreach>" +
+ "</script>"})
+ int batchOffline(List<DeviceChannel> channels);
+
+ @Select(value = {" <script>" +
+ "select * " +
+ "from device_channel " +
+ "where deviceId=#{deviceId}" +
+ " <if test='parentId != null '> and parentId = #{parentId} </if>" +
+ " <if test='parentId == null '> and parentId is null </if>" +
+ " <if test='onlyCatalog == true '> and parental = 1 </if>" +
+ " </script>"})
+ List<DeviceChannel> getSubChannelsByDeviceId(String deviceId, String parentId, boolean onlyCatalog);
}
--
Gitblit v1.8.0