Merge remote-tracking branch 'origin/master'

Administrator

2023-08-03 dee2cf1591b135c9bf75dcaf81a96ee48435b5f9

 ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java

@@ -84,27 +84,44 @@
                    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);
                    }
                    deptMap.put((String)gpsMap.get("carId"),gpsMap);//首次加入容器，再次去重
                    PositionContainer.getDeptPositionMap().put(deptId,deptMap);
                }else{
                }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);
                    }
                    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]));
                        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);
                        }
                        deptMapp.put((String)gpsMap.get("carId"),gpsMap);//首次加入容器，再次去重
                        PositionContainer.getDeptPositionMap().put(deptIdp,deptMap);
                    }
                }
                //存入用户容器
                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);
                            }
                        }
                    }
                }
            }