From 343497b5566e43619c9f5298a42904aaa88eed25 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 22 May 2023 13:35:23 +0300 Subject: [PATCH] =?UTF-8?q?clearing-service=20http://jira.mfd.msk:8088/bro?= =?UTF-8?q?wse/CLS-290=20stage=2010/11=20=D0=BC=D0=B5=D0=BB=D0=BE=D1=87?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clearing/session/stage/TaskType.java | 5 ++++ .../stage/impl/EndStageNotification.java | 2 +- .../stage/task/FinishingSessionPayload.java | 13 ++++++++++ .../platform/enumeration/SessionStatus.java | 26 +++++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/task/FinishingSessionPayload.java create mode 100644 platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/SessionStatus.java diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/TaskType.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/TaskType.java index a6a3bac15..47d060511 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/TaskType.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/TaskType.java @@ -37,6 +37,11 @@ public enum TaskType { + /** + * Step 10 + */ + FinishingSession, + /** * Step 11 */ diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/EndStageNotification.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/EndStageNotification.java index ef76991c9..ad6481639 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/EndStageNotification.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/EndStageNotification.java @@ -54,7 +54,7 @@ public class EndStageNotification implements ISessionStage { } protected Collection selectRegistry() { - String registrySQL = "registryStatus=" + RegistryStatus.OK.getKey() + ")"; + String registrySQL = "registryStatus='" + RegistryStatus.OK.getKey() + "'"; Collection result = registryImdg.getCollectionObjectsBySQL(registrySQL); log.trace("Selected {} registry's by sql: {}", result.size(), registrySQL); return result; diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/task/FinishingSessionPayload.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/task/FinishingSessionPayload.java new file mode 100644 index 000000000..9842cdc30 --- /dev/null +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/task/FinishingSessionPayload.java @@ -0,0 +1,13 @@ +package ru.spcex.clearing.session.stage.task; + +public class FinishingSessionPayload { + private Long sessionId; + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } +} diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/SessionStatus.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/SessionStatus.java new file mode 100644 index 000000000..9f1c34986 --- /dev/null +++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/SessionStatus.java @@ -0,0 +1,26 @@ +package ru.spcex.platform.enumeration; + +import ru.spcex.platform.utils.enumeration.IEnumKey; + +public enum SessionStatus implements IEnumKey { + ACTV("ACTV"), + CLRN("CLRN"), + CLOS("CLOS"); + + + SessionStatus(String key) { + this.key = key; + } + + private String key; + + @Override + public String getKey() { + return this.key; + } + + @Override + public boolean equalsByKey(String key) { + return IEnumKey.super.equalsByKey(key); + } +}