|
|
|
@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.id.AssetId; |
|
|
|
import org.thingsboard.server.common.data.id.DeviceId; |
|
|
|
import org.thingsboard.server.dao.asset.AssetService; |
|
|
|
import org.thingsboard.server.dao.device.DeviceService; |
|
|
|
import org.thingsboard.server.gen.edge.EdgeEntityType; |
|
|
|
import org.thingsboard.server.gen.edge.EntityViewUpdateMsg; |
|
|
|
import org.thingsboard.server.gen.edge.UpdateMsgType; |
|
|
|
|
|
|
|
@ -42,17 +43,17 @@ public class EntityViewUpdateMsgConstructor { |
|
|
|
public EntityViewUpdateMsg constructEntityViewUpdatedMsg(UpdateMsgType msgType, EntityView entityView) { |
|
|
|
String relatedName; |
|
|
|
String relatedType; |
|
|
|
org.thingsboard.server.gen.edge.EntityType relatedEntityType; |
|
|
|
EdgeEntityType relatedEntityType; |
|
|
|
if (entityView.getEntityId().getEntityType().equals(EntityType.DEVICE)) { |
|
|
|
Device device = deviceService.findDeviceById(entityView.getTenantId(), new DeviceId(entityView.getEntityId().getId())); |
|
|
|
relatedName = device.getName(); |
|
|
|
relatedType = device.getType(); |
|
|
|
relatedEntityType = org.thingsboard.server.gen.edge.EntityType.DEVICE; |
|
|
|
relatedEntityType = EdgeEntityType.DEVICE; |
|
|
|
} else { |
|
|
|
Asset asset = assetService.findAssetById(entityView.getTenantId(), new AssetId(entityView.getEntityId().getId())); |
|
|
|
relatedName = asset.getName(); |
|
|
|
relatedType = asset.getType(); |
|
|
|
relatedEntityType = org.thingsboard.server.gen.edge.EntityType.ASSET; |
|
|
|
relatedEntityType = EdgeEntityType.ASSET; |
|
|
|
} |
|
|
|
EntityViewUpdateMsg.Builder builder = EntityViewUpdateMsg.newBuilder() |
|
|
|
.setMsgType(msgType) |
|
|
|
|