Browse Source

Add RuleChain case for fetchEntityNameAsync

pull/804/head
Igor Kulikov 8 years ago
parent
commit
ee291b9b05
  1. 15
      dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java

15
dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java

@ -23,18 +23,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.thingsboard.server.common.data.HasName; import org.thingsboard.server.common.data.HasName;
import org.thingsboard.server.common.data.alarm.AlarmId; import org.thingsboard.server.common.data.alarm.AlarmId;
import org.thingsboard.server.common.data.id.AssetId; import org.thingsboard.server.common.data.id.*;
import org.thingsboard.server.common.data.id.CustomerId;
import org.thingsboard.server.common.data.id.DashboardId;
import org.thingsboard.server.common.data.id.DeviceId;
import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.id.UserId;
import org.thingsboard.server.dao.alarm.AlarmService; import org.thingsboard.server.dao.alarm.AlarmService;
import org.thingsboard.server.dao.asset.AssetService; import org.thingsboard.server.dao.asset.AssetService;
import org.thingsboard.server.dao.customer.CustomerService; import org.thingsboard.server.dao.customer.CustomerService;
import org.thingsboard.server.dao.dashboard.DashboardService; import org.thingsboard.server.dao.dashboard.DashboardService;
import org.thingsboard.server.dao.device.DeviceService; import org.thingsboard.server.dao.device.DeviceService;
import org.thingsboard.server.dao.rule.RuleChainService;
import org.thingsboard.server.dao.tenant.TenantService; import org.thingsboard.server.dao.tenant.TenantService;
import org.thingsboard.server.dao.user.UserService; import org.thingsboard.server.dao.user.UserService;
@ -66,6 +61,9 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
@Autowired @Autowired
private AlarmService alarmService; private AlarmService alarmService;
@Autowired
private RuleChainService ruleChainService;
@Override @Override
public void deleteEntityRelations(EntityId entityId) { public void deleteEntityRelations(EntityId entityId) {
super.deleteEntityRelations(entityId); super.deleteEntityRelations(entityId);
@ -98,6 +96,9 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
case ALARM: case ALARM:
hasName = alarmService.findAlarmByIdAsync(new AlarmId(entityId.getId())); hasName = alarmService.findAlarmByIdAsync(new AlarmId(entityId.getId()));
break; break;
case RULE_CHAIN:
hasName = ruleChainService.findRuleChainByIdAsync(new RuleChainId(entityId.getId()));
break;
default: default:
throw new IllegalStateException("Not Implemented!"); throw new IllegalStateException("Not Implemented!");
} }

Loading…
Cancel
Save