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

refactor code

Browse Source
This commit is contained in:
Yuriy Lytvynchuk 2022-08-25 11:47:06 +03:00
parent 57a913aa00
commit cf7ba9b390
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNode.java
View File

@ -61,12 +61,12 @@ public class TbSplitArrayMsgNode implements TbNode {
ArrayNode data = (ArrayNode) jsonNode;
List<TbMsg> messages = new ArrayList<>();
data.forEach(msgNode -> {
messages.add(createNewMsg(msg, msgNode));
messages.add(createMsg(msg, msgNode, data.size() > 1));
});
ctx.ack(msg);
if (messages.size() == 1) {
ctx.tellSuccess(messages.get(0));
} else {
ctx.ack(msg);
for (TbMsg newMsg : messages) {
ctx.tellSuccess(newMsg);
}
@ -76,8 +76,12 @@ public class TbSplitArrayMsgNode implements TbNode {
}
}
private TbMsg createNewMsg(TbMsg msg, JsonNode msgNode) {
return TbMsg.newMsg(msg.getQueueName(), msg.getType(), msg.getOriginator(), msg.getMetaData(), JacksonUtil.toString(msgNode));
private TbMsg createMsg(TbMsg msg, JsonNode msgNode, boolean newMessage) {
if (newMessage) {
return TbMsg.newMsg(msg.getQueueName(), msg.getType(), msg.getOriginator(), msg.getMetaData(), JacksonUtil.toString(msgNode));
} else {
return TbMsg.transformMsg(msg, msg.getType(), msg.getOriginator(), msg.getMetaData(), JacksonUtil.toString(msgNode));
}
}
@Override
@ -85,3 +89,4 @@ public class TbSplitArrayMsgNode implements TbNode {
}
}