From 8a87e4226aa802d6a0e3566c66824fedf68e77da Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:30:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/common/GlobalVariable.java | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/common/GlobalVariable.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/common/GlobalVariable.java
index 28bf220..3caac9d 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/common/GlobalVariable.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/common/GlobalVariable.java
@@ -1,24 +1,25 @@
-package com.ruoyi.device.hiksdk.common;
-
-import com.ruoyi.device.hiksdk.domain.recordInfo;
-import lombok.Data;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @ClassName: globalVariable
- * @Description: 鍏ㄥ眬鍙橀噺
- * @Author: Administrator
- * @Date: 2023骞�01鏈�31鏃� 17:05
- * @Version: 1.0
- **/
-@Data
-public class GlobalVariable {
- //淇濆瓨鐩告満鐧诲綍淇℃伅
- public static Map<String, Integer> loginMap = new HashMap<>();
- //鐩告満棰勮瀛楀吀
- public static Map<String, Integer> previewMap = new HashMap<>();
- //绾跨▼瀛楀吀
- public static Map<String,String>threadMap=new HashMap<>();
-}
+package com.ruoyi.device.hiksdk.common;
+
+import lombok.Data;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName: globalVariable
+ * @Description: 鍏ㄥ眬鍙橀噺
+ * @Author: Administrator
+ * @Date: 2023骞�01鏈�31鏃� 17:05
+ * @Version: 1.0
+ **/
+@Data
+public class GlobalVariable {
+ //淇濆瓨鐩告満鐧诲綍淇℃伅
+ public static Map<String, Object> loginMap = new HashMap<>();
+ //鐩告満棰勮瀛楀吀
+ public static Map<String, Integer> previewMap = new HashMap<>();
+ //绾跨▼瀛楀吀
+ public static Map<String,String>threadMap=new HashMap<>();
+
+ //淇濆瓨鐩告満鐧诲綍淇℃伅(loginId:Camera)
+ public static Map<Integer, Object> loginCameraMap = new HashMap<>();
+}
--
Gitblit v1.9.3