From 4aeca7f5ddbae254ee088a835e8577a43506594b Mon Sep 17 00:00:00 2001 From: lin <648540858@qq.com> Date: Tue, 30 Sep 2025 20:31:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/custom/CameraChannelController.java | 21 ++++--------------- .../custom/service/CameraChannelService.java | 15 ++++--------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/web/custom/CameraChannelController.java b/src/main/java/com/genersoft/iot/vmp/web/custom/CameraChannelController.java index 77e0110c9..71d936352 100644 --- a/src/main/java/com/genersoft/iot/vmp/web/custom/CameraChannelController.java +++ b/src/main/java/com/genersoft/iot/vmp/web/custom/CameraChannelController.java @@ -37,7 +37,6 @@ public class CameraChannelController { @Parameter(name = "sortName", description = "排序字段名") @Parameter(name = "order", description = "排序方式（升序 asc 或降序 desc ）") @Parameter(name = "groupAlias", description = "分组别名") - @Parameter(name = "topGroupAlias", description = "虚拟组织别名") @Parameter(name = "geoCoordSys", description = "坐标系类型：WGS84,GCJ02、BD09") @Parameter(name = "status", description = "摄像头状态") @Parameter(name = "containMobileDevice", description = "是否包含移动设备") @@ -47,7 +46,6 @@ public class CameraChannelController { @RequestParam(required = false) String sortName, @RequestParam(required = false) String order, @RequestParam(required = false) String groupAlias, - @RequestParam(required = false) String topGroupAlias, @RequestParam(required = false) Boolean status, @RequestParam(required = false) Boolean containMobileDevice){ if (ObjectUtils.isEmpty(query)) { @@ -62,11 +60,8 @@ public class CameraChannelController { if (ObjectUtils.isEmpty(groupAlias)) { groupAlias = null; } - if (ObjectUtils.isEmpty(topGroupAlias)) { - topGroupAlias = null; - } - return channelService.queryList(page, count, query, sortName, order, groupAlias, topGroupAlias, status, containMobileDevice); + return channelService.queryList(page, count, query, sortName, order, groupAlias, status, containMobileDevice); } @GetMapping(value = "/camera/list") @@ -78,7 +73,6 @@ public class CameraChannelController { @Parameter(name = "sortName", description = "排序字段名") @Parameter(name = "order", description = "排序方式（升序 asc 或降序 desc ）") @Parameter(name = "groupAlias", description = "分组别名") - @Parameter(name = "topGroupAlias", description = "虚拟组织别名") @Parameter(name = "geoCoordSys", description = "坐标系类型：WGS84,GCJ02、BD09") @Parameter(name = "status", description = "摄像头状态") @Parameter(name = "containMobileDevice", description = "是否包含移动设备") @@ -88,7 +82,6 @@ public class CameraChannelController { @RequestParam(required = false) String sortName, @RequestParam(required = false) String order, @RequestParam(required = false) String groupAlias, - @RequestParam(required = false) String topGroupAlias, @RequestParam(required = false) Boolean status, @RequestParam(required = false) Boolean containMobileDevice){ if (ObjectUtils.isEmpty(query)) { @@ -103,11 +96,8 @@ public class CameraChannelController { if (ObjectUtils.isEmpty(groupAlias)) { groupAlias = null; } - if (ObjectUtils.isEmpty(topGroupAlias)) { - topGroupAlias = null; - } - return channelService.queryList(page, count, query, sortName, order, groupAlias, topGroupAlias, status, containMobileDevice); + return channelService.queryList(page, count, query, sortName, order, groupAlias, status, containMobileDevice); } @GetMapping(value = "/camera/one") @@ -153,12 +143,11 @@ public class CameraChannelController { @Parameter(name = "maxLatitude", description = "最大纬度") @Parameter(name = "level", description = "地图级别") @Parameter(name = "groupAlias", description = "分组别名") - @Parameter(name = "topGroupAlias", description = "虚拟组织别名") @Parameter(name = "geoCoordSys", description = "坐标系类型：WGS84,GCJ02、BD09") public List queryListInBox(Double minLongitude, Double maxLongitude, Double minLatitude, Double maxLatitude, @RequestParam(required = false) Integer level, - String groupAlias, String topGroupAlias, + String groupAlias, @RequestParam(required = false) String geoCoordSys) { return null; } @@ -169,7 +158,6 @@ public class CameraChannelController { @Parameter(name = "position", description = "多边形位置，格式： [{'lng':116.32, 'lat': 39: 39.2}, {'lng':115.32, 'lat': 39: 38.2}, {'lng':125.32, 'lat': 39: 38.2}]") @Parameter(name = "level", description = "地图级别") @Parameter(name = "groupAlias", description = "分组别名") - @Parameter(name = "topGroupAlias", description = "虚拟组织别名") @Parameter(name = "geoCoordSys", description = "坐标系类型：WGS84,GCJ02、BD09") public List queryListInPolygon(@RequestBody PolygonQueryParam param) { return null; @@ -182,10 +170,9 @@ public class CameraChannelController { @Parameter(name = "centerLatitude", description = "圆心纬度") @Parameter(name = "radius", description = "查询范围的半径，单位米") @Parameter(name = "groupAlias", description = "分组别名") - @Parameter(name = "topGroupAlias", description = "虚拟组织别名") @Parameter(name = "geoCoordSys", description = "坐标系类型：WGS84,GCJ02、BD09") public List queryListInCircle(Double centerLongitude, Double centerLatitude, Double radius, String groupAlias, - String topGroupAlias, String geoCoordSys) { + String geoCoordSys) { return null; } diff --git a/src/main/java/com/genersoft/iot/vmp/web/custom/service/CameraChannelService.java b/src/main/java/com/genersoft/iot/vmp/web/custom/service/CameraChannelService.java index 1e44378aa..9005540b8 100644 --- a/src/main/java/com/genersoft/iot/vmp/web/custom/service/CameraChannelService.java +++ b/src/main/java/com/genersoft/iot/vmp/web/custom/service/CameraChannelService.java @@ -34,19 +34,12 @@ public class CameraChannelService implements CommandLineRunner { } - public PageInfo queryList(Integer page, Integer count, String query, String sortName, String order, String groupAlias, String topGroupAlias, Boolean status, Boolean containMobileDevice) { + public PageInfo queryList(Integer page, Integer count, String query, String sortName, String order, String groupAlias, Boolean status, Boolean containMobileDevice) { // 构建组织结构信息 - String groupDeviceId = null; - if (topGroupAlias != null && groupAlias != null) { - // 根据别名获取分组信息 - Group businessGroup = groupMapper.queryGroupByAlias(topGroupAlias); - Assert.notNull(businessGroup, "域信息未找到"); - - Group group = groupMapper.queryGroupByAliasAndBusinessGroup(groupAlias, businessGroup.getDeviceId()); - Assert.notNull(businessGroup, "获取组织结构失败"); - groupDeviceId = group.getDeviceId(); - } + Group group = groupMapper.queryGroupByAlias(groupAlias); + Assert.notNull(group, "获取组织结构失败"); + String groupDeviceId = group.getDeviceId(); // 构建分页 PageHelper.startPage(page, count);