Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-15 2dc82639ec241aa69f75f7fa6dce5df4942a5665

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

@@ -95,7 +95,7 @@
                    String carModel = (String) result.get("carModel");//获取车辆模型
                    Integer drct = (Integer) gpsMap.get("drct");//获取车辆模型
                    Integer speed = (Integer) gpsMap.get("speed");
                    log.info("定位数据：carId:"+carId+"lng:"+lng+"lat:"+lat);
                    log.debug("定位数据：carId:"+carId+"lng:"+lng+"lat:"+lat);
                    //定义2维空间
                    Point2D.Double point = new Point2D.Double(Double.parseDouble(lng), Double.parseDouble(lat));
                    List<Point2D.Double> pts = new ArrayList<Point2D.Double>();
@@ -479,6 +479,11 @@
                if(fengType==0){
                    //锁开关状态
                    int lockCloseNum = 0;
                    String mapString1 = "{\"A01\":100000,\"A02\":100000,\"res\":\""+String.valueOf(System.currentTimeMillis())+"\"}";
                    System.out.println("自动施封："+mapString1);
                    EmqClient emqClient1 = new EmqClient(carId+"mqttPublish"+UUID.randomUUID());
                    emqClient1.connect();
                    emqClient1.publish(ardSyCarRtu.getTopicPublish(),mapString1, QosEnum.QoS2,false);
                    //如果不是施封状态，则发送施封命令
                    if(ardSyCarLocks.get(0).getRelayInfo()!=null){
                        if(ardSyCarLocks.get(0).getRelayInfo()==1){
@@ -522,11 +527,6 @@
//                                map.put("A02", 100000);//断开第二路继电器
//                                map.put("res", String.valueOf(System.currentTimeMillis()));
//                                String mapString = com.alibaba.fastjson.JSON.toJSONString(map);
                                String mapString = "{\"A01\":100000,\"A02\":100000,\"res\":\""+String.valueOf(System.currentTimeMillis())+"\"}";
                                System.out.println("自动施封："+mapString);
                                EmqClient emqClient = new EmqClient(carId+"mqttPublish"+UUID.randomUUID());
                                emqClient.connect();
                                emqClient.publish(ardSyCarRtu.getTopicPublish(),mapString, QosEnum.QoS2,false);
                                log.debug("车辆"+carId+"施封命令发送成功！");
                                //                    mqttOnce.publishCar(carId,ardSyCarRtu.getTopicPublish(),String.valueOf(new JSONObject(map)),"施封");
                            }