diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/DigitalSecurityRequestAdapter.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/DigitalSecurityRequestAdapter.java index fd2e769ff..66be9e235 100644 --- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/DigitalSecurityRequestAdapter.java +++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/adapter/DigitalSecurityRequestAdapter.java @@ -15,6 +15,7 @@ public class DigitalSecurityRequestAdapter { gatewayRequest.setDepoDcId(digitalCertificate.getDepoDcId()); gatewayRequest.setInstrumentType(digitalCertificate.getInstrumentType()); gatewayRequest.setIssuerId(digitalCertificate.getIssuerId()); + gatewayRequest.setInn(digitalCertificate.getUcp().getCompanyInn()); gatewayRequest.setShortName(digitalCertificate.getShortName()); gatewayRequest.setFullName(digitalCertificate.getFullName()); gatewayRequest.setFullNameEng(digitalCertificate.getFullNameEng()); diff --git a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java index 3491cccac..558f88ec6 100644 --- a/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java +++ b/clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/GatewaySecurityService.java @@ -481,8 +481,8 @@ public class GatewaySecurityService extends QueueConsumer implements Initializin DigitalCertificateSecurityGatewayRequest request = baseRequest.getRequestPayload(); Map> query = new HashMap<>(); - query.put("companySymbol", CompanySymbol.UUID.getKey()); - query.put("companySymbolValue", request.getIssuerId()); + query.put("companySymbol", CompanySymbol.INN.getKey()); + query.put("companySymbolValue", request.getInn()); CompanySymbols companySymbols = companySymbolsImdg.getSingleObjectByFieldValues(query); Long companyId = null; diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/DigitalCertificateSecurityGatewayRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/DigitalCertificateSecurityGatewayRequest.java index a6dd25d2b..6ddeb5b30 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/DigitalCertificateSecurityGatewayRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/securitites/DigitalCertificateSecurityGatewayRequest.java @@ -21,6 +21,8 @@ public class DigitalCertificateSecurityGatewayRequest implements WithSecuritySym @JsonProperty private UUID issuerId; @JsonProperty + private String inn; + @JsonProperty private String shortName; @JsonProperty private String fullName; @@ -78,6 +80,14 @@ public class DigitalCertificateSecurityGatewayRequest implements WithSecuritySym this.issuerId = issuerId; } + public String getInn() { + return inn; + } + + public void setInn(String inn) { + this.inn = inn; + } + public String getShortName() { return shortName; }