Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-16 59fcc48c8589b9df2af744fd6c77854061a52f54

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

@@ -10,9 +10,13 @@
import com.ruoyi.device.channel.service.IArdChannelService;
import com.ruoyi.device.hiksdk.common.GlobalVariable;
import com.ruoyi.device.hiksdk.service.IHikClientService;
import com.ruoyi.media.domain.Vtdu;
import com.ruoyi.media.service.IVtduService;
import com.ruoyi.utils.forest.MediaClient;
import com.sun.jna.Pointer;
import lombok.extern.slf4j.Slf4j;

import javax.annotation.Resource;
import java.util.Comparator;
import java.util.List;
import java.util.concurrent.PriorityBlockingQueue;
@@ -35,6 +39,7 @@

    @Override
    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);
        IArdCamerasService ardCamerasService = SpringUtils.getBean(IArdCamerasService.class);
@@ -47,14 +52,38 @@
            GlobalVariable.loginMap.put(camera.getId(), lUserID);
            log.debug(camera.getIp() + ":" + camera.getPort() + "登录成功");
            camera.setLoginId(lUserID);
            camera.setState("1");
            camera.setChanNum((int) lpDeviceinfo.byChanNum);
            camera.setStartDChan((int) lpDeviceinfo.byStartDChan);
            //获取最新通道
            List<ArdChannel> cameraChannelList = hikClientService.getCameraChannelList(camera);
            if (cameraChannelList.size() > 0) {
                //添加通道
                for (ArdChannel channel : cameraChannelList) {
                    channel.setId(IdUtils.simpleUUID());
                    ardChannelService.insertArdChannel(channel);
                }
                //配置到流媒体
                for (ArdChannel channel : cameraChannelList) {
                    String name = camera.getId() + "_" + channel.getChanNo();
                    String rtspSource = "rtsp://" + camera.getUsername() + ":" + camera.getPassword() + "@" + camera.getIp() + ":" + camera.getRtspPort() + "/h264/ch" + channel.getChanNo() + "/main/av_stream";
                    Vtdu vtdu = vtduService.selectVtduByName(name);
                    if (vtdu == null) {
                        //添加到流媒体
                        vtdu = new Vtdu();
                        vtdu.setRtspSource(rtspSource);
                        vtdu.setName(camera.getId() + "_" + channel.getChanNo());
                        vtdu.setIsCode("0");//默认不转码
                        vtdu.setMode("1");//默认CPU软解码
                        vtdu.setCameraId(camera.getId());
                        vtduService.insertVtdu(vtdu);
                    } else {
                        if (!rtspSource.equals(vtdu.getRtspSource())) {
                            //更新rtsp地址
                            vtdu.setRtspSource(rtspSource);
                            vtduService.updateVtdu(vtdu);
                        }
                    }
                }
            }
            //创建引导队列
@@ -68,8 +97,9 @@
            log.debug(camera.getIp() + ":" + camera.getPort() + "登录失败");
            camera.setChanNum(0);
            camera.setLoginId(-1);
            camera.setState("0");
        }
        ardCamerasService.updateArdCameras(camera);
        return 1;
    }
}
}