From 67af71cb4de71b1267e6300b7581cb6ccc8aa1d3 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 24 六月 2023 16:00:17 +0800
Subject: [PATCH] 优化ptz的websocket推送
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AlarmTask.java | 5 +++--
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java | 7 +++----
2 files changed, 6 insertions(+), 6 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 16d4594..609af09 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
@@ -5,7 +5,9 @@
import com.ruoyi.alarm.stealAlarm.service.IStealElecAlarmService;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.LonlatConver;
+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 lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -27,8 +29,6 @@
@Slf4j(topic = "AlarmTask")
public class AlarmTask {
- @Resource
- IGlobalAlarmService globalAlarmService;
/**
* @鎻忚堪 瀹氭椂鎺ㄩ�佹墍鏈夋姤璀︾殑鐐逛綅鏁伴噺
* @鍙傛暟 []
@@ -38,6 +38,7 @@
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
public void globalAlarmCountPush() {
+ IGlobalAlarmService globalAlarmService = SpringUtils.getBean(IGlobalAlarmService.class);
Map<String, Integer> stringIntegerMap = globalAlarmService.selectAlarmLogsCount();
if (ONLINE_USER_SESSIONS.size() > 0) {
WebSocketUtils.sendMessageAll(stringIntegerMap);
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java
index baff613..44dae03 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java
@@ -1,5 +1,6 @@
package com.ruoyi.quartz.task;
+import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.websocket.util.WebSocketUtils;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
@@ -22,10 +23,6 @@
**/
@Component("SdkTask")
public class SdkTask {
- @Resource
- IArdCamerasService ardCamerasService;
- @Resource
- IHikClientService hikClientService;
/**
* @鎻忚堪 瀹氭椂鎺ㄩ�乸tz
@@ -36,6 +33,8 @@
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
public void ptzPush() {
+ IArdCamerasService ardCamerasService = SpringUtils.getBean(IArdCamerasService.class);
+ IHikClientService hikClientService = SpringUtils.getBean(IHikClientService.class);
List<Map<String, Object>> list = new ArrayList<>();
ArdCameras ardCameras = new ArdCameras();
ardCameras.setGdtype("1");
--
Gitblit v1.9.3