Browse Source

Added check - does assigned information available

pull/8102/head
zbeacon 4 years ago
parent
commit
0427eeea9d
  1. 1
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmAssignee.java
  2. 6
      dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmInfoEntity.java

1
common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmAssignee.java

@ -15,7 +15,6 @@
*/
package org.thingsboard.server.common.data.alarm;
import lombok.Builder;
import lombok.Data;
import org.thingsboard.server.common.data.id.UserId;

6
dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmInfoEntity.java

@ -28,8 +28,6 @@ import javax.persistence.Table;
import static org.thingsboard.server.dao.model.ModelConstants.ALARM_ASSIGNEE_EMAIL_PROPERTY;
import static org.thingsboard.server.dao.model.ModelConstants.ALARM_ASSIGNEE_FIRST_NAME_PROPERTY;
import static org.thingsboard.server.dao.model.ModelConstants.ALARM_ASSIGNEE_LAST_NAME_PROPERTY;
import static org.thingsboard.server.dao.model.ModelConstants.ALARM_COLUMN_FAMILY_NAME;
import static org.thingsboard.server.dao.model.ModelConstants.ALARM_CUSTOMER_ID_PROPERTY;
import static org.thingsboard.server.dao.model.ModelConstants.ALARM_ORIGINATOR_LABEL_PROPERTY;
import static org.thingsboard.server.dao.model.ModelConstants.ALARM_ORIGINATOR_NAME_PROPERTY;
import static org.thingsboard.server.dao.model.ModelConstants.ALARM_VIEW_NAME;
@ -70,7 +68,9 @@ public class AlarmInfoEntity extends AbstractAlarmEntity<AlarmInfo> {
AlarmInfo alarmInfo = new AlarmInfo(super.toAlarm());
alarmInfo.setOriginatorName(originatorName);
alarmInfo.setOriginatorLabel(originatorLabel);
alarmInfo.setAssignee(new AlarmAssignee(new UserId(getAssigneeId()), assigneeFirstName, assigneeLastName, assigneeEmail));
if (getAssigneeId() != null) {
alarmInfo.setAssignee(new AlarmAssignee(new UserId(getAssigneeId()), assigneeFirstName, assigneeLastName, assigneeEmail));
}
return alarmInfo;
}
}

Loading…
Cancel
Save