add section to Limit request
This commit is contained in:
parent
d087b1caa7
commit
4f8e13ca3c
5 changed files with 31 additions and 6 deletions
|
|
@ -94,7 +94,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
|
||||||
InboundRequest inboundRequest = new InboundRequest();
|
InboundRequest inboundRequest = new InboundRequest();
|
||||||
inboundRequest.setId(UUID.randomUUID());
|
inboundRequest.setId(UUID.randomUUID());
|
||||||
inboundRequest.setType("FILL_LIMITS");
|
inboundRequest.setType("FILL_LIMITS");
|
||||||
inboundRequest.setSection(Section.FOND.getKey());
|
inboundRequest.setSection(exportedRequest.getSection());
|
||||||
inboundRequest.setDatetime(Instant.now());
|
inboundRequest.setDatetime(Instant.now());
|
||||||
|
|
||||||
Map<String, Object> content = new HashMap<>();
|
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);
|
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) {
|
public void requestOnDemandSecurity(BaseRequest<GatewayTaskRequest> userRequest) {
|
||||||
|
|
@ -127,14 +127,13 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
|
||||||
HttpEntity<InboundRequest> request = new HttpEntity<>(inboundRequest, httpHeaders);
|
HttpEntity<InboundRequest> request = new HttpEntity<>(inboundRequest, httpHeaders);
|
||||||
|
|
||||||
String response = restTemplate.postForObject(url, request, String.class);
|
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);
|
request = new HttpEntity<>(inboundRequest, httpHeaders);
|
||||||
response = restTemplate.postForObject(url, request, String.class);
|
response = restTemplate.postForObject(url, request, String.class);
|
||||||
|
|
||||||
log.debug("LOCM task 2/2 complete (MKR section), response: {}", response);
|
log.debug("LOSC task 2/2 complete (MKR section), response: {}", response);
|
||||||
// return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private String formingInboundUrl(String path) {
|
private String formingInboundUrl(String path) {
|
||||||
|
|
|
||||||
|
|
@ -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.domain.cud.utilities.LimExportedRequest;
|
||||||
import ru.spcex.clearing.platform.messaging.serialization.LogFormatter;
|
import ru.spcex.clearing.platform.messaging.serialization.LogFormatter;
|
||||||
import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
|
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.enumeration.ServiceStatus;
|
||||||
import ru.spcex.platform.imdg.api.Imdg;
|
import ru.spcex.platform.imdg.api.Imdg;
|
||||||
import ru.spcex.platform.imdg.api.ImdgProvider;
|
import ru.spcex.platform.imdg.api.ImdgProvider;
|
||||||
|
|
@ -50,6 +51,8 @@ public abstract class AbstractExporterService {
|
||||||
|
|
||||||
public abstract String getTargetFileName();
|
public abstract String getTargetFileName();
|
||||||
|
|
||||||
|
public abstract Section section();
|
||||||
|
|
||||||
public void process() {
|
public void process() {
|
||||||
String fileName = getTargetFileName();
|
String fileName = getTargetFileName();
|
||||||
log.debug("Start export {} Lim file", fileName);
|
log.debug("Start export {} Lim file", fileName);
|
||||||
|
|
@ -79,6 +82,7 @@ public abstract class AbstractExporterService {
|
||||||
void sendLimExportedNotification(String fileName) {
|
void sendLimExportedNotification(String fileName) {
|
||||||
LimExportedRequest limExportedRequest = new LimExportedRequest();
|
LimExportedRequest limExportedRequest = new LimExportedRequest();
|
||||||
limExportedRequest.setLimFileName(fileName);
|
limExportedRequest.setLimFileName(fileName);
|
||||||
|
limExportedRequest.setSection(section().getKey());
|
||||||
log.debug("Send message to kafka \"{}\": {}", LIM_EXPORTED, LogFormatter.toStringWrapper(limExportedRequest));
|
log.debug("Send message to kafka \"{}\": {}", LIM_EXPORTED, LogFormatter.toStringWrapper(limExportedRequest));
|
||||||
kafkaSender.sendRequestToQueue(LIM_EXPORTED, limExportedRequest);
|
kafkaSender.sendRequestToQueue(LIM_EXPORTED, limExportedRequest);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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.LimFormat;
|
||||||
import ru.spcex.clearing.lim.exporter.config.SFTPConfig;
|
import ru.spcex.clearing.lim.exporter.config.SFTPConfig;
|
||||||
import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
|
import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
|
||||||
|
import ru.spcex.platform.enumeration.Section;
|
||||||
import ru.spcex.platform.imdg.api.ImdgProvider;
|
import ru.spcex.platform.imdg.api.ImdgProvider;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
|
@ -33,6 +34,11 @@ public class MoneyExporterService extends AbstractExporterService {
|
||||||
return prepareFileName("money");
|
return prepareFileName("money");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Section section() {
|
||||||
|
return Section.MKR;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Collection<String> getLimFileRows() {
|
public Collection<String> getLimFileRows() {
|
||||||
log.debug("Started loading and formation of money file lines");
|
log.debug("Started loading and formation of money file lines");
|
||||||
|
|
|
||||||
|
|
@ -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.LimFormat;
|
||||||
import ru.spcex.clearing.lim.exporter.config.SFTPConfig;
|
import ru.spcex.clearing.lim.exporter.config.SFTPConfig;
|
||||||
import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
|
import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
|
||||||
|
import ru.spcex.platform.enumeration.Section;
|
||||||
import ru.spcex.platform.imdg.api.ImdgProvider;
|
import ru.spcex.platform.imdg.api.ImdgProvider;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
|
@ -31,6 +32,11 @@ public class SecurityExporterService extends AbstractExporterService {
|
||||||
return prepareFileName("security");
|
return prepareFileName("security");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Section section() {
|
||||||
|
return Section.FOND;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Collection<String> getLimFileRows() {
|
public Collection<String> getLimFileRows() {
|
||||||
log.debug("Started loading and formation of DEPO file lines");
|
log.debug("Started loading and formation of DEPO file lines");
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
public class LimExportedRequest {
|
public class LimExportedRequest {
|
||||||
@JsonProperty
|
@JsonProperty
|
||||||
private String limFileName;
|
private String limFileName;
|
||||||
|
@JsonProperty
|
||||||
|
private String section;
|
||||||
|
|
||||||
public String getLimFileName() {
|
public String getLimFileName() {
|
||||||
return limFileName;
|
return limFileName;
|
||||||
|
|
@ -13,4 +15,12 @@ public class LimExportedRequest {
|
||||||
public void setLimFileName(String limFileName) {
|
public void setLimFileName(String limFileName) {
|
||||||
this.limFileName = limFileName;
|
this.limFileName = limFileName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getSection() {
|
||||||
|
return section;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSection(String section) {
|
||||||
|
this.section = section;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue