1、流媒体升级1.2.0，修改部分forest接口 2、登录设备判断编码自动配置转码 3、增加sdk聚焦模式切换 4、增加sdk视场角获取并定时上传

‘liusuyi’

2023-10-21 d353fdce7cb957aa0f5d9d51d0ad4205c96e156c

 ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java

@@ -3,31 +3,25 @@
import com.ruoyi.common.annotation.SdkOperate;

import com.ruoyi.common.utils.file.FileUtils;

import com.ruoyi.common.utils.file.MimeTypeUtils;

import com.ruoyi.common.utils.spring.SpringUtils;

import com.ruoyi.common.utils.uuid.IdUtils;

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.channel.domain.ArdChannel;

import com.ruoyi.device.channel.service.IArdChannelService;

import com.ruoyi.device.dhsdk.common.Res;

import com.ruoyi.device.dhsdk.lib.NetSDKLib;

import com.ruoyi.device.dhsdk.lib.NetSDKLib.LLong;

import com.ruoyi.device.dhsdk.lib.enumeration.EM_FOCUS_LIMIT_SELECT_MODE;

import com.ruoyi.device.dhsdk.lib.enumeration.EM_NEW_CONFIG;

import com.ruoyi.device.dhsdk.lib.enumeration.NET_EM_CFG_OPERATE_TYPE;

import com.ruoyi.device.dhsdk.lib.structure.CFG_VIDEO_IN_FOCUS;

import com.ruoyi.device.dhsdk.lib.structure.CFG_VIDEO_IN_FOCUS_UNIT;

import com.ruoyi.device.dhsdk.lib.structure.NET_ENCODE_VIDEO_INFO;

import com.ruoyi.device.dhsdk.lib.structure.DH_OUT_PTZ_VIEW_RANGE_STATUS;

import com.ruoyi.device.dhsdk.module.*;

import com.ruoyi.device.dhsdk.service.IDhClientService;

import com.ruoyi.device.hiksdk.common.GlobalVariable;

import com.ruoyi.device.hiksdk.sdk.HCNetSDK;

import com.ruoyi.media.domain.Vtdu;

import com.ruoyi.media.service.IVtduService;

import com.ruoyi.media.service.impl.VtduServiceImpl;

import com.ruoyi.utils.gis.GisUtil;

import com.ruoyi.utils.minio.MinioUtil;

import com.ruoyi.utils.tools.ArdTool;

import com.sun.jna.Pointer;

import lombok.extern.slf4j.Slf4j;

import org.springframework.beans.factory.annotation.Value;

@@ -150,11 +144,18 @@
                if (vtdu != null) {

                    vtduService.deleteVtduByName(name);

                }



                //添加到流媒体

                CameraCmd cmd = new CameraCmd(camera.getId(), channel.getChanNo());

                Map<String, Object> videoCompressionCfg = getVideoCompressionCfg(cmd);

                vtdu = new Vtdu();

                if (videoCompressionCfg.get("videoEncType").equals("标准h264")) {

                    vtdu.setIsCode("0");//默认不转码

                } else {

                    vtdu.setIsCode("1");//默认转码

                }

                vtdu.setRtspSource(rtspSource);

                vtdu.setName(camera.getId() + "_" + channel.getChanNo());

                vtdu.setIsCode("0");//默认不转码

                vtdu.setMode("1");//默认CPU软解码

                vtdu.setCameraId(camera.getId());

                vtduService.insertVtdu(vtdu);

@@ -312,7 +313,8 @@
        if (b) {

            DecimalFormat df = new DecimalFormat("0.0");//设置保留位数

            String nPTZPan = df.format((float) dh_ptz_location_info.nPTZPan / 10);

            String nPTZTilt = df.format((float) dh_ptz_location_info.nPTZTilt / 10);

            float t = (float) dh_ptz_location_info.nPTZTilt / 10;

            String nPTZTilt = df.format(t < 0 ? t + 360 : t);

            String nPTZZoom = df.format((float) dh_ptz_location_info.nPTZZoom);

            ptzMap.put("p", nPTZPan);

            ptzMap.put("t", nPTZTilt);

@@ -648,10 +650,12 @@
                cfg_video_in_focus.stVideoInFocusUnit[i].nFocusLimit = 10000;//聚焦极限值, 单位毫米

                if (enable) {//聚焦模式, 0-关闭, 1-辅助聚焦, 2-自动聚焦, 3-半自动聚焦, 4-手动聚焦

                    cfg_video_in_focus.stVideoInFocusUnit[i].nMode = 4;//手动聚焦

                    cfg_video_in_focus.stVideoInFocusUnit[i].emFocusMode = 1;//聚焦极限Manual

                    cfg_video_in_focus.stVideoInFocusUnit[i].emFocusMode = 0;//聚焦极限Manual

                    log.debug("当前为手动聚焦模式");

                } else {

                    cfg_video_in_focus.stVideoInFocusUnit[i].nMode = 2;//自动聚焦

                    cfg_video_in_focus.stVideoInFocusUnit[i].emFocusMode = 0;//聚焦极限Auto

                    cfg_video_in_focus.stVideoInFocusUnit[i].emFocusMode = 1;//聚焦极限Auto

                    log.debug("当前为自动聚焦模式");

                }

            }

            cfg_video_in_focus.nChannelIndex = chanNo - 1;

@@ -666,6 +670,49 @@
        }

    }



    @Override

    public String getFocusMode(CameraCmd cmd) {

        String mode = "";

        String cameraId = cmd.getCameraId();

        Integer chanNo = cmd.getChanNo();

        if (!GlobalVariable.loginMap.containsKey(cameraId)) {

            return "";

        }

        LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);

        try {

            NET_VIDEOIN_FOCUSMODE_INFO focusModeInfo = new NET_VIDEOIN_FOCUSMODE_INFO();

            int emCfgOpType = NET_EM_CFG_OPERATE_TYPE.NET_EM_CFG_VIDEOIN_FOCUSMODE;

            boolean bool = ConfigModule.GetConfig(loginId, chanNo - 1, emCfgOpType, focusModeInfo);

            if (!bool) {

                log.error("获取失败,请稍后重试" + getErrorCodePrint());

            }

            System.out.println("配置类型:" + focusModeInfo.emCfgType);     // 具体信息，参考库里的枚举

            System.out.println("聚焦模式:" + focusModeInfo.emFocusMode);

            switch (focusModeInfo.emFocusMode) {

                case 0:

                    mode = "关闭";

                    break;

                case 1:

                    mode = "辅助聚焦";

                    break;

                case 2:

                    mode = "自动聚焦";

                    break;

                case 3:

                    mode = "半自动聚焦";

                    break;

                case 4:

                    mode = "手动聚焦";

                    break;

            }



        } catch (Exception ex) {

            log.error("获取聚焦模式异常:" + ex.getMessage());



        }

        return mode;

    }



    //透雾

    @Override

    public boolean controlDefogcfg(CameraCmd cmd) {

@@ -677,9 +724,9 @@
        }

        LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);

        try {

            EM_NEW_CONFIG config = EM_NEW_CONFIG.CFG_CMD_VIDEOINDEFOG;

            String command = EM_NEW_CONFIG.CFG_CMD_VIDEOINDEFOG.getValue();

            //CFG_VIDEOINDEFOG_LIST cfg_videoindefog_list=new CFG_VIDEOINDEFOG_LIST();

            boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, config.getValue(), null);

            boolean bool = ConfigModule.SetDevConfig(loginId, chanNo - 1, command, null);

            if (!bool) {

                log.error("控制失败,请稍后重试" + getErrorCodePrint());

            }

@@ -836,6 +883,32 @@
        return map;

    }



    //获取GIS信息数据

    @Override

    public Map<String, Object> getGisInfo(CameraCmd cmd) {

        Map<String, Object> map = new HashMap<>();

        try {

            String cameraId = cmd.getCameraId();

            Integer chanNo = cmd.getChanNo();

            if (!GlobalVariable.loginMap.containsKey(cameraId)) {

                return null;

            }

            LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);

            DH_OUT_PTZ_VIEW_RANGE_STATUS dh_out_ptz_view_range_status = new DH_OUT_PTZ_VIEW_RANGE_STATUS();

            boolean b = ConfigModule.queryDevState(loginId, NET_DEVSTATE_PTZ_VIEW_RANGE, dh_out_ptz_view_range_status);

            if (b) {

                float nAngelH = (float) dh_out_ptz_view_range_status.nAngelH / 10;

                float nAngelV = (float) dh_out_ptz_view_range_status.nAngelV / 10;

                map = getPtz(cmd);//获取ptz

                map.put("fHorFieldAngle", nAngelH);// 水平视场角

                map.put("fVerFieldAngle", nAngelV);// 垂直视场角

            }

        } catch (Exception ex) {

            log.error("获取云台可视域异常" + ex.getMessage());

        }

        return map;

    }



    // 设备断线回调: 当设备出现断线时，SDK会调用该函数

    private static class DisConnect implements NetSDKLib.fDisConnect {

        public void invoke(LLong m_hLoginHandle, String pchDVRIP, int nDVRPort, Pointer dwUser) {