增加外联报警数据接收入库和引导就近光电 增加外联报警业务功能

‘liusuyi’

2023-07-07 5f5cf5b1b4683a56fd0c85a0d89d14a4c0268cde

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

@@ -2,6 +2,8 @@

import com.ruoyi.alarm.globalAlarm.domain.GuidePriorityQueue;
import com.ruoyi.alarm.globalAlarm.domain.GuideTask;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.tomcat.util.threads.TaskThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -10,6 +12,8 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.PriorityBlockingQueue;

import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;

/**
 * @ClassName QueueManager
@@ -20,6 +24,7 @@
 */

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

    @Autowired
@@ -57,6 +62,12 @@
    public void addTaskToQueue(String cameraId, GuideTask task) {
        /*通过相机ID获取引导队列，并将引导任务加入队列*/
        PriorityBlockingQueue<GuideTask> guideTaskQueue = GuidePriorityQueue.cameraQueueMap.get(cameraId);
        if(StringUtils.isNull(guideTaskQueue))
        {
            log.info("相机未登录,没有队列,无法入队引导");
            return;
        }
        log.debug("新任务入队:"+task.getAlarmId());
        guideTaskQueue.add(task);
        /*获取该相机的当前执行线程*/
        TaskThread currentTaskThread = threadMap.get(cameraId);
@@ -83,14 +94,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();
                }