单兵端-新任务轮询异常修复

‘liusuyi’

2023-08-02 cf746a1b31ddd2b2b4232c5ce9dd304a2d5c2c46

 ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java

@@ -161,6 +161,7 @@
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.ptzMap"})
    public @ResponseBody
    AjaxResult SetPTZ(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.setPtz(cmd));
    }

@@ -190,8 +191,17 @@
    public @ResponseBody
    AjaxResult setPTZLock(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.controlLock(cmd));
        return AjaxResult.success(sdk.controlLock(cmd));
    }

    @ApiOperation("设置解锁")
    @PostMapping("/setPTZUnLock")
    @ApiOperationSupport(includeParameters = {"cmd.cameraId"})
    @Log(title = "设置解锁", businessType = BusinessType.CONTROL)
    public @ResponseBody
    AjaxResult setPTZUnLock(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return AjaxResult.success(sdk.controlUnLock(cmd));
    }

    @ApiOperation("获取云台锁定信息")
@@ -237,6 +247,14 @@
        return toAjax(sdk.controlFocusMode(cmd));
    }

    @ApiOperation(value = "获取聚焦模式", notes = "1手动2自动")
    @PostMapping("/getFocusMode")
    public @ResponseBody
    AjaxResult getFocusMode(@RequestBody CameraCmd cmd) {
        String focusMode = sdk.getFocusMode(cmd);
        return AjaxResult.success(focusMode);
    }

    @ApiOperation("云台加热")
    @PostMapping("/heateRpwron")
    @Log(title = "云台加热", businessType = BusinessType.CONTROL)
@@ -262,6 +280,7 @@
        String base64Str = sdk.captureJPEGPicture(cmd);
        return toAjaxString(base64Str, "相机抓图");
    }

    @ApiOperation("相机抓图")
    @PostMapping("/picCutCate")
    @Log(title = "相机抓图", businessType = BusinessType.CONTROL)