diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java index f48985b07..48b5f3e9e 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java @@ -173,7 +173,11 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligations); } //stage 6 - runStage(TaskType.FormingRegistersOnOS, formingRegistersOnOS); //returns Collection + { + FormingRegistersOnOSPayload payload = new FormingRegistersOnOSPayload(); + payload.setSessionId(currSession.getId()); + runStage(TaskType.FormingRegistersOnOS, payload, formingRegistersOnOS); //returns Collection + } //stage 7 StageResult> returnsPayment = null; diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java index a849f072c..cf46e742c 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java @@ -157,8 +157,11 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ companyIdPayload.setProcessedCompanyId(currSession.getCompanyId()); runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligations); } - //stage 6 - runStage(TaskType.FormingRegistersOnOS, formingRegistersOnOS); //returns Collection + { + FormingRegistersOnOSPayload payload = new FormingRegistersOnOSPayload(); + payload.setSessionId(currSession.getId()); + runStage(TaskType.FormingRegistersOnOS, payload, formingRegistersOnOS); //returns Collection + } //stage 7 StageResult> paymentResult = null; { diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java index 7cd20d00e..4eb10af79 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java @@ -146,7 +146,11 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligations); } //stage 6 - runStage(TaskType.FormingRegistersOnOS, formingRegistersOnOS); //returns Collection + { + FormingRegistersOnOSPayload payload = new FormingRegistersOnOSPayload(); + payload.setSessionId(currSession.getId()); + runStage(TaskType.FormingRegistersOnOS, payload, formingRegistersOnOS); //returns Collection + } //stage 7 StageResult> paymentResult = null; { diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java index bbb266ff3..13b5d48b3 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java @@ -146,7 +146,11 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligations); } //stage 6 - runStage(TaskType.FormingRegistersOnOS, formingRegistersOnOS); //returns Collection + { + FormingRegistersOnOSPayload payload = new FormingRegistersOnOSPayload(); + payload.setSessionId(currSession.getId()); + runStage(TaskType.FormingRegistersOnOS, payload, formingRegistersOnOS); //returns Collection + } StageResult> paymentResult = null; { FormingPaymentInstructionPayload payload = new FormingPaymentInstructionPayload(); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java index b0cd84a8a..6393e37fe 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java @@ -145,7 +145,11 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligations); } //stage 6 - runStage(TaskType.FormingRegistersOnOS, formingRegistersOnOS); //returns Collection + { + FormingRegistersOnOSPayload payload = new FormingRegistersOnOSPayload(); + payload.setSessionId(currSession.getId()); + runStage(TaskType.FormingRegistersOnOS, payload, formingRegistersOnOS); //returns Collection + } //stage 7 StageResult> paymentResult = null; { diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java index 52804cc64..34e881296 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java @@ -134,7 +134,11 @@ public class ReturnDepositSession extends AbstractSession implements Initializin } //stage 6 - runStage(TaskType.FormingRegistersOnOS, formingRegistersOnOS); //returns Collection + { + FormingRegistersOnOSPayload payload = new FormingRegistersOnOSPayload(); + payload.setSessionId(currSession.getId()); + runStage(TaskType.FormingRegistersOnOS, payload, formingRegistersOnOS); //returns Collection + } StageResult> paymentResult = null; { FormingPaymentInstructionPayload payload = new FormingPaymentInstructionPayload(); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java index e76040d5e..ef0a1414b 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java @@ -146,7 +146,11 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligations); } //stage 6 - runStage(TaskType.FormingRegistersOnOS, formingRegistersOnOS); //returns Collection + { + FormingRegistersOnOSPayload payload = new FormingRegistersOnOSPayload(); + payload.setSessionId(currSession.getId()); + runStage(TaskType.FormingRegistersOnOS, payload, formingRegistersOnOS); //returns Collection + } //stage 7 StageResult> paymentResult = null; { diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingRegistersOnOS.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingRegistersOnOS.java index 11e9cb01d..697a6bbf8 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingRegistersOnOS.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingRegistersOnOS.java @@ -45,7 +45,7 @@ public class FormingRegistersOnOS implements ISessionStage { FormingRegistersOnOSPayload payload = (FormingRegistersOnOSPayload) task.getData(); switch (task.getTaskType()) { case FormingRegistersOnOS -> { - return createRegistryOnObligationsAndSettlementRequirements(); + return createRegistryOnObligationsAndSettlementRequirements(payload.getSessionId()); } default -> { throw new IllegalStateException("Unknown task type: " + task.getTaskType()); @@ -57,19 +57,21 @@ public class FormingRegistersOnOS implements ISessionStage { * Select Registry by: registryCode = [O/T][S/M][*][T] & registryStatus=OK * * @return + * @param sessionId */ - protected Collection selectRegistry() { + protected Collection selectRegistry(Long sessionId) { String registrySQL = "(registryDesignation=" + RegistryDesignation.O.getKey() + " or registryDesignation=" + RegistryDesignation.T.getKey() + ")"; registrySQL += " and (registryInstrumentType=" + RegistryInstrumentType.S.getKey() + " or registryInstrumentType=" + RegistryInstrumentType.M.getKey() + ")"; registrySQL += " and (registryUnit=" + RegistryUnit.T.getKey() + ")"; registrySQL += " and registryStatus=" + RegistryStatus.OK.getKey() + ")"; + registrySQL += " and sessionId=" + sessionId; Collection result = registryImdg.getCollectionObjectsBySQL(registrySQL); log.trace("Selected {} registry's by sql: {}", result.size(), registrySQL); return result; } - protected StageResult createRegistryOnObligationsAndSettlementRequirements() { - Collection forRegistries = selectRegistry(); + protected StageResult createRegistryOnObligationsAndSettlementRequirements(Long sessionId) { + Collection forRegistries = selectRegistry(sessionId); ArrayList newRegistries = new ArrayList<>(); //todo oreder by обрабатываться группами по полю registry.groupId diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/task/FormingRegistersOnOSPayload.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/task/FormingRegistersOnOSPayload.java index c09807ebb..3693dba46 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/task/FormingRegistersOnOSPayload.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/task/FormingRegistersOnOSPayload.java @@ -1,5 +1,13 @@ package ru.spcex.clearing.session.stage.task; public class FormingRegistersOnOSPayload { + private Long sessionId; + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } }