From 9442c37ce73497a66d540f035e58201b54656e49 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 15 二月 2022 17:41:09 +0800
Subject: [PATCH] 优化级联添加通道流程
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 121 ++++++++++++++++++++++++++--------------
1 files changed, 79 insertions(+), 42 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 28d63c3..32dd7df 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,6 +1,7 @@
package com.genersoft.iot.vmp.storager.dao;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.vmanager.bean.DeviceChannelTree;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
@@ -54,17 +55,22 @@
int update(DeviceChannel channel);
@Select(value = {" <script>" +
- "SELECT * FROM ( "+
- " SELECT * , (SELECT count(0) FROM device_channel WHERE parentId=dc.channelId) as subCount FROM 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='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>) dcr" +
- " WHERE 1=1 " +
+ "SELECT " +
+ "dc1.*, " +
+ "COUNT(dc2.channelId) as subCount " +
+ "from " +
+ "device_channel dc1 " +
+ "left join device_channel dc2 on " +
+ "dc1.channelId = dc2.parentId " +
+ "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='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 subCount >0</if>" +
" <if test='hasSubChannel == false' > AND subCount=0</if>" +
- " ORDER BY channelId ASC" +
+ "GROUP BY dc1.channelId " +
" </script>"})
List<DeviceChannel> queryChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online);
@@ -87,27 +93,31 @@
void startPlay(String deviceId, String channelId, String streamId);
- @Select(value = {" <script>" +
- "SELECT * FROM ( "+
- " SELECT dc.channelId, dc.deviceId, dc.name, de.manufacturer, de.hostAddress, " +
- "(SELECT count(0) FROM device_channel WHERE parentId=dc.channelId) as subCount, " +
- "(SELECT pc.platformId FROM platform_gb_channel pc WHERE pc.deviceId=dc.deviceId AND pc.channelId = dc.channelId ) as platformId " +
- "FROM device_channel dc " +
- "LEFT JOIN device de ON dc.deviceId = de.deviceId " +
- " 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='online == true' > AND dc.status=1</if> " +
- " <if test='online == false' > AND dc.status=0</if> " +
- ") dcr" +
- " WHERE 1=1 " +
- " <if test='hasSubChannel!= null and hasSubChannel == true' > AND subCount >0</if> " +
- " <if test='hasSubChannel!= null and hasSubChannel == false' > AND subCount=0</if> " +
- " <if test='platformId != null and inPlatform == true ' > AND platformId='${platformId}'</if> " +
- " <if test='platformId != null and inPlatform == false ' > AND (platformId != '${platformId}' OR platformId is NULL ) </if> " +
- " ORDER BY deviceId, channelId ASC" +
- " </script>"})
- List<ChannelReduce> queryChannelListInAll(String query, Boolean online, Boolean hasSubChannel, String platformId, Boolean inPlatform);
+ @Select(value = {" <script>" +
+ "SELECT dc.channelId, "+
+ "dc.deviceId, " +
+ "dc.name, " +
+ "de.manufacturer, " +
+ "de.hostAddress, " +
+ "(SELECT count(0) FROM device_channel WHERE parentId = dc.channelId) as subCount, " +
+ "pgc.platformId as platformId, " +
+ "pgc.catalogId as catalogId " +
+ "FROM device_channel dc " +
+ "LEFT JOIN device de ON dc.deviceId = de.deviceId " +
+ "LEFT JOIN platform_gb_channel pgc on de.deviceId = pgc.deviceId and pgc.channelId = dc.channelId " +
+ "LEFT JOIN device_channel dc2 ON dc2.deviceId = de.deviceId AND dc2.parentId = dc.channelId " +
+ " 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='online == true' > AND dc.status=1</if> " +
+ " <if test='online == false' > AND dc.status=0</if> " +
+ " <if test='hasSubChannel!= null and hasSubChannel == true' > AND dc2.channelId is not null</if> " +
+ " <if test='hasSubChannel!= null and hasSubChannel == false' > AND dc2.channelId is null</if> " +
+ " <if test='catalogId == null ' > AND pgc.platformId is null AND pgc.catalogId is null</if> " +
+ " <if test='catalogId != null ' > AND pgc.platformId =#{platformId} AND pgc.catalogId = #{catalogId}</if> " +
+ " ORDER BY dc.deviceId, dc.channelId ASC" +
+ " </script>"})
+ List<ChannelReduce> queryChannelListInAll(String query, Boolean online, Boolean hasSubChannel, String platformId, String catalogId);
@Select("SELECT * FROM device_channel WHERE channelId=#{channelId}")
List<DeviceChannel> queryChannelByChannelId( String channelId);
@@ -133,7 +143,7 @@
"'${item.streamId}', ${item.longitude}, ${item.latitude},'${item.createTime}', '${item.updateTime}')" +
"</foreach> " +
"</script>")
- void batchAdd(List<DeviceChannel> addChannels);
+ int batchAdd(List<DeviceChannel> addChannels);
@Update({"<script>" +
"<foreach collection='updateChannels' item='item' separator=';'>" +
@@ -167,21 +177,48 @@
"WHERE deviceId=#{item.deviceId} AND channelId=#{item.channelId}"+
"</foreach>" +
"</script>"})
- void batchUpdate(List<DeviceChannel> updateChannels);
+ int batchUpdate(List<DeviceChannel> updateChannels);
+
@Select(value = {" <script>" +
- "SELECT * FROM ( "+
- " SELECT * , (SELECT count(0) FROM device_channel WHERE parentId=dc.channelId) as subCount FROM 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='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>) dcr" +
- " WHERE 1=1 " +
+ "SELECT " +
+ "dc1.*, " +
+ "COUNT(dc2.channelId) as subCount " +
+ "from " +
+ "device_channel dc1 " +
+ "left join device_channel dc2 on " +
+ "dc1.channelId = dc2.parentId " +
+ "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='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 subCount >0</if>" +
" <if test='hasSubChannel == false' > AND subCount=0</if>" +
- " ORDER BY channelId ASC" +
- " LIMIT #{limit} OFFSET #{start}" +
+ "GROUP BY dc1.channelId " +
+ "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<DeviceChannel> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, String parentChannelId, String query,
+ Boolean hasSubChannel, Boolean online, int start, int limit);
+
+ @Select("SELECT * FROM device_channel WHERE deviceId=#{deviceId} AND status=1")
+ List<DeviceChannel> queryOnlineChannelsByDeviceId(String deviceId);
+
+ @Select(" SELECT\n" +
+ " channelId,\n" +
+ " channelId as id,\n" +
+ " deviceId,\n" +
+ " parentId,\n" +
+ " status,\n" +
+ " name as title,\n" +
+ " channelId as \"value\",\n" +
+ " channelId as \"key\",\n" +
+ " channelId,\n" +
+ " longitude,\n" +
+ " latitude\n" +
+ " from device_channel\n" +
+ " where deviceId = #{deviceId}")
+ List<DeviceChannelTree> tree(String deviceId);
}
--
Gitblit v1.8.0