Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-24 8a87e4226aa802d6a0e3566c66824fedf68e77da

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

@@ -12,11 +12,9 @@
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;
@@ -68,22 +66,17 @@
                    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);
                        }
                    if (vtdu != null) {
                        vtduService.deleteVtduByName(name);
                    }
                    //添加到流媒体
                    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);
                }
            }
            //创建引导队列