From 94957a09881d41800588afeb6b357c29d2f2cdc3 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期三, 06 九月 2023 15:14:41 +0800 Subject: [PATCH] 设备健康列表 --- ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AlarmTask.java | 45 ++++++++++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 15 deletions(-) diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AlarmTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AlarmTask.java index cf22a3f..1eea459 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AlarmTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AlarmTask.java @@ -1,22 +1,17 @@ package com.ruoyi.quartz.task; -import com.ruoyi.alarm.globalAlarm.service.IGlobalAlarmService; -import com.ruoyi.alarm.stealAlarm.domain.ArdAlarmStealelec; -import com.ruoyi.alarm.stealAlarm.service.IStealElecAlarmService; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.utils.LonlatConver; +import com.ruoyi.alarm.global.domain.GuidePriorityQueue; +import com.ruoyi.alarm.global.domain.GuideTask; +import com.ruoyi.alarm.global.service.IGlobalAlarmService; import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.common.websocket.util.WebSocketUtils; -import com.ruoyi.device.camera.service.IArdCamerasService; -import com.ruoyi.system.service.ISysUserService; +import com.ruoyi.utils.websocket.util.WebSocketUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import javax.annotation.Resource; -import java.text.SimpleDateFormat; import java.util.*; +import java.util.concurrent.PriorityBlockingQueue; -import static com.ruoyi.common.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS; +import static com.ruoyi.utils.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS; /** * @ClassName: AlarmTask @@ -26,7 +21,7 @@ * @Version: 1.0 **/ @Component("AlarmTask") -@Slf4j(topic = "AlarmTask") +@Slf4j public class AlarmTask { /** @@ -38,10 +33,30 @@ * @淇敼浜哄拰鍏跺畠淇℃伅 */ public void globalAlarmCountPush() { - IGlobalAlarmService globalAlarmService = SpringUtils.getBean(IGlobalAlarmService.class); - Map<String, Object> stringIntegerMap = globalAlarmService.selectAlarmLogsCount(); - if (ONLINE_USER_SESSIONS.size() > 0) { + try { + IGlobalAlarmService globalAlarmService = SpringUtils.getBean(IGlobalAlarmService.class); + Map<String, Object> stringIntegerMap = globalAlarmService.selectAlarmLogsCount(); + if (ONLINE_USER_SESSIONS.size() > 0) { WebSocketUtils.sendMessageAll(stringIntegerMap); + } + } catch (Exception ex) { + log.error("瀹氭椂鎺ㄩ�佹墍鏈夋姤璀︾殑鐐逛綅鏁伴噺寮傚父:" + ex.getMessage()); + } + } + + /** + * 瀹氭椂娓呯┖寮曞闃熷垪 + * 鍒樿嫃涔� + * 2023/7/1 10:41 + */ + public void clearGuideQueue() { + try { + log.info("瀹氭椂娓呯悊寮曞闃熷垪"); + for (PriorityBlockingQueue<GuideTask> guideQueue : GuidePriorityQueue.cameraQueueMap.values()) { + guideQueue.clear(); + } + } catch (Exception ex) { + log.error("瀹氭椂娓呯┖寮曞闃熷垪:" + ex.getMessage()); } } } \ No newline at end of file -- Gitblit v1.9.3