Merge remote-tracking branch 'origin/master'

Administrator

2023-08-03 dee2cf1591b135c9bf75dcaf81a96ee48435b5f9

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

@@ -113,6 +113,17 @@
                        }
                    }
                }
                //存入用户容器
                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);
                            }
                        }
                    }
                }
            }
            /**
             *
@@ -143,7 +154,7 @@
    public void sendMassage() {
        try {
            PushClientImplPosition client = new PushClientImplPosition();
            client.setLog(true);//是否打印明文
            client.setLog(false);//是否打印明文
            client.setHost(this.ip);//服务器IP
            client.setPort(10100);//服务器端口
            client.setUserName(this.userId);//系统用户名