优化提交

‘liusuyi’

2023-07-01 ef0ed9877417b7efb3a6ec72121bee56720f6939

 ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueManager.java

@@ -24,7 +24,7 @@
 */

@Component
@Slf4j
@Slf4j(topic = "guideQueue")
public class QueueManager {

    @Autowired
@@ -64,8 +64,9 @@
        PriorityBlockingQueue<GuideTask> guideTaskQueue = GuidePriorityQueue.cameraQueueMap.get(cameraId);
        if(StringUtils.isNull(guideTaskQueue))
        {
            log.info("相机未初始化成功，没有队列");
            log.info("相机未登录，没有队列");
        }
        log.debug("新任务入队:"+task.getAlarmId());
        guideTaskQueue.add(task);
        /*获取该相机的当前执行线程*/
        TaskThread currentTaskThread = threadMap.get(cameraId);
@@ -92,14 +93,15 @@
            while (!Thread.currentThread().isInterrupted()) {
                try {
                    GuideTask task = queue.take();
                    log.debug("取出队列数据:"+task.getAlarmId());
                    taskExecutor.processTask(task);
                    GuidePriorityQueue.printPriorityQueue();
                    // 更新线程的当前任务
                    TaskThread currentTaskThread = threadMap.get(queueName);
                    if (currentTaskThread != null) {
                        currentTaskThread.setCurrentTask(task);
                    }
                } catch (InterruptedException e) {
                    log.info("中断当前线程");
                    //线程中断，退出循环
                    Thread.currentThread().interrupt();
                }