diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/mqtt/config/MqttPublishMessage.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/mqtt/config/MqttPublishMessage.java index 2983875..14b2235 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/mqtt/config/MqttPublishMessage.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/mqtt/config/MqttPublishMessage.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; @Component public class MqttPublishMessage { - public void publish(String message, String topic) { + public MqttMessage publish(String message, String topic) { MqttClient cloudClient = MqttConnectInit.mqttClientMap.get("cloudClient"); MqttMessage mqttMessage = new MqttMessage(); /** @@ -36,6 +36,8 @@ public class MqttPublishMessage { } catch (MqttException e) { e.printStackTrace(); } + + return mqttMessage; } } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/mqtt/message/handle/MessageUtilService.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/mqtt/message/handle/MessageUtilService.java index 810ce84..2cc267b 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/mqtt/message/handle/MessageUtilService.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/mqtt/message/handle/MessageUtilService.java @@ -102,8 +102,13 @@ public class MessageUtilService { String encrypt = aes.encryptBase64(JSONUtil.toJsonStr(message)); // 3. 发送MQTT消息 - publishMessage.publish(encrypt, topic.toString()); - } + try { + MqttMessage mqttMessage = publishMessage.publish(encrypt, topic.toString()); + addMqttMessage(topic, mqttMessage.getId()+"", mqttMessage.getQos(), dataBody); + } catch (Exception e) { + throw new RuntimeException(e); + } + }