From 97c75a868e9fca03598dfa862bdd7ad94fd5fdcb Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 09 十一月 2023 00:54:08 +0800
Subject: [PATCH] 调整MQTT

---
 src/main/java/com/fzzy/mqtt/MqttPublishService.java |   65 +++++++++++++++++++-------------
 1 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/fzzy/mqtt/MqttPublishService.java b/src/main/java/com/fzzy/mqtt/MqttPublishService.java
index f02df27..136ed84 100644
--- a/src/main/java/com/fzzy/mqtt/MqttPublishService.java
+++ b/src/main/java/com/fzzy/mqtt/MqttPublishService.java
@@ -1,24 +1,33 @@
 package com.fzzy.mqtt;
 
+import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
+@Slf4j
 @Service
 public class MqttPublishService {
 
-    private static MqttClient client ;
+
+    @Resource
+    private MqttProperties mqttProperties;
+
+    private static MqttClient client;
 
 
     public void init() throws MqttException {
         //String topic = "/device/hx-weigh-big-01/91511424746940066Y001_91511424746940066Y0010000_002_004_002_001/message/property/report";
-        String username = "admin";
-        String password = "admin123321";
-        String clientid = "FZZY-gateway";
-        String broker = "tcp://127.0.0.1:1883";
+        String username = mqttProperties.getUsername();
+        String password = mqttProperties.getPassword();
+        String clientid = mqttProperties.getClientId();
+        String broker = mqttProperties.getHost();
         //String content = " { \"headers\":{ \"productId\":\"hx-weigh-big-01\", \"keepOnlineTimeoutSeconds\":600, \"keepOnline\":true, \"deviceName\":\"鍦扮绉伴噸\" }, \"messageType\":\"REPORT_PROPERTY\", \"deviceId\":\"91511424746940066Y001_91511424746940066Y0010000_002_004_002_001\", \"properties\":{ \"weightInfo\":\"{\\\"exceed\\\":false,\\\"grossWeight\\\":3000.0,\\\"netWeight\\\":3000.0,\\\"static\\\":false,\\\"tareWeight\\\":3000.0,\\\"weightUnit\\\":\\\"KG\\\"}\" }, \"timestamp\":1698336020044     }";
         int qos = 0;
         try {
@@ -38,27 +47,31 @@
         }
 
     }
-   public  void publishMsg(String topic,String content) {
 
-      // String topic = "/device/hx-weigh-big-01/91511424746940066Y001_91511424746940066Y0010000_002_004_002_001/message/property/report";
-       //String content = " { \"headers\":{ \"productId\":\"hx-weigh-big-01\", \"keepOnlineTimeoutSeconds\":600, \"keepOnline\":true, \"deviceName\":\"鍦扮绉伴噸\" }, \"messageType\":\"REPORT_PROPERTY\", \"deviceId\":\"91511424746940066Y001_91511424746940066Y0010000_002_004_002_001\", \"properties\":{ \"weightInfo\":\"{\\\"exceed\\\":false,\\\"grossWeight\\\":3000.0,\\\"netWeight\\\":3000.0,\\\"static\\\":false,\\\"tareWeight\\\":3000.0,\\\"weightUnit\\\":\\\"KG\\\"}\" }, \"timestamp\":1698336020044     }";
-       int qos = 0;
+    public void publishMsg(String topic, String content) {
 
-       try {
-           // 鍒涘缓娑堟伅骞惰缃� QoS
-           MqttMessage message = new MqttMessage(content.getBytes());
-           message.setQos(qos);
-           // 鍙戝竷娑堟伅
-           client.publish(topic, message);
-           System.out.println("Message published");
-           System.out.println("topic: " + topic);
-           System.out.println("message content: " + content);
-           // 鍏抽棴杩炴帴
-           //client.disconnect();
-           // 鍏抽棴瀹㈡埛绔�
-           //client.close();
-      } catch (MqttException e) {
-           throw new RuntimeException(e);
-      }
-  }
+        // String topic = "/device/hx-weigh-big-01/91511424746940066Y001_91511424746940066Y0010000_002_004_002_001/message/property/report";
+        //String content = " { \"headers\":{ \"productId\":\"hx-weigh-big-01\", \"keepOnlineTimeoutSeconds\":600, \"keepOnline\":true, \"deviceName\":\"鍦扮绉伴噸\" }, \"messageType\":\"REPORT_PROPERTY\", \"deviceId\":\"91511424746940066Y001_91511424746940066Y0010000_002_004_002_001\", \"properties\":{ \"weightInfo\":\"{\\\"exceed\\\":false,\\\"grossWeight\\\":3000.0,\\\"netWeight\\\":3000.0,\\\"static\\\":false,\\\"tareWeight\\\":3000.0,\\\"weightUnit\\\":\\\"KG\\\"}\" }, \"timestamp\":1698336020044     }";
+        int qos = mqttProperties.getQos();
+
+        try {
+            // 鍒涘缓娑堟伅骞惰缃� QoS
+            MqttMessage message = new MqttMessage(content.getBytes());
+            message.setQos(qos);
+            // 鍙戝竷娑堟伅
+            client.publish(topic, message);
+
+
+            log.info("------------Message published-------------");
+            log.info("topic: " + topic);
+            log.info("message content: " + content);
+
+            // 鍏抽棴杩炴帴
+            //client.disconnect();
+            // 鍏抽棴瀹㈡埛绔�
+            //client.close();
+        } catch (MqttException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

--
Gitblit v1.9.3