From 8f5fed4fbee754b1e22258f8862bdabf518df315 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 01 八月 2025 12:42:41 +0800
Subject: [PATCH] 区分数据
---
cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java b/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java
index 51fb42a..ba2d67e 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java
@@ -1,6 +1,5 @@
package com.ruoyi.device.mqtt;
-import com.alibaba.fastjson.JSONObject;
import com.ruoyi.device.service.CollectBridgeService;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
@@ -14,11 +13,11 @@
@Component
@Slf4j
-public class MQCallback<component> implements MqttCallback {
+public class MQCallback implements MqttCallback {
- private MQClient mqClient; // MQTT杩炴帴鏁版嵁
+ private final MQClient mqClient; // MQTT杩炴帴鏁版嵁
- private MQConfig mqConfig; // yml閰嶇疆鏁版嵁
+ private final DeviceMqttConfig mqConfig; // yml閰嶇疆鏁版嵁
private static MQCallback mqCallback;
@@ -32,7 +31,7 @@
mqCallback.collectBridgeService = this.collectBridgeService;
}
- public MQCallback(MQClient mqClient, MQConfig mqConfig) {
+ public MQCallback(MQClient mqClient, DeviceMqttConfig mqConfig) {
this.mqClient = mqClient;
this.mqConfig = mqConfig;
}
@@ -65,15 +64,25 @@
* MQTT鏈嶅姟鍣ㄥ悜WEB鏈嶅姟鍣ㄥ彂閫佺殑鏁版嵁浼氭墽琛屽埌杩欓噷闈紝瀹樻柟璇濈О涓猴細璁㈤槄鍚庣殑娑堟伅
* @param topic 涓婚锛氫篃绉颁负搴曞眰缃戝叧鍞竴鏍囪瘑
* @param message 淇℃伅
- * @throws Exception 鎶ラ敊
*/
@Override
- public void messageArrived(String topic, MqttMessage message) throws Exception {
+ public void messageArrived(String topic, MqttMessage message) {
try {
String parse = new String(message.getPayload());
- JSONObject jsonObject = JSONObject.parseObject(parse);
+ switch (topic){
+ case "/ztt/v3/2455220/publish":
+ //鑰愪笣锛氱洿娴佺數闃绘暟鎹В鏋�
+ mqCallback.collectBridgeService.addBridgeValueByNS(parse);
+ break;
+ case "/ztt/v3/2455221/publish":
+ //鑰愪笣锛氫几闀跨巼鏁版嵁瑙ｆ瀽
+ mqCallback.collectBridgeService.addBridgeValueByNSD(parse);
+// log.info("浼搁暱鐜囨秷鎭綋锛歿}",parse);
+ break;
+ }
// 濉厖閲囬泦鏁版嵁
- mqCallback.collectBridgeService.addBridgeValue(jsonObject);
+// JSONObject jsonObject = JSONObject.parseObject(parse);
+// mqCallback.collectBridgeService.addBridgeValue(jsonObject);
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.3