Browse Source

Merge pull request #7367 from devaskim/details_node_id

[3.4.2] Rule Engine: Details rule node returns entity's ID as well.
pull/7514/head
Andrew Shvayka 4 years ago
committed by GitHub
parent
commit
ef7693babc
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java
  2. 2
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntityDetails.java

3
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java

@ -119,6 +119,9 @@ public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEnti
private JsonElement setProperties(ContactBased entity, JsonElement data, EntityDetails entityDetails, String prefix) {
JsonObject dataAsObject = data.getAsJsonObject();
switch (entityDetails) {
case ID:
dataAsObject.addProperty(prefix + "id", entity.getId().toString());
break;
case TITLE:
dataAsObject.addProperty(prefix + "title", entity.getName());
break;

2
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntityDetails.java

@ -17,6 +17,6 @@ package org.thingsboard.rule.engine.util;
public enum EntityDetails {
TITLE, COUNTRY, CITY, STATE, ZIP, ADDRESS, ADDRESS2, PHONE, EMAIL, ADDITIONAL_INFO
ID, TITLE, COUNTRY, CITY, STATE, ZIP, ADDRESS, ADDRESS2, PHONE, EMAIL, ADDITIONAL_INFO
}

Loading…
Cancel
Save