From 01dd9c8e4c755a7272205425b0d81316fa3b503c Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 28 七月 2023 17:31:29 +0800
Subject: [PATCH] 三一车辆追踪优化提交

---
 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index f4d6bf2..205c577 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -707,9 +707,9 @@
     @Override
     public Results chaseCarByCarId(String usersId, String carId, String cycle) {
         try{
-            Map<String,Map<String,Object>> map = new HashMap();
+            /*Map<String,Map<String,Object>> map = new HashMap();
             map.put(carId,new HashMap());
-            PositionContainer.getUserPositionMap().put(usersId,map);
+            PositionContainer.getUserPositionMap().put(usersId,map);*/
             if(cycle.equals("0")){
                 if(userCarTimerMap.get(usersId) != null){
                     userCarTimerMap.get(usersId).cancel();
@@ -722,30 +722,44 @@
                     userCarTimerMap.get(usersId).cancel();
                     userCarTimerMap.remove(usersId);
                     PositionContainer.getUserPositionMap().remove(usersId);
+                    Map<String,Map<String,Object>> map = new HashMap();
+                    map.put(carId,new HashMap());
+                    PositionContainer.getUserPositionMap().put(usersId,map);
                     Date date = new Date();
                     Timer carPositionTimer = new Timer();//瀹氭椂鎺ㄩ�佸疄鏃朵綅缃�
                     TimerTask carPositionTask =new TimerTask(){
                         @Override
                         public void run(){
                             Map<String,Object> position = PositionContainer.getUserPositionMap().get(usersId).get(carId);
-                            Map<String,Map<String,Object>> data = new HashMap();
-                            data.put("31000",position);
-                            WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(usersId), JSON.toJSONString(data));
+                            if(position != null){
+                                if(position.size() != 0){
+                                    Map<String,Map<String,Object>> data = new HashMap();
+                                    data.put("31000",position);
+                                    WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(usersId), JSON.toJSONString(data));
+                                }
+                            }
                         }
                     };
                     carPositionTimer.scheduleAtFixedRate(carPositionTask,date,Integer.parseInt(cycle));//鍚敤
                     this.userCarTimerMap.put(usersId,carPositionTimer);
                     return Results.succeed("寮�濮嬭拷韪�");
                 }else{
+                    Map<String,Map<String,Object>> map = new HashMap();
+                    map.put(carId,new HashMap());
+                    PositionContainer.getUserPositionMap().put(usersId,map);
                     Date date = new Date();
                     Timer carPositionTimer = new Timer();//瀹氭椂鎺ㄩ�佸疄鏃朵綅缃�
                     TimerTask carPositionTask =new TimerTask(){
                         @Override
                         public void run(){
                             Map<String,Object> position = PositionContainer.getUserPositionMap().get(usersId).get(carId);
-                            Map<String,Map<String,Object>> data = new HashMap();
-                            data.put("31000",position);
-                            WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(usersId), JSON.toJSONString(data));
+                            if(position != null){
+                                if(position.size() != 0){
+                                    Map<String,Map<String,Object>> data = new HashMap();
+                                    data.put("31000",position);
+                                    WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(usersId), JSON.toJSONString(data));
+                                }
+                            }
                         }
                     };
                     carPositionTimer.scheduleAtFixedRate(carPositionTask,date,Integer.parseInt(cycle));//鍚敤

--
Gitblit v1.9.3