diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java index bd90cc6ca..cfdd8c317 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/service/TradingClearingRegistryService.java @@ -19,9 +19,11 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.platform.messaging.domain.ActionType; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.Consts; +import ru.spcex.clearing.platform.messaging.domain.cud.account.ClientCodeNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonIdRequest; import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryNewRequest; import ru.spcex.clearing.platform.messaging.domain.cud.registry.TradingClearingRegistryUpdateRequest; +import ru.spcex.clearing.platform.messaging.domain.cud.reports.ReportRequest; import ru.spcex.clearing.platform.messaging.serialization.LogFormatter; import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate; @@ -29,10 +31,7 @@ import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender; import ru.spcex.clearing.util.security.UserRoleVerification; import ru.spcex.clearing.util.services.RequestHelper; import ru.spcex.clearing.validation.common.ValidationHelper; -import ru.spcex.platform.enumeration.AccountType; -import ru.spcex.platform.enumeration.ServiceStatus; -import ru.spcex.platform.enumeration.TradingClearingRegistryPurpose; -import ru.spcex.platform.enumeration.TradingClearingRegistryType; +import ru.spcex.platform.enumeration.*; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.predicate.ImdgPredicate; @@ -408,31 +407,37 @@ public class TradingClearingRegistryService extends QueueConsumer implements Ini * company-service сообщение об успешном добавлении ТКР клиента с параметром tradingClearingRegistry.code */ protected void sendNotificationToCompanySvc(TradingClearingRegistry tradingClearingRegistry) { -// TradingClearingRegistryNewRequest request = new TradingClearingRegistryNewRequest(); -// request.setMoneyAccountId(tradingClearingRegistry.getId()); -// request.setCompanyId(tradingClearingRegistry.getCompanyId()); -// request.setCode(tradingClearingRegistry.getCode()); -// log.debug("Send message to kafka \"{}\": {}", Consts.DESTINATION_, LogFormatter.toStringWrapper(request)); -// kafkaSender.sendRequestToQueue(Consts.DESTINATION_, request); + ClientCodeNewRequest request = new ClientCodeNewRequest(); + request.setMoneyAccountId(tradingClearingRegistry.getId()); + request.setCompanyId(tradingClearingRegistry.getCompanyId()); + request.setCode(tradingClearingRegistry.getCode()); +// request.setMoneyAccountId(tradingClearingRegistry.getMoneyAccountId()); +// request.setDepoAccountId(tradingClearingRegistry.getDepoAccountId()); + log.debug("Send message to kafka \"{}\": {}", Consts.DESTINATION_CLIENT_CODE_NEW_UM_COMPANY, LogFormatter.toStringWrapper(request)); + kafkaSender.sendRequestToQueue(Consts.DESTINATION_CLIENT_CODE_NEW_UM_COMPANY, request); } /** * clearing-service сообщение на открытие клиринговых регистров; */ protected void sendNotificationToClearingSvc(TradingClearingRegistry tradingClearingRegistry) { -// TradingClearingRegistryNewRequest request = new TradingClearingRegistryNewRequest(); -// request.setMoneyAccountId(tradingClearingRegistry.getId()); -// request.setCompanyId(tradingClearingRegistry.getCompanyId()); -// request.setCode(tradingClearingRegistry.getCode()); -// log.debug("Send message to kafka \"{}\": {}", Consts.DESTINATION_, LogFormatter.toStringWrapper(request)); -// kafkaSender.sendRequestToQueue(Consts.DESTINATION_, request); + TradingClearingRegistryNewRequest request = new TradingClearingRegistryNewRequest(); + request.setTradingClearingRegistryType(tradingClearingRegistry.getTradingClearingRegistryType()); + request.setCompanyId(tradingClearingRegistry.getCompanyId()); + request.setMoneyAccountId(tradingClearingRegistry.getMoneyAccountId()); + request.setDepoAccountId(tradingClearingRegistry.getDepoAccountId()); + request.setStatus(tradingClearingRegistry.getStatus()); + log.debug("Send message to kafka \"{}\": {}", Consts.DESTINATION_TRADING_CLEARING_REGISTRY_AUTO_NEW, LogFormatter.toStringWrapper(request)); + kafkaSender.sendRequestToQueue(Consts.DESTINATION_TRADING_CLEARING_REGISTRY_AUTO_NEW, request); } /** - * report-service сообщение на формирование уведомления о создании нового ТКР + * todo report-service сообщение на формирование уведомления о создании нового ТКР */ protected void sendNotificationToReportSvc(TradingClearingRegistry tradingClearingRegistry) { -// TradingClearingRegistryNewRequest request = new TradingClearingRegistryNewRequest(); -// request.setMoneyAccountId(tradingClearingRegistry.getId()); -// log.debug("Send message to kafka \"{}\": {}", Consts.DESTINATION_, LogFormatter.toStringWrapper(request)); -// kafkaSender.sendRequestToQueue(Consts.DESTINATION_, request); + log.debug("Todo report destination: new TCR"); +// ReportRequest request = new ReportRequest(); +// request.setReportId(ReportType.NEW_TRADING_CLEARING_REGISTRY); +// request.setTradingClearingRegistryId(tradingClearingRegistry.getId()); +// log.debug("Send message to kafka \"{}\": {}", Consts.CREATE_REPORT_FOR_TCR, LogFormatter.toStringWrapper(request)); +// kafkaSender.sendRequestToQueue(Consts.CREATE_REPORT_FOR_TCR, request); } }