From eebab358e2882fc7e3aeec152db5151a6bd0be02 Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期四, 09 十一月 2023 17:24:39 +0800 Subject: [PATCH] 重新调整测试页面 --- src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java b/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java index d863ab5..f2eed2f 100644 --- a/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java +++ b/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java @@ -8,7 +8,9 @@ import com.fzzy.gateway.hx2023.ScConstant; import com.fzzy.gateway.hx2023.data.CloudSendData; import com.fzzy.gateway.hx2023.data.SyncReqData; +import com.fzzy.mqtt.MqttGatewayService; import com.fzzy.mqtt.MqttProviderConfig; +import com.fzzy.mqtt.MqttPublishService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -24,7 +26,7 @@ @Resource private GatewayRemoteManager gatewayRemoteManager; @Resource - private MqttProviderConfig providerClient; + private MqttGatewayService mqttGatewayService; /** @@ -32,7 +34,7 @@ * * @param message */ - public void onReceiveMessage(String message) { + public void onReceiveMessage(String topic,String message) { try { CloudSendData cloudSendData = JSONObject.parseObject(message, CloudSendData.class); @@ -46,7 +48,7 @@ } } catch (Exception e) { - + log.error("--------鎵ц寮傚父-----{}",e); } } @@ -69,13 +71,15 @@ //鑷姩鎺ㄩ�� if (200 == resp.getCode() && syncReqData.isAutoReplay()) { - String topic = "/${productId}/${deviceId}/properties/report"; + String topic = ScConstant.TOPIC_REPORT; topic = topic.replace("${productId}", device.getProductId()).replace("${deviceId}", device.getDeviceId()); - providerClient.publish(topic, resp.getData()); + mqttGatewayService.publishMqttWithTopic(resp.getData(), topic); - log.info("=======绮儏鎺ㄩ��==========={}", resp.getData()); + log.info("----------------------------鎺ㄩ�丮QTT淇℃伅---------------------------"); + log.info("-----TOPIC-----{}",topic); + log.info("-----Message-----{}",resp.getData()); } } } -- Gitblit v1.9.3