roouzenn/wvp
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复级联的国标通道无经纬度问题

Browse Source
This commit is contained in:
648540858
2022-03-29 10:04:28 +08:00
parent fb977546f3
commit 1553b39b45
6 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
View File

@@ -245,7 +245,7 @@ public interface IVideoManagerStorager {
/**
* 查询设备的通道信息
*/
List<ChannelReduce> queryChannelListInParentPlatform(String platformId);
List<DeviceChannelInPlatform> queryChannelListInParentPlatform(String platformId);
/**

12
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
View File

@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.storager.dao;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannelInPlatform;
import com.genersoft.iot.vmp.vmanager.bean.DeviceChannelTree;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import org.apache.ibatis.annotations.*;
@@ -114,22 +115,15 @@ public interface DeviceChannelMapper {
@Select(value = {" <script>" +
"SELECT " +
" dc.id,\n" +
" dc.channelId,\n" +
" dc.deviceId,\n" +
" dc.name,\n" +
" de.manufacturer,\n" +
" de.hostAddress,\n" +
" dc.subCount,\n" +
" dc.*,\n" +
" pgc.platformId as platformId,\n" +
" pgc.catalogId as catalogId " +
" FROM device_channel dc " +
" LEFT JOIN device de ON dc.deviceId = de.deviceId " +
" LEFT JOIN platform_gb_channel pgc on pgc.deviceChannelId = dc.id " +
" WHERE pgc.platformId = #{platformId} " +
" ORDER BY dc.deviceId, dc.channelId ASC" +
" </script>"})
List<ChannelReduce> queryChannelByPlatformId(String platformId);
List<DeviceChannelInPlatform> queryChannelByPlatformId(String platformId);
@Select("SELECT * FROM device_channel WHERE channelId=#{channelId}")

4
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
View File

@@ -612,9 +612,9 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
}
@Override
public List<ChannelReduce> queryChannelListInParentPlatform(String platformId) {
public List<DeviceChannelInPlatform> queryChannelListInParentPlatform(String platformId) {
return deviceChannelMapper.queryChannelByPlatformId( platformId);
return deviceChannelMapper.queryChannelByPlatformId(platformId);
}
@Override