diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
index 7452bb1b3..8425e5545 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
@@ -632,14 +632,14 @@ public interface CommonGBChannelMapper {
     @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForMysql", databaseId = "mysql")
     @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForH2", databaseId = "h2")
     @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForKingBase", databaseId = "kingbase")
-    @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForPostgresql", databaseId = "postgresql")
+    @SelectProvider(type = ChannelProvider.class, method = "queryListInCircleForKingBase", databaseId = "postgresql")
     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 = "queryListInPolygonForH2", databaseId = "h2")
     @SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForKingBase", databaseId = "kingbase")
-    @SelectProvider(type = ChannelProvider.class, method = "queryListInPolygonForPostgresql", databaseId = "postgresql")
+    @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);
 
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
index b72322e51..70e8f7e99 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
@@ -680,6 +680,35 @@ public class ChannelProvider {
         return sqlBuild.toString();
     }
 
+    public String queryListInCircleForKingBase(Map<String, Object> params ){
+        StringBuilder sqlBuild = new StringBuilder();
+        sqlBuild.append(BASE_SQL_FOR_CAMERA_DEVICE);
+        sqlBuild.append(" where wdc.channel_type = 0 AND (wdc.gb_ptz_type is null ||  wdc.gb_ptz_type != 99) " +
+                " AND coalesce(wdc.gb_parent_id, wdc.parent_id) in (");
+
+        sqlBuild.append(" ");
+        List<CameraGroup> groupList = (List<CameraGroup>)params.get("groupList");
+        boolean first = true;
+        for (CameraGroup group : groupList) {
+            if (!first) {
+                sqlBuild.append(",");
+            }
+            sqlBuild.append("'" + group.getDeviceId() + "'");
+            first = false;
+        }
+        sqlBuild.append(" )");
+
+        String geomTextBuilder = "point(" + params.get("centerLongitude") + " " + params.get("centerLatitude") + ")";
+
+        sqlBuild.append("AND ST_DistanceSphere(ST_MakePoint(coalesce(wdc.gb_longitude, wdc.longitude), coalesce(wdc.gb_latitude, wdc.latitude)), ST_GeomFromText('").append(geomTextBuilder).append("')) < #{radius}");
+
+        if (params.get("level") != null) {
+            sqlBuild.append(" AND ( map_level <= #{level} || map_level is null )");
+        }
+
+        return sqlBuild.toString();
+    }
+
     public String queryListInPolygonForMysql(Map<String, Object> params ){
         StringBuilder sqlBuild = new StringBuilder();
         sqlBuild.append(BASE_SQL_FOR_CAMERA_DEVICE);
@@ -718,6 +747,44 @@ public class ChannelProvider {
         return sqlBuild.toString();
     }
 
+    public String queryListInPolygonForKingBase(Map<String, Object> params ){
+        StringBuilder sqlBuild = new StringBuilder();
+        sqlBuild.append(BASE_SQL_FOR_CAMERA_DEVICE);
+        sqlBuild.append(" where wdc.channel_type = 0 AND (wdc.gb_ptz_type is null ||  wdc.gb_ptz_type != 99) " +
+                " AND coalesce(wdc.gb_parent_id, wdc.parent_id) in (");
+
+        sqlBuild.append(" ");
+        List<CameraGroup> groupList = (List<CameraGroup>)params.get("groupList");
+        boolean first = true;
+        for (CameraGroup group : groupList) {
+            if (!first) {
+                sqlBuild.append(",");
+            }
+            sqlBuild.append("'" + group.getDeviceId() + "'");
+            first = false;
+        }
+        sqlBuild.append(" )");
+
+        StringBuilder geomTextBuilder = new StringBuilder();
+        geomTextBuilder.append("POLYGON((");
+        List<Point> pointList = (List<Point>)params.get("pointList");
+        for (int i = 0; i < pointList.size(); i++) {
+            if (i > 0) {
+                geomTextBuilder.append(", ");
+            }
+            Point point = pointList.get(i);
+            geomTextBuilder.append(point.getLng()).append(" ").append(point.getLat());
+        }
+        geomTextBuilder.append("))");
+        sqlBuild.append("AND ST_Within(ST_MakePoint(coalesce(wdc.gb_longitude, wdc.longitude), coalesce(wdc.gb_latitude, wdc.latitude)), ST_GeomFromText('").append(geomTextBuilder).append("'))");
+
+        if (params.get("level") != null) {
+            sqlBuild.append(" AND ( map_level <= #{level} || map_level is null )");
+        }
+
+        return sqlBuild.toString();
+    }
+
     public String queryGbChannelByChannelDeviceIdAndGbDeviceId(Map<String, Object> params ){
         StringBuilder sqlBuild = new StringBuilder();
         sqlBuild.append(BASE_SQL_FOR_CAMERA_DEVICE);