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

Renamed class

Browse Source
This commit is contained in:
Volodymyr Babak 2020-05-22 18:52:44 +03:00
parent 31a1e310f1
commit eceb9f1309
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/EntityViewUpdateMsgConstructor.java
View File

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

4
common/edge-api/src/main/proto/edge.proto
View File

@ -182,7 +182,7 @@ message EntityViewUpdateMsg {
string type = 3; string type = 3;
string relatedName = 4; string relatedName = 4;
string relatedType = 5; string relatedType = 5;
EntityType relatedEntityType = 6; EdgeEntityType relatedEntityType = 6;
string groupName = 7; string groupName = 7;
} }
@ -238,7 +238,7 @@ message RuleChainMetadataRequestMsg {
int64 ruleChainIdLSB = 2; int64 ruleChainIdLSB = 2;
} }
enum EntityType { enum EdgeEntityType {
DEVICE = 0; DEVICE = 0;
ASSET = 1; ASSET = 1;
} }