diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/PlatformController.java index f4e5dd5a..79e6b3d0 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/PlatformController.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/PlatformController.java @@ -189,6 +189,7 @@ public class PlatformController { @Parameter(name = "page", description = "当前页", required = true) @Parameter(name = "count", description = "每页条数", required = true) @Parameter(name = "platformId", description = "上级平台的数据ID") + @Parameter(name = "channelType", description = "通道类型, 0:国标设备,1:推流设备,2:拉流代理") @Parameter(name = "query", description = "查询内容") @Parameter(name = "online", description = "是否在线") @Parameter(name = "hasShare", description = "是否已经共享") @@ -197,7 +198,7 @@ public class PlatformController { public PageInfo queryChannelList(int page, int count, @RequestParam(required = false) Integer platformId, @RequestParam(required = false) String query, - @RequestParam(required = false) Boolean channelType, + @RequestParam(required = false) Integer channelType, @RequestParam(required = false) Boolean online, @RequestParam(required = false) Boolean hasShare) { @@ -206,7 +207,7 @@ public class PlatformController { query = null; } - return platformChannelService.queryChannelList(page, count, query, online, platformId, hasShare); + return platformChannelService.queryChannelList(page, count, query, channelType, online, platformId, hasShare); } @Operation(summary = "向上级平台添加国标通道", security = @SecurityRequirement(name = JwtUtils.HEADER)) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java index 1ca53307..3311a249 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java @@ -149,9 +149,13 @@ public interface PlatformChannelMapper { " AND coalesce(wpgc.status, wdc.gb_status, wdc.status) = 'OFF' " + " AND wpgc.platform_id = #{platformId} " + " AND wpgc.platform_id is null " + + " AND wdc.device_db_id is not null " + + " AND wdc.stream_push_id is not null " + + " AND wdc.stream_proxy_id is not null " + "") List queryForPlatformForWebList(@Param("platformId") Integer platformId, @Param("query") String query, - @Param("online") Boolean online, @Param("hasShare") Boolean hasShare); + @Param("channelType") Integer channelType, @Param("online") Boolean online, + @Param("hasShare") Boolean hasShare); @Select("select\n" + " wdc.id as gb_id,\n" + diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/IPlatformChannelService.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/IPlatformChannelService.java index 66233a6f..c862b665 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/IPlatformChannelService.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/IPlatformChannelService.java @@ -14,7 +14,7 @@ import java.util.List; */ public interface IPlatformChannelService { - PageInfo queryChannelList(int page, int count, String query, Boolean online, Integer platformId, Boolean hasShare); + PageInfo queryChannelList(int page, int count, String query, Integer channelType, Boolean online, Integer platformId, Boolean hasShare); int addAllChannel(Integer platformId); diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java index 169ab31e..54b43ae6 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java @@ -54,9 +54,9 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService { @Override - public PageInfo queryChannelList(int page, int count, String query, Boolean online, Integer platformId, Boolean hasShare) { + public PageInfo queryChannelList(int page, int count, String query, Integer channelType, Boolean online, Integer platformId, Boolean hasShare) { PageHelper.startPage(page, count); - List all = platformChannelMapper.queryForPlatformForWebList(platformId, query, online, hasShare); + List all = platformChannelMapper.queryForPlatformForWebList(platformId, query, channelType, online, hasShare); return new PageInfo<>(all); } diff --git a/web_src/src/components/dialog/shareChannelAdd.vue b/web_src/src/components/dialog/shareChannelAdd.vue index 30bd1fa8..d1c9e62d 100755 --- a/web_src/src/components/dialog/shareChannelAdd.vue +++ b/web_src/src/components/dialog/shareChannelAdd.vue @@ -18,9 +18,9 @@ - - - + + + 添加状态: