Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-30 305fe6a8621998e5130d541660c2e3c5f02672d6

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

@@ -1094,7 +1094,7 @@
    public boolean controlInfrarecfg(CameraCmd cmd) {

        String cameraId = cmd.getCameraId();

        boolean enable = cmd.isEnable();

        Integer channelNum = cmd.getChanNo();

        Integer chanNo = cmd.getChanNo();

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

            return false;

        }

@@ -1102,17 +1102,17 @@
        NET_DVR_CAMERAPARAMCFG_EX struDayNigh = new NET_DVR_CAMERAPARAMCFG_EX();

        Pointer point = struDayNigh.getPointer();

        IntByReference ibrBytesReturned = new IntByReference(0);

        boolean b_GetCameraParam = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_CCDPARAMCFG_EX, channelNum, point, struDayNigh.size(), ibrBytesReturned);

        boolean b_GetCameraParam = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_CCDPARAMCFG_EX, chanNo, point, struDayNigh.size(), ibrBytesReturned);

        if (!b_GetCameraParam) {

            log.error("获取前端参数失败，错误码：" + hCNetSDK.NET_DVR_GetLastError());

        }

        struDayNigh.read();

        log.debug("是否开启夜视：" + struDayNigh.struDayNight.byDayNightFilterType);

        String current = struDayNigh.struDayNight.byDayNightFilterType == 1 ? "开启" : "关闭";

        log.debug("当前状态:" + current);



        NET_DVR_DAYNIGHT daynight = new NET_DVR_DAYNIGHT();

        if (enable) {

            daynight.byDayNightFilterType = 1;//夜晚



        } else {

            daynight.byDayNightFilterType = 0;//白天

        }

@@ -1120,12 +1120,15 @@
        daynight.byDayNightFilterTime = 60;

        struDayNigh.struDayNight = daynight;

        struDayNigh.write();

        boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_CCDPARAMCFG_EX, channelNum, point, struDayNigh.size());

        boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_CCDPARAMCFG_EX, chanNo, point, struDayNigh.size());

        if (!bool) {

            int code = hCNetSDK.NET_DVR_GetLastError();

            log.error("设置夜视失败,请稍后重试" + code);

        }

        log.debug("设置夜视成功");

        else {

            log.debug("设置夜视成功");

        }



        return bool;

    }