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/service/impl/CollectBridgeServiceImpl.java | 10 ++++++++++
cnas-device/src/main/java/com/ruoyi/device/service/CollectBridgeService.java | 2 ++
cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java | 2 +-
3 files changed, 13 insertions(+), 1 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..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
@@ -76,7 +76,7 @@
break;
case "/ztt/v3/2455221/publish":
//鑰愪笣锛氫几闀跨巼鏁版嵁瑙ｆ瀽
- mqCallback.collectBridgeService.addBridgeValueByNS(parse);
+ mqCallback.collectBridgeService.addBridgeValueByNSD(parse);
// log.info("浼搁暱鐜囨秷鎭綋锛歿}",parse);
break;
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/CollectBridgeService.java b/cnas-device/src/main/java/com/ruoyi/device/service/CollectBridgeService.java
index 39c7782..dc4e50b 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/CollectBridgeService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/CollectBridgeService.java
@@ -19,5 +19,7 @@
void addBridgeValue(JSONObject jsonObject);
void addBridgeValueByNS(String jsonStr);
+
+ void addBridgeValueByNSD(String jsonStr);
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java
index a44f275..f952d2b 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java
@@ -115,10 +115,20 @@
//杩囨护鍑哄寘鍚疄闄呯數闃诲�肩殑瀵硅薄
// 澶勭悊 NSDQCS.DQCS.DZZ 鏁版嵁
processSingleValueDataStream(dataList, DCResistanceMqttConstants.NSDQCS_DQCS_DZZ);
+ }
+ }
+
+ @Override
+ public void addBridgeValueByNSD(String jsonStr) {
+ Map<String, Object> dataMap = JSONObject.parseObject(jsonStr, new TypeReference<Map<String, Object>>(){}.getType());
+ if(CollectionUtil.isNotEmpty(dataMap) && Objects.nonNull(dataMap.get("data"))){
+ List<DCResistanceMqttVO> dataList = JSONArray.parseObject(dataMap.get("data").toString(), new TypeReference<List<DCResistanceMqttVO>>(){}.getType());
+ //杩囨护鍑哄寘鍚疄闄呯數闃诲�肩殑瀵硅薄
// 澶勭悊 NSTSSC.TSSC.WY 鏁版嵁
processThreeTimesValueDataStream(dataList, ElongationMqttConstants.NSTSSC_TSSC_WY);
}
}
+
/**
* 澶勭悊鍗曞�兼暟鎹祦鐨勬暟鎹苟淇濆瓨鍒� Redis
* @param dataList 鏁版嵁鍒楄〃
--
Gitblit v1.9.3