From 2f4b64274233eccba253a49c022b8ff1355162ed Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 24 七月 2023 14:06:17 +0800
Subject: [PATCH] 三一车辆接口改為forest，刪除okhttp客戶端提交
---
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java | 64 ++++++++++++++++++--------------
1 files changed, 36 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..aa2e1b2 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
@@ -75,35 +75,43 @@
log.error(String.format(" ---->鏀跺埌瀹氫綅鏁版嵁:%s",JSON.toJSONString(gpsMap)));*/
String carId = (String)gpsMap.get("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);
+ }
+ }
}
}
/**
--
Gitblit v1.9.3