From ff1dcdad798b3fd484439e8a87a4d0ac75ab5720 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 25 七月 2025 16:30:08 +0800
Subject: [PATCH] Merge branch 'dev_ztns' into dev_ywx_ztns
---
cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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..9cc678f 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,9 +1,15 @@
package com.ruoyi.device.mqtt;
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.ruoyi.device.constant.DCResistanceMqttConstants;
import com.ruoyi.device.service.CollectBridgeService;
+import com.ruoyi.device.vo.DCResistanceMqttVO;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
import org.eclipse.paho.client.mqttv3.MqttCallback;
import org.eclipse.paho.client.mqttv3.MqttMessage;
@@ -11,6 +17,9 @@
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
@Component
@Slf4j
@@ -71,9 +80,11 @@
public void messageArrived(String topic, MqttMessage message) throws Exception {
try {
String parse = new String(message.getPayload());
- JSONObject jsonObject = JSONObject.parseObject(parse);
+// JSONObject jsonObject = JSONObject.parseObject(parse);
// 濉厖閲囬泦鏁版嵁
- mqCallback.collectBridgeService.addBridgeValue(jsonObject);
+// mqCallback.collectBridgeService.addBridgeValue(jsonObject);
+ //鑰愪笣锛氱洿娴佺數闃绘暟鎹В鏋�
+ mqCallback.collectBridgeService.addBridgeValueByNS(parse);
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.3