From baa7492e99f6ef5acc551f7a6eff64072bf69a06 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 26 Jun 2023 15:52:46 +0300 Subject: [PATCH] =?UTF-8?q?utility-service=20http://jira.mfd.msk:8088/brow?= =?UTF-8?q?se/CLS-339=20Notification=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B5=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utility/service/NotificationService.java | 7 +++++-- .../cud/utilities/NotificationNewRequest.java | 20 +++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/NotificationService.java b/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/NotificationService.java index cc50660cb..a8cec87fb 100644 --- a/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/NotificationService.java +++ b/clearing-parent/utility-service/src/main/java/ru/spcex/clearing/utility/service/NotificationService.java @@ -81,8 +81,11 @@ public class NotificationService extends QueueConsumer implements InitializingBe notification.setObjectType(request.getObjectType()); notification.setObjectId(request.getObjectId()); notification.setNotificationStatus(PEND.getKey()); - notification.setCreated(Instant.now()); - notification.setUpdated(Instant.now()); + notification.setComment(request.getComment()); + notification.setPriority(request.getPriority()); + Instant now = Instant.now(); + notification.setCreated(now); + notification.setUpdated(now); return notification; } diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/NotificationNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/NotificationNewRequest.java index 88b57c4db..2711c0480 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/NotificationNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/NotificationNewRequest.java @@ -11,6 +11,10 @@ public class NotificationNewRequest { public String objectType; @JsonProperty public Long objectId; + @JsonProperty + public String comment; + @JsonProperty + public String priority; public Long getSenderId() { return senderId; @@ -43,4 +47,20 @@ public class NotificationNewRequest { public void setObjectId(Long objectId) { this.objectId = objectId; } + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public String getPriority() { + return priority; + } + + public void setPriority(String priority) { + this.priority = priority; + } }