From ef29f52abd4050046adfa7465ad1ff94e82c44b2 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Tue, 29 Aug 2023 13:40:06 +0300 Subject: [PATCH] Added image for edge dashboard msg --- .../service/edge/rpc/constructor/DashboardMsgConstructor.java | 3 +++ .../edge/rpc/processor/dashboard/BaseDashboardProcessor.java | 1 + common/edge-api/src/main/proto/edge.proto | 1 + 3 files changed, 5 insertions(+) diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DashboardMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DashboardMsgConstructor.java index edfdefb603..87d33ef5f5 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DashboardMsgConstructor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DashboardMsgConstructor.java @@ -37,6 +37,9 @@ public class DashboardMsgConstructor { if (dashboard.getAssignedCustomers() != null) { builder.setAssignedCustomers(JacksonUtil.toString(dashboard.getAssignedCustomers())); } + if (dashboard.getImage() != null) { + builder.setImage(dashboard.getImage()); + } return builder.build(); } diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/BaseDashboardProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/BaseDashboardProcessor.java index b055c03cf7..8d82399046 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/BaseDashboardProcessor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/BaseDashboardProcessor.java @@ -42,6 +42,7 @@ public abstract class BaseDashboardProcessor extends BaseEdgeProcessor { dashboard.setCreatedTime(Uuids.unixTimestamp(dashboardId.getId())); } dashboard.setTitle(dashboardUpdateMsg.getTitle()); + dashboard.setImage(dashboardUpdateMsg.hasImage() ? dashboardUpdateMsg.getImage() : null); dashboard.setConfiguration(JacksonUtil.toJsonNode(dashboardUpdateMsg.getConfiguration())); Set assignedCustomers = null; if (dashboardUpdateMsg.hasAssignedCustomers()) { diff --git a/common/edge-api/src/main/proto/edge.proto b/common/edge-api/src/main/proto/edge.proto index a057bd74a4..a5158f4638 100644 --- a/common/edge-api/src/main/proto/edge.proto +++ b/common/edge-api/src/main/proto/edge.proto @@ -187,6 +187,7 @@ message DashboardUpdateMsg { string title = 6; string configuration = 7; optional string assignedCustomers = 8; + optional string image = 9; } message DeviceUpdateMsg {