Browse Source

fixed pull request comments

pull/7762/head
dashevchenko 4 years ago
parent
commit
5ba574af36
  1. 2
      dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmCommentDao.java
  2. 3
      dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmCommentService.java
  3. 1
      dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java

2
dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmCommentDao.java

@ -28,7 +28,9 @@ import org.thingsboard.server.dao.Dao;
import java.util.UUID;
public interface AlarmCommentDao extends Dao<AlarmComment> {
AlarmComment createAlarmComment(TenantId tenantId, AlarmComment alarmComment);
void deleteAlarmComment(TenantId tenantId, AlarmCommentId alarmCommentId);
AlarmComment findAlarmCommentById(TenantId tenantId, UUID key);

3
dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmCommentService.java

@ -48,10 +48,13 @@ public class BaseAlarmCommentService extends AbstractEntityService implements Al
@Autowired
private AlarmCommentDao alarmCommentDao;
@Autowired
private UserService userService;
@Autowired
private DataValidator<AlarmComment> alarmCommentDataValidator;
@Override
public AlarmCommentOperationResult createOrUpdateAlarmComment(TenantId tenantId, AlarmComment alarmComment) {
alarmCommentDataValidator.validate(alarmComment, tenantId);

1
dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java

@ -305,7 +305,6 @@ public class ModelConstants {
public static final String ALARM_COMMENT_TYPE = "type";
public static final String ALARM_COMMENT_COMMENT = "comment";
/**
* Cassandra entity relation constants.
*/

Loading…
Cancel
Save