简柏林 / thingskit · Commits

Commit f17a4d2bc26f68a121d818c6c141906c7cd621e3

Authored by Bohdan Smetaniuk
1 parent 76b35010

fixes

Inline Side-by-side
Showing 5 changed files with 57 additions and 7 deletions
@@ -72,7 +72,7 @@ public class WidgetTypeController extends BaseController { @@ -72,7 +72,7 @@ public class WidgetTypeController extends BaseController {
72 checkEntity(widgetType.getId(), widgetType, Resource.WIDGET_TYPE); 72 checkEntity(widgetType.getId(), widgetType, Resource.WIDGET_TYPE);
73 WidgetType savedWidgetType = widgetTypeService.saveWidgetType(widgetType); 73 WidgetType savedWidgetType = widgetTypeService.saveWidgetType(widgetType);
74 74
75 - sendNotificationMsgToEdgeService(savedWidgetType.getTenantId(), savedWidgetType.getId(), ActionType.UPDATED); 75 + sendNotificationMsgToEdgeService(savedWidgetType.getTenantId(), savedWidgetType.getId(), savedWidgetType.getId() == null ? ActionType.ADDED : ActionType.UPDATED);
76 76
77 return checkNotNull(savedWidgetType); 77 return checkNotNull(savedWidgetType);
78 } catch (Exception e) { 78 } catch (Exception e) {
@@ -71,7 +71,7 @@ public class WidgetsBundleController extends BaseController { @@ -71,7 +71,7 @@ public class WidgetsBundleController extends BaseController {
71 checkEntity(widgetsBundle.getId(), widgetsBundle, Resource.WIDGETS_BUNDLE); 71 checkEntity(widgetsBundle.getId(), widgetsBundle, Resource.WIDGETS_BUNDLE);
72 WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle); 72 WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
73 73
74 - sendNotificationMsgToEdgeService(savedWidgetsBundle.getTenantId(), savedWidgetsBundle.getId(), ActionType.UPDATED); 74 + sendNotificationMsgToEdgeService(savedWidgetsBundle.getTenantId(), savedWidgetsBundle.getId(), savedWidgetsBundle.getId() == null ? ActionType.ADDED : ActionType.UPDATED);
75 75
76 return checkNotNull(savedWidgetsBundle); 76 return checkNotNull(savedWidgetsBundle);
77 } catch (Exception e) { 77 } catch (Exception e) {
@@ -39,7 +39,17 @@ import org.thingsboard.server.queue.discovery.PartitionService; @@ -39,7 +39,17 @@ import org.thingsboard.server.queue.discovery.PartitionService;
39 import org.thingsboard.server.queue.provider.TbQueueProducerProvider; 39 import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
40 import org.thingsboard.server.queue.util.TbCoreComponent; 40 import org.thingsboard.server.queue.util.TbCoreComponent;
41 import org.thingsboard.server.service.edge.rpc.EdgeEventStorageSettings; 41 import org.thingsboard.server.service.edge.rpc.EdgeEventStorageSettings;
42 -import org.thingsboard.server.service.edge.rpc.constructor.*; 42 +import org.thingsboard.server.service.edge.rpc.constructor.AlarmUpdateMsgConstructor;
  43 +import org.thingsboard.server.service.edge.rpc.constructor.AssetUpdateMsgConstructor;
  44 +import org.thingsboard.server.service.edge.rpc.constructor.DashboardUpdateMsgConstructor;
  45 +import org.thingsboard.server.service.edge.rpc.constructor.DeviceUpdateMsgConstructor;
  46 +import org.thingsboard.server.service.edge.rpc.constructor.EntityDataMsgConstructor;
  47 +import org.thingsboard.server.service.edge.rpc.constructor.EntityViewUpdateMsgConstructor;
  48 +import org.thingsboard.server.service.edge.rpc.constructor.RelationUpdateMsgConstructor;
  49 +import org.thingsboard.server.service.edge.rpc.constructor.RuleChainUpdateMsgConstructor;
  50 +import org.thingsboard.server.service.edge.rpc.constructor.UserUpdateMsgConstructor;
  51 +import org.thingsboard.server.service.edge.rpc.constructor.WidgetTypeUpdateMsgConstructor;
  52 +import org.thingsboard.server.service.edge.rpc.constructor.WidgetsBundleUpdateMsgConstructor;
43 import org.thingsboard.server.service.edge.rpc.init.SyncEdgeService; 53 import org.thingsboard.server.service.edge.rpc.init.SyncEdgeService;
44 import org.thingsboard.server.service.executors.DbCallbackExecutorService; 54 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
45 import org.thingsboard.server.service.queue.TbClusterService; 55 import org.thingsboard.server.service.queue.TbClusterService;
@@ -43,7 +43,19 @@ import org.thingsboard.server.common.data.asset.Asset; @@ -43,7 +43,19 @@ import org.thingsboard.server.common.data.asset.Asset;
43 import org.thingsboard.server.common.data.audit.ActionType; 43 import org.thingsboard.server.common.data.audit.ActionType;
44 import org.thingsboard.server.common.data.edge.Edge; 44 import org.thingsboard.server.common.data.edge.Edge;
45 import org.thingsboard.server.common.data.edge.EdgeEvent; 45 import org.thingsboard.server.common.data.edge.EdgeEvent;
46 -import org.thingsboard.server.common.data.id.*; 46 +import org.thingsboard.server.common.data.id.AlarmId;
  47 +import org.thingsboard.server.common.data.id.AssetId;
  48 +import org.thingsboard.server.common.data.id.CustomerId;
  49 +import org.thingsboard.server.common.data.id.DashboardId;
  50 +import org.thingsboard.server.common.data.id.DeviceId;
  51 +import org.thingsboard.server.common.data.id.EdgeId;
  52 +import org.thingsboard.server.common.data.id.EntityId;
  53 +import org.thingsboard.server.common.data.id.EntityViewId;
  54 +import org.thingsboard.server.common.data.id.RuleChainId;
  55 +import org.thingsboard.server.common.data.id.TenantId;
  56 +import org.thingsboard.server.common.data.id.UserId;
  57 +import org.thingsboard.server.common.data.id.WidgetTypeId;
  58 +import org.thingsboard.server.common.data.id.WidgetsBundleId;
47 import org.thingsboard.server.common.data.kv.AttributeKvEntry; 59 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
48 import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry; 60 import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
49 import org.thingsboard.server.common.data.kv.LongDataEntry; 61 import org.thingsboard.server.common.data.kv.LongDataEntry;
@@ -64,7 +76,35 @@ import org.thingsboard.server.common.msg.queue.ServiceType; @@ -64,7 +76,35 @@ import org.thingsboard.server.common.msg.queue.ServiceType;
64 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo; 76 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
65 import org.thingsboard.server.common.msg.session.SessionMsgType; 77 import org.thingsboard.server.common.msg.session.SessionMsgType;
66 import org.thingsboard.server.common.transport.util.JsonUtils; 78 import org.thingsboard.server.common.transport.util.JsonUtils;
67 -import org.thingsboard.server.gen.edge.*; 79 +import org.thingsboard.server.gen.edge.AlarmUpdateMsg;
  80 +import org.thingsboard.server.gen.edge.AssetUpdateMsg;
  81 +import org.thingsboard.server.gen.edge.AttributesRequestMsg;
  82 +import org.thingsboard.server.gen.edge.ConnectRequestMsg;
  83 +import org.thingsboard.server.gen.edge.ConnectResponseCode;
  84 +import org.thingsboard.server.gen.edge.ConnectResponseMsg;
  85 +import org.thingsboard.server.gen.edge.DashboardUpdateMsg;
  86 +import org.thingsboard.server.gen.edge.DeviceCredentialsRequestMsg;
  87 +import org.thingsboard.server.gen.edge.DeviceCredentialsUpdateMsg;
  88 +import org.thingsboard.server.gen.edge.DeviceUpdateMsg;
  89 +import org.thingsboard.server.gen.edge.DownlinkMsg;
  90 +import org.thingsboard.server.gen.edge.EdgeConfiguration;
  91 +import org.thingsboard.server.gen.edge.EntityDataProto;
  92 +import org.thingsboard.server.gen.edge.EntityUpdateMsg;
  93 +import org.thingsboard.server.gen.edge.EntityViewUpdateMsg;
  94 +import org.thingsboard.server.gen.edge.RelationRequestMsg;
  95 +import org.thingsboard.server.gen.edge.RequestMsg;
  96 +import org.thingsboard.server.gen.edge.RequestMsgType;
  97 +import org.thingsboard.server.gen.edge.ResponseMsg;
  98 +import org.thingsboard.server.gen.edge.RuleChainMetadataRequestMsg;
  99 +import org.thingsboard.server.gen.edge.RuleChainMetadataUpdateMsg;
  100 +import org.thingsboard.server.gen.edge.RuleChainUpdateMsg;
  101 +import org.thingsboard.server.gen.edge.UpdateMsgType;
  102 +import org.thingsboard.server.gen.edge.UplinkMsg;
  103 +import org.thingsboard.server.gen.edge.UplinkResponseMsg;
  104 +import org.thingsboard.server.gen.edge.UserCredentialsRequestMsg;
  105 +import org.thingsboard.server.gen.edge.UserCredentialsUpdateMsg;
  106 +import org.thingsboard.server.gen.edge.WidgetTypeUpdateMsg;
  107 +import org.thingsboard.server.gen.edge.WidgetsBundleUpdateMsg;
68 import org.thingsboard.server.gen.transport.TransportProtos; 108 import org.thingsboard.server.gen.transport.TransportProtos;
69 import org.thingsboard.server.queue.TbQueueCallback; 109 import org.thingsboard.server.queue.TbQueueCallback;
70 import org.thingsboard.server.queue.TbQueueMsgMetadata; 110 import org.thingsboard.server.queue.TbQueueMsgMetadata;
@@ -607,7 +647,7 @@ public final class EdgeGrpcSession implements Closeable { @@ -607,7 +647,7 @@ public final class EdgeGrpcSession implements Closeable {
607 break; 647 break;
608 case DELETED: 648 case DELETED:
609 WidgetTypeUpdateMsg widgetTypeUpdateMsg = 649 WidgetTypeUpdateMsg widgetTypeUpdateMsg =
610 - ctx.getWidgetTypeUpdateMsgConstructor().constructWidgetTypeUpdateMsg(widgetTypeId); 650 + ctx.getWidgetTypeUpdateMsgConstructor().constructWidgetTypeDeleteMsg(widgetTypeId);
611 entityUpdateMsg = EntityUpdateMsg.newBuilder() 651 entityUpdateMsg = EntityUpdateMsg.newBuilder()
612 .setWidgetTypeUpdateMsg(widgetTypeUpdateMsg) 652 .setWidgetTypeUpdateMsg(widgetTypeUpdateMsg)
613 .build(); 653 .build();
@@ -47,7 +47,7 @@ public class WidgetTypeUpdateMsgConstructor { @@ -47,7 +47,7 @@ public class WidgetTypeUpdateMsgConstructor {
47 return builder.build(); 47 return builder.build();
48 } 48 }
49 49
50 - public WidgetTypeUpdateMsg constructWidgetTypeUpdateMsg(WidgetTypeId widgetTypeId) { 50 + public WidgetTypeUpdateMsg constructWidgetTypeDeleteMsg(WidgetTypeId widgetTypeId) {
51 return WidgetTypeUpdateMsg.newBuilder() 51 return WidgetTypeUpdateMsg.newBuilder()
52 .setMsgType(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE) 52 .setMsgType(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE)
53 .setIdMSB(widgetTypeId.getId().getMostSignificantBits()) 53 .setIdMSB(widgetTypeId.getId().getMostSignificantBits())