From 0362c0c8502a81fc974afb8d2aff85d9efd7bbb1 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 29 六月 2023 17:28:22 +0800
Subject: [PATCH] 修改报警逻辑 增加优先级队列

---
 ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java
index b3c34c7..a4d1d6c 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java
@@ -1,5 +1,7 @@
 package com.ruoyi.device.hiksdk.util.hikSdkUtil;
 
+import com.ruoyi.alarm.globalAlarm.domain.GuidePriorityQueue;
+import com.ruoyi.alarm.globalAlarm.domain.GuideTask;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.device.camera.domain.ArdCameras;
 import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
@@ -9,6 +11,8 @@
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.Comparator;
+import java.util.PriorityQueue;
 
 /**
  * @Description: 寮傛鐧诲綍鍥炶皟
@@ -35,6 +39,10 @@
             log.info(camera.getIp() + ":" + camera.getPort() + "鐧诲綍鎴愬姛");
             camera.setLoginId(lUserID);
             camera.setChannel((int) lpDeviceinfo.byChanNum);
+            //鍒涘缓寮曞闃熷垪
+            Comparator<GuideTask> comparator = GuidePriorityQueue.getComparator();
+            PriorityQueue<GuideTask> priorityQueue=new PriorityQueue<>(comparator);
+            GuidePriorityQueue.cameraQueueMap.put(camera.getId(),priorityQueue);
         } else {
             log.info(camera.getIp() + ":" + camera.getPort() + "鐧诲綍澶辫触");
             camera.setChannel(0);

--
Gitblit v1.9.3