From c73fe2b0cf2b0956b0f480aed2e5cb35ba446de5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 22 三月 2023 10:45:36 +0800
Subject: [PATCH] Merge pull request #787 from xiaoQQya/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 96 +++++++++++++++++++++++++++++++++++------------
1 files changed, 71 insertions(+), 25 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..93f2a09 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);
@@ -244,28 +295,6 @@
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 +344,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);
@@ -357,4 +386,21 @@
@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);
}
--
Gitblit v1.8.0