diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java index d1d823702..6de1da6f6 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepLccValueReportBuilder.java @@ -33,12 +33,12 @@ public class KSRepLccValueReportBuilder extends CSVReportBuilder baseRegistries = registryImdg.getCollectionObjectsByPredicate(baseRegistriesPredicate); -// -// Map> groupedByTKR = baseRegistries.stream() -// .filter(registry -> { -// if (registry.getTradingClearingRegistryId() == null) { -// log.warn("Skip registry (id = {}): empty trading_clearing_registry_id", registry.getId()); -// return false; -// } -// if (registry.getSecurityId() == null) { -// log.warn("Skip registry (id = {}): empty security_id", registry.getId()); -// return false; -// } -// return true; -// }) -// .collect(Collectors.groupingBy(Registry::getTradingClearingRegistryId)); -// -// Map currencyRates = new HashMap<>(); -// LocalDateTime nowTime = LocalDateTime.now(); -// LocalDate now = LocalDate.now(); -// for (Map.Entry> entryTKR : groupedByTKR.entrySet()) { -// Long tradingClearingRegistryId = entryTKR.getKey(); -// List registriesForTKR = entryTKR.getValue(); -// -// Registry sampleRegistry = registriesForTKR.iterator().next(); -// String firmId = sampleRegistry.getTradingCode(); -// String tkr = sampleRegistry.getTradingClearingRegistry(); -// BigDecimal sumValue = BigDecimal.ZERO; -// for (Registry registry : registriesForTKR) { -// if ( -// registry.getRegistryDesignation().equals(RegistryDesignation.A.getKey()) && -// registry.getRegistryInstrumentType().equals(RegistryInstrumentType.M.getKey()) && -// registry.getRegistryUnit().equals(RegistryUnit.F.getKey()) -// ) { -// if (registry.getBalance() == null) continue; -// Long securityId = registry.getSecurityId(); -// Rates currencyRate = currencyRates.get(securityId); -// if (currencyRate == null) { -// ImdgPredicateBuilder ratesPB = ratesImdg.predicateBuilder(); -// Collection rates = ratesImdg.getCollectionObjectsByPredicate( -// ratesPB.and( -// ratesPB.equals("currency_id", securityId), -// ratesPB.notNull("value"), -// ratesPB.equals("value_date", now) -// ) -// ); -// if (!rates.isEmpty()) { -// currencyRate = rates.iterator().next(); -// } else { -// currencyRate = new Rates(); -// currencyRate.setValue(BigDecimal.ONE); -// }; -// currencyRates.put(securityId, currencyRate); -// } -// sumValue = sumValue.add(registry.getBalance().multiply(currencyRate.getValue())); -// } -// } -// -// Map> registriesForSecurityId = registriesForTKR.stream().collect( -// Collectors.groupingBy(Registry::getSecurityId) -// ); -// -// List rowsForGroup = new ArrayList<>(); -// for (Map.Entry> entrySecurityId : registriesForSecurityId.entrySet()) { -// KSRepLccValueReport ksRepLccValueReport = new KSRepLccValueReport(); -// ksRepLccValueReport.setFirmId(firmId); -// ksRepLccValueReport.setReportDate(nowTime); -// ksRepLccValueReport.setTkr(tkr); -// ksRepLccValueReport.setSumValue(sumValue); -// -// Long securityId = entrySecurityId.getKey(); -// List registries = entrySecurityId.getValue(); -// BigDecimal demandMoney = BigDecimal.ZERO; -// BigDecimal obligMoney = BigDecimal.ZERO; -// BigDecimal posMoney = BigDecimal.ZERO; -// for (Registry registry : registries) { -// if ( -// List.of(RegistryStatus.PROC, RegistryStatus.MNG).contains( -// IEnumKey.getEnumByKey(RegistryStatus.class, registry.getRegistryStatus()) -// ) && -// registry.getRegistryInstrumentType().equals(RegistryInstrumentType.M.getKey()) && -// registry.getRegistryUnit().equals(RegistryUnit.T.getKey()) -// ) { -// } -// } -// -// rowsForGroup.add(ksRepLccValueReport); -// } -// -// } -// rows = new ArrayList<>();