diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/dao/CommonGBChannelMapper.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/dao/CommonGBChannelMapper.java index 7e91efa9..32f453c0 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/dao/CommonGBChannelMapper.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/dao/CommonGBChannelMapper.java @@ -641,17 +641,12 @@ public interface CommonGBChannelMapper extends BaseMapperX { @Param("minLatitude") Double minLatitude, @Param("maxLatitude") Double maxLatitude, @Param("level") Integer level, @Param("groupList") List groupList); - @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForMysql", databaseId = "mysql") - @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForMysql", databaseId = "h2") - @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForKingBase", databaseId = "kingbase") - @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForKingBase", databaseId = "postgresql") + // 仅支持 MySQL(项目未配置 databaseIdProvider,移除 H2/KingBase/PostgreSQL 变体) + @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForMysql") List queryListInCircle(@Param("centerLongitude") Double centerLongitude, @Param("centerLatitude") Double centerLatitude, @Param("radius") Double radius, @Param("level") Integer level, @Param("groupList") List groupList); - @SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForMysql", databaseId = "mysql") - @SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForMysql", databaseId = "h2") - @SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForKingBase", databaseId = "kingbase") - @SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForKingBase", databaseId = "postgresql") + @SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForMysql") List queryListInPolygon(@Param("pointList") List pointList, @Param("level") Integer level, @Param("groupList") List groupList); @SelectProvider(type = ChannelProvider.class, method = "queryListForSyMobile") diff --git a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/dao/GroupMapper.java b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/dao/GroupMapper.java index ce93c7c8..cdc38984 100644 --- a/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/dao/GroupMapper.java +++ b/viewsh-module-video/viewsh-module-video-server/src/main/java/com/viewsh/module/video/gb28181/dao/GroupMapper.java @@ -217,30 +217,7 @@ public interface GroupMapper extends BaseMapperX { " set w1.parent_id = w2.id" + " where w1.id in " + " #{item.id}" + - " ", databaseId = "mysql") - @Update(value = " ", databaseId = "h2") - @Update( value = " ", databaseId = "postgresql") - @Update( value = " ", databaseId = "kingbase") + " ") void updateParentId(List groupListForAdd); @Update(value = " ", databaseId = "mysql") - @Update(value = " ", databaseId = "h2") - @Update( value = " ", databaseId = "kingbase") - @Update( value = " ", databaseId = "postgresql") + " ") void updateParentIdWithBusinessGroup(List groupListForAdd); @Select(" ", databaseId = "mysql") - @Update(value = " ", databaseId = "h2") - @Update( value = " ", databaseId = "kingbase") - @Update( value = " ", databaseId = "postgresql") + " ") void updateParentId(List regionListForAdd); @Update("