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

Added alarm id for future needs

Browse Source
This commit is contained in:
Volodymyr Babak 2021-08-04 09:45:16 +03:00
parent 7d1a849047
commit 5557406f07
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/AlarmMsgConstructor.java
View File

@ -58,6 +58,8 @@ public class AlarmMsgConstructor {
} }
AlarmUpdateMsg.Builder builder = AlarmUpdateMsg.newBuilder() AlarmUpdateMsg.Builder builder = AlarmUpdateMsg.newBuilder()
.setMsgType(msgType) .setMsgType(msgType)
.setIdMSB(alarm.getId().getId().getMostSignificantBits())
.setIdLSB(alarm.getId().getId().getLeastSignificantBits())
.setName(alarm.getName()) .setName(alarm.getName())
.setType(alarm.getType()) .setType(alarm.getType())
.setOriginatorName(entityName) .setOriginatorName(entityName)

1
application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AlarmEdgeProcessor.java
View File

@ -54,6 +54,7 @@ public class AlarmEdgeProcessor extends BaseEdgeProcessor {
EntityId originatorId = getAlarmOriginator(tenantId, alarmUpdateMsg.getOriginatorName(), EntityId originatorId = getAlarmOriginator(tenantId, alarmUpdateMsg.getOriginatorName(),
EntityType.valueOf(alarmUpdateMsg.getOriginatorType())); EntityType.valueOf(alarmUpdateMsg.getOriginatorType()));
if (originatorId == null) { if (originatorId == null) {
log.warn("Originator not found for the alarm msg {}", alarmUpdateMsg);
return Futures.immediateFuture(null); return Futures.immediateFuture(null);
} }
try { try {

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

@ -250,18 +250,20 @@ message EntityViewUpdateMsg {
message AlarmUpdateMsg { message AlarmUpdateMsg {
UpdateMsgType msgType = 1; UpdateMsgType msgType = 1;
string name = 2; int64 idMSB = 2;
string type = 3; int64 idLSB = 3;
string originatorType = 4; string name = 4;
string originatorName = 5; string type = 5;
string severity = 6; string originatorType = 6;
string status = 7; string originatorName = 7;
int64 startTs = 8; string severity = 8;
int64 endTs = 9; string status = 9;
int64 ackTs = 10; int64 startTs = 10;
int64 clearTs = 11; int64 endTs = 11;
string details = 12; int64 ackTs = 12;
bool propagate = 13; int64 clearTs = 13;
string details = 14;
bool propagate = 15;
} }
message CustomerUpdateMsg { message CustomerUpdateMsg {