From 79b466a6b77ed62f2275f97c5812a26da27ca489 Mon Sep 17 00:00:00 2001
From: Administrator <ard@qq.com>
Date: 星期二, 01 八月 2023 13:45:01 +0800
Subject: [PATCH] 优化app历史任务列表
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 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 98b5782..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
@@ -395,6 +395,13 @@
}
}
}
+ for(String userId : userCarTimerMap.keySet()){//鐢ㄦ埛绂荤嚎鍚庡皢杞﹁締杩借釜璧勬簮閲婃斁
+ if(!ONLINE_USER_SESSIONS.keySet().contains(userId)){
+ userCarTimerMap.get(userId).cancel();
+ userCarTimerMap.remove(userId);
+ PositionContainer.getUserPositionMap().remove(userId);
+ }
+ }
}
@Override
@@ -699,16 +706,10 @@
@Override
public Results chaseCarByCarId(String usersId, String carId, String cycle) {
- if(ONLINE_USER_SESSIONS.get(usersId) == null){
- userCarTimerMap.get(usersId).cancel();
- userCarTimerMap.remove(usersId);
- PositionContainer.getUserPositionMap().remove(usersId);
- return Results.succeed("鍋滄杩借釜");
- }
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();
@@ -721,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