From 2dc82639ec241aa69f75f7fa6dce5df4942a5665 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 15 十二月 2023 13:34:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 e6e13f6..f360ce8 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
@@ -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)),"鏂藉皝");
                             }

--
Gitblit v1.9.3