From ca7685886ae8a4a4bb6717d48a1c48cf3934faf3 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 21 十一月 2025 22:20:25 +0800
Subject: [PATCH] oa调整
---
cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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..5ff8c3e 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,16 +64,29 @@
* 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);
- // 濉厖閲囬泦鏁版嵁
- mqCallback.collectBridgeService.addBridgeValue(jsonObject);
-
+ switch (topic){
+ case "/ztt/v3/2455220/publish":
+ //鑰愪笣锛氱洿娴佺數闃绘暟鎹В鏋怤S-ER02001
+ mqCallback.collectBridgeService.dcResistanceDataAnalysis(parse,"NS-ER02001");
+ break;
+// case "/aiot/8fac9fa0-c517-11f0-954c-255ce11213f1":
+// //鑰愪笣锛氱洿娴佺數闃绘暟鎹В鏋怤S-ER02002
+// mqCallback.collectBridgeService.dcResistanceDataAnalysis(parse,"NS-ER02002");
+// break;
+ case "/ztt/v3/2455221/publish":
+ //鑰愪笣锛氫几闀跨巼鏁版嵁瑙ｆ瀽NS-FM05003
+ mqCallback.collectBridgeService.elongationDataAnalysis(parse,"NS-FM05003");
+// break;
+// case "/aiot/38568140-c697-11f0-8b13-c14e8310d70b":
+// //鑰愪笣锛氫几闀跨巼鏁版嵁瑙ｆ瀽NS-FM05002
+// mqCallback.collectBridgeService.elongationDataAnalysis(parse,"NS-FM05002");
+ break;
+ }
} catch (Exception e) {
e.printStackTrace();
log.info("============銆嬨�嬫帴鏀舵秷鎭富棰樺紓甯� : " + e.getMessage());
--
Gitblit v1.9.3