增加获取当前聚焦模式接口

‘liusuyi’

2023-06-24 12fe66f8ad34f912321efee674060671280fb78c

增加获取当前聚焦模式接口

 ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java

@@ -379,7 +379,11 @@
                aas.setParams(params);
                List<ArdAlarmStealelec> ardAlarmStealelecs = ardAlarmStealelecMapper.selectArdAlarmStealelecList(aas);
                return ardAlarmStealelecs;

            case 1002:
                ArdAlarmCamera aac = new ArdAlarmCamera();
                aac.setParams(params);
                List<ArdAlarmCamera> ardAlarmCameras = ardAlarmCameraMapper.selectArdAlarmCameraList(aac);
                return ardAlarmCameras;
            case 1014:
                ArdAlarmTube aat = new ArdAlarmTube();
                aat.setParams(params);

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

@@ -15,6 +15,7 @@
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 java.util.List;
@@ -235,6 +236,13 @@
        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)

 ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java

@@ -54,7 +54,8 @@

    //聚焦模式
    boolean controlFocusMode(CameraCmd cmd);

    //获取聚焦模式
    String getFocusMode(CameraCmd cmd);
    //云台加热
    boolean controlPTHeateRpwron(CameraCmd cmd);


 ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java

@@ -1014,6 +1014,25 @@
        return bool;
    }

    public String getFocusMode(CameraCmd cmd)
    {
        String cameraId = cmd.getCameraId();
        Integer channelNum = cmd.getChannelNum();
        if (!GlobalVariable.loginMap.containsKey(cameraId)) {
            return "";
        }
        Integer userId = GlobalVariable.loginMap.get(cameraId);
        NET_DVR_FOCUSMODE_CFG struFocusMode = new NET_DVR_FOCUSMODE_CFG();
        Pointer point = struFocusMode.getPointer();
        IntByReference ibrBytesReturned = new IntByReference(0);
        boolean b_GetCameraParam = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_FOCUSMODECFG, channelNum, point, struFocusMode.size(), ibrBytesReturned);
        if (!b_GetCameraParam) {
            System.out.println("获取前端参数失败，错误码：" + hCNetSDK.NET_DVR_GetLastError());
        }
        struFocusMode.read();
        log.info("当前聚焦模式：" + struFocusMode.byFocusMode);
        return String.valueOf(struFocusMode.byFocusMode);
    }
    /**
     * @描述 云台加热开关
     * @参数 [userId, channelNum, enable]

 ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml

@@ -36,7 +36,13 @@
            <if test="cameraChannel != null "> and camera_channel = #{cameraChannel}</if>
            <if test="cameraType != null  and cameraType != ''"> and camera_type = #{cameraType}</if>
            <if test="alarmType != null  and alarmType != ''"> and alarm_type = #{alarmType}</if>
            <if test="alarmTime != null "> and alarm_time = #{alarmTime}</if>
<!--            <if test="alarmTime != null "> and alarm_time = #{alarmTime}</if>-->
            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                AND alarm_time &gt;= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
            </if>
            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
                AND alarm_time &lt;= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
            </if>
            <if test="longitude != null "> and longitude = #{longitude}</if>
            <if test="latitude != null "> and latitude = #{latitude}</if>
            <if test="ruleId != null "> and rule_id = #{ruleId}</if>