增加获取附近相机接口 增加相机报警引导开关 增加日夜切换变换通道

‘liusuyi’

2023-06-17 d046fe01d52bc9ab423647db7af0591fd3a36259

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

@@ -4,20 +4,19 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
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.hiksdk.service.hikClientService;
import com.ruoyi.device.hiksdk.service.IHikClientService;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;

import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;

@@ -35,7 +34,7 @@
public class SdkController extends BaseController {

    @Resource
    private hikClientService sdk;
    private IHikClientService sdk;
    @Resource
    private IArdCamerasService ardCamerasService;

@@ -93,7 +92,8 @@
    @Log(title = "云台控制", businessType = BusinessType.CONTROL)
    public @ResponseBody
    AjaxResult PTZControlWithSpeed(@RequestBody CameraCmd cmd) {
        return toAjax(sdk.PTZControlWithSpeed(cmd));
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.pTZControlWithSpeed(cmd));
    }


@@ -169,7 +169,7 @@
    @ApiOperationSupport(includeParameters = {"cmd.cameraId", "cmd.channelNum", "cmd.targetPosition"})
    public @ResponseBody
    AjaxResult setTargetPosition(@RequestBody CameraCmd cmd) {
        return toAjax(sdk.setTargetPosition(cmd));
        return toAjax(sdk.guideTargetPosition(cmd));
    }


@@ -188,8 +188,8 @@
    @Log(title = "设置锁定", businessType = BusinessType.CONTROL)
    public @ResponseBody
    AjaxResult setPTZLock(@RequestBody CameraCmd cmd) {
        cmd.setOperator(SecurityUtils.getUserId());
        return toAjax(sdk.controlLock(cmd));

    }

    @ApiOperation("获取云台锁定信息")
@@ -260,6 +260,7 @@
        String base64Str = sdk.captureJPEGPicture(cmd);
        return toAjaxString(base64Str, "相机抓图");
    }

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