From dee2cf1591b135c9bf75dcaf81a96ee48435b5f9 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 03 八月 2023 17:17:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 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..efec4be 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
@@ -357,6 +357,15 @@
@Override
public Map<String, Object> getArdSyCarAndDeptByCarId(String carId) {
Map<String, Object> result = ardSyCarMapper.getArdSyCarAndDeptByCarId(carId);
+ if(result != null){
+ if(result.get("carPicture") != null){
+ if(!((String)result.get("carPicture")).equals("")){
+ String url = ((String)result.get("carPicture")).split("sycar")[0];
+ String carModel = url + (String)result.get("carModel");
+ result.put("carModel",carModel);
+ }
+ }
+ }
return result;
}
@@ -548,7 +557,14 @@
for (int i = 0; i < carList.size(); i++) {
ArdSyCar ardSyCar = carList.get(i);
if(carId.equals(ardSyCar.getCarId())){
- m.put("carModel",ardSyCar.getCarModel());
+ String url = "";
+ if(ardSyCar.getCarPicture() != null){
+ if(!ardSyCar.getCarPicture().equals("")){
+ url = ardSyCar.getCarPicture().split("sycar")[0];
+ }
+ }
+ m.put("carModel",url + ardSyCar.getCarModel());//zns
+ //m.put("carModel",ardSyCar.getCarModel());
m.put("carTypeArd",ardSyCar.getCarType());
m.put("carBrand",ardSyCar.getCarBrand());
m.put("carPicture",ardSyCar.getCarPicture());
@@ -707,9 +723,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 +738,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