From d4a6cfef40c1518019b97857d7d423188eef0fab Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 04 七月 2023 08:36:19 +0800
Subject: [PATCH] 增加获取部门和相机(开启复选框)接口
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 44dae03..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,17 +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;
/**
@@ -43,15 +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("10000",list);
+ Map<String, Object> sendMap = new HashMap<>();
+ sendMap.put("10000", list);
WebSocketUtils.sendMessageAll(sendMap);
}
}
--
Gitblit v1.9.3