Browse Source

Use getMetadataTs method instead of direct fetch from metadata

pull/6437/head
Volodymyr Babak 5 years ago
parent
commit
5b4e92974d
  1. 4
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java

@ -93,7 +93,7 @@ public abstract class AbstractTbMsgPushNode<T extends BaseTbMsgPushNodeConfigura
case POST_ATTRIBUTES: case POST_ATTRIBUTES:
entityBody.put("kv", dataJson); entityBody.put("kv", dataJson);
entityBody.put(SCOPE, getScope(metadata)); entityBody.put(SCOPE, getScope(metadata));
if (SessionMsgType.POST_ATTRIBUTES_REQUEST.name().equals(msgType)) { if (EdgeEventActionType.POST_ATTRIBUTES.equals(actionType)) {
entityBody.put("isPostAttributes", true); entityBody.put("isPostAttributes", true);
} }
break; break;
@ -104,7 +104,7 @@ public abstract class AbstractTbMsgPushNode<T extends BaseTbMsgPushNodeConfigura
break; break;
case TIMESERIES_UPDATED: case TIMESERIES_UPDATED:
entityBody.put("data", dataJson); entityBody.put("data", dataJson);
entityBody.put("ts", metadata.get("ts")); entityBody.put("ts", msg.getMetaDataTs());
break; break;
} }
return buildEvent(ctx.getTenantId(), actionType, msg.getOriginator().getId(), eventTypeByEntityType, JacksonUtil.valueToTree(entityBody)); return buildEvent(ctx.getTenantId(), actionType, msg.getOriginator().getId(), eventTypeByEntityType, JacksonUtil.valueToTree(entityBody));

Loading…
Cancel
Save