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

http://jira.mfd.msk:8088/browse/CLS-314 sdf57 and sdf51

Browse source
This commit is contained in:
etreshenkov 2023-05-23 18:05:31 +03:00
parent 32bcede266
commit 41cdca1e3b
4 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ResultContainer.java
View file

@ -17,7 +17,7 @@ public class ResultContainer {
private Long groupId;
private StageResult lastStageResult;
private LocalDateTime registrationDateTime;
private String mamberCode;
private String memberCode;
protected ResultContainer() {}
@ -76,11 +76,11 @@ public class ResultContainer {
this.registrationDateTime = registrationDateTime;
}
public String getMamberCode() {
return mamberCode;
public String getMemberCode() {
return memberCode;
}
public void setMamberCode(String mamberCode) {
this.mamberCode = mamberCode;
public void setMemberCode(String memberCode) {
this.memberCode = memberCode;
}
}

6
clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplate.java
View file

@ -36,7 +36,7 @@ public enum FilenameTemplate {
return appendSection(resultContainer)
.append(dateTime(resultContainer))
.append(counter(resultContainer, files))
.append(mamberCode(resultContainer))
.append(memberCode(resultContainer))
.append(".DBF").toString();
}
};
@ -66,10 +66,10 @@ public enum FilenameTemplate {
return result;
}
protected StringBuilder mamberCode(ResultContainer resultContainer) {
protected StringBuilder memberCode(ResultContainer resultContainer) {
StringBuilder result = new StringBuilder();
result.append('_');
result.append(resultContainer.getMamberCode());
result.append(resultContainer.getMemberCode());
return result;
}

26
clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java
View file

@ -1,6 +1,8 @@
package ru.spcex.clearing.dbf.exporter.services;
import org.apache.kafka.clients.consumer.Consumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.stereotype.Service;
import ru.spcex.clearing.dbf.exporter.logic.Processor;
@ -9,6 +11,7 @@ import ru.spcex.clearing.dbf.exporter.logic.data.enums.Table;
import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
import ru.spcex.clearing.platform.messaging.domain.Consts;
import ru.spcex.clearing.platform.messaging.domain.cud.balance.ExportToFileRequest;
import ru.spcex.clearing.platform.messaging.domain.cud.clearing.Sdf56And51Request;
import ru.spcex.clearing.platform.messaging.domain.cud.clearing.SdfClearingRequest;
import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
import ru.spcex.platform.imdg.api.ImdgProvider;
@ -18,6 +21,7 @@ import java.util.Optional;
@Service
public class CommandService extends QueueConsumer implements InitializingBean {
private final Logger log = LoggerFactory.getLogger(getClass());
private final ImdgProvider imdgProvider;
private final Processor processor;
@ -56,9 +60,9 @@ public class CommandService extends QueueConsumer implements InitializingBean {
callback(SdfClearingRequest.class)
.setConsumer(r -> processSpecial(Table.S_DF54, r))
.forDestination(Consts.SDF54_PROCESS, callbacks::put);
callback(SdfClearingRequest.class)
.setConsumer(r -> processSpecial(Table.S_DF56, r))
.forDestination(Consts.SDF56_PROCESS, callbacks::put);
callback(Sdf56And51Request.class)
.setConsumer(r -> revise(r))
.forDestination(Consts.REVISE_PROCESS, callbacks::put);
init();
}
@ -80,4 +84,20 @@ public class CommandService extends QueueConsumer implements InitializingBean {
resultContainer.setGroupId(request.getGroupId());
processor.process(resultContainer);
}
private void revise(BaseRequest<Sdf56And51Request> systemRequest) {
Sdf56And51Request sdf56And51Request = systemRequest.getRequestPayload();
log.debug("Not implemented sdf56 and sdf51 request");
{
ResultContainer resultContainer = ResultContainer.createNewTask(Table.S_DF56);
resultContainer.setGroupId(null);
processor.process(resultContainer);
}
{
ResultContainer resultContainer = ResultContainer.createNewTask(Table.S_DF51);
resultContainer.setGroupId(null);
processor.process(resultContainer);
}
}
}

1
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
View file

@ -118,6 +118,7 @@ public interface Consts {
String SDF54_PROCESS = "sdf54-process";
String SDF56_PROCESS = "sdf56-process";
String SDF57_PROCESS = "sdf57-process";
String REVISE_PROCESS = "revise-process";
String EXPORT_PROCESS = "export-process";
String EXPORT_COMPLETED = "export_completed";
String S_TRADES_IMPORTED = "s_trades-imported";