From 1bca1b9c61676b48cc3137d3003e520c75ecdd92 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: Sat, 13 Jan 2024 10:57:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/sy/gps31/PositionContainer.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/sy/gps31/PositionContainer.java b/ard-work/src/main/java/com/ruoyi/sy/gps31/PositionContainer.java
index ac30783..5075feb 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/gps31/PositionContainer.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/gps31/PositionContainer.java
@@ -1,5 +1,7 @@
 package com.ruoyi.sy.gps31;
 
+import com.ruoyi.sy.domain.ArdSyCarLock;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -8,12 +10,32 @@
 
     private static Map<String, Map<String,Map<String,Object>>> deptPositionMap = new HashMap();//依部门存放实施车辆位置:deptId,carId,车辆位置
 
-    public static Map<String, Map<String, Map<String,Object>>> getDeptPositionMap() {
+    private static Map<String, Map<String,Map<String,Object>>> userPositionMap = new HashMap();//依用户存放实施车辆位置:userId,carId,车辆位置
+
+    public static Map<String, List<ArdSyCarLock>> getTopicSubscribe() {
+        return topicSubscribe;
+    }
+
+    public static void setTopicSubscribe(Map<String, List<ArdSyCarLock>> topicSubscribe) {
+        PositionContainer.topicSubscribe = topicSubscribe;
+    }
+
+    public static Map<String, List<ArdSyCarLock>> topicSubscribe;
+
+
+    public static synchronized Map<String, Map<String, Map<String,Object>>> getDeptPositionMap() {
         return deptPositionMap;
     }
 
-    public static void setDeptPositionMap(Map<String, Map<String, Map<String,Object>>> deptPositionMap) {
+    public static synchronized void setDeptPositionMap(Map<String, Map<String, Map<String,Object>>> deptPositionMap) {
         PositionContainer.deptPositionMap = deptPositionMap;
     }
 
+    public static synchronized Map<String, Map<String, Map<String, Object>>> getUserPositionMap() {
+        return userPositionMap;
+    }
+
+    public static synchronized void setUserPositionMap(Map<String, Map<String, Map<String, Object>>> userPositionMap) {
+        PositionContainer.userPositionMap = userPositionMap;
+    }
 }

--
Gitblit v1.9.3