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

Added default dashboard id to asset profile

Browse Source
This commit is contained in:
Volodymyr Babak 2022-10-13 10:46:28 +03:00
parent cc4029120a
commit ef91b66b6a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/AssetProfileMsgConstructor.java
View File

@ -16,13 +16,11 @@
package org.thingsboard.server.service.edge.rpc.constructor; package org.thingsboard.server.service.edge.rpc.constructor;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.asset.AssetProfile; import org.thingsboard.server.common.data.asset.AssetProfile;
import org.thingsboard.server.common.data.id.AssetProfileId; import org.thingsboard.server.common.data.id.AssetProfileId;
import org.thingsboard.server.gen.edge.v1.AssetProfileUpdateMsg; import org.thingsboard.server.gen.edge.v1.AssetProfileUpdateMsg;
import org.thingsboard.server.gen.edge.v1.UpdateMsgType; import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
import org.thingsboard.server.queue.util.DataDecodingEncodingService;
import org.thingsboard.server.queue.util.TbCoreComponent; import org.thingsboard.server.queue.util.TbCoreComponent;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@ -38,6 +36,10 @@ public class AssetProfileMsgConstructor {
.setIdLSB(assetProfile.getId().getId().getLeastSignificantBits()) .setIdLSB(assetProfile.getId().getId().getLeastSignificantBits())
.setName(assetProfile.getName()) .setName(assetProfile.getName())
.setDefault(assetProfile.isDefault()); .setDefault(assetProfile.isDefault());
if (assetProfile.getDefaultDashboardId() != null) {
builder.setDefaultDashboardIdMSB(assetProfile.getDefaultDashboardId().getId().getMostSignificantBits())
.setDefaultDashboardIdLSB(assetProfile.getDefaultDashboardId().getId().getLeastSignificantBits());
}
if (assetProfile.getDefaultQueueName() != null) { if (assetProfile.getDefaultQueueName() != null) {
builder.setDefaultQueueName(assetProfile.getDefaultQueueName()); builder.setDefaultQueueName(assetProfile.getDefaultQueueName());
} }

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

@ -233,8 +233,10 @@ message AssetProfileUpdateMsg {
bool default = 6; bool default = 6;
int64 defaultRuleChainIdMSB = 7; int64 defaultRuleChainIdMSB = 7;
int64 defaultRuleChainIdLSB = 8; int64 defaultRuleChainIdLSB = 8;
optional string defaultQueueName = 9; int64 defaultDashboardIdMSB = 9;
optional bytes image = 10; int64 defaultDashboardIdLSB = 10;
optional string defaultQueueName = 11;
optional bytes image = 12;
} }
message DeviceCredentialsUpdateMsg { message DeviceCredentialsUpdateMsg {