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

Merge pull request #1616 from ShvaykaD/improvement/TbGetEntityDetailsNodes

Browse Source 
improvement to TbGetEntityDetailsNodes
This commit is contained in:
Igor Kulikov 2019-04-16 12:49:13 +03:00 committed by GitHub
commit fd1d20886b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 122 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java
View File

@ -15,6 +15,8 @@
*/ */
package org.thingsboard.rule.engine.metadata; package org.thingsboard.rule.engine.metadata;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
@ -34,9 +36,9 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ExecutionException;
import static org.thingsboard.rule.engine.api.TbRelationTypes.SUCCESS; import static org.thingsboard.rule.engine.api.TbRelationTypes.SUCCESS;
import static org.thingsboard.rule.engine.api.util.DonAsynchron.withCallback;
@Slf4j @Slf4j
public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEntityDetailsNodeConfiguration> implements TbNode { public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEntityDetailsNodeConfiguration> implements TbNode {
@ -54,19 +56,20 @@ public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEnti
@Override @Override
public void onMsg(TbContext ctx, TbMsg msg) { public void onMsg(TbContext ctx, TbMsg msg) {
try { withCallback(getDetails(ctx, msg),
ctx.tellNext(getDetails(ctx, msg), SUCCESS); m -> ctx.tellNext(m, SUCCESS),
} catch (Exception e) { t -> ctx.tellFailure(msg, t), ctx.getDbCallbackExecutor());
ctx.tellFailure(msg, e);
}
} }
@Override @Override
public void destroy() {} public void destroy() {
}
protected abstract C loadGetEntityDetailsNodeConfiguration(TbNodeConfiguration configuration) throws TbNodeException; protected abstract C loadGetEntityDetailsNodeConfiguration(TbNodeConfiguration configuration) throws TbNodeException;
protected abstract TbMsg getDetails(TbContext ctx, TbMsg msg); protected abstract ListenableFuture<TbMsg> getDetails(TbContext ctx, TbMsg msg);
protected abstract ListenableFuture<ContactBased> getContactBasedListenableFuture(TbContext ctx, TbMsg msg);
protected MessageData getDataAsJson(TbMsg msg) { protected MessageData getDataAsJson(TbMsg msg) {
if (this.config.isAddToMetadata()) { if (this.config.isAddToMetadata()) {
@ -76,25 +79,56 @@ public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEnti
} }
} }
protected TbMsg transformMsg(TbContext ctx, TbMsg msg, JsonElement resultObject, MessageData messageData) { protected ListenableFuture<TbMsg> getTbMsgListenableFuture(TbContext ctx, TbMsg msg, MessageData messageData, String prefix) {
if (messageData.getDataType().equals("metadata")) { if (!this.config.getDetailsList().isEmpty()) {
Map<String, String> metadataMap = gson.fromJson(resultObject.toString(), TYPE); ListenableFuture<JsonElement> resultObject = null;
return ctx.transformMsg(msg, msg.getType(), msg.getOriginator(), new TbMsgMetaData(metadataMap), msg.getData()); ListenableFuture<ContactBased> contactBasedListenableFuture = getContactBasedListenableFuture(ctx, msg);
for (EntityDetails entityDetails : this.config.getDetailsList()) {
resultObject = addContactProperties(messageData.getData(), contactBasedListenableFuture, entityDetails, prefix);
}
return transformMsg(ctx, msg, resultObject, messageData);
} else { } else {
return ctx.transformMsg(msg, msg.getType(), msg.getOriginator(), msg.getMetaData(), gson.toJson(resultObject)); return Futures.immediateFuture(msg);
} }
} }
protected JsonElement addContactProperties(JsonElement data, ContactBased entity, EntityDetails entityDetails, String prefix) { private ListenableFuture<TbMsg> transformMsg(TbContext ctx, TbMsg msg, ListenableFuture<JsonElement> propertiesFuture, MessageData messageData) {
return Futures.transformAsync(propertiesFuture, jsonElement -> {
if (jsonElement != null) {
if (messageData.getDataType().equals("metadata")) {
Map<String, String> metadataMap = gson.fromJson(jsonElement.toString(), TYPE);
return Futures.immediateFuture(ctx.transformMsg(msg, msg.getType(), msg.getOriginator(), new TbMsgMetaData(metadataMap), msg.getData()));
} else {
return Futures.immediateFuture(ctx.transformMsg(msg, msg.getType(), msg.getOriginator(), msg.getMetaData(), gson.toJson(jsonElement)));
}
} else {
return Futures.immediateFuture(null);
}
});
}
private ListenableFuture<JsonElement> addContactProperties(JsonElement data, ListenableFuture<ContactBased> entityFuture, EntityDetails entityDetails, String prefix) {
return Futures.transformAsync(entityFuture, contactBased -> {
if (contactBased != null) {
return Futures.immediateFuture(setProperties(contactBased, data, entityDetails, prefix));
} else {
return Futures.immediateFuture(null);
}
});
}
private JsonElement setProperties(ContactBased entity, JsonElement data, EntityDetails entityDetails, String prefix) {
JsonObject dataAsObject = data.getAsJsonObject(); JsonObject dataAsObject = data.getAsJsonObject();
switch (entityDetails) { switch (entityDetails) {
case ADDRESS: case ADDRESS:
if (entity.getAddress() != null) if (entity.getAddress() != null) {
dataAsObject.addProperty(prefix + "address", entity.getAddress()); dataAsObject.addProperty(prefix + "address", entity.getAddress());
}
break; break;
case ADDRESS2: case ADDRESS2:
if (entity.getAddress2() != null) if (entity.getAddress2() != null) {
dataAsObject.addProperty(prefix + "address2", entity.getAddress2()); dataAsObject.addProperty(prefix + "address2", entity.getAddress2());
}
break; break;
case CITY: case CITY:
if (entity.getCity() != null) dataAsObject.addProperty(prefix + "city", entity.getCity()); if (entity.getCity() != null) dataAsObject.addProperty(prefix + "city", entity.getCity());
@ -104,16 +138,24 @@ public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEnti
dataAsObject.addProperty(prefix + "country", entity.getCountry()); dataAsObject.addProperty(prefix + "country", entity.getCountry());
break; break;
case STATE: case STATE:
if (entity.getState() != null) dataAsObject.addProperty(prefix + "state", entity.getState()); if (entity.getState() != null) {
dataAsObject.addProperty(prefix + "state", entity.getState());
}
break; break;
case EMAIL: case EMAIL:
if (entity.getEmail() != null) dataAsObject.addProperty(prefix + "email", entity.getEmail()); if (entity.getEmail() != null) {
dataAsObject.addProperty(prefix + "email", entity.getEmail());
}
break; break;
case PHONE: case PHONE:
if (entity.getPhone() != null) dataAsObject.addProperty(prefix + "phone", entity.getPhone()); if (entity.getPhone() != null) {
dataAsObject.addProperty(prefix + "phone", entity.getPhone());
}
break; break;
case ZIP: case ZIP:
if (entity.getZip() != null) dataAsObject.addProperty(prefix + "zip", entity.getZip()); if (entity.getZip() != null) {
dataAsObject.addProperty(prefix + "zip", entity.getZip());
}
break; break;
case ADDITIONAL_INFO: case ADDITIONAL_INFO:
if (entity.getAdditionalInfo().hasNonNull("description")) { if (entity.getAdditionalInfo().hasNonNull("description")) {
@ -126,7 +168,7 @@ public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEnti
@Data @Data
@AllArgsConstructor @AllArgsConstructor
protected static class MessageData { private static class MessageData {
private JsonElement data; private JsonElement data;
private String dataType; private String dataType;
} }

83
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNode.java
View File

@ -15,19 +15,16 @@
*/ */
package org.thingsboard.rule.engine.metadata; package org.thingsboard.rule.engine.metadata;
import com.google.gson.JsonElement; import com.google.common.util.concurrent.Futures;
import com.google.gson.JsonObject; import com.google.common.util.concurrent.ListenableFuture;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.thingsboard.rule.engine.api.RuleNode; import org.thingsboard.rule.engine.api.RuleNode;
import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.rule.engine.api.TbContext;
import org.thingsboard.rule.engine.api.TbNodeConfiguration; import org.thingsboard.rule.engine.api.TbNodeConfiguration;
import org.thingsboard.rule.engine.api.TbNodeException; import org.thingsboard.rule.engine.api.TbNodeException;
import org.thingsboard.rule.engine.api.util.TbNodeUtils; import org.thingsboard.rule.engine.api.util.TbNodeUtils;
import org.thingsboard.rule.engine.util.EntityDetails; import org.thingsboard.server.common.data.ContactBased;
import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.Customer;
import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.EntityView;
import org.thingsboard.server.common.data.asset.Asset;
import org.thingsboard.server.common.data.id.AssetId; import org.thingsboard.server.common.data.id.AssetId;
import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.DeviceId;
import org.thingsboard.server.common.data.id.EntityViewId; import org.thingsboard.server.common.data.id.EntityViewId;
@ -54,45 +51,59 @@ public class TbGetCustomerDetailsNode extends TbAbstractGetEntityDetailsNode<TbG
} }
@Override @Override
protected TbMsg getDetails(TbContext ctx, TbMsg msg) { protected ListenableFuture<TbMsg> getDetails(TbContext ctx, TbMsg msg) {
return getCustomerTbMsg(ctx, msg, getDataAsJson(msg)); return getTbMsgListenableFuture(ctx, msg, getDataAsJson(msg), CUSTOMER_PREFIX);
} }
private TbMsg getCustomerTbMsg(TbContext ctx, TbMsg msg, MessageData messageData) { @Override
JsonElement resultObject = null; protected ListenableFuture<ContactBased> getContactBasedListenableFuture(TbContext ctx, TbMsg msg) {
if (!config.getDetailsList().isEmpty()) { return Futures.transformAsync(getCustomer(ctx, msg), customer -> {
for (EntityDetails entityDetails : config.getDetailsList()) { if (customer != null) {
resultObject = addContactProperties(messageData.getData(), getCustomer(ctx, msg), entityDetails, CUSTOMER_PREFIX); return Futures.immediateFuture(customer);
} else {
return Futures.immediateFuture(null);
} }
return transformMsg(ctx, msg, resultObject, messageData); });
} else {
return msg;
}
} }
private Customer getCustomer(TbContext ctx, TbMsg msg) { private ListenableFuture<Customer> getCustomer(TbContext ctx, TbMsg msg) {
switch (msg.getOriginator().getEntityType()) { switch (msg.getOriginator().getEntityType()) {
case DEVICE: case DEVICE:
Device device = ctx.getDeviceService().findDeviceById(ctx.getTenantId(), new DeviceId(msg.getOriginator().getId())); return Futures.transformAsync(ctx.getDeviceService().findDeviceByIdAsync(ctx.getTenantId(), new DeviceId(msg.getOriginator().getId())), device -> {
if (!device.getCustomerId().isNullUid()) { if (device != null) {
return ctx.getCustomerService().findCustomerById(ctx.getTenantId(), device.getCustomerId()); if (!device.getCustomerId().isNullUid()) {
} else { return ctx.getCustomerService().findCustomerByIdAsync(ctx.getTenantId(), device.getCustomerId());
throw new RuntimeException("Device with name '" + device.getName() + "' is not assigned to Customer."); } else {
} throw new RuntimeException("Device with name '" + device.getName() + "' is not assigned to Customer.");
}
} else {
return Futures.immediateFuture(null);
}
});
case ASSET: case ASSET:
Asset asset = ctx.getAssetService().findAssetById(ctx.getTenantId(), new AssetId(msg.getOriginator().getId())); return Futures.transformAsync(ctx.getAssetService().findAssetByIdAsync(ctx.getTenantId(), new AssetId(msg.getOriginator().getId())), asset -> {
if (!asset.getCustomerId().isNullUid()) { if (asset != null) {
return ctx.getCustomerService().findCustomerById(ctx.getTenantId(), asset.getCustomerId()); if (!asset.getCustomerId().isNullUid()) {
} else { return ctx.getCustomerService().findCustomerByIdAsync(ctx.getTenantId(), asset.getCustomerId());
throw new RuntimeException("Asset with name '" + asset.getName() + "' is not assigned to Customer."); } else {
} throw new RuntimeException("Asset with name '" + asset.getName() + "' is not assigned to Customer.");
}
} else {
return Futures.immediateFuture(null);
}
});
case ENTITY_VIEW: case ENTITY_VIEW:
EntityView entityView = ctx.getEntityViewService().findEntityViewById(ctx.getTenantId(), new EntityViewId(msg.getOriginator().getId())); return Futures.transformAsync(ctx.getEntityViewService().findEntityViewByIdAsync(ctx.getTenantId(), new EntityViewId(msg.getOriginator().getId())), entityView -> {
if (!entityView.getCustomerId().isNullUid()) { if (entityView != null) {
return ctx.getCustomerService().findCustomerById(ctx.getTenantId(), entityView.getCustomerId()); if (!entityView.getCustomerId().isNullUid()) {
} else { return ctx.getCustomerService().findCustomerByIdAsync(ctx.getTenantId(), entityView.getCustomerId());
throw new RuntimeException("EntityView with name '" + entityView.getName() + "' is not assigned to Customer."); } else {
} throw new RuntimeException("EntityView with name '" + entityView.getName() + "' is not assigned to Customer.");
}
} else {
return Futures.immediateFuture(null);
}
});
default: default:
throw new RuntimeException("Entity with entityType '" + msg.getOriginator().getEntityType() + "' is not supported."); throw new RuntimeException("Entity with entityType '" + msg.getOriginator().getEntityType() + "' is not supported.");
} }

28
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNode.java
View File

@ -15,17 +15,15 @@
*/ */
package org.thingsboard.rule.engine.metadata; package org.thingsboard.rule.engine.metadata;
import com.google.gson.JsonElement; import com.google.common.util.concurrent.Futures;
import com.google.gson.JsonObject; import com.google.common.util.concurrent.ListenableFuture;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.thingsboard.rule.engine.api.RuleNode; import org.thingsboard.rule.engine.api.RuleNode;
import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.rule.engine.api.TbContext;
import org.thingsboard.rule.engine.api.TbNodeConfiguration; import org.thingsboard.rule.engine.api.TbNodeConfiguration;
import org.thingsboard.rule.engine.api.TbNodeException; import org.thingsboard.rule.engine.api.TbNodeException;
import org.thingsboard.rule.engine.api.util.TbNodeUtils; import org.thingsboard.rule.engine.api.util.TbNodeUtils;
import org.thingsboard.rule.engine.util.EntityDetails;
import org.thingsboard.server.common.data.ContactBased; import org.thingsboard.server.common.data.ContactBased;
import org.thingsboard.server.common.data.Tenant;
import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.data.plugin.ComponentType;
import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.TbMsg;
@ -49,20 +47,18 @@ public class TbGetTenantDetailsNode extends TbAbstractGetEntityDetailsNode<TbGet
} }
@Override @Override
protected TbMsg getDetails(TbContext ctx, TbMsg msg) { protected ListenableFuture<TbMsg> getDetails(TbContext ctx, TbMsg msg) {
return getTenantTbMsg(ctx, msg, getDataAsJson(msg)); return getTbMsgListenableFuture(ctx, msg, getDataAsJson(msg), TENANT_PREFIX);
} }
private TbMsg getTenantTbMsg(TbContext ctx, TbMsg msg, MessageData messageData) { @Override
JsonElement resultObject = null; protected ListenableFuture<ContactBased> getContactBasedListenableFuture(TbContext ctx, TbMsg msg) {
Tenant tenant = ctx.getTenantService().findTenantById(ctx.getTenantId()); return Futures.transformAsync(ctx.getTenantService().findTenantByIdAsync(ctx.getTenantId(), ctx.getTenantId()), tenant -> {
if (!config.getDetailsList().isEmpty()) { if (tenant != null) {
for (EntityDetails entityDetails : config.getDetailsList()) { return Futures.immediateFuture(tenant);
resultObject = addContactProperties(messageData.getData(), tenant, entityDetails, TENANT_PREFIX); } else {
return Futures.immediateFuture(null);
} }
return transformMsg(ctx, msg, resultObject, messageData); });
} else {
return msg;
}
} }
} }