From 7ef593e1e3c35aaeecf9318f0b3941230d3ed002 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 09 十月 2024 11:22:54 +0800
Subject: [PATCH] 增加在数据点计算规则后数据点名称加_n的适配
---
collect/src/main/java/com/qianwen/mdc/collect/service/IOTMqttReceiveService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/service/IOTMqttReceiveService.java b/collect/src/main/java/com/qianwen/mdc/collect/service/IOTMqttReceiveService.java
index 5b16ccd..63e7ee7 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/service/IOTMqttReceiveService.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/service/IOTMqttReceiveService.java
@@ -5,6 +5,7 @@
import java.util.Optional;
import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,12 +56,14 @@
Set<String> keySet = jsonObj.keySet();
String[] keys = keySet.toArray(new String[] {});
+ final String NEWDP_SUFFIX = "_n";//璁＄畻瑙勫垯浣跨敤涔嬪悗鏂版暟鎹偣鐨勭粨灏�
for(String key : keys) {
String appId = key;//iot绯荤粺涓殑搴旂敤id锛屾湰搴旂敤涓簲璇ョ敤琛ㄥ幓瀵瑰簲
long workstationId = getWorkstationIdByAppId(appId);
TelemetryData tdata = new TelemetryData();
tdata.setWorkstationId(workstationId);
+
JSONArray dtArr = jsonObj.getJSONArray(appId);
for(int i=0;i<dtArr.size();i++) {
@@ -74,7 +77,11 @@
Set<String> valueKeySet = values.keySet();
valueKeySet.forEach(valueKey ->{
- tdataItem.addPoint(valueKey,values.getString(valueKey));
+ String oriValueKey = valueKey;;//鐢变簬浣跨敤璁＄畻瑙勫垯鐨勯噰闆嗙偣鍚嶇О浼氬悗闈㈠鍔犱竴涓�"_n",鎵�浠ヨ繖涓猳riValueKey浠ｈ〃娌℃湁澧炲姞"_n"鐨�
+ if(StringUtils.endsWith(valueKey, NEWDP_SUFFIX)) {
+ oriValueKey = StringUtils.removeEnd(valueKey, NEWDP_SUFFIX);
+ }
+ tdataItem.addPoint(oriValueKey,values.getString(valueKey));//浣跨敤鍘熷閰嶇疆鐐逛繚鎸佷繚瀛樻暟鎹�
});
tdata.addItem(tdataItem);
--
Gitblit v1.9.3