Commit 303b63f3925a2a41b1d992767885371fbb1d04f3
Committed by
Igor Kulikov
1 parent
cdc34746
moved name from Tenant and Customer to ContactBased (#1929)
Showing
5 changed files
with
7 additions
and
4 deletions
... | ... | @@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode; |
19 | 19 | import org.thingsboard.server.common.data.id.UUIDBased; |
20 | 20 | |
21 | 21 | @EqualsAndHashCode(callSuper = true) |
22 | -public abstract class ContactBased<I extends UUIDBased> extends SearchTextBasedWithAdditionalInfo<I> { | |
22 | +public abstract class ContactBased<I extends UUIDBased> extends SearchTextBasedWithAdditionalInfo<I> implements HasName { | |
23 | 23 | |
24 | 24 | private static final long serialVersionUID = 5047448057830660988L; |
25 | 25 | ... | ... |
... | ... | @@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.id.TenantId; |
23 | 23 | |
24 | 24 | import com.fasterxml.jackson.databind.JsonNode; |
25 | 25 | |
26 | -public class Customer extends ContactBased<CustomerId> implements HasName, HasTenantId { | |
26 | +public class Customer extends ContactBased<CustomerId> implements HasTenantId { | |
27 | 27 | |
28 | 28 | private static final long serialVersionUID = -1599722990298929275L; |
29 | 29 | ... | ... |
... | ... | @@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.id.TenantId; |
23 | 23 | import com.fasterxml.jackson.databind.JsonNode; |
24 | 24 | |
25 | 25 | @EqualsAndHashCode(callSuper = true) |
26 | -public class Tenant extends ContactBased<TenantId> implements HasName, HasTenantId { | |
26 | +public class Tenant extends ContactBased<TenantId> implements HasTenantId { | |
27 | 27 | |
28 | 28 | private static final long serialVersionUID = 8057243243859922101L; |
29 | 29 | ... | ... |
... | ... | @@ -120,6 +120,9 @@ public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEnti |
120 | 120 | private JsonElement setProperties(ContactBased entity, JsonElement data, EntityDetails entityDetails, String prefix) { |
121 | 121 | JsonObject dataAsObject = data.getAsJsonObject(); |
122 | 122 | switch (entityDetails) { |
123 | + case TITLE: | |
124 | + dataAsObject.addProperty(prefix + "title", entity.getName()); | |
125 | + break; | |
123 | 126 | case ADDRESS: |
124 | 127 | if (entity.getAddress() != null) { |
125 | 128 | dataAsObject.addProperty(prefix + "address", entity.getAddress()); | ... | ... |
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; |
17 | 17 | |
18 | 18 | public enum EntityDetails { |
19 | 19 | |
20 | - COUNTRY, CITY, STATE, ZIP, ADDRESS, ADDRESS2, PHONE, EMAIL, ADDITIONAL_INFO | |
20 | + TITLE, COUNTRY, CITY, STATE, ZIP, ADDRESS, ADDRESS2, PHONE, EMAIL, ADDITIONAL_INFO | |
21 | 21 | |
22 | 22 | } | ... | ... |