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

refactoring

Browse Source
This commit is contained in:
dashevchenko 2023-01-13 16:37:13 +02:00
parent 2253933250
commit 0a6d227364
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmOperationResult.java
View File

@ -15,6 +15,7 @@
*/ */
package org.thingsboard.server.dao.alarm; package org.thingsboard.server.dao.alarm;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import org.thingsboard.server.common.data.alarm.Alarm; import org.thingsboard.server.common.data.alarm.Alarm;
import org.thingsboard.server.common.data.alarm.AlarmSeverity; import org.thingsboard.server.common.data.alarm.AlarmSeverity;
@ -24,6 +25,7 @@ import java.util.Collections;
import java.util.List; import java.util.List;
@Data @Data
@AllArgsConstructor
public class AlarmOperationResult { public class AlarmOperationResult {
private final Alarm alarm; private final Alarm alarm;
private final boolean successful; private final boolean successful;
@ -38,12 +40,4 @@ public class AlarmOperationResult {
public AlarmOperationResult(Alarm alarm, boolean successful, List<EntityId> propagatedEntitiesList) { public AlarmOperationResult(Alarm alarm, boolean successful, List<EntityId> propagatedEntitiesList) {
this(alarm, successful, false, null, propagatedEntitiesList); this(alarm, successful, false, null, propagatedEntitiesList);
} }
public AlarmOperationResult(Alarm alarm, boolean successful, boolean created, AlarmSeverity oldSeverity, List<EntityId> propagatedEntitiesList) {
this.alarm = alarm;
this.successful = successful;
this.created = created;
this.oldSeverity = oldSeverity;
this.propagatedEntitiesList = propagatedEntitiesList;
}
} }

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

@ -107,9 +107,8 @@ public class BaseAlarmCommentService extends AbstractEntityService implements Al
if (existing != null) { if (existing != null) {
if (newAlarmComment.getComment() != null) { if (newAlarmComment.getComment() != null) {
JsonNode comment = newAlarmComment.getComment(); JsonNode comment = newAlarmComment.getComment();
UUID uuid = Uuids.timeBased();
((ObjectNode) comment).put("edited", "true"); ((ObjectNode) comment).put("edited", "true");
((ObjectNode) comment).put("editedOn", Uuids.unixTimestamp(uuid)); ((ObjectNode) comment).put("editedOn", System.currentTimeMillis());
existing.setComment(comment); existing.setComment(comment);
} }
return alarmCommentDao.save(tenantId, existing); return alarmCommentDao.save(tenantId, existing);