aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-23 21:47:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

临时提交

Browse Source
This commit is contained in:
lin 2025-10-10 09:18:34 +08:00
parent a3c4f02e3f
commit 3a6c59ed6c
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -633,7 +633,8 @@ public interface CommonGBChannelMapper {
@SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForH2", databaseId = "h2") @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForH2", databaseId = "h2")
@SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForKingBase", databaseId = "kingbase") @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForKingBase", databaseId = "kingbase")
@SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForPostgresql", databaseId = "postgresql") @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForPostgresql", databaseId = "postgresql")
List<CameraChannel> queryListInCircle(Double centerLongitude, Double centerLatitude, Double radius, Integer level, List<CameraGroup> groupList); List<CameraChannel> queryListInCircle(@Param("centerLongitude") Double centerLongitude, @Param("centerLatitude") Double centerLatitude,
@Param("radius") Double radius, @Param("level") Integer level, @Param("groupList") List<CameraGroup> groupList);
@SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForMysql", databaseId = "mysql") @SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForMysql", databaseId = "mysql")
@SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForH2", databaseId = "h2") @SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForH2", databaseId = "h2")

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

@ -122,7 +122,7 @@ public interface GroupMapper {
@Select("SELECT * from wvp_common_group WHERE business_group = #{businessGroup} ") @Select("SELECT * from wvp_common_group WHERE business_group = #{businessGroup} ")
List<Group> queryByBusinessGroup(@Param("businessGroup") String businessGroup); List<Group> queryByBusinessGroup(@Param("businessGroup") String businessGroup);
@Select("SELECT * from wvp_common_group WHERE business_group = #{businessGroup} ") @Select("SELECT * from wvp_common_group WHERE business_group = #{businessGroup}")
@MapKey("id") @MapKey("id")
Map<Integer, CameraGroup> queryByBusinessGroupForMap(@Param("businessGroup") String businessGroup); Map<Integer, CameraGroup> queryByBusinessGroupForMap(@Param("businessGroup") String businessGroup);

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

@ -669,8 +669,9 @@ public class ChannelProvider {
} }
sqlBuild.append(" )"); sqlBuild.append(" )");
sqlBuild.append(" AND coalesce(wdc.gb_longitude, wdc.longitude) >= #{minLongitude} AND coalesce(wdc.gb_longitude, wdc.longitude) <= #{maxLongitude}"); String geomTextBuilder = "point(" + params.get("centerLongitude") + " " + params.get("centerLatitude") + ")";
sqlBuild.append(" AND coalesce(wdc.gb_latitude, wdc.latitude) >= #{minLatitude} AND coalesce(wdc.gb_latitude, wdc.latitude) <= #{maxLatitude}");
sqlBuild.append("AND ST_Distance_Sphere(point(coalesce(wdc.gb_longitude, wdc.longitude), coalesce(wdc.gb_latitude, wdc.latitude)), ST_GeomFromText('").append(geomTextBuilder).append("')) < #{radius}");
if (params.get("level") != null) { if (params.get("level") != null) {
sqlBuild.append(" AND ( map_level <= #{level} || map_level is null )"); sqlBuild.append(" AND ( map_level <= #{level} || map_level is null )");
@ -707,7 +708,8 @@ public class ChannelProvider {
Point point = pointList.get(i); Point point = pointList.get(i);
geomTextBuilder.append(point.getLng()).append(" ").append(point.getLat()); geomTextBuilder.append(point.getLng()).append(" ").append(point.getLat());
} }
sqlBuild.append("AND ST_Within(point(coalesce(wdc.gb_longitude, wdc.longitude), coalesce(wdc.gb_latitude, wdc.latitude)), ST_GeomFromText('").append(geomTextBuilder).append("))'))"); geomTextBuilder.append("))");
sqlBuild.append("AND ST_Within(point(coalesce(wdc.gb_longitude, wdc.longitude), coalesce(wdc.gb_latitude, wdc.latitude)), ST_GeomFromText('").append(geomTextBuilder).append("'))");
if (params.get("level") != null) { if (params.get("level") != null) {
sqlBuild.append(" AND ( map_level <= #{level} || map_level is null )"); sqlBuild.append(" AND ( map_level <= #{level} || map_level is null )");