Browse Source

修复国标目录发送缺失的问题

pull/419/head
648540858 3 years ago
parent
commit
60278ee6ad
  1. 20
      src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
  2. 2
      src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java

20
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java

@ -112,6 +112,26 @@ public interface DeviceChannelMapper {
" </script>"}) " </script>"})
List<ChannelReduce> queryChannelListInAll(String query, Boolean online, Boolean hasSubChannel, String platformId, String catalogId); List<ChannelReduce> queryChannelListInAll(String query, Boolean online, Boolean hasSubChannel, String platformId, String catalogId);
@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" +
" 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);
@Select("SELECT * FROM device_channel WHERE channelId=#{channelId}") @Select("SELECT * FROM device_channel WHERE channelId=#{channelId}")
List<DeviceChannel> queryChannelByChannelId( String channelId); List<DeviceChannel> queryChannelByChannelId( String channelId);

2
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java

@ -614,7 +614,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
@Override @Override
public List<ChannelReduce> queryChannelListInParentPlatform(String platformId) { public List<ChannelReduce> queryChannelListInParentPlatform(String platformId) {
return deviceChannelMapper.queryChannelListInAll(null, null, null, platformId, platformId); return deviceChannelMapper.queryChannelByPlatformId( platformId);
} }
@Override @Override

Loading…
Cancel
Save