From d91383b4e5ed2d39cc580610b2b4271f0bbec4d8 Mon Sep 17 00:00:00 2001 From: ialbert Date: Fri, 30 Jun 2023 18:04:35 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=81=D0=B5=D1=81=D1=81=D0=B8=D1=8F=20=D0=9C?= =?UTF-8?q?=D0=9A=D0=A0=20=D1=87=D0=B0=D1=81=D1=82=D1=8C=205=20=D1=88?= =?UTF-8?q?=D0=B0=D0=B3=D0=B0=20=D0=BF=D0=BE=20=D1=81=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=BA=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clearing/session/stage/FinalMkrSession.java | 12 ++++++++---- .../impl/FormingPaymentInstructionDealsFinalMkr.java | 8 ++++---- .../impl/InspectionObligationsDepositReturn.java | 8 ++++---- 3 files changed, 16 insertions(+), 12 deletions(-) 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 1a396e0a2..cc4c20f1b 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 @@ -38,7 +38,8 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean private final ObligationAdmission obligationsAdmission; private final InclusionObligations inclusionObligations; - private final InspectionObligationsDepositReturn inspectionObligations; + private final InspectionObligationsDepositReturn inspectionObligationsReturn; + private final InspectionObligations inspectionObligations; private final FormingRegistersOnOS formingRegistersOnOS; private final FormingPaymentInstructionReturnMkr formingPaymentInstructionReturn; private final FormingPaymentInstructionDealsFinalMkr formingPaymentInstructionDeals; @@ -58,13 +59,13 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean RequirementsAndObligationCreation requirementsAndObligationCreation, ObligationAdmission obligationsAdmission, InclusionObligations inclusionObligations, - FormingRegistersOnOS formingRegistersOnOS, + InspectionObligations inspectionObligations, FormingRegistersOnOS formingRegistersOnOS, FormingPaymentInstructionReturnMkr formingPaymentInstructionReturn, FormingPaymentInstructionDealsFinalMkr formingPaymentInstructionDeals, UnlockResources unlockResources, FinishingSession finishingSession, EndStageNotification endStageNotification, IMessageResolver messageResolver, - InspectionObligationsDepositReturn inspectionObligations, + InspectionObligationsDepositReturn inspectionObligationsReturn, @Qualifier("marketCodesForBn") Supplier> marketCodes) { super(imdgProvider, messageResolver); this.balanceRevise = balanceRevise; @@ -72,6 +73,7 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean this.requirementsAndObligationCreation = requirementsAndObligationCreation; this.obligationsAdmission = obligationsAdmission; this.inclusionObligations = inclusionObligations; + this.inspectionObligations = inspectionObligations; this.formingRegistersOnOS = formingRegistersOnOS; this.formingPaymentInstructionReturn = formingPaymentInstructionReturn; this.formingPaymentInstructionDeals = formingPaymentInstructionDeals; @@ -79,7 +81,7 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean this.finishingSession = finishingSession; this.endStageNotification = endStageNotification; this.executionDepositImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_ExecutionDeposit, ExecutionDeposit.class); - this.inspectionObligations = inspectionObligations; + this.inspectionObligationsReturn = inspectionObligationsReturn; this.marketCodes = marketCodes; this.registryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Registry, Registry.class); } @@ -98,6 +100,7 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean rgsPrctBuilder.lessEqual("valueDate", LocalDate.now()) ) ); + inspectionObligationsReturn.setSessionType(sessionType()); inspectionObligations.setSessionType(sessionType()); imdgProvider.waitAvailable(); initSessionIfPresent(); @@ -170,6 +173,7 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean { InspectionPoolPayload companyIdPayload = new InspectionPoolPayload(); companyIdPayload.setProcessedCompanyId(currSession.getCompanyId()); + runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligationsReturn); runStage(TaskType.InspectionObligations, companyIdPayload, inspectionObligations); } //stage 6 diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionDealsFinalMkr.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionDealsFinalMkr.java index dc7edf0ad..efd2ce8e8 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionDealsFinalMkr.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/FormingPaymentInstructionDealsFinalMkr.java @@ -131,7 +131,7 @@ public class FormingPaymentInstructionDealsFinalMkr implements ISessionStage { .stream() .collect(Collectors.groupingBy(Registry::getGroupId)); log.debug("groups.size = {}", groups.size()); - List allPaymentInstructions = new ArrayList<>(); + List paymentInstructionDeals = new ArrayList<>(); for (Map.Entry> group : groups.entrySet()) { Long groupId = group.getKey(); Function findByCode = rgsCode -> group.getValue() @@ -192,7 +192,7 @@ public class FormingPaymentInstructionDealsFinalMkr implements ISessionStage { .build(); Pair.forEach(pmtInstrs, pmtInstr -> { paymentInstructionImdg.insert(pmtInstr); - allPaymentInstructions.add(pmtInstr); + paymentInstructionDeals.add(pmtInstr); }); log.trace("generated PaymentInstructions for groupId {}: pmtInstr1.id={} pmtInstr2.id={}", groupId, @@ -202,8 +202,8 @@ public class FormingPaymentInstructionDealsFinalMkr implements ISessionStage { log.debug("PaymentInstructions return size {}, PaymentInstructions deals size {}. sending SDF03", paymentInstructionReturns.size(), - allPaymentInstructions.size()); - List returnsAndDeals = Stream.concat(paymentInstructionReturns.stream(), allPaymentInstructions.stream()).toList(); + paymentInstructionDeals.size()); + List returnsAndDeals = Stream.concat(paymentInstructionReturns.stream(), paymentInstructionDeals.stream()).toList(); sendSdfs(returnsAndDeals); StageResult> stageResult = new StageResult<>(null, true); stageResult.setStageResult(returnsAndDeals); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java index 46eadf2dd..d1d1384f8 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/InspectionObligationsDepositReturn.java @@ -105,7 +105,7 @@ public class InspectionObligationsDepositReturn implements ISessionStage { Optional omtInGroupO = group.stream().filter(registry -> equalByRgs(OM_T, registry)).findFirst(); if (omtInGroupO.isEmpty()) { log.error("groupId {} failed to find OM*T registry", entry.getKey()); - group.forEach(rgs -> updateStatus(rgs, RegistryStatus.MNG)); + group.forEach(rgs -> updateStatus(rgs, registryStatusForDmxCheckFailed())); continue; } Registry omtRgs = omtInGroupO.get(); @@ -139,7 +139,7 @@ public class InspectionObligationsDepositReturn implements ISessionStage { Optional amfAssetO = searchAssetByOMT(omtRgs); if (amfAssetO.isEmpty()) { log.error("OM*T register.id={} groupId={} failed to find AM*F asset", omtRgs.getId(), entry.getKey()); - group.forEach(rgs -> updateStatus(rgs, RegistryStatus.MNG)); + group.forEach(rgs -> updateStatus(rgs, registryStatusForDmxCheckFailed())); continue; } @@ -157,7 +157,7 @@ public class InspectionObligationsDepositReturn implements ISessionStage { if (dmtBalance.compareTo(omtBalance) >= 0 && amfBalance.compareTo(omtBalance) >=0) { group.forEach(rgs -> updateStatus(rgs, RegistryStatus.OK)); } else { - group.forEach(rgs -> updateStatus(rgs, RegistryStatus.MNG)); + group.forEach(rgs -> updateStatus(rgs, registryStatusForDmxCheckFailed())); } continue; } @@ -172,7 +172,7 @@ public class InspectionObligationsDepositReturn implements ISessionStage { if (dmtBalance.compareTo(omtBalance) >= 0 && amfBalance.compareTo(omtBalance) >= 0) { group.forEach(rgs -> updateStatus(rgs, RegistryStatus.OK)); } else { - group.forEach(rgs -> updateStatus(rgs, RegistryStatus.MNG)); + group.forEach(rgs -> updateStatus(rgs, registryStatusForDmxCheckFailed())); } continue; }