From be8d66423f013b2a5c1fbdd58d8f1780a0e53c77 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Tue, 23 Jan 2024 00:07:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BD=E6=A0=87=E7=BA=A7?= =?UTF-8?q?=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/service/IPlatformService.java | 2 +- .../vmp/service/impl/PlatformServiceImpl.java | 16 +++++++++++++--- .../vmp/storager/dao/CommonChannelMapper.java | 6 ++++++ .../vmp/storager/dao/ParentPlatformMapper.java | 13 +++++++------ .../vmp/storager/dao/PlatformCatalogMapper.java | 0 .../vmp/storager/dao/PlatformChannelMapper.java | 0 .../gb28181/platform/PlatformController.java | 13 +++++++++---- 7 files changed, 36 insertions(+), 14 deletions(-) delete mode 100755 src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java delete mode 100755 src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java diff --git a/src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java b/src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java index ef94ff6a..52c76c2f 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java @@ -21,7 +21,7 @@ public interface IPlatformService { * @param count * @return */ - PageInfo queryParentPlatformList(int page, int count); + PageInfo queryParentPlatformList(int page, int count, String query, Boolean online); /** * 添加级联平台 diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java index c65113fe..2ec1128d 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java @@ -57,6 +57,9 @@ public class PlatformServiceImpl implements IPlatformService { @Autowired private ParentPlatformMapper platformMapper; + @Autowired + private CommonChannelMapper commonChannelMapper; + @Autowired private IRedisCatchStorage redisCatchStorage; @@ -92,10 +95,17 @@ public class PlatformServiceImpl implements IPlatformService { } @Override - public PageInfo queryParentPlatformList(int page, int count) { + public PageInfo queryParentPlatformList(int page, int count, String query, Boolean online) { PageHelper.startPage(page, count); - List all = platformMapper.getParentPlatformList(); - return new PageInfo<>(all); + List all = platformMapper.getParentPlatformList(query, online); + PageInfo platformPageInfo = new PageInfo<>(all); + int allCount = commonChannelMapper.getAllCount(); + platformPageInfo.getList().stream().forEach(parentPlatform -> { + if (parentPlatform.isShareAllChannel()) { + parentPlatform.setChannelCount(allCount); + } + }); + return platformPageInfo; } @Override diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/CommonChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/CommonChannelMapper.java index 19db3a6c..df7fb884 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/CommonChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/CommonChannelMapper.java @@ -655,4 +655,10 @@ public interface CommonChannelMapper { @Select("SELECT common_gb_id FROM wvp_common_channel WHERE common_gb_id = #{commonGbChannelId}") CommonGbChannel getOne(@Param("commonGbChannelId") int commonGbChannelId); + + @Select("") + int getAllCount(); + } diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java index e601cc30..993f3539 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java @@ -63,16 +63,17 @@ public interface ParentPlatformMapper { int delParentPlatform(ParentPlatform parentPlatform); @Select("") - List getParentPlatformList(); + List getParentPlatformList(@Param("query") String query, @Param("online") Boolean online); @Select("SELECT * FROM wvp_platform WHERE enable=#{enable} ") List getEnableParentPlatformList(boolean enable); diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java deleted file mode 100755 index e69de29b..00000000 diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java deleted file mode 100755 index e69de29b..00000000 diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java index d9a44cfe..136f1e68 100755 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java @@ -84,14 +84,19 @@ public class PlatformController { * @param count 每页条数 * @return */ - @GetMapping("/query/{count}/{page}") + @GetMapping("/list/{count}/{page}") @Operation(summary = "分页查询级联平台", security = @SecurityRequirement(name = JwtUtils.HEADER)) @Parameter(name = "page", description = "当前页", required = true) @Parameter(name = "count", description = "每页条数", required = true) - public PageInfo platforms(@PathVariable int page, @PathVariable int count) { + public PageInfo platforms(int page, int count, + @RequestParam(required = false)String query, + @RequestParam(required = false)Boolean online) { - PageInfo parentPlatformPageInfo = platformService.queryParentPlatformList(page, count); - if (parentPlatformPageInfo.getList().size() > 0) { + if (ObjectUtils.isEmpty(query)) { + query = null; + } + PageInfo parentPlatformPageInfo = platformService.queryParentPlatformList(page, count, query, online); + if (!parentPlatformPageInfo.getList().isEmpty()) { for (ParentPlatform platform : parentPlatformPageInfo.getList()) { platform.setMobilePositionSubscribe(subscribeHolder.getMobilePositionSubscribe(platform.getId()) != null); platform.setCatalogSubscribe(subscribeHolder.getCatalogSubscribe(platform.getId()) != null);