Merge remote-tracking branch 'origin/master'

Administrator

2023-08-22 e8a4f9014fbea4159ea15642226c6793d57d13ee

 ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java

@@ -375,7 +375,9 @@
                    continue;
                }
                /*判断坐标是否在多边形范围内*/
                Point camPosition=new Point(camera.getLongitude(), camera.getLatitude());
                Point camPosition=new Point();
                camPosition.setLongitude(camera.getLongitude());
                camPosition.setLatitude(camera.getLatitude());
                boolean inPolygon = GisTool.isInPolygon(camPosition, partitionLocation);
                if (inPolygon) {
                    /*获取通道列表*/