dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Send array of KV entry grouped by timestamp to rule chain

Browse Source
This commit is contained in:
Viacheslav Kukhtyn 2020-11-13 12:47:07 +02:00
parent f4bec22a61
commit 6ccb9d6036
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
application/src/main/java/org/thingsboard/server/controller/BaseController.java
View File

@ -108,9 +108,11 @@ import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
import javax.mail.MessagingException; import javax.mail.MessagingException;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Collectors;
import static org.thingsboard.server.dao.service.Validator.validateId; import static org.thingsboard.server.dao.service.Validator.validateId;
@ -770,15 +772,8 @@ public abstract class BaseController {
keys.forEach(attrsArrayNode::add); keys.forEach(attrsArrayNode::add);
} }
} else if (actionType == ActionType.TIMESERIES_UPDATED) { } else if (actionType == ActionType.TIMESERIES_UPDATED) {
List<TsKvEntry> telemetry = extractParameter(List.class, 0, additionalInfo); List<TsKvEntry> timeseries = extractParameter(List.class, 0, additionalInfo);
if (telemetry != null && !telemetry.isEmpty()) { addTimeseries(entityNode, timeseries);
ObjectNode values = json.createObjectNode();
for (TsKvEntry tsKvEntry : telemetry) {
addKvEntry(values, tsKvEntry);
}
entityNode.put("ts", telemetry.get(0).getTs());
entityNode.set("values", values);
}
} }
} }
TbMsg tbMsg = TbMsg.newMsg(msgType, entityId, metaData, TbMsgDataType.JSON, json.writeValueAsString(entityNode)); TbMsg tbMsg = TbMsg.newMsg(msgType, entityId, metaData, TbMsgDataType.JSON, json.writeValueAsString(entityNode));
@ -831,4 +826,20 @@ public abstract class BaseController {
return null; return null;
} }
private void addTimeseries(ObjectNode entityNode, List<TsKvEntry> timeseries) throws Exception {
if (timeseries != null && !timeseries.isEmpty()) {
ArrayNode result = entityNode.putArray("timeseries");
Map<Long, List<TsKvEntry>> groupedTelemetry = timeseries.stream()
.collect(Collectors.groupingBy(TsKvEntry::getTs));
for (Map.Entry<Long, List<TsKvEntry>> entry : groupedTelemetry.entrySet()) {
ObjectNode element = json.createObjectNode();
element.put("ts", entry.getKey());
ObjectNode values = element.putObject("values");
for (TsKvEntry tsKvEntry : entry.getValue()) {
addKvEntry(values, tsKvEntry);
}
result.add(element);
}
}
}
} }