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

pull request comments

Browse Source
This commit is contained in:
dashevchenko 2022-12-20 15:37:37 +02:00
parent 955369a7f1
commit df31723f58
4 changed files with 13 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCommentInfo.java
View File

@ -17,15 +17,19 @@ package org.thingsboard.server.common.data.alarm;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ApiModel
@Data
@EqualsAndHashCode(callSuper = true)
public class AlarmCommentInfo extends AlarmComment {
private static final long serialVersionUID = 2807343093519543377L;
@ApiModelProperty(position = 19, value = "User name", example = "John")
@ApiModelProperty(position = 19, value = "User first name", example = "John")
private String firstName;
@ApiModelProperty(position = 19, value = "User name", example = "Brown")
@ApiModelProperty(position = 19, value = "User last name", example = "Brown")
private String lastName;
public AlarmCommentInfo() {
@ -41,52 +45,4 @@ public class AlarmCommentInfo extends AlarmComment {
this.firstName = firstName;
this.lastName = lastName;
}
public String getFirstName() {
return firstName;
}
public void setFirstName(String firstName) {
this.firstName = firstName;
}
public String getLastName() {
return lastName;
}
public void setLastName(String lastName) {
this.lastName = lastName;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (!super.equals(o)) return false;
AlarmCommentInfo alarmCommentInfo = (AlarmCommentInfo) o;
if (firstName == null) {
if (alarmCommentInfo.firstName != null)
return false;
} else if (!firstName.equals(alarmCommentInfo.firstName))
return false;
if (lastName == null) {
if (alarmCommentInfo.lastName != null)
return false;
} else if (!lastName.equals(alarmCommentInfo.lastName))
return false;
return true;
}
@Override
public int hashCode() {
int result = super.hashCode();
result = 31 * result + (firstName != null ? firstName.hashCode() : 0);
result = 31 * result + (lastName != null ? lastName.hashCode() : 0);
return result;
}
}

2
common/data/src/main/java/org/thingsboard/server/common/data/id/AlarmCommentId.java
View File

@ -26,7 +26,7 @@ import java.util.UUID;
@ApiModel
public class AlarmCommentId extends UUIDBased implements EntityId{
private static final long serialVersionUID = 2L;
private static final long serialVersionUID = 1L;
@JsonCreator
public AlarmCommentId(@JsonProperty("id") UUID id) {

6
dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmCommentService.java
View File

@ -63,7 +63,6 @@ public class BaseAlarmCommentService extends AbstractEntityService implements Al
}
@Override
@Transactional
public AlarmCommentOperationResult deleteAlarmComment(TenantId tenantId, AlarmCommentId alarmCommentId) {
log.debug("Deleting Alarm Comment with id: {}", alarmCommentId);
AlarmCommentOperationResult result = new AlarmCommentOperationResult(new AlarmComment(), true);
@ -73,13 +72,14 @@ public class BaseAlarmCommentService extends AbstractEntityService implements Al
@Override
public PageData<AlarmCommentInfo> findAlarmComments(TenantId tenantId, AlarmId alarmId, PageLink pageLink) {
log.trace("Executing findAlarmComments by alarmId [{}]", alarmId);
return alarmCommentDao.findAlarmComments(tenantId, alarmId, pageLink);
}
@Override
public ListenableFuture<AlarmComment> findAlarmCommentByIdAsync(TenantId tenantId, AlarmCommentId alarmCommentId) {
log.trace("Executing findAlarmCommentByIdAsync [{}]", alarmCommentId);
validateId(alarmCommentId, "Incorrect alarmId " + alarmCommentId);
log.trace("Executing findAlarmCommentByIdAsync by alarmCommentId [{}]", alarmCommentId);
validateId(alarmCommentId, "Incorrect alarmCommentId " + alarmCommentId);
return alarmCommentDao.findAlarmCommentByIdAsync(tenantId, alarmCommentId.getId());
}

4
dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmCommentDao.java
View File

@ -69,18 +69,20 @@ public class JpaAlarmCommentDao extends JpaAbstractDao<AlarmCommentEntity, Alarm
@Override
public PageData<AlarmCommentInfo> findAlarmComments(TenantId tenantId, AlarmId id, PageLink pageLink){
log.trace("Try to find alarm comments by alard id using [{}]", id);
log.trace("Try to find alarm comments by alarm id using [{}]", id);
return DaoUtil.toPageData(
alarmCommentRepository.findAllByAlarmId(id.getId(), DaoUtil.toPageable(pageLink)));
}
@Override
public AlarmComment findAlarmCommentById(TenantId tenantId, UUID key) {
log.trace("Try to find alarm comment by id using [{}]", key);
return DaoUtil.getData(alarmCommentRepository.findById(key));
}
@Override
public ListenableFuture<AlarmComment> findAlarmCommentByIdAsync(TenantId tenantId, UUID key) {
log.trace("Try to find alarm comment by id using [{}]", key);
return findByIdAsync(tenantId, key);
}