guzijian / wvp-GB28181-pro · Commits

Commit c23a52929641484ed0b4ca728630f6d74872da8b

Authored by mk1990
2 parents a1b6e564 60278ee6

Merge branch 'wvp-28181-2.0' of https://github.91chi.fun/https://github.com/6485… 

…40858/wvp-GB28181-pro into wvp-28181-2.0
Inline Side-by-side
Showing 2 changed files with 21 additions and 1 deletions
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
  View file @c23a529
... ... @@ -112,6 +112,26 @@ public interface DeviceChannelMapper {
112 112 " </script>"})
113 113 List<ChannelReduce> queryChannelListInAll(String query, Boolean online, Boolean hasSubChannel, String platformId, String catalogId);
114 114  
  115 + @Select(value = {" <script>" +
  116 + "SELECT " +
  117 + " dc.id,\n" +
  118 + " dc.channelId,\n" +
  119 + " dc.deviceId,\n" +
  120 + " dc.name,\n" +
  121 + " de.manufacturer,\n" +
  122 + " de.hostAddress,\n" +
  123 + " dc.subCount,\n" +
  124 + " pgc.platformId as platformId,\n" +
  125 + " pgc.catalogId as catalogId " +
  126 + " FROM device_channel dc " +
  127 + " LEFT JOIN device de ON dc.deviceId = de.deviceId " +
  128 + " LEFT JOIN platform_gb_channel pgc on pgc.deviceChannelId = dc.id " +
  129 + " WHERE pgc.platformId = #{platformId} " +
  130 + " ORDER BY dc.deviceId, dc.channelId ASC" +
  131 + " </script>"})
  132 + List<ChannelReduce> queryChannelByPlatformId(String platformId);
  133 +
  134 +
115 135 @Select("SELECT * FROM device_channel WHERE channelId=#{channelId}")
116 136 List<DeviceChannel> queryChannelByChannelId( String channelId);
117 137  
... ...
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
  View file @c23a529
... ... @@ -614,7 +614,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
614 614 @Override
615 615 public List<ChannelReduce> queryChannelListInParentPlatform(String platformId) {
616 616  
617   - return deviceChannelMapper.queryChannelListInAll(null, null, null, platformId, platformId);
  617 + return deviceChannelMapper.queryChannelByPlatformId( platformId);
618 618 }
619 619  
620 620 @Override
... ...