优化

‘liusuyi’

2024-03-14 650b127a6a671a87034db5e027379e740aa56364

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

@@ -104,7 +104,7 @@
    public @ResponseBody

    AjaxResult gotoPreset(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        return toAjax(cameraSdkService.gotoPreset(cmd));

        return cameraSdkService.gotoPreset(cmd);

    }



    @ApiOperation("设置预置点")

@@ -114,7 +114,7 @@
    public @ResponseBody

    AjaxResult setPreset(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        return toAjax(cameraSdkService.setPreset(cmd));

        return cameraSdkService.setPreset(cmd);

    }



    @ApiOperation("获取聚焦值")

@@ -124,8 +124,7 @@
    public @ResponseBody

    AjaxResult getFocusPos(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        int focus = cameraSdkService.getFocusPos(cmd);

        return AjaxResult.success("获取聚焦值", focus);

        return cameraSdkService.getFocusPos(cmd);

    }



    @ApiOperation("设置聚焦值")

@@ -135,7 +134,7 @@
    public @ResponseBody

    AjaxResult setFocusPos(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        return toAjax(cameraSdkService.setFocusPos(cmd));

        return cameraSdkService.setFocusPos(cmd);

    }



    @ApiOperation("获取PTZ")

@@ -145,8 +144,7 @@
    public @ResponseBody

    AjaxResult getPTZ(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        Map<String, Object> ptzMap = cameraSdkService.getPtz(cmd);

        return AjaxResult.success("获取ptz", ptzMap);

        return cameraSdkService.getPtz(cmd);

    }



    @ApiOperation("获取PTZ范围")

@@ -156,8 +154,7 @@
    public @ResponseBody

    AjaxResult getPTZScope(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        Map<String, Object> ptzMap = cameraSdkService.getPtzScope(cmd);

        return AjaxResult.success("获取ptz范围", ptzMap);

        return cameraSdkService.getPtzScope(cmd);

    }



    @ApiOperation("设置PTZ")

@@ -185,7 +182,7 @@
        List<ArdCameraNoGuideZone> ardCameraNoGuideZones = ardCameraNoGuideZoneService.selectArdCameraNoGuideZoneList(ardCameraNoGuideZone);

        if (ardCameraNoGuideZones.size() > 0) {

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

            for(ArdCameraNoGuideZone zone:ardCameraNoGuideZones) {

            for (ArdCameraNoGuideZone zone : ardCameraNoGuideZones) {

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

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

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

@@ -199,13 +196,12 @@
                Point targetPoint = new Point(lon, lat);

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

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

                if(inPolygon)

                {

                if (inPolygon) {

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

                }

            }

        }

        return toAjax(cameraSdkService.guideTargetPosition(cmd));

        return cameraSdkService.guideTargetPosition(cmd);

    }



    @ApiOperation("指向目标井")

@@ -225,7 +221,7 @@
    public @ResponseBody

    AjaxResult setZeroPTZ(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        return toAjax(cameraSdkService.setZeroPtz(cmd));

        return cameraSdkService.setZeroPtz(cmd);

    }



    @ApiOperation("设置锁定")

@@ -235,7 +231,7 @@
    public @ResponseBody

    AjaxResult setPTZLock(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        return AjaxResult.success(cameraSdkService.controlLock(cmd));

        return cameraSdkService.controlLock(cmd);

    }



    @ApiOperation("设置解锁")

@@ -245,7 +241,7 @@
    public @ResponseBody

    AjaxResult setPTZUnLock(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        return AjaxResult.success(cameraSdkService.controlUnLock(cmd));

        return cameraSdkService.controlUnLock(cmd);

    }



    @ApiOperation("获取云台锁定信息")

@@ -255,7 +251,8 @@
    public @ResponseBody

    AjaxResult getPTZLockInfo(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        int byWorkMode = cameraSdkService.getPTZLockInfo(cmd);

        AjaxResult ajaxResult = cameraSdkService.getPTZLockInfo(cmd);

        Integer byWorkMode = (Integer) ajaxResult.get("msg");

        if (byWorkMode == 0) {

            return AjaxResult.success("云台锁定状态：解锁");

        } else if (byWorkMode == 1) {

@@ -272,7 +269,7 @@
    public @ResponseBody

    AjaxResult defogcfg(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        return toAjax(cameraSdkService.controlDefogcfg(cmd));

        return cameraSdkService.controlDefogcfg(cmd);

    }



    @ApiOperation("红外开关")

@@ -282,7 +279,7 @@
    public @ResponseBody

    AjaxResult infrarecfg(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        return toAjax(cameraSdkService.controlInfrarecfg(cmd));

        return cameraSdkService.controlInfrarecfg(cmd);

    }



    @ApiOperation(value = "手动/自动聚焦", notes = "true手动flase自动")

@@ -292,7 +289,7 @@
    public @ResponseBody

    AjaxResult enableFocusMode(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        return toAjax(cameraSdkService.controlFocusMode(cmd));

        return cameraSdkService.controlFocusMode(cmd);

    }



    @ApiOperation(value = "获取聚焦模式", notes = "1手动2自动")

@@ -301,8 +298,7 @@
    public @ResponseBody

    AjaxResult getFocusMode(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        String focusMode = cameraSdkService.getFocusMode(cmd);

        return AjaxResult.success(focusMode);

        return cameraSdkService.getFocusMode(cmd);

    }



    @ApiOperation("云台加热")

@@ -312,7 +308,7 @@
    public @ResponseBody

    AjaxResult heateRpwron(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        return toAjax(cameraSdkService.controlPTHeateRpwron(cmd));

        return cameraSdkService.controlPTHeateRpwron(cmd);

    }





@@ -323,7 +319,7 @@
    public @ResponseBody

    AjaxResult cameraDeicing(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        return toAjax(cameraSdkService.controlCameraDeicing(cmd));

        return cameraSdkService.controlCameraDeicing(cmd);

    }



    @ApiOperation("相机抓图")

@@ -344,7 +340,7 @@
    public @ResponseBody

    AjaxResult getGisInfo(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        return AjaxResult.success(cameraSdkService.getGisInfo(cmd));

        return cameraSdkService.getGisInfo(cmd);

    }



    @ApiOperation("录像")