优化

‘liusuyi’

2023-08-22 df7cbd4d9b23b44c8aca4c32d85551dd0706b7f0

优化

 ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java

@@ -202,7 +202,9 @@
                    if (lon == null || lat == null) {
                        continue;
                    }
                    Point point2D=new Point(lon,lat);
                    Point point2D=new Point();
                    point2D.setLongitude(lon);
                    point2D.setLatitude(lat);
                    boolean inPolygon = GisTool.isInPolygon(point2D, partitionLocation);
                    if (inPolygon) {
                        Map<String, Object> params = new HashMap<>();

 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) {
                    /*获取通道列表*/

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java

@@ -1143,7 +1143,9 @@
                List<Map<String, Object>> carGPSMap = (List<Map<String, Object>>) carGPSTrack.get("list");
                Double lng = Double.valueOf((String) carGPSMap.get(0).get("lng"));
                Double lat = Double.valueOf((String) carGPSMap.get(0).get("lat"));
                Point point = new Point(lng, lat);
                Point point = new Point();
                point.setLongitude(lng);
                point.setLatitude(lat);
                boolean inPolygon = GisTool.isInPolygon(point, partitionLocation);
                if (inPolygon) {
                    carMap.put("longitude", lng);

 ard-work/src/main/java/com/ruoyi/utils/tools/GisTool.java

@@ -35,15 +35,15 @@
    }

    public static void main(String[] args) {
        // 被检测的经纬度点
        Point point= new Point(126.649261,45.687377);
        // 商业区域（百度多边形区域经纬度集合）
        List<Point> partitionLocation = new ArrayList<>();
        partitionLocation.add(new Point(126.64459,45.688548));
        partitionLocation.add(new Point(126.653376,45.68938));
        partitionLocation.add(new Point(126.645776,45.685048));
        partitionLocation.add(new Point(126.654184,45.685778));
        System.out.println(isInPolygon(point,partitionLocation));
//        // 被检测的经纬度点
//        Point point= new Point(126.649261,45.687377);
//        // 商业区域（百度多边形区域经纬度集合）
//        List<Point> partitionLocation = new ArrayList<>();
//        partitionLocation.add(new Point(126.64459,45.688548));
//        partitionLocation.add(new Point(126.653376,45.68938));
//        partitionLocation.add(new Point(126.645776,45.685048));
//        partitionLocation.add(new Point(126.654184,45.685778));
//        System.out.println(isInPolygon(point,partitionLocation));
    }

    /**

 ard-work/src/main/java/com/ruoyi/utils/tools/Point.java

@@ -15,9 +15,4 @@
    private static final long serialVersionUID = 1L;
    private Double longitude;
    private Double latitude;

    public Point(Double x, Double y) {
        this.longitude = x;
        this.latitude = y;
    }
}

 ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java

@@ -102,7 +102,7 @@
                        SysUser sysUser = sysUserService.selectUserById(currentOperator);
                        if(StringUtils.isNull(sysUser))
                        {
                            return false;
                            return true;
                        }
                        currentLevel = Integer.valueOf(sysUser.getCameraPriority());
                    }