Merge remote-tracking branch 'origin/master'

Administrator

2023-08-25 74c08a504d55ae137004cb44e0145010f62f9585

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

@@ -59,9 +59,13 @@
                }
            }
            //创建引导队列
            if(!GuidePriorityQueue.cameraQueueMap.containsKey(camera.getId()))
            {
            Comparator<GuideTask> comparator = GuidePriorityQueue.getComparator();
            PriorityBlockingQueue<GuideTask> priorityQueue = new PriorityBlockingQueue<>(1000, comparator);
            GuidePriorityQueue.cameraQueueMap.put(camera.getId(), priorityQueue);
            }

        } else {
            log.debug(camera.getIp() + ":" + camera.getPort() + "登录失败");
            camera.setChanNum(0);