treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-851

Browse source
This commit is contained in:
etreschenkov 2025-06-03 11:39:48 +03:00
parent 28b5ef8b4b
commit 4099d3d1c0
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/DigitalSecurityRequestAdapter.java
View file

@ -27,15 +27,19 @@ public class DigitalSecurityRequestAdapter {
gatewayRequest.setSettlementOrganization(digitalCertificate.getSettlementOrganization()); gatewayRequest.setSettlementOrganization(digitalCertificate.getSettlementOrganization());
gatewayRequest.setSettlementDepository(digitalCertificate.getSettlementDepository()); gatewayRequest.setSettlementDepository(digitalCertificate.getSettlementDepository());
Optional<DigitalNominal> digitalNominal = digitalCertificate.getNominal().stream() if (digitalCertificate.getTypeCode().equals("U")) {
.filter( gatewayRequest.setNominalDenominationUnitForDate(digitalCertificate.getUcp().getDenominationUnitBase());
nominal -> nominal.getIndexDate().isEqual(LocalDate.now())) } else {
.findFirst(); Optional<DigitalNominal> digitalNominal = digitalCertificate.getNominal().stream()
digitalNominal.ifPresent(nominal -> { .filter(
gatewayRequest.setNominalIndexDate(nominal.getIndexDate()); nominal -> nominal.getIndexDate().isEqual(LocalDate.now()))
gatewayRequest.setNominalDenominationUnitForDate(nominal.getDenominationUnitForDate()); .findFirst();
gatewayRequest.setNominalIndexFact(nominal.getIndexFact()); digitalNominal.ifPresent(nominal -> {
}); gatewayRequest.setNominalIndexDate(nominal.getIndexDate());
gatewayRequest.setNominalDenominationUnitForDate(nominal.getDenominationUnitForDate());
gatewayRequest.setNominalIndexFact(nominal.getIndexFact());
});
}
return gatewayRequest; return gatewayRequest;
} }
} }

2
clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/config/validation/ValidationConfig.java
View file

@ -5,6 +5,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import ru.clearing.classes.statics.data.company.Company; import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.statics.data.misc.ValidationSymbols;
import ru.clearing.classes.statics.data.scheduler.ClearingCalendar; import ru.clearing.classes.statics.data.scheduler.ClearingCalendar;
import ru.clearing.classes.statics.data.scheduler.Planner; import ru.clearing.classes.statics.data.scheduler.Planner;
import ru.clearing.classes.statics.data.scheduler.PlannerTemplate; import ru.clearing.classes.statics.data.scheduler.PlannerTemplate;
@ -43,6 +44,7 @@ public class ValidationConfig {
addImdg.accept(IMDGDistributedNames.Map_Security, Security.class); addImdg.accept(IMDGDistributedNames.Map_Security, Security.class);
addImdg.accept(IMDGDistributedNames.Map_DayStatusDictionary, DayStatusDictionary.class); addImdg.accept(IMDGDistributedNames.Map_DayStatusDictionary, DayStatusDictionary.class);
addImdg.accept(IMDGDistributedNames.Map_SessionTypeDictionary, SessionTypeDictionary.class); addImdg.accept(IMDGDistributedNames.Map_SessionTypeDictionary, SessionTypeDictionary.class);
addImdg.accept(IMDGDistributedNames.Map_ValidationSymbols, ValidationSymbols.class);
return imdg; return imdg;
} }