From 5ba574af36ef80572e2c86bcf880ad0cd1e5acf0 Mon Sep 17 00:00:00 2001 From: dashevchenko Date: Tue, 20 Dec 2022 15:42:41 +0200 Subject: [PATCH] fixed pull request comments --- .../java/org/thingsboard/server/dao/alarm/AlarmCommentDao.java | 2 ++ .../thingsboard/server/dao/alarm/BaseAlarmCommentService.java | 3 +++ .../java/org/thingsboard/server/dao/model/ModelConstants.java | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmCommentDao.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmCommentDao.java index 04f2674d39..ff4c77bf7f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmCommentDao.java +++ b/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 createAlarmComment(TenantId tenantId, AlarmComment alarmComment); + void deleteAlarmComment(TenantId tenantId, AlarmCommentId alarmCommentId); AlarmComment findAlarmCommentById(TenantId tenantId, UUID key); diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmCommentService.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmCommentService.java index 1de9080a00..766cac8fbe 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmCommentService.java +++ b/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 alarmCommentDataValidator; + @Override public AlarmCommentOperationResult createOrUpdateAlarmComment(TenantId tenantId, AlarmComment alarmComment) { alarmCommentDataValidator.validate(alarmComment, tenantId); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java index bd462eb6b6..fc5c663d7c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java +++ b/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. */