XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

临时提交

Browse Source
This commit is contained in:
lin
2025-10-13 15:35:12 +08:00
parent efb39fc158
commit f724451058
7 changed files with 224 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
View File

@@ -148,6 +148,8 @@ public class VideoManagerConstants {
public static final String VM_MSG_SUBSCRIBE_DEVICE_STATUS = "device";
//************************** 第三方 ****************************************
public static final String WVP_STREAM_GB_ID_PREFIX = "memberNo_";

2
src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
View File

@@ -642,4 +642,6 @@ public interface CommonGBChannelMapper {
@SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForKingBase", databaseId = "postgresql")
List<CameraChannel> queryListInPolygon(@Param("pointList") List<Point> pointList, @Param("level") Integer level, @Param("groupList") List<CameraGroup> groupList);
@SelectProvider(type = ChannelProvider.class, method = "queryListForSyMobile")
List<CameraChannel> queryListForSyMobile(@Param("business") String business);
}

5
src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
View File

@@ -820,4 +820,9 @@ public class ChannelProvider {
sqlBuild.append(" )");
return sqlBuild.toString() ;
}
public String queryListForSyMobile(Map<String, Object> params ){
return BASE_SQL_FOR_CAMERA_DEVICE +
" WHERE wdc.gb_ptz_type = 99 AND coalesce(gb_business_group_id, business_group_id) = #{business}";
}
}

15
src/main/java/com/genersoft/iot/vmp/web/custom/CameraChannelController.java
View File

@@ -69,7 +69,7 @@ public class CameraChannelController {
@Parameter(name = "geoCoordSys", description = "坐标系类型：WGS84,GCJ02、BD09")
@Parameter(name = "status", description = "摄像头状态")
public PageInfo<CameraChannel> queryListWithChild(@RequestParam(required = false, value = "page", defaultValue = "1" )Integer page,
@RequestParam(required = false, value = "page", defaultValue = "100")Integer count,
@RequestParam(required = false, value = "count", defaultValue = "100")Integer count,
@RequestParam(required = false) String query,
@RequestParam(required = false) String sortName,
@RequestParam(required = false) Boolean order,
@@ -262,10 +262,19 @@ public class CameraChannelController {
result.setResult(wvpResult);
});
return result;
}
@GetMapping(value = "/camera/list-for-mobile")
@ResponseBody
@Operation(summary = "查询移动设备摄像机列表", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "page", description = "当前页")
@Parameter(name = "count", description = "每页查询数量")
@Parameter(name = "topGroupAlias", description = "分组别名")
public PageInfo<CameraChannel> queryListForMobile(@RequestParam(required = false, value = "page", defaultValue = "1" )Integer page,
@RequestParam(required = false, value = "count", defaultValue = "100")Integer count,
String topGroupAlias){
return channelService.queryListForMobile(page, count, topGroupAlias);
}
}

25
src/main/java/com/genersoft/iot/vmp/web/custom/service/CameraChannelService.java
View File

@@ -109,7 +109,7 @@ public class CameraChannelService implements CommandLineRunner {
public PageInfo<CameraChannel> queryList(Integer page, Integer count, String groupAlias, Boolean status, String geoCoordSys) {
// 构建组织结构信息
Group group = groupMapper.queryGroupByAlias(groupAlias);
Assert.notNull(group, "获取组织结构失败");
Assert.notNull(group, "组织结构不存在");
String groupDeviceId = group.getDeviceId();
// 构建分页
@@ -125,7 +125,7 @@ public class CameraChannelService implements CommandLineRunner {
public PageInfo<CameraChannel> queryListWithChild(Integer page, Integer count, String query, String sortName, Boolean order, String groupAlias, Boolean status, String geoCoordSys) {
// 构建组织结构信息
CameraGroup group = groupMapper.queryGroupByAlias(groupAlias);
Assert.notNull(group, "获取组织结构失败");
Assert.notNull(group, "组织结构不存在");
String groupDeviceId = group.getDeviceId();
// 获取所有子节点
List<CameraGroup> groupList = queryAllGroupChildren(group.getId(), group.getBusinessGroup());
@@ -346,7 +346,7 @@ public class CameraChannelService implements CommandLineRunner {
public List<CameraChannel> queryListInBox(Double minLongitude, Double maxLongitude, Double minLatitude, Double maxLatitude, Integer level, String groupAlias, String geoCoordSys) {
// 构建组织结构信息
CameraGroup group = groupMapper.queryGroupByAlias(groupAlias);
Assert.notNull(group, "获取组织结构失败");
Assert.notNull(group, "组织结构不存在");
// 获取所有子节点
List<CameraGroup> groupList = queryAllGroupChildren(group.getId(), group.getBusinessGroup());
groupList.add(group);
@@ -380,7 +380,7 @@ public class CameraChannelService implements CommandLineRunner {
public List<CameraChannel> queryListInCircle(Double centerLongitude, Double centerLatitude, Double radius, Integer level, String groupAlias, String geoCoordSys) {
// 构建组织结构信息
CameraGroup group = groupMapper.queryGroupByAlias(groupAlias);
Assert.notNull(group, "获取组织结构失败");
Assert.notNull(group, "组织结构不存在");
// 获取所有子节点
List<CameraGroup> groupList = queryAllGroupChildren(group.getId(), group.getBusinessGroup());
groupList.add(group);
@@ -407,7 +407,7 @@ public class CameraChannelService implements CommandLineRunner {
public List<CameraChannel> queryListInPolygon(List<Point> pointList, String groupAlias, Integer level, String geoCoordSys) {
// 构建组织结构信息
CameraGroup group = groupMapper.queryGroupByAlias(groupAlias);
Assert.notNull(group, "获取组织结构失败");
Assert.notNull(group, "组织结构不存在");
// 获取所有子节点
List<CameraGroup> groupList = queryAllGroupChildren(group.getId(), group.getBusinessGroup());
groupList.add(group);
@@ -431,4 +431,19 @@ public class CameraChannelService implements CommandLineRunner {
List<CameraChannel> all = channelMapper.queryListInPolygon(pointList, level, groupList);
return addIconPathAndPositionForCameraChannelList(all, geoCoordSys);
}
public PageInfo<CameraChannel> queryListForMobile(Integer page, Integer count, String topGroupAlias) {
CameraGroup cameraGroup = groupMapper.queryGroupByAlias(topGroupAlias);
Assert.notNull(cameraGroup, "组织结构不存在");
// 构建分页
PageHelper.startPage(page, count);
List<CameraChannel> all = channelMapper.queryListForSyMobile(cameraGroup.getDeviceId());
PageInfo<CameraChannel> groupPageInfo = new PageInfo<>(all);
List<CameraChannel> list = addIconPathAndPositionForCameraChannelList(groupPageInfo.getList(), null);
groupPageInfo.setList(list);
return groupPageInfo;
}
}