无人机配置

zhangjianrock@163.com

2024-01-13 f6289a3070749caf8ca010b83f2a74be1764901f

 ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/lib/LoginResultCallBack.java

@@ -9,12 +9,11 @@
import com.ruoyi.device.channel.domain.ArdChannel;

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

import com.ruoyi.utils.sdk.common.GlobalVariable;

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

import com.ruoyi.media.domain.Vtdu;

import com.ruoyi.media.service.IVtduService;

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

import com.sun.jna.Pointer;

import lombok.extern.slf4j.Slf4j;



import java.util.Comparator;

import java.util.List;

import java.util.concurrent.PriorityBlockingQueue;

@@ -39,7 +38,7 @@
    public int invoke(int lUserID, int dwResult, HCNetSDK.NET_DVR_DEVICEINFO_V30 lpDeviceinfo, Pointer pUser) {

        IVtduService vtduService = SpringUtils.getBean(IVtduService.class);

        IArdChannelService ardChannelService = SpringUtils.getBean(IArdChannelService.class);

        IHikClientService hikClientService = SpringUtils.getBean(IHikClientService.class);

        HikvisionSDK hikClientService = SpringUtils.getBean(HikvisionSDK.class);

        IArdCamerasService ardCamerasService = SpringUtils.getBean(IArdCamerasService.class);

        if (GlobalVariable.loginMap.containsKey(camera.getId())) {

            GlobalVariable.loginMap.remove(camera.getId());

@@ -54,8 +53,9 @@
            camera.setChanNum((int) lpDeviceinfo.byChanNum);

            camera.setStartDChan((int) lpDeviceinfo.byStartDChan);

            //获取最新通道

            List<ArdChannel> cameraChannelList = hikClientService.getCameraChannelList(camera);

            List<ArdChannel> cameraChannelList = hikClientService.getIPChannelInfo(camera);

            if (cameraChannelList.size() > 0) {

                camera.setChanNum(cameraChannelList.size());

                //添加通道

                for (ArdChannel channel : cameraChannelList) {

                    channel.setId(IdUtils.simpleUUID());