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

Fix compatibility between CE and PE

Browse Source
This commit is contained in:
Andrii Shvaika 2023-10-24 12:30:17 +03:00
parent 0571f7e6dd
commit b2098fc112
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
common/cluster-api/src/main/proto/queue.proto
View File

@ -32,28 +32,28 @@ enum EntityTypeProto {
ASSET = 5; ASSET = 5;
DEVICE = 6; DEVICE = 6;
ALARM = 7; ALARM = 7;
// next 3 reserved for PE;
RULE_CHAIN = 11;
RULE_NODE = 12;
// next 2 reserved for PE; // next 2 reserved for PE;
RULE_CHAIN = 10; ENTITY_VIEW = 15;
RULE_NODE = 11; WIDGETS_BUNDLE = 16;
WIDGET_TYPE = 17;
// next 2 reserved for PE; // next 2 reserved for PE;
ENTITY_VIEW = 14; TENANT_PROFILE = 20;
WIDGETS_BUNDLE = 15; DEVICE_PROFILE = 21;
WIDGET_TYPE = 16; ASSET_PROFILE = 22;
// next 2 reserved for PE; API_USAGE_STATE = 23;
TENANT_PROFILE = 19; TB_RESOURCE = 24;
DEVICE_PROFILE = 20; OTA_PACKAGE = 25;
ASSET_PROFILE = 21; EDGE = 26;
API_USAGE_STATE = 22; RPC = 27;
TB_RESOURCE = 23; QUEUE = 28;
OTA_PACKAGE = 24; NOTIFICATION_TARGET = 29;
EDGE = 25; NOTIFICATION_TEMPLATE = 30;
RPC = 26; NOTIFICATION_REQUEST = 31;
QUEUE = 27; NOTIFICATION = 32;
NOTIFICATION_TARGET = 28; NOTIFICATION_RULE = 33;
NOTIFICATION_TEMPLATE = 29;
NOTIFICATION_REQUEST = 30;
NOTIFICATION = 31;
NOTIFICATION_RULE = 32;
} }
/** /**

38
common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
View File

@ -33,32 +33,32 @@ public enum EntityType {
ASSET(5), ASSET(5),
DEVICE(6), DEVICE(6),
ALARM (7), ALARM (7),
RULE_CHAIN (10), RULE_CHAIN (11),
RULE_NODE (11), RULE_NODE (12),
ENTITY_VIEW (14) { ENTITY_VIEW (15) {
// backward compatibility for TbOriginatorTypeSwitchNode to return correct rule node connection. // backward compatibility for TbOriginatorTypeSwitchNode to return correct rule node connection.
@Override @Override
public String getNormalName () { public String getNormalName () {
return "Entity View"; return "Entity View";
} }
}, },
WIDGETS_BUNDLE (15), WIDGETS_BUNDLE (16),
WIDGET_TYPE (16), WIDGET_TYPE (17),
TENANT_PROFILE (19), TENANT_PROFILE (20),
DEVICE_PROFILE (20), DEVICE_PROFILE (21),
ASSET_PROFILE (21), ASSET_PROFILE (22),
API_USAGE_STATE (22), API_USAGE_STATE (23),
TB_RESOURCE (23), TB_RESOURCE (24),
OTA_PACKAGE (24), OTA_PACKAGE (25),
EDGE (25), EDGE (26),
RPC (26), RPC (27),
QUEUE (27), QUEUE (28),
NOTIFICATION_TARGET (28), NOTIFICATION_TARGET (29),
NOTIFICATION_TEMPLATE (29), NOTIFICATION_TEMPLATE (30),
NOTIFICATION_REQUEST (30), NOTIFICATION_REQUEST (31),
NOTIFICATION (31), NOTIFICATION (32),
NOTIFICATION_RULE (32); NOTIFICATION_RULE (33);
@Getter @Getter
private final int protoNumber; // Corresponds to EntityTypeProto private final int protoNumber; // Corresponds to EntityTypeProto