From 690b5ff07ace78fa1f3f4fa1b0508481cf182919 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 31 七月 2023 11:09:02 +0800
Subject: [PATCH] 修复单兵端 - 下发给我的任务列表分页问题
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 230 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 172 insertions(+), 58 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 27a9858..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
@@ -1,19 +1,15 @@
package com.ruoyi.sy.service.impl;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.common.websocket.util.WebSocketUtils;
+import com.ruoyi.utils.websocket.util.WebSocketUtils;
import com.ruoyi.device.hiksdk.config.MinioClientSingleton;
import com.ruoyi.device.hiksdk.util.minio.MinioUtils;
import com.ruoyi.sy.domain.ArdSyUser;
@@ -39,7 +35,7 @@
import javax.annotation.Resource;
-import static com.ruoyi.common.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
+import static com.ruoyi.utils.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
/**
* 涓変竴杞﹁締Service涓氬姟灞傚鐞�
@@ -65,6 +61,8 @@
private SYClient sYClient;
private Map<Integer,Map<String,String>> logInMap = new HashMap();
+
+ private Map<String, Timer> userCarTimerMap = new HashMap();
/**
* 鏌ヨ涓変竴杞﹁締
@@ -365,16 +363,43 @@
@Override
public void sendArdSyCarPosition() {
for(String key : ONLINE_USER_SESSIONS.keySet()){
- SysUser sysUser = userMapper.selectUserById(key);
- if(sysUser == null){
- return;
+ if(PositionContainer.getUserPositionMap().keySet().contains(key)){//褰撹拷韪殑杞﹁締瀹瑰櫒鍖呭惈姝ょ敤鎴稩d锛屽垯瀹炴椂浣嶇疆鎺ㄩ�侀渶瑕佸墧闄よ杞﹁締
+ SysUser sysUser = userMapper.selectUserById(key);
+ if(sysUser == null){
+ //return;
+ continue;
+ }
+ String deptId = String.valueOf(sysUser.getDeptId());
+ Map<String,Map<String,Object>> map = PositionContainer.getDeptPositionMap().get(deptId);
+ List<String> carIdList = new ArrayList();
+ carIdList.addAll(PositionContainer.getUserPositionMap().get(key).keySet());
+ String carId = carIdList.get(0);
+ map.remove(carId);
+ if(map != null){
+ Map<String,Object> data = new HashMap();
+ data.put("30000", map.values());
+ WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(key), JSON.toJSONString(data));
+ }
+ }else{
+ SysUser sysUser = userMapper.selectUserById(key);
+ if(sysUser == null){
+ //return;
+ continue;
+ }
+ String deptId = String.valueOf(sysUser.getDeptId());
+ Map<String,Map<String,Object>> map = PositionContainer.getDeptPositionMap().get(deptId);
+ if(map != null){
+ Map<String,Object> data = new HashMap();
+ data.put("30000", map.values());
+ WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(key), JSON.toJSONString(data));
+ }
}
- String deptId = String.valueOf(sysUser.getDeptId());
- Map<String,Map<String,Object>> map = PositionContainer.getDeptPositionMap().get(deptId);
- if(map != null){
- Map<String,Object> data = new HashMap();
- data.put("30000", map.values());
- WebSocketUtils.sendMessage(ONLINE_USER_SESSIONS.get(key), JSON.toJSONString(data));
+ }
+ for(String userId : userCarTimerMap.keySet()){//鐢ㄦ埛绂荤嚎鍚庡皢杞﹁締杩借釜璧勬簮閲婃斁
+ if(!ONLINE_USER_SESSIONS.keySet().contains(userId)){
+ userCarTimerMap.get(userId).cancel();
+ userCarTimerMap.remove(userId);
+ PositionContainer.getUserPositionMap().remove(userId);
}
}
}
@@ -455,49 +480,53 @@
carList31 = sYClient.getCarList1(syURL,teamId, result.get("userId"),result.get("sessionId"));
//鎷垮埌杞﹁締鏁版嵁
list= (List) carList31.get("list");
- List<String> carIdList = new ArrayList();
- //鎵�鏈塩arId
- for(Map<String,String> m : list){
- carIdList.add(m.get("carId"));
- }
- if(carIdList.size() == 0){
- Map<String,String> map0 = new HashMap();
- map0.put("list", "{}");
- map0.put("rspCode", "1");
- list.add(map0);
+ if(list.isEmpty()){
return list;
- }
- //娣诲姞杞﹁締灞炴��
- for(Map<String,String> m : list){
- switch (m.get("state")) {
- case "1":
- m.put("carState", "绂荤嚎-浠庢湭鎶ュ畾浣�");break;
- case "2":
- m.put("carState", "绂荤嚎-娆犺垂");break;
- case "3":
- m.put("carState", "绂荤嚎");break;
- case "4":
- m.put("carState", "绂荤嚎-鎶ヨ");break;
- case "5":
- m.put("carState", "鍦ㄧ嚎-浠庢湭鎶ュ畾浣�");break;
- case "6":
- m.put("carState", "鍦ㄧ嚎-娆犺垂");break;
- case "7":
- m.put("carState", "鍦ㄧ嚎-琛岄┒");break;
- case "8":
- m.put("carState", "鍦ㄧ嚎-琛岄┒-鎶ヨ");break;
- case "9":
- m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC鍏�");break;
- case "10":
- m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC寮�");break;
- case "11":
- m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC鍏�-鎶ヨ");break;
- case "12":
- m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC寮�-鎶ヨ");break;
- case "13":
- m.put("carState", "鍦ㄧ嚎-鏃犳晥瀹氫綅");break;
- default:
- break;
+ }else {
+ List<String> carIdList = new ArrayList();
+ //鎵�鏈塩arId
+ for(Map<String,String> m : list){
+ carIdList.add(m.get("carId"));
+ }
+ if(carIdList.size() == 0){
+ Map<String,String> map0 = new HashMap();
+ map0.put("list", "{}");
+ map0.put("rspCode", "1");
+ list.add(map0);
+ return list;
+ }
+ //娣诲姞杞﹁締灞炴��
+ for(Map<String,String> m : list){
+ switch (m.get("state")) {
+ case "1":
+ m.put("carState", "绂荤嚎-浠庢湭鎶ュ畾浣�");break;
+ case "2":
+ m.put("carState", "绂荤嚎-娆犺垂");break;
+ case "3":
+ m.put("carState", "绂荤嚎");break;
+ case "4":
+ m.put("carState", "绂荤嚎-鎶ヨ");break;
+ case "5":
+ m.put("carState", "鍦ㄧ嚎-浠庢湭鎶ュ畾浣�");break;
+ case "6":
+ m.put("carState", "鍦ㄧ嚎-娆犺垂");break;
+ case "7":
+ m.put("carState", "鍦ㄧ嚎-琛岄┒");break;
+ case "8":
+ m.put("carState", "鍦ㄧ嚎-琛岄┒-鎶ヨ");break;
+ case "9":
+ m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC鍏�");break;
+ case "10":
+ m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC寮�");break;
+ case "11":
+ m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC鍏�-鎶ヨ");break;
+ case "12":
+ m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC寮�-鎶ヨ");break;
+ case "13":
+ m.put("carState", "鍦ㄧ嚎-鏃犳晥瀹氫綅");break;
+ default:
+ break;
+ }
}
}
return list;
@@ -658,4 +687,89 @@
return new HashMap<String,List<String>>();
}
}
+
+ @Override
+ public Results getCarGPSBycarId(String usersId,String carId,String syURL,ArdSyUser ardSyUser){
+ Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
+ //31鐢ㄦ埛鍚嶅瘑鐮�
+ String username31 = ardSyUser.getUserId();
+ String password31 = ardSyUser.getPassword();
+ String passwordMd5 = DigestUtils.md5Hex(password31);
+ Map<String, Object> result1 = sYClient.logIn(syURL,passwordMd5, username31);
+ result = new HashMap();
+ result.put("userId", username31);
+ result.put("sessionId", (String) result1.get("sessionId"));
+ Map<String,Object> result0 = new HashMap();
+ result0 = sYClient.getCarNearPositionByCarId(syURL,carId,result.get("userId"),result.get("sessionId"));
+ return Results.succeed(result0);
+ }
+
+ @Override
+ public Results chaseCarByCarId(String usersId, String carId, String cycle) {
+ try{
+ /*Map<String,Map<String,Object>> map = new HashMap();
+ map.put(carId,new HashMap());
+ PositionContainer.getUserPositionMap().put(usersId,map);*/
+ if(cycle.equals("0")){
+ if(userCarTimerMap.get(usersId) != null){
+ userCarTimerMap.get(usersId).cancel();
+ userCarTimerMap.remove(usersId);
+ PositionContainer.getUserPositionMap().remove(usersId);
+ }
+ return Results.succeed("鍋滄杩借釜");
+ }else{
+ if(userCarTimerMap.get(usersId) != null){
+ 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);
+ 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);
+ 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("寮�濮嬭拷韪�");
+ }
+ }
+ }catch(Exception e){
+ e.printStackTrace();
+ return Results.error("杩借釜澶辫触");
+ }
+ }
}
--
Gitblit v1.9.3