Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-07 1ccdcb4a890687d59b272f5397e8b41ae4ce2254

 ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/controller/HikSdkController.java

@@ -8,9 +8,9 @@
import com.ruoyi.device.camera.domain.ArdCameras;

import com.ruoyi.device.camera.domain.CameraCmd;

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

import com.ruoyi.utils.sdk.hiksdk.service.IHikClientService;

import com.ruoyi.common.annotation.Anonymous;

import com.ruoyi.common.core.domain.AjaxResult;

import com.ruoyi.utils.sdk.hiksdk.service.impl.HikSdkStrategy;

import io.swagger.annotations.Api;

import io.swagger.annotations.ApiOperation;

import org.springframework.stereotype.Controller;

@@ -35,7 +35,7 @@
public class HikSdkController extends BaseController {



    @Resource

    private IHikClientService sdk;

    private HikSdkStrategy sdk;

    @Resource

    private IArdCamerasService ardCamerasService;



@@ -85,7 +85,7 @@
    public @ResponseBody

    AjaxResult PTZControlWithSpeed(@RequestBody CameraCmd cmd) {

        cmd.setOperator(SecurityUtils.getUserId());

        return toAjax(sdk.pTZControlWithSpeed(cmd));

        return toAjax(sdk.pTZControl(cmd));

    }



    @ApiOperation("调用预置点")