etreschenkov 2025-09-04 18:24:43 +03:00
parent 7279f460b3
commit 95f7c54376

View file

@ -242,11 +242,12 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
return; return;
} }
String finalReportKey = defineExtTypeName(reportType);
Map<String, Object> content = new HashMap<>(); Map<String, Object> content = new HashMap<>();
reportRequest.getReports().forEach(reportPart -> makeContentByReportRequest(content, reportPart)); reportRequest.getReports().forEach(reportPart -> makeContentByReportRequest(content, reportPart));
OutboundRequest outboundRequest = OutboundRequestBuilder.builder() OutboundRequest outboundRequest = OutboundRequestBuilder.builder()
.section(reportType == ReportType.REPORT_KS_VALUE ? Section.CURR.getKey() : Section.FOND.getKey()) .section(reportType == ReportType.REPORT_KS_VALUE ? Section.CURR.getKey() : Section.FOND.getKey())
.type(reportType.getKey()) .type(finalReportKey)
.clearingSystem(clearingSystemValue) .clearingSystem(clearingSystemValue)
.content(content).build(); .content(content).build();
@ -369,4 +370,16 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
httpHeaders.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON)); httpHeaders.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
return new HttpEntity<>(outboundRequest, httpHeaders); return new HttpEntity<>(outboundRequest, httpHeaders);
} }
private String defineExtTypeName(ReportType reportType) {
String finalReportKey = reportType.getKey();
if (!clearingSystemValue.equals("SPVB")) {
if (reportType == ReportType.REPORT_KS_FINAL) {
finalReportKey = "REPORT_KS_OUTER";
} else if (reportType == ReportType.REPORT_KS_VALUE) {
finalReportKey = "REPORT_KS_VALUE_OUTER";
}
}
return finalReportKey;
}
} }