禁出电子围栏报警逻辑bug修改提交

zhangnaisong

2024-01-31 2d10f00422f1c501f2cffec29fef1c6a8eba3a55

 ard-work/src/main/java/com/ruoyi/device/camera/controller/CameraSdkController.java

@@ -11,6 +11,7 @@
import com.ruoyi.device.camera.domain.CameraCmd;

import com.ruoyi.device.camera.service.IArdCamerasService;

import com.ruoyi.device.camera.service.ICameraSdkService;



import com.ruoyi.device.noguidezone.domain.ArdCameraNoGuideZone;

import com.ruoyi.device.noguidezone.service.IArdCameraNoGuideZoneService;

import com.ruoyi.utils.gis.GisUtil;

@@ -43,8 +44,10 @@
    private ICameraSdkService cameraSdkService;

    @Resource

    private IArdCamerasService ardCamerasService;



    @Autowired

    private IArdCameraNoGuideZoneService ardCameraNoGuideZoneService;





    @RequestMapping("/preview")

    private String preview() {

@@ -177,33 +180,43 @@
        //拦截手动引导

        ArdCameraNoGuideZone ardCameraNoGuideZone = new ArdCameraNoGuideZone();

        ardCameraNoGuideZone.setCameraId(cmd.getCameraId());

        ardCameraNoGuideZone.setEnabled("1");

        //获取当前相机的禁引可视域列表

        List<ArdCameraNoGuideZone> ardCameraNoGuideZones = ardCameraNoGuideZoneService.selectArdCameraNoGuideZoneList(ardCameraNoGuideZone);

        if (ardCameraNoGuideZones.size() > 0) {

            //获取到当前相机的坐标集合

            List<Point> pointList = new ArrayList<>();

            for(ArdCameraNoGuideZone zone:ardCameraNoGuideZones) {

                String[] parts = zone.getPoi().split(",");

                List<Point> pointList = new ArrayList<>();

                for (int i = 0; i < parts.length; i += 3) {

                    Point point = new Point();

                    point.setLongitude(Double.valueOf(parts[i]));

                    point.setLatitude(Double.valueOf(parts[i + 1]));

                    pointList.add(point);

                }

            }

            double lon = cmd.getTargetPosition()[0];

            double lat = cmd.getTargetPosition()[1];

            Point targetPoint = new Point(lon, lat);

            //判断引导目标是否在坐标集合组成的多边形内

            boolean inPolygon = GisUtil.isInPolygon(targetPoint, pointList);

            if(inPolygon)

            {

                return AjaxResult.error("引导坐标位于禁引可视域内");

                double lon = cmd.getTargetPosition()[0];

                double lat = cmd.getTargetPosition()[1];

                Point targetPoint = new Point(lon, lat);

                //判断引导目标是否在坐标集合组成的多边形内

                boolean inPolygon = GisUtil.isInPolygon(targetPoint, pointList);

                if(inPolygon)

                {

                    return AjaxResult.error("引导坐标位于禁引可视域内");

                }

            }

        }

        return toAjax(cameraSdkService.guideTargetPosition(cmd));

    }



    @ApiOperation("指向目标井")

    @PostMapping("/setTargetWell")

    @Log(title = "指向目标井", businessType = BusinessType.CONTROL)

    @ApiOperationSupport(includeParameters = {"cmd.wellId"})

    public @ResponseBody

    AjaxResult setTargetWell(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        return cameraSdkService.guideTargetWell(cmd);

    }



    @ApiOperation("设置零方位角")

    @PostMapping("/setZeroPTZ")