From d81c4b7040ece72eddfa5e4437be8c250cce73dd Mon Sep 17 00:00:00 2001 From: ialbert Date: Fri, 25 Aug 2023 17:45:57 +0300 Subject: [PATCH] sdf20, sdf21 --- .../ru/spcex/clearing/service/executors/Sdf20Executor.java | 5 +++-- .../clearing/service/validation/Sdf21ValidationRule.java | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf20Executor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf20Executor.java index 3feebd8ac..4c787ed4d 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf20Executor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/executors/Sdf20Executor.java @@ -115,15 +115,16 @@ public class Sdf20Executor { rgsImdg.insert(assets.a__b()); } if (ds_t == null) { - log.debug("DS*T were not found for sdf20.id={} creating", sDf20.getId()); ds_t = assets.a__t().clone(); RegistryManager.zeroState(ds_t); ds_t.setBalance(quantity); ds_t.setRegistryDesignation(RegistryDesignation.D.getKey()); ds_t.setRegistryCode(RegistryUtil.clearingCode(ds_t)); rgsImdg.insert(ds_t); + log.debug("created DS*T.id={} for sdf20.id={}", ds_t.getId(), sDf20.getId()); } else { - log.debug("DS*T.id={} found for sdf20.id={}", ds_t.getId(), sDf20.getId()); + //защита от повторной обработки + log.debug("DS*T.id={} found for sdf20.id={}. skipping sdf20", ds_t.getId(), sDf20.getId()); return; } Registry as_t = assets.a__t(); diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf21ValidationRule.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf21ValidationRule.java index 233805996..63c6ac97b 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf21ValidationRule.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/validation/Sdf21ValidationRule.java @@ -1,5 +1,7 @@ package ru.spcex.clearing.service.validation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import ru.clearing.classes.statics.data.account.Account; import ru.clearing.classes.statics.data.registry.Registry; import ru.clearing.classes.statics.data.sdf.SDf21; @@ -58,12 +60,13 @@ public enum Sdf21ValidationRule implements IValidationRule