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

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

Browse source
This commit is contained in:
Aleksey Kulikov 2025-05-21 14:22:40 +03:00
parent 7f46dc5b4f
commit 89fe02d557
3 changed files with 11 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/DigitalCertificateSecurityService.java
View file

@ -27,7 +27,6 @@ import ru.spcex.platform.enumeration.WorkflowStatus;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgId; import ru.spcex.platform.imdg.api.ImdgId;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.imdg.api.ImdgTransaction;
import ru.spcex.platform.utils.error.ValidationException; import ru.spcex.platform.utils.error.ValidationException;
@Service @Service
@ -79,7 +78,7 @@ public class DigitalCertificateSecurityService extends QueueConsumer implements
try { try {
userRoleVerification.validateRoleAndThrow(userRequest); userRoleVerification.validateRoleAndThrow(userRequest);
DigitalCertificateSecurity digitalCertificateSecurity = newDigitalCertificate0(userRequest.getRequestPayload()); DigitalCertificateSecurity digitalCertificateSecurity = newDigitalCertificate0(userRequest.getRequestPayload());
log.debug("successfully processed, request id {}, new object id {}", userRequest.getId(), digitalCertificateSecurity.getId()); log.debug("successfully processed, request id {}, new digital_certificate_security.id {}", userRequest.getId(), digitalCertificateSecurity.getId());
return null; return null;
} catch (ValidationException e) { } catch (ValidationException e) {
return requestHelper.makeErrorResponse(userRequest, e.getEnumMsg()); return requestHelper.makeErrorResponse(userRequest, e.getEnumMsg());
@ -116,15 +115,7 @@ public class DigitalCertificateSecurityService extends QueueConsumer implements
digitalCertificate.setNominalIndexationSign(req.getNominalIndexationSign()); digitalCertificate.setNominalIndexationSign(req.getNominalIndexationSign());
digitalCertificate.setSettlementHouse(req.getSettlementHouse()); digitalCertificate.setSettlementHouse(req.getSettlementHouse());
digitalCertificate.setDepository(req.getDepository()); digitalCertificate.setDepository(req.getDepository());
ImdgTransaction transaction = imdgProvider.newTransaction(); digitalCertificateSecurityImdg.insert(digitalCertificate);
try {
transaction.beginTransaction();
Imdg<DigitalCertificateSecurity> digitalCertificateImdg = transaction.getImdg(IMDGDistributedNames.Map_DigitalCertificateSecurity, DigitalCertificateSecurity.class);
digitalCertificateImdg.insert(digitalCertificate);
transaction.commitTransaction();
} catch (Throwable e) {
transaction.rollbackTransaction();
}
return digitalCertificate; return digitalCertificate;
} }
@ -133,7 +124,7 @@ public class DigitalCertificateSecurityService extends QueueConsumer implements
try { try {
userRoleVerification.validateRoleAndThrow(userRequest); userRoleVerification.validateRoleAndThrow(userRequest);
DigitalCertificateSecurity digitalCertificateSecurity = updateDigitalCertificate0(userRequest.getRequestPayload()); DigitalCertificateSecurity digitalCertificateSecurity = updateDigitalCertificate0(userRequest.getRequestPayload());
log.debug("successfully processed, request id {}, updated object id {}", userRequest.getId(), digitalCertificateSecurity.getId()); log.debug("successfully processed, request id {}, updated digital_certificate_security.id {}", userRequest.getId(), digitalCertificateSecurity.getId());
return null; return null;
} catch (ValidationException e) { } catch (ValidationException e) {
return requestHelper.makeErrorResponse(userRequest, e.getEnumMsg()); return requestHelper.makeErrorResponse(userRequest, e.getEnumMsg());
@ -165,9 +156,6 @@ public class DigitalCertificateSecurityService extends QueueConsumer implements
digitalCertificate.setNominalIndexationSign(req.getNominalIndexationSign()); digitalCertificate.setNominalIndexationSign(req.getNominalIndexationSign());
digitalCertificate.setSettlementHouse(req.getSettlementHouse()); digitalCertificate.setSettlementHouse(req.getSettlementHouse());
digitalCertificate.setDepository(req.getDepository()); digitalCertificate.setDepository(req.getDepository());
if (req.getWorkflowStatus() != null) {
digitalCertificate.setWorkflowStatus(req.getWorkflowStatus());
}
digitalCertificate.setInstrumentType(req.getInstrumentType()); digitalCertificate.setInstrumentType(req.getInstrumentType());
digitalCertificateSecurityImdg.update(digitalCertificate); digitalCertificateSecurityImdg.update(digitalCertificate);

7
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java
View file

@ -21,6 +21,7 @@ import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeCashFlow;
import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeSecurity; import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeSecurity;
import ru.clearing.classes.statics.data.misc.Listing; import ru.clearing.classes.statics.data.misc.Listing;
import ru.clearing.classes.statics.data.security.CurrencyPairSecurity; import ru.clearing.classes.statics.data.security.CurrencyPairSecurity;
import ru.clearing.classes.statics.data.security.DigitalCertificateSecurity;
import ru.clearing.classes.statics.data.security.MoneyMarketSecurity; import ru.clearing.classes.statics.data.security.MoneyMarketSecurity;
import ru.clearing.classes.statics.data.security.Security; import ru.clearing.classes.statics.data.security.Security;
import ru.clearing.platform.dictionary.CurrencyPairDictionary; import ru.clearing.platform.dictionary.CurrencyPairDictionary;
@ -73,6 +74,7 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin
private final Imdg<FixedIncomeSecurity> fixedIncomeSecurityImdg; private final Imdg<FixedIncomeSecurity> fixedIncomeSecurityImdg;
private final Imdg<EquitySecurity> equitySecurityImdg; private final Imdg<EquitySecurity> equitySecurityImdg;
private final Imdg<DigitalCertificateSecurity> digitalCertificateSecurityImdg;
private final Imdg<MoneyMarketSecurity> moneyMarketSecurityImdg; private final Imdg<MoneyMarketSecurity> moneyMarketSecurityImdg;
private final Imdg<CurrencyPairSecurity> currencyPairSecurityImdg; private final Imdg<CurrencyPairSecurity> currencyPairSecurityImdg;
private final Imdg<Listing> listingImdg; private final Imdg<Listing> listingImdg;
@ -121,6 +123,7 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin
this.validation = validation; this.validation = validation;
this.fixedIncomeSecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_FixedIncomeSecurity, FixedIncomeSecurity.class); this.fixedIncomeSecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_FixedIncomeSecurity, FixedIncomeSecurity.class);
this.equitySecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_EquitySecurity, EquitySecurity.class); this.equitySecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_EquitySecurity, EquitySecurity.class);
this.digitalCertificateSecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_DigitalCertificateSecurity, DigitalCertificateSecurity.class);
this.moneyMarketSecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_MoneyMarketSecurity, MoneyMarketSecurity.class); this.moneyMarketSecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_MoneyMarketSecurity, MoneyMarketSecurity.class);
this.currencyPairSecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CurrencyPairSecurity, CurrencyPairSecurity.class); this.currencyPairSecurityImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CurrencyPairSecurity, CurrencyPairSecurity.class);
this.currencyPairDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CurrencyPairDictionary, CurrencyPairDictionary.class); this.currencyPairDictionaryImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_CurrencyPairDictionary, CurrencyPairDictionary.class);
@ -367,9 +370,9 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin
} }
log.debug("Processed request with securitySymbol: {}", newRequest.getSecuritySymbol()); log.debug("Processed request with securitySymbol: {}", newRequest.getSecuritySymbol());
newRequest.setIssuerId(companyId); newRequest.setIssuerId(companyId);
log.trace("EquitySecurityNewRequest - FOND"); log.trace("DigitalCertificateSecurityNewRequest - FOND");
String securitySymbol = newRequest.getSecuritySymbol(); String securitySymbol = newRequest.getSecuritySymbol();
security = findSecurityBySecuritySymbol(equitySecurityImdg, securitySymbol); security = findSecurityBySecuritySymbol(digitalCertificateSecurityImdg, securitySymbol);
if (security == null) { if (security == null) {
security = digitalCertificateSecurityService.newDigitalCertificate0(newRequest); security = digitalCertificateSecurityService.newDigitalCertificate0(newRequest);

16
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/UtilitarianDigitalRightService.java
View file

@ -23,7 +23,6 @@ import ru.spcex.platform.enumeration.UserRole;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgId; import ru.spcex.platform.imdg.api.ImdgId;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.imdg.api.ImdgTransaction;
import ru.spcex.platform.utils.error.ValidationException; import ru.spcex.platform.utils.error.ValidationException;
@Service @Service
@ -72,7 +71,7 @@ public class UtilitarianDigitalRightService extends QueueConsumer implements Ini
try { try {
userRoleVerification.validateRoleAndThrow(userRequest); userRoleVerification.validateRoleAndThrow(userRequest);
UtilitarianDigitalRight utilitarianDigitalRight = newUtilitarianDigitalRight0(userRequest.getRequestPayload()); UtilitarianDigitalRight utilitarianDigitalRight = newUtilitarianDigitalRight0(userRequest.getRequestPayload());
log.debug("successfully processed, request id {}, new object id {}", userRequest.getId(), utilitarianDigitalRight.getId()); log.debug("successfully processed, request id {}, new utilitarian_digital_right.id {}", userRequest.getId(), utilitarianDigitalRight.getId());
return null; return null;
} catch (ValidationException e) { } catch (ValidationException e) {
return requestHelper.makeErrorResponse(userRequest, e.getEnumMsg()); return requestHelper.makeErrorResponse(userRequest, e.getEnumMsg());
@ -100,16 +99,7 @@ public class UtilitarianDigitalRightService extends QueueConsumer implements Ini
utilitarianDigitalRight.setRightEssence(req.getRightEssence()); utilitarianDigitalRight.setRightEssence(req.getRightEssence());
utilitarianDigitalRight.setRightUnit(req.getRightUnit()); utilitarianDigitalRight.setRightUnit(req.getRightUnit());
utilitarianDigitalRight.setRightUnitMeasurement(req.getRightUnitMeasurement()); utilitarianDigitalRight.setRightUnitMeasurement(req.getRightUnitMeasurement());
utilitarianDigitalRightImdg.insert(utilitarianDigitalRight);
ImdgTransaction transaction = imdgProvider.newTransaction();
try {
transaction.beginTransaction();
Imdg<UtilitarianDigitalRight> utilitarianDigitalRightImdg = transaction.getImdg(IMDGDistributedNames.Map_UtilitarianDigitalRight, UtilitarianDigitalRight.class);
utilitarianDigitalRightImdg.insert(utilitarianDigitalRight);
transaction.commitTransaction();
} catch (Throwable e) {
transaction.rollbackTransaction();
}
return utilitarianDigitalRight; return utilitarianDigitalRight;
} }
@ -118,7 +108,7 @@ public class UtilitarianDigitalRightService extends QueueConsumer implements Ini
try { try {
userRoleVerification.validateRoleAndThrow(userRequest); userRoleVerification.validateRoleAndThrow(userRequest);
UtilitarianDigitalRight utilitarianDigitalRight = updateUtilitarianDigitalRight0(userRequest.getRequestPayload()); UtilitarianDigitalRight utilitarianDigitalRight = updateUtilitarianDigitalRight0(userRequest.getRequestPayload());
log.debug("successfully processed, request id {}, updated object id {}", userRequest.getId(), utilitarianDigitalRight.getId()); log.debug("successfully processed, request id {}, updated utilitarian_digital_right.id {}", userRequest.getId(), utilitarianDigitalRight.getId());
return null; return null;
} catch (ValidationException e) { } catch (ValidationException e) {
return requestHelper.makeErrorResponse(userRequest, e.getEnumMsg()); return requestHelper.makeErrorResponse(userRequest, e.getEnumMsg());