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 |   21 ++++++++++++---------
 1 files changed, 12 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 93f15b1..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
@@ -71,19 +71,22 @@
             String parse = new String(message.getPayload());
             switch (topic){
                 case "/ztt/v3/2455220/publish":
-                    //鑰愪笣锛氱洿娴佺數闃绘暟鎹В鏋�
-                    mqCallback.collectBridgeService.addBridgeValueByNS(parse);
+                    //鑰愪笣锛氱洿娴佺數闃绘暟鎹В鏋怤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":
-                    //鑰愪笣锛氫几闀跨巼鏁版嵁瑙f瀽
-                    mqCallback.collectBridgeService.addBridgeValueByNS(parse);
-//                    log.info("浼搁暱鐜囨秷鎭綋锛歿}",parse);
+                    //鑰愪笣锛氫几闀跨巼鏁版嵁瑙f瀽NS-FM05003
+                    mqCallback.collectBridgeService.elongationDataAnalysis(parse,"NS-FM05003");
+//                    break;
+//                case "/aiot/38568140-c697-11f0-8b13-c14e8310d70b":
+//                    //鑰愪笣锛氫几闀跨巼鏁版嵁瑙f瀽NS-FM05002
+//                    mqCallback.collectBridgeService.elongationDataAnalysis(parse,"NS-FM05002");
                     break;
             }
-            // 濉厖閲囬泦鏁版嵁
-//            JSONObject jsonObject = JSONObject.parseObject(parse);
-//            mqCallback.collectBridgeService.addBridgeValue(jsonObject);
-
         } catch (Exception e) {
             e.printStackTrace();
             log.info("============銆嬨�嬫帴鏀舵秷鎭富棰樺紓甯� : " + e.getMessage());

--
Gitblit v1.9.3