From bf26314672d20ec0b90a001c4ed7dee3c8683c73 Mon Sep 17 00:00:00 2001
From: zhangjian <zhangjianrock@163.com>
Date: 星期五, 30 六月 2023 14:08:19 +0800
Subject: [PATCH] websocket返回上锁用户id
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java | 25 ++++++++++++++++++-------
1 files changed, 18 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..6ee5445 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,21 @@
package com.ruoyi.quartz.task;
+import com.ruoyi.common.utils.StringUtils;
+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.common.GlobalVariable;
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 +27,6 @@
**/
@Component("SdkTask")
public class SdkTask {
- @Resource
- IArdCamerasService ardCamerasService;
- @Resource
- IHikClientService hikClientService;
/**
* @鎻忚堪 瀹氭椂鎺ㄩ�乸tz
@@ -36,6 +37,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");
@@ -44,16 +47,24 @@
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(camera.getId());
cmd.setChannelNum(1);
+ if (!GlobalVariable.loginMap.containsKey(camera.getId()))//鍙帹閫佺櫥褰曟垚鍔熺殑鐩告満
+ {
+ continue;
+ }
Map<String, Object> ptz = hikClientService.getPtz(cmd);
+ if (StringUtils.isNull(ptz)) {
+ continue;
+ }
if (ptz.size() > 0) {
ptz.put("cameraId", camera.getId());
+ ptz.put("operatorId", camera.getOperatorId());//涓婇攣鐢ㄦ埛id
+ ptz.put("operatorExpired", camera.getOperatorExpired());
list.add(ptz);
}
}
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