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

add section to Limit request

Browse source
This commit is contained in:
etreshenkov 2023-06-13 12:03:22 +03:00
parent d087b1caa7
commit 4f8e13ca3c
5 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java
View file

@ -94,7 +94,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
InboundRequest inboundRequest = new InboundRequest();
inboundRequest.setId(UUID.randomUUID());
inboundRequest.setType("FILL_LIMITS");
inboundRequest.setSection(Section.FOND.getKey());
inboundRequest.setSection(exportedRequest.getSection());
inboundRequest.setDatetime(Instant.now());
Map<String, Object> content = new HashMap<>();
@ -104,7 +104,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
String response = restTemplate.postForObject(url, request, String.class);
log.debug("LOCM task complete, response: {}", response);
log.debug("Limit request complete, response: {}", response);
}
public void requestOnDemandSecurity(BaseRequest<GatewayTaskRequest> userRequest) {
@ -127,14 +127,13 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
HttpEntity<InboundRequest> request = new HttpEntity<>(inboundRequest, httpHeaders);
String response = restTemplate.postForObject(url, request, String.class);
log.debug("LOCM task 1/2 complete (FOND section), response: {}", response);
log.debug("LOSC task 1/2 complete (FOND section), response: {}", response);
inboundRequest.setSection(Section.FOND.getKey());
inboundRequest.setSection(Section.MKR.getKey());
request = new HttpEntity<>(inboundRequest, httpHeaders);
response = restTemplate.postForObject(url, request, String.class);
log.debug("LOCM task 2/2 complete (MKR section), response: {}", response);
// return null;
log.debug("LOSC task 2/2 complete (MKR section), response: {}", response);
}
private String formingInboundUrl(String path) {

4
clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/AbstractExporterService.java
View file

@ -10,6 +10,7 @@ import ru.spcex.clearing.lim.exporter.config.SFTPConfig;
import ru.spcex.clearing.platform.messaging.domain.cud.utilities.LimExportedRequest;
import ru.spcex.clearing.platform.messaging.serialization.LogFormatter;
import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
import ru.spcex.platform.enumeration.Section;
import ru.spcex.platform.enumeration.ServiceStatus;
import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider;
@ -50,6 +51,8 @@ public abstract class AbstractExporterService {
public abstract String getTargetFileName();
public abstract Section section();
public void process() {
String fileName = getTargetFileName();
log.debug("Start export {} Lim file", fileName);
@ -79,6 +82,7 @@ public abstract class AbstractExporterService {
void sendLimExportedNotification(String fileName) {
LimExportedRequest limExportedRequest = new LimExportedRequest();
limExportedRequest.setLimFileName(fileName);
limExportedRequest.setSection(section().getKey());
log.debug("Send message to kafka \"{}\": {}", LIM_EXPORTED, LogFormatter.toStringWrapper(limExportedRequest));
kafkaSender.sendRequestToQueue(LIM_EXPORTED, limExportedRequest);
}

6
clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/MoneyExporterService.java
View file

@ -8,6 +8,7 @@ import ru.clearing.classes.statics.data.registry.Registry;
import ru.spcex.clearing.lim.exporter.config.LimFormat;
import ru.spcex.clearing.lim.exporter.config.SFTPConfig;
import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
import ru.spcex.platform.enumeration.Section;
import ru.spcex.platform.imdg.api.ImdgProvider;
import java.math.BigDecimal;
@ -33,6 +34,11 @@ public class MoneyExporterService extends AbstractExporterService {
return prepareFileName("money");
}
@Override
public Section section() {
return Section.MKR;
}
@Override
public Collection<String> getLimFileRows() {
log.debug("Started loading and formation of money file lines");

6
clearing-parent/lim-exporter/src/main/java/ru/spcex/clearing/lim/exporter/services/SecurityExporterService.java
View file

@ -7,6 +7,7 @@ import ru.clearing.classes.statics.data.registry.Registry;
import ru.spcex.clearing.lim.exporter.config.LimFormat;
import ru.spcex.clearing.lim.exporter.config.SFTPConfig;
import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
import ru.spcex.platform.enumeration.Section;
import ru.spcex.platform.imdg.api.ImdgProvider;
import java.time.LocalDate;
@ -31,6 +32,11 @@ public class SecurityExporterService extends AbstractExporterService {
return prepareFileName("security");
}
@Override
public Section section() {
return Section.FOND;
}
@Override
public Collection<String> getLimFileRows() {
log.debug("Started loading and formation of DEPO file lines");

10
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/utilities/LimExportedRequest.java
View file

@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class LimExportedRequest {
@JsonProperty
private String limFileName;
@JsonProperty
private String section;
public String getLimFileName() {
return limFileName;
@ -13,4 +15,12 @@ public class LimExportedRequest {
public void setLimFileName(String limFileName) {
this.limFileName = limFileName;
}
public String getSection() {
return section;
}
public void setSection(String section) {
this.section = section;
}
}