tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

code review

pull/7245/head
Yuriy Lytvynchuk 4 years ago
parent
370c43affb
commit
3fe6fa99aa
2 changed files with 16 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractRelationActionNode.java
  2. 31
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesByNameAndTypeLoader.java

10
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractRelationActionNode.java
View File

@ -40,8 +40,6 @@ import org.thingsboard.server.common.data.asset.Asset;
import org.thingsboard.server.common.data.edge.Edge;
import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.id.EntityIdFactory;
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.relation.EntityRelation;
import org.thingsboard.server.common.data.relation.EntitySearchDirection;
import org.thingsboard.server.common.data.relation.RelationTypeGroup;
@ -250,11 +248,9 @@ public abstract class TbAbstractRelationActionNode<C extends TbAbstractRelationA
break;
case DASHBOARD:
DashboardService dashboardService = ctx.getDashboardService();
PageData<DashboardInfo> dashboardInfoTextPageData = dashboardService.findDashboardsByTenantId(ctx.getTenantId(), new PageLink(200, 0, entitykey.getEntityName()));
for (DashboardInfo dashboardInfo : dashboardInfoTextPageData.getData()) {
if (dashboardInfo.getTitle().equals(entitykey.getEntityName())) {
targetEntity.setEntityId(dashboardInfo.getId());
}
DashboardInfo dashboardInfo = dashboardService.findFirstDashboardInfoByTenantIdAndName(ctx.getTenantId(), entitykey.getEntityName());
if (dashboardInfo != null) {
targetEntity.setEntityId(dashboardInfo.getId());
}
break;
case USER:

31
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesByNameAndTypeLoader.java
View File

@ -25,71 +25,66 @@ import org.thingsboard.server.common.data.User;
import org.thingsboard.server.common.data.asset.Asset;
import org.thingsboard.server.common.data.edge.Edge;
import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import java.util.Optional;
public class EntitiesByNameAndTypeLoader {
public static EntityId findEntityId(TbContext ctx, EntityType entityType, String entityName) {
EntityId targetEntity = null;
EntityId targetEntityId = null;
switch (entityType) {
case DEVICE:
Device device = ctx.getDeviceService().findDeviceByTenantIdAndName(ctx.getTenantId(), entityName);
if (device != null) {
targetEntity = device.getId();
targetEntityId = device.getId();
}
break;
case ASSET:
Asset asset = ctx.getAssetService().findAssetByTenantIdAndName(ctx.getTenantId(), entityName);
if (asset != null) {
targetEntity = asset.getId();
targetEntityId = asset.getId();
}
break;
case CUSTOMER:
Optional<Customer> customerOptional = ctx.getCustomerService().findCustomerByTenantIdAndTitle(ctx.getTenantId(), entityName);
if (customerOptional.isPresent()) {
targetEntity = customerOptional.get().getId();
targetEntityId = customerOptional.get().getId();
}
break;
case TENANT:
targetEntity = ctx.getTenantId();
targetEntityId = ctx.getTenantId();
break;
case ENTITY_VIEW:
EntityView entityView = ctx.getEntityViewService().findEntityViewByTenantIdAndName(ctx.getTenantId(), entityName);
if (entityView != null) {
targetEntity = entityView.getId();
targetEntityId = entityView.getId();
}
break;
case EDGE:
Edge edge = ctx.getEdgeService().findEdgeByTenantIdAndName(ctx.getTenantId(), entityName);
if (edge != null) {
targetEntity = edge.getId();
targetEntityId = edge.getId();
}
break;
case DASHBOARD:
PageData<DashboardInfo> dashboardInfoTextPageData = ctx.getDashboardService().findDashboardsByTenantId(ctx.getTenantId(), new PageLink(200, 0, entityName));
Optional<DashboardInfo> currentDashboardInfo = dashboardInfoTextPageData.getData().stream()
.filter(dashboardInfo -> dashboardInfo.getTitle().equals(entityName))
.findFirst();
if (currentDashboardInfo.isPresent()) {
targetEntity = currentDashboardInfo.get().getId();
DashboardInfo dashboardInfo = ctx.getDashboardService().findFirstDashboardInfoByTenantIdAndName(ctx.getTenantId(), entityName);
if (dashboardInfo != null) {
targetEntityId = dashboardInfo.getId();
}
break;
case USER:
User user = ctx.getUserService().findUserByEmail(ctx.getTenantId(), entityName);
if (user != null) {
targetEntity = user.getId();
targetEntityId = user.getId();
}
break;
default:
throw new IllegalStateException("Unexpected entity type " + entityType.name());
}
if (targetEntity == null) {
if (targetEntityId == null) {
throw new IllegalStateException("Failed to found " + entityType.name() + " entity by name: '" + entityName + "'!");
}
return targetEntity;
return targetEntityId;
}
}

Write Preview
Loading…
Cancel
Save