Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-16 59fcc48c8589b9df2af744fd6c77854061a52f54

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

@@ -8,6 +8,7 @@
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.dhsdk.service.IDhClientService;
import com.ruoyi.device.hiksdk.service.IHikClientService;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -37,6 +38,8 @@
    @Resource
    private IHikClientService sdk;
    @Resource
    private IDhClientService ClientService;
    @Resource
    private IArdCamerasService ardCamerasService;

    /**
@@ -63,10 +66,7 @@
    private String index() {
        return "test";
    }
    @RequestMapping("/media")
    private String media() {
        return "preview2";
    }

    @GetMapping("/list")
    public @ResponseBody
    AjaxResult list(ArdCameras ardCamera) {
@@ -104,7 +104,6 @@
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.pTZControlWithSpeed(cmd));
    }


    @ApiOperation("调用预置点")
    @PostMapping("/gotoPreset")
@@ -152,7 +151,7 @@
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo"})
    @Log(title = "获取PTZ", businessType = BusinessType.CONTROL)
    public @ResponseBody
    AjaxResult GetPTZ(@RequestBody CameraCmd cmd) {
    AjaxResult getPTZ(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        Map<String, Object> ptzMap = sdk.getPtz(cmd);
        return AjaxResult.success("获取ptz", ptzMap);
@@ -163,7 +162,7 @@
    @Log(title = "获取PTZ范围", businessType = BusinessType.CONTROL)
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo"})
    public @ResponseBody
    AjaxResult GetPTZScope(@RequestBody CameraCmd cmd) {
    AjaxResult getPTZScope(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        Map<String, Object> ptzMap = sdk.getPtzScope(cmd);
        return AjaxResult.success("获取ptz范围", ptzMap);
@@ -174,7 +173,7 @@
    @Log(title = "设置PTZ", businessType = BusinessType.CONTROL)
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.ptzMap"})
    public @ResponseBody
    AjaxResult SetPTZ(@RequestBody CameraCmd cmd) {
    AjaxResult setPTZ(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.setPtz(cmd));
    }
@@ -195,7 +194,7 @@
    @Log(title = "设置零方位角", businessType = BusinessType.CONTROL)
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.cmd.chanNo"})
    public @ResponseBody
    AjaxResult SetZeroPTZ(@RequestBody CameraCmd cmd) {
    AjaxResult setZeroPTZ(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.setZeroPtz(cmd));
    }
@@ -281,7 +280,7 @@
    @Log(title = "云台加热", businessType = BusinessType.CONTROL)
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.enable"})
    public @ResponseBody
    AjaxResult HeateRpwron(@RequestBody CameraCmd cmd) {
    AjaxResult heateRpwron(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.controlPTHeateRpwron(cmd));
    }
@@ -292,7 +291,7 @@
    @Log(title = "镜头加热", businessType = BusinessType.CONTROL)
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.chanNo", "cmd.enable"})
    public @ResponseBody
    AjaxResult CameraDeicing(@RequestBody CameraCmd cmd) {
    AjaxResult cameraDeicing(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.controlCameraDeicing(cmd));
    }
@@ -326,6 +325,7 @@
        String path = sdk.record(cmd);
        return toAjaxString(path, "手动录像");
    }

    @ApiOperation("获取相机架设参数")
    @PostMapping("/getCameraSetupCFG")
    @Log(title = "获取相机架设参数", businessType = BusinessType.CONTROL)