From 2b4e189a547decd0e943d77988477b74cb686add Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 5 Sep 2023 11:38:49 +0300 Subject: [PATCH 1/3] StatementServiceV2 move to package --- .../clearing/service/StatementService.java | 1 + .../ru/spcex/clearing/statement/SdfGroup.java | 30 +++++++++++++++++++ .../StatementServiceV2.java | 22 ++------------ 3 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/statement/SdfGroup.java rename clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/{service => statement}/StatementServiceV2.java (93%) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementService.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementService.java index 05cc606ed..381f7bbcd 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementService.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementService.java @@ -21,6 +21,7 @@ import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; import ru.spcex.clearing.service.executors.AbstractExecutor; import ru.spcex.clearing.service.executors.Reviser; import ru.spcex.clearing.service.model.Result; +import ru.spcex.clearing.statement.StatementServiceV2; import ru.spcex.platform.classes.base.SpcexObjectBase; import ru.spcex.platform.enumeration.ObjectType; import ru.spcex.platform.enumeration.Priority; diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/statement/SdfGroup.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/statement/SdfGroup.java new file mode 100644 index 000000000..306c4fd35 --- /dev/null +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/statement/SdfGroup.java @@ -0,0 +1,30 @@ +package ru.spcex.clearing.statement; + +import ru.spcex.platform.enumeration.SdfTable; + +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Optional; + +public enum SdfGroup { + Sdf01And57(SdfTable.SDF_01, SdfTable.SDF_57), + Triple(SdfTable.SDF_04, SdfTable.SDF_01, SdfTable.SDF_57), + Quad(SdfTable.SDF_04, SdfTable.SDF_13, SdfTable.SDF_01, SdfTable.SDF_57), + Sdf08And21(SdfTable.SDF_08, SdfTable.SDF_21); + private final Collection group; + + SdfGroup(SdfTable... group) { + this.group = List.of(group); + } + + public Collection getGroup() { + return group; + } + + public static Optional groupByTable(SdfTable t) { + return Arrays.stream(SdfGroup.values()) + .filter(g -> g.getGroup().contains(t)) + .findFirst(); + } +} diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementServiceV2.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/statement/StatementServiceV2.java similarity index 93% rename from clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementServiceV2.java rename to clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/statement/StatementServiceV2.java index 9c2e79a81..bd5011878 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/StatementServiceV2.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/statement/StatementServiceV2.java @@ -1,4 +1,4 @@ -package ru.spcex.clearing.service; +package ru.spcex.clearing.statement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,6 +11,7 @@ import ru.spcex.clearing.platform.messaging.domain.Consts; import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdf01Request; import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest; import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; +import ru.spcex.clearing.service.StatementService; import ru.spcex.clearing.service.executors.*; import ru.spcex.clearing.service.model.Result; import ru.spcex.platform.enumeration.SdfTable; @@ -177,23 +178,4 @@ public class StatementServiceV2 { } } - private enum SdfGroup { - Sdf01And57(SdfTable.SDF_01, SdfTable.SDF_57), - Sdf08And21(SdfTable.SDF_08, SdfTable.SDF_21); - private final Collection group; - - SdfGroup(SdfTable... group) { - this.group = List.of(group); - } - - public Collection getGroup() { - return group; - } - - public static Optional groupByTable(SdfTable t) { - return Arrays.stream(SdfGroup.values()) - .filter(g -> g.getGroup().contains(t)) - .findFirst(); - } - } } From 25d8915647f5de03bc3fb74fd032e762a9a9c5f1 Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 5 Sep 2023 11:40:01 +0300 Subject: [PATCH 2/3] rollback SdfGroup --- .../src/main/java/ru/spcex/clearing/statement/SdfGroup.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/statement/SdfGroup.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/statement/SdfGroup.java index 306c4fd35..cf58dc1cb 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/statement/SdfGroup.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/statement/SdfGroup.java @@ -9,8 +9,8 @@ import java.util.Optional; public enum SdfGroup { Sdf01And57(SdfTable.SDF_01, SdfTable.SDF_57), - Triple(SdfTable.SDF_04, SdfTable.SDF_01, SdfTable.SDF_57), - Quad(SdfTable.SDF_04, SdfTable.SDF_13, SdfTable.SDF_01, SdfTable.SDF_57), +// Triple(SdfTable.SDF_04, SdfTable.SDF_01, SdfTable.SDF_57), +// Quad(SdfTable.SDF_04, SdfTable.SDF_13, SdfTable.SDF_01, SdfTable.SDF_57), Sdf08And21(SdfTable.SDF_08, SdfTable.SDF_21); private final Collection group; From 04f35dcdaa2530572806acd090e17dc39d06b662 Mon Sep 17 00:00:00 2001 From: ialbert Date: Tue, 5 Sep 2023 12:03:09 +0300 Subject: [PATCH 3/3] TaskType revise key fix --- .../src/main/java/ru/spcex/clearing/session/stage/TaskType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 142bca615..bf683b8d8 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 @@ -8,7 +8,7 @@ public enum TaskType implements IEnumKey { */ StartRevise("CLR0"), ContinueRevise("CLR 0_0"), - StartRevisePart1("CLR 0_9"), + StartRevisePart1("ะก0_1"), /** * step 1