From 3c08ca7661566c94012040647428fee759820b39 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期日, 08 十月 2023 15:23:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PushTask.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PushTask.java
similarity index 79%
rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java
rename to ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PushTask.java
index ad33328..4aa4deb 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PushTask.java
@@ -1,32 +1,58 @@
package com.ruoyi.quartz.task;
+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.constant.CacheConstants;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.utils.websocket.util.WebSocketUtils;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.hiksdk.common.GlobalVariable;
import com.ruoyi.device.hiksdk.service.IHikClientService;
+import com.ruoyi.utils.websocket.util.WebSocketUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
+
import java.util.*;
+import java.util.concurrent.PriorityBlockingQueue;
import static com.ruoyi.utils.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
/**
+ * @ClassName: AlarmTask
* @Description:
- * @ClassName: SdkTask
- * @Author: 鍒樿嫃涔�
- * @Date: 2023骞�06鏈�24鏃�14:23
+ * @Author: Administrator
+ * @Date: 2023骞�03鏈�06鏃� 11:13
* @Version: 1.0
**/
-@Component("SdkTask")
-@Slf4j(topic = "hikSdk")
-public class SdkTask {
+@Component("PushTask")
+@Slf4j
+public class PushTask {
+
+ /**
+ * @鎻忚堪 瀹氭椂鎺ㄩ�佹墍鏈夋姤璀︾殑鐐逛綅鏁伴噺
+ * @鍙傛暟 []
+ * @杩斿洖鍊� void
+ * @鍒涘缓浜� 鍒樿嫃涔�
+ * @鍒涘缓鏃堕棿 2023/6/15 15:43
+ * @淇敼浜哄拰鍏跺畠淇℃伅
+ */
+ public void globalAlarmCountPush() {
+ 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());
+ }
+ }
+
/**
* @鎻忚堪 瀹氭椂鎺ㄩ�乸tz
@@ -105,5 +131,4 @@
log.error("鎺ㄩ�乸tz寮傚父:" + ex.getMessage());
}
}
-
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3