From ba1e219d97e123b91657dc424f13a2fdeaa85d21 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Mon, 21 Aug 2023 13:37:01 +0800
Subject: [PATCH] 修改兴趣点列表井号模糊查询
---
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java | 77 ++++++++++++++++++++++++--------------
1 files changed, 49 insertions(+), 28 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java b/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
index 480922a..9be6f79 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
@@ -13,6 +13,7 @@
import com.gps31.push.netty.client.TcpClient;
import com.gps31.push.util.MapUtil;
import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.sy.service.impl.ArdSyCarDayServiceImpl;
import com.ruoyi.sy.service.impl.ArdSyCarServiceImpl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -74,36 +75,56 @@
System.out.println(sdf.format(new Date()));
log.error(String.format(" ---->收到定位数据:%s",JSON.toJSONString(gpsMap)));*/
String carId = (String)gpsMap.get("carId");
+ ((ArdSyCarDayServiceImpl)SpringUtils.getBean("ardSyCarDayServiceImpl")).insertArdSyCarDay(carId);//新增车辆上报时间
Map<String,Object> result = ((ArdSyCarServiceImpl)SpringUtils.getBean("ardSyCarServiceImpl")).getArdSyCarAndDeptByCarId(carId);//查询车辆及部门
- gpsMap.putAll(result);
- String ancestors = (String) gpsMap.get("ancestors");//获取父级部门
- String[] ancestorsArray = ancestors.split(",");
- if(ancestorsArray.length == 1){//最高级部门
- String deptId = String.valueOf(gpsMap.get("deptId"));
- Map<String,Map<String,Object>> deptMap = PositionContainer.getDeptPositionMap().get(deptId);
- if(deptMap == null){
- deptMap = new HashMap();
- }
- deptMap.put((String)gpsMap.get("carId"),gpsMap);//首次加入容器，再次去重
- PositionContainer.getDeptPositionMap().put(deptId,deptMap);
- }else{
- //加入本部门容器
- String deptId = String.valueOf(gpsMap.get("deptId"));
- Map<String,Map<String,Object>> deptMap = PositionContainer.getDeptPositionMap().get(deptId);
- if(deptMap == null){
- deptMap = new HashMap();
- }
- deptMap.put((String)gpsMap.get("carId"),gpsMap);//首次加入容器，再次去重
- PositionContainer.getDeptPositionMap().put(deptId,deptMap);
- //加入父级部门容器
- for(int i = 1;i <= ancestorsArray.length - 1;i++){
- String deptIdp = String.valueOf(gpsMap.get(ancestorsArray[i]));
- Map<String,Map<String,Object>> deptMapp = PositionContainer.getDeptPositionMap().get(deptIdp);
- if(deptMapp == null){
- deptMapp = new HashMap();
+ if(result != null){
+ gpsMap.putAll(result);
+ String ancestors = (String) gpsMap.get("ancestors");//获取父级部门
+ String[] ancestorsArray = ancestors.split(",");
+ if(ancestorsArray.length == 1){//最高级部门
+ String deptId = String.valueOf(gpsMap.get("deptId"));
+ Map<String,Map<String,Object>> deptMap = PositionContainer.getDeptPositionMap().get(deptId);
+ if(deptMap == null){
+ deptMap = new HashMap();
+ deptMap.put((String)gpsMap.get("carId"),gpsMap);
+ PositionContainer.getDeptPositionMap().put(deptId,deptMap);
+ }else{
+ deptMap.put((String)gpsMap.get("carId"),gpsMap);
}
- deptMapp.put((String)gpsMap.get("carId"),gpsMap);//首次加入容器，再次去重
- PositionContainer.getDeptPositionMap().put(deptIdp,deptMap);
+ }else{//其他部门
+ //加入本部门容器
+ String deptId = String.valueOf(gpsMap.get("deptId"));
+ Map<String,Map<String,Object>> deptMap = PositionContainer.getDeptPositionMap().get(deptId);
+ if(deptMap == null){
+ deptMap = new HashMap();
+ deptMap.put((String)gpsMap.get("carId"),gpsMap);
+ PositionContainer.getDeptPositionMap().put(deptId,deptMap);
+ }else{
+ deptMap.put((String)gpsMap.get("carId"),gpsMap);
+ }
+ //加入父级部门容器
+ for(int i = 1;i <= ancestorsArray.length - 1;i++){
+ String deptIdp = ancestorsArray[i];
+ Map<String,Map<String,Object>> deptMapp = PositionContainer.getDeptPositionMap().get(deptIdp);
+ if(deptMapp == null){
+ deptMapp = new HashMap();
+ deptMapp.put((String)gpsMap.get("carId"),gpsMap);
+ PositionContainer.getDeptPositionMap().put(deptIdp,deptMapp);
+ }else{
+ deptMapp.put((String)gpsMap.get("carId"),gpsMap);
+ }
+ }
+ }
+ //存入用户容器
+ if(PositionContainer.getUserPositionMap().size() != 0){
+ for(String userId : PositionContainer.getUserPositionMap().keySet()){
+ Map<String,Map<String,Object>> carIdCarMap = PositionContainer.getUserPositionMap().get(userId);
+ if(carIdCarMap != null){
+ if(carIdCarMap.keySet().contains(carId)){
+ PositionContainer.getUserPositionMap().get(userId).put(carId,gpsMap);
+ }
+ }
+ }
}
}
/**
--
Gitblit v1.9.3