From 3089fbc788d1dbd638d1cfd9c2f9b7f2011d0af0 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 30 六月 2023 16:21:48 +0800
Subject: [PATCH] 优化sdk控制

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 674c5bd..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
@@ -6,6 +6,7 @@
 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;
 
@@ -46,14 +47,18 @@
             CameraCmd cmd = new CameraCmd();
             cmd.setCameraId(camera.getId());
             cmd.setChannelNum(1);
-            Map<String, Object> ptz = hikClientService.getPtz(cmd);
-            if(StringUtils.isNull(ptz))
+            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("operatorExpired",camera.getOperatorExpired());
+                ptz.put("operatorId", camera.getOperatorId());//涓婇攣鐢ㄦ埛id
+                ptz.put("operatorExpired", camera.getOperatorExpired());
                 list.add(ptz);
             }
         }

--
Gitblit v1.9.3