From 1aad56563c6861e13f3a837eb7ef410723cc2358 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期日, 25 六月 2023 11:00:04 +0800
Subject: [PATCH] 报警点位数量推送增加一层map 增加通用光电报警数量推送
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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/SdkTask.java
index ae0c0b5..60c3937 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,16 +1,19 @@
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;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.hiksdk.service.IHikClientService;
import org.springframework.stereotype.Component;
+
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import static com.ruoyi.common.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
/**
@@ -22,10 +25,6 @@
**/
@Component("SdkTask")
public class SdkTask {
- @Resource
- IArdCamerasService ardCamerasService;
- @Resource
- IHikClientService hikClientService;
/**
* @鎻忚堪 瀹氭椂鎺ㄩ�乸tz
@@ -36,6 +35,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");
@@ -51,9 +52,8 @@
}
}
if (ONLINE_USER_SESSIONS.size() > 0) {
- Map<String, Object> sendMap=new HashMap<>();
- sendMap.put("command",10000);
- sendMap.put("ptz",list);
+ Map<String, Object> sendMap = new HashMap<>();
+ sendMap.put("10000", list);
WebSocketUtils.sendMessageAll(sendMap);
}
}
--
Gitblit v1.9.3