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

Minor changes

Browse source
This commit is contained in:
Ivan Nikolaev-Axenov 2024-06-10 12:57:25 +03:00
parent c0c6a9813a
commit 10e9ef9079
17 changed files with 187 additions and 192 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,13 +16,9 @@ public class ResultContainer {
private LocalDateTime registrationDateTime;
private String memberCode;
protected ResultContainer() {}
public static ResultContainer createNewTask(Table tableForExport) {
ResultContainer container = new ResultContainer();
container.tableForExport = tableForExport;
container.uuid = UUID.randomUUID();
return container;
public ResultContainer(Table tableForExport) {
this.tableForExport = tableForExport;
this.uuid = UUID.randomUUID();
}
public Table getTableForExport() {

2
clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/stages/ExportFromHazelcast.java
View file

@ -46,7 +46,7 @@ public class ExportFromHazelcast {
public ExportFromHazelcast(ExportXMLServiceSettings settings,
ImdgProvider imdgProvider,
@Qualifier("mockSFTP") SFTPConfig.XmlGateway gateway,
SFTPConfig.XmlGateway gateway,
@Qualifier("xmlMapper") XmlMapper xmlMapper,
@Qualifier("mapOfTable") Map<Table, ObjectTag<? extends SpcexObjectBase>> objectTagMap,
Supplier<KafkaSender> kafkaSender) {

2
clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/stages/PrepareXMLFile.java
View file

@ -32,7 +32,7 @@ public class PrepareXMLFile implements InitializingBean {
private final SFTPConfig.XmlGateway gateway;
public PrepareXMLFile(ExportXMLServiceSettings settings,
@Qualifier("mockSFTP") SFTPConfig.XmlGateway gateway) {
SFTPConfig.XmlGateway gateway) {
this.settings = settings;
this.gateway = gateway;
}

14
clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/services/CommandService.java
View file

@ -7,6 +7,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.stereotype.Service;
import org.springframework.util.StopWatch;
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;
@ -83,7 +84,7 @@ public class CommandService extends QueueConsumer implements InitializingBean {
if (tableForExport.isEmpty()) {
throw new IllegalStateException(String.format("Unsupported table prefix: %s", request.getNameOfTable()));
}
ResultContainer resultContainer = ResultContainer.createNewTask(tableForExport.get());
ResultContainer resultContainer = new ResultContainer(tableForExport.get());
resultContainer.setGroupId(request.getSdfGroupId());
resultContainer.setSourceName(request.getFileName());
runProcess(resultContainer);
@ -91,7 +92,7 @@ public class CommandService extends QueueConsumer implements InitializingBean {
private void processSpecial(Table table, BaseRequest<SdfClearingRequest> systemRequest) {
SdfClearingRequest request = systemRequest.getRequestPayload();
ResultContainer resultContainer = ResultContainer.createNewTask(table);
ResultContainer resultContainer = new ResultContainer(table);
resultContainer.setGroupId(request.getGroupId());
resultContainer.setSourceName(null);
runProcess(resultContainer);
@ -100,7 +101,7 @@ public class CommandService extends QueueConsumer implements InitializingBean {
private void processByLauncher(Table table, BaseRequest<LauncherCommandRequest> systemRequest) {
LauncherCommandRequest request = systemRequest.getRequestPayload();
log.info("RequestId={}, LauncherCommandRequest task={}. Table {}", systemRequest.getId(), request.getTaskName(), table);
ResultContainer resultContainer = ResultContainer.createNewTask(table);
ResultContainer resultContainer = new ResultContainer(table);
resultContainer.setGroupId(null);
resultContainer.setSourceName(null);
runProcess(resultContainer);
@ -110,7 +111,8 @@ public class CommandService extends QueueConsumer implements InitializingBean {
log.info("uuid {}. Task started", resultContainer.getUuid());
StageResult result;
long startMills = System.currentTimeMillis();
StopWatch stopWatch = new StopWatch();
stopWatch.start();
result = prepareXMLFile.process(resultContainer);
resultContainer.setLastStageResult(result);
if (result == StageResult.OK) {
@ -121,11 +123,11 @@ public class CommandService extends QueueConsumer implements InitializingBean {
result = journal.process(resultContainer);
resultContainer.setLastStageResult(result);
}
long endMills = System.currentTimeMillis();
stopWatch.stop();
log.info("uuid {}. Task completed, result: {}, time working: {} ms",
resultContainer.getUuid(),
result,
endMills - startMills);
stopWatch.getTotalTimeMillis());
}
}

4
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/config/XMLImporterConfig.java
View file

@ -58,8 +58,8 @@ public class XMLImporterConfig {
}
@Bean("mapOfTable")
public Map<ETable, ObjectTag<? extends SpcexObjectBase, ?>> getMapOfTables() {
Map<ETable, ObjectTag<? extends SpcexObjectBase, ?>> map = new HashMap<>();
public Map<ETable, ObjectTag<? extends SpcexObjectBase>> getMapOfTables() {
Map<ETable, ObjectTag<? extends SpcexObjectBase>> map = new HashMap<>();
map.put(ETable.DF_01, new DF01ObjectTag());
map.put(ETable.DF_04, new DF04ObjectTag());
map.put(ETable.DF_06, new DF06ObjectTag());

13
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/ResultContainer.java
View file

@ -11,15 +11,10 @@ public class ResultContainer {
private File xmlFile;
private StageResult lastStageStatus;
protected ResultContainer() {
}
public static ResultContainer createNewTask(ETable xmlTable, File xmlFile) {
ResultContainer container = new ResultContainer();
container.xmlTable = xmlTable;
container.xmlFile = xmlFile;
container.uuid = UUID.randomUUID();
return container;
public ResultContainer(ETable xmlTable, File xmlFile) {
this.xmlTable = xmlTable;
this.xmlFile = xmlFile;
this.uuid = UUID.randomUUID();
}
public ETable getXmlTable() {

6
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/DocumentTag.java
View file

@ -41,7 +41,7 @@ public class DocumentTag {
@JacksonXmlElementWrapper(localName = "OBJECTS")
@JacksonXmlProperty(localName = "OBJECT")
private List<ObjectTag<? extends SpcexObjectBase, ?>> objects;
private List<ObjectTag<? extends SpcexObjectBase>> objects;
public DocumentTag() {
}
@ -110,11 +110,11 @@ public class DocumentTag {
this.parentDoc = parentDoc;
}
public List<ObjectTag<? extends SpcexObjectBase, ?>> getObjects() {
public List<ObjectTag<? extends SpcexObjectBase>> getObjects() {
return objects;
}
public void setObjects(List<ObjectTag<? extends SpcexObjectBase, ?>> objects) {
public void setObjects(List<ObjectTag<? extends SpcexObjectBase>> objects) {
this.objects = objects;
}

28
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF01ObjectTag.java
View file

@ -9,7 +9,7 @@ import ru.clearing.classes.statics.data.sdf.SDf01;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
public class DF01ObjectTag extends ObjectTag<SDf01, DF01ObjectTag> {
public class DF01ObjectTag extends ObjectTag<SDf01> {
private static final String PREFIX = ETable.DF_01.name();
private static final Class<SDf01> CLAZZ = SDf01.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf01;
@ -56,21 +56,21 @@ public class DF01ObjectTag extends ObjectTag<SDf01, DF01ObjectTag> {
}
@Override
public SDf01 getEntity(DF01ObjectTag entity) {
public SDf01 getSDfEntity() {
SDf01 result = new SDf01();
result.setCurr_code(entity.getCurrCode());
result.setAccount(entity.getAccount());
result.setRemainder(entity.getRemainder());
result.setDeal(entity.getDeal());
result.setAcc_code(entity.getAccCode());
result.setDat(entity.getDat().toString());
result.setMarket(entity.getMarket());
result.setAcc_name(entity.getAccName());
result.setAcc_type(entity.getAccType());
result.setSumengage(entity.getSumengage());
result.setSumunblock(entity.getSumunblock());
result.setFile_type(entity.getFileType());
result.setCurr_code(this.getCurrCode());
result.setAccount(this.getAccount());
result.setRemainder(this.getRemainder());
result.setDeal(this.getDeal());
result.setAcc_code(this.getAccCode());
result.setDat(this.getDat().toString());
result.setMarket(this.getMarket());
result.setAcc_name(this.getAccName());
result.setAcc_type(this.getAccType());
result.setSumengage(this.getSumengage());
result.setSumunblock(this.getSumunblock());
result.setFile_type(this.getFileType());
result.setFileName(filename);
result.setGenerationTime(Instant.now());
result.setGenerationId(fileId);

46
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF04ObjectTag.java
View file

@ -9,7 +9,7 @@ import ru.clearing.classes.statics.data.sdf.SDf04;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
public class DF04ObjectTag extends ObjectTag<SDf04, DF04ObjectTag> {
public class DF04ObjectTag extends ObjectTag<SDf04> {
private static final String PREFIX = ETable.DF_04.name();
private static final Class<SDf04> CLAZZ = SDf04.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf04;
@ -67,30 +67,30 @@ public class DF04ObjectTag extends ObjectTag<SDf04, DF04ObjectTag> {
}
@Override
public SDf04 getEntity(DF04ObjectTag entity) {
public SDf04 getSDfEntity() {
SDf04 result = new SDf04();
result.setSeg_type(entity.getSegType());
result.setDoc_type(entity.getDocType());
result.setDocnm_ref(entity.getDocnmRef());
result.setDocnmprev(entity.getDocnmprev());
result.setC_acc_deb(entity.getcAccDeb());
result.setSbanknam1(entity.getSbanknam1());
result.setSbanknam2(entity.getSbanknam1());
result.setSbanknam3(entity.getSbanknam1());
result.setSbanknam4(entity.getSbanknam1());
result.setSbanknam5(entity.getSbanknam1());
result.setC_acc_cred(entity.getcAccCred());
result.setRbanknam1(entity.getRbanknam1());
result.setRbanknam2(entity.getRbanknam1());
result.setRbanknam3(entity.getRbanknam1());
result.setRbanknam4(entity.getRbanknam1());
result.setRbanknam5(entity.getRbanknam1());
result.setPay_date(entity.getPayDate().toString());
result.setPay_val(entity.getPayVal());
result.setSum_deb(entity.getSumDeb());
result.setSpecif_1(entity.getSpecif1());
result.setImp_result(entity.getImpResult());
result.setSeg_type(this.getSegType());
result.setDoc_type(this.getDocType());
result.setDocnm_ref(this.getDocnmRef());
result.setDocnmprev(this.getDocnmprev());
result.setC_acc_deb(this.getcAccDeb());
result.setSbanknam1(this.getSbanknam1());
result.setSbanknam2(this.getSbanknam1());
result.setSbanknam3(this.getSbanknam1());
result.setSbanknam4(this.getSbanknam1());
result.setSbanknam5(this.getSbanknam1());
result.setC_acc_cred(this.getcAccCred());
result.setRbanknam1(this.getRbanknam1());
result.setRbanknam2(this.getRbanknam1());
result.setRbanknam3(this.getRbanknam1());
result.setRbanknam4(this.getRbanknam1());
result.setRbanknam5(this.getRbanknam1());
result.setPay_date(this.getPayDate().toString());
result.setPay_val(this.getPayVal());
result.setSum_deb(this.getSumDeb());
result.setSpecif_1(this.getSpecif1());
result.setImp_result(this.getImpResult());
result.setFile_name(filename);
result.setGenerationTime(Instant.now());
result.setGenerationId(fileId);

30
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF06ObjectTag.java
View file

@ -10,7 +10,7 @@ import ru.clearing.classes.statics.data.sdf.SDf06;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
public class DF06ObjectTag extends ObjectTag<SDf06, DF06ObjectTag> {
public class DF06ObjectTag extends ObjectTag<SDf06> {
private static final String PREFIX = ETable.DF_06.name();
private static final Class<SDf06> CLAZZ = SDf06.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf06;
@ -60,22 +60,22 @@ public class DF06ObjectTag extends ObjectTag<SDf06, DF06ObjectTag> {
}
@Override
public SDf06 getEntity(DF06ObjectTag entity) {
public SDf06 getSDfEntity() {
SDf06 result = new SDf06();
result.setAccount(entity.getAccount());
result.setSum(entity.getSum());
result.setMarket(entity.getMarket());
result.setType(entity.getType());
result.setDeal(entity.getDeal());
result.setClientN(entity.getClientN());
result.setInn(entity.getInn());
result.setBic(entity.getBic());
result.setSpec(entity.getSpec());
result.setNumber(entity.getNumber());
result.setDoc_Num(entity.getDocNum());
result.setDoc_Date(entity.getDocDate().toString());
result.setPay_val(entity.getPayVal());
result.setAccount(this.getAccount());
result.setSum(this.getSum());
result.setMarket(this.getMarket());
result.setType(this.getType());
result.setDeal(this.getDeal());
result.setClientN(this.getClientN());
result.setInn(this.getInn());
result.setBic(this.getBic());
result.setSpec(this.getSpec());
result.setNumber(this.getNumber());
result.setDoc_Num(this.getDocNum());
result.setDoc_Date(this.getDocDate().toString());
result.setPay_val(this.getPayVal());
result.setFileName(filename);
result.setGenerationTime(Instant.now());
result.setGenerationId(fileId);

16
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF52ObjectTag.java
View file

@ -9,7 +9,7 @@ import ru.clearing.classes.statics.data.sdf.SDf52;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
public class DF52ObjectTag extends ObjectTag<SDf52, DF52ObjectTag> {
public class DF52ObjectTag extends ObjectTag<SDf52> {
private static final String PREFIX = ETable.DF_52.name();
private static final Class<SDf52> CLAZZ = SDf52.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf52;
@ -38,15 +38,15 @@ public class DF52ObjectTag extends ObjectTag<SDf52, DF52ObjectTag> {
}
@Override
public SDf52 getEntity(DF52ObjectTag entity) {
public SDf52 getSDfEntity() {
SDf52 result = new SDf52();
result.setAccount(entity.getAccount());
result.setAcc_name(entity.getAccName());
result.setDeal(entity.getDeal());
result.setDate(entity.getDate().toString());
result.setAcc_type(entity.getAccType());
result.setStatus(entity.getStatus());
result.setAccount(this.getAccount());
result.setAcc_name(this.getAccName());
result.setDeal(this.getDeal());
result.setDate(this.getDate().toString());
result.setAcc_type(this.getAccType());
result.setStatus(this.getStatus());
result.setFileName(filename);
result.setGenerationTime(Instant.now());
result.setGenerationId(fileId);

94
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF55ObjectTag.java
View file

@ -9,7 +9,7 @@ import ru.clearing.classes.statics.data.sdf.SDf55;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
public class DF55ObjectTag extends ObjectTag<SDf55, DF55ObjectTag> {
public class DF55ObjectTag extends ObjectTag<SDf55> {
private static final String PREFIX = ETable.DF_55.name();
private static final Class<SDf55> CLAZZ = SDf55.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf55;
@ -129,54 +129,54 @@ public class DF55ObjectTag extends ObjectTag<SDf55, DF55ObjectTag> {
}
@Override
public SDf55 getEntity(DF55ObjectTag entity) {
public SDf55 getSDfEntity() {
SDf55 result = new SDf55();
result.setSeg_type(entity.getSegType());
result.setDoc_type(entity.getDocType());
result.setDocnm_ref(entity.getDocnmRef());
result.setDocnmprev(entity.getDocnmprev());
result.setSbankcode(entity.getSbankcode());
result.setC_acc_deb(entity.getcAccDeb());
result.setSbanknam1(entity.getSbanknam1());
result.setSbanknam2(entity.getSbanknam1());
result.setSbanknam3(entity.getSbanknam1());
result.setSbanknam4(entity.getSbanknam1());
result.setSbanknam5(entity.getSbanknam1());
result.setRbankcode(entity.getRbankcode());
result.setC_acc_cred(entity.getcAccCred());
result.setRbanknam1(entity.getRbanknam1());
result.setRbanknam2(entity.getRbanknam1());
result.setRbanknam3(entity.getRbanknam1());
result.setRbanknam4(entity.getRbanknam1());
result.setRbanknam5(entity.getRbanknam1());
result.setOp_type(entity.getOpType());
result.setOp_order(entity.getOpOrder());
result.setPay_date(entity.getPayDate().toString());
result.setPay_val(entity.getPayVal());
result.setSum_deb(entity.getSumDeb());
result.setSclientn1(entity.getSclientn1());
result.setSclientn2(entity.getSclientn1());
result.setSclientn3(entity.getSclientn1());
result.setSclientn4(entity.getSclientn1());
result.setInn_deb(entity.getInnCred());
result.setKpp_deb(entity.getKppCred());
result.setAcc_deb(entity.getAccDeb());
result.setRclientn1(entity.getRclientn1());
result.setRclientn2(entity.getRclientn1());
result.setRclientn3(entity.getRclientn1());
result.setRclientn4(entity.getRclientn1());
result.setInn_cred(entity.getInnCred());
result.setKpp_cred(entity.getKppCred());
result.setAcc_kr_1(entity.getAccKr1());
result.setSpecif_1(entity.getSpecif1());
result.setSend_type(entity.getSendType());
result.setDoc_result(entity.getDocResult());
result.setDoc_Num(entity.getDocNum());
result.setDoc_Date(entity.getDocDate().toString());
result.setValue_date(entity.getValueDate().toString());
result.setSwift_ben(entity.getSwiftBen());
result.setSwift_int(entity.getSwiftInt());
result.setSeg_type(this.getSegType());
result.setDoc_type(this.getDocType());
result.setDocnm_ref(this.getDocnmRef());
result.setDocnmprev(this.getDocnmprev());
result.setSbankcode(this.getSbankcode());
result.setC_acc_deb(this.getcAccDeb());
result.setSbanknam1(this.getSbanknam1());
result.setSbanknam2(this.getSbanknam1());
result.setSbanknam3(this.getSbanknam1());
result.setSbanknam4(this.getSbanknam1());
result.setSbanknam5(this.getSbanknam1());
result.setRbankcode(this.getRbankcode());
result.setC_acc_cred(this.getcAccCred());
result.setRbanknam1(this.getRbanknam1());
result.setRbanknam2(this.getRbanknam1());
result.setRbanknam3(this.getRbanknam1());
result.setRbanknam4(this.getRbanknam1());
result.setRbanknam5(this.getRbanknam1());
result.setOp_type(this.getOpType());
result.setOp_order(this.getOpOrder());
result.setPay_date(this.getPayDate().toString());
result.setPay_val(this.getPayVal());
result.setSum_deb(this.getSumDeb());
result.setSclientn1(this.getSclientn1());
result.setSclientn2(this.getSclientn1());
result.setSclientn3(this.getSclientn1());
result.setSclientn4(this.getSclientn1());
result.setInn_deb(this.getInnCred());
result.setKpp_deb(this.getKppCred());
result.setAcc_deb(this.getAccDeb());
result.setRclientn1(this.getRclientn1());
result.setRclientn2(this.getRclientn1());
result.setRclientn3(this.getRclientn1());
result.setRclientn4(this.getRclientn1());
result.setInn_cred(this.getInnCred());
result.setKpp_cred(this.getKppCred());
result.setAcc_kr_1(this.getAccKr1());
result.setSpecif_1(this.getSpecif1());
result.setSend_type(this.getSendType());
result.setDoc_result(this.getDocResult());
result.setDoc_Num(this.getDocNum());
result.setDoc_Date(this.getDocDate().toString());
result.setValue_date(this.getValueDate().toString());
result.setSwift_ben(this.getSwiftBen());
result.setSwift_int(this.getSwiftInt());
result.setFileName(filename);
result.setGenerationTime(Instant.now());
result.setGenerationId(fileId);

90
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/DF57ObjectTag.java
View file

@ -9,7 +9,7 @@ import ru.clearing.classes.statics.data.sdf.SDf57;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
public class DF57ObjectTag extends ObjectTag<SDf57, DF57ObjectTag> {
public class DF57ObjectTag extends ObjectTag<SDf57> {
private static final String PREFIX = ETable.DF_57.name();
private static final Class<SDf57> CLAZZ = SDf57.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf57;
@ -122,52 +122,52 @@ public class DF57ObjectTag extends ObjectTag<SDf57, DF57ObjectTag> {
}
@Override
public SDf57 getEntity(DF57ObjectTag entity) {
public SDf57 getSDfEntity() {
SDf57 result = new SDf57();
result.setDbfId(entity.getId());
result.setDeal_deb(entity.getDealDeb());
result.setDeal_cred(entity.getDealCred());
result.setSbankcode(entity.getSbankcode());
result.setC_acc_deb(entity.getcAccDeb());
result.setSbanknam1(entity.getSbanknam1());
result.setSbanknam2(entity.getSbanknam1());
result.setSbanknam3(entity.getSbanknam1());
result.setSbanknam4(entity.getSbanknam1());
result.setSbanknam5(entity.getSbanknam1());
result.setRbankcode(entity.getRbankcode());
result.setC_acc_cred(entity.getcAccCred());
result.setRbanknam1(entity.getRbanknam1());
result.setRbanknam2(entity.getRbanknam1());
result.setRbanknam3(entity.getRbanknam1());
result.setRbanknam4(entity.getRbanknam1());
result.setRbanknam5(entity.getRbanknam1());
result.setOp_type(entity.getOpType());
result.setPay_date(entity.getPayDate().toString());
result.setExt_date(entity.getExtDate().toString());
result.setPay_val(entity.getPayVal());
result.setSum_deb(entity.getSumDeb());
result.setSclientn1(entity.getSclientn1());
result.setSclientn2(entity.getSclientn1());
result.setSclientn3(entity.getSclientn1());
result.setSclientn4(entity.getSclientn1());
result.setInn_deb(entity.getInnDeb());
result.setKpp_deb(entity.getKppDeb());
result.setAcc_deb(entity.getAccDeb());
result.setRclientn1(entity.getRclientn1());
result.setRclientn2(entity.getRclientn1());
result.setRclientn3(entity.getRclientn1());
result.setRclientn4(entity.getRclientn1());
result.setInn_cred(entity.getInnDeb());
result.setKpp_cred(entity.getKppDeb());
result.setAcc_kr(entity.getAccKr());
result.setSpecif(entity.getSpecif());
result.setDoc_Num(entity.getDocNum());
result.setDoc_Date(entity.getDocDate().toString());
result.setDt_in(entity.getDtIn());
result.setKt_in(entity.getKtIn());
result.setDt_out(entity.getDtOut());
result.setKt_out(entity.getKtOut());
result.setDbfId(this.getId());
result.setDeal_deb(this.getDealDeb());
result.setDeal_cred(this.getDealCred());
result.setSbankcode(this.getSbankcode());
result.setC_acc_deb(this.getcAccDeb());
result.setSbanknam1(this.getSbanknam1());
result.setSbanknam2(this.getSbanknam1());
result.setSbanknam3(this.getSbanknam1());
result.setSbanknam4(this.getSbanknam1());
result.setSbanknam5(this.getSbanknam1());
result.setRbankcode(this.getRbankcode());
result.setC_acc_cred(this.getcAccCred());
result.setRbanknam1(this.getRbanknam1());
result.setRbanknam2(this.getRbanknam1());
result.setRbanknam3(this.getRbanknam1());
result.setRbanknam4(this.getRbanknam1());
result.setRbanknam5(this.getRbanknam1());
result.setOp_type(this.getOpType());
result.setPay_date(this.getPayDate().toString());
result.setExt_date(this.getExtDate().toString());
result.setPay_val(this.getPayVal());
result.setSum_deb(this.getSumDeb());
result.setSclientn1(this.getSclientn1());
result.setSclientn2(this.getSclientn1());
result.setSclientn3(this.getSclientn1());
result.setSclientn4(this.getSclientn1());
result.setInn_deb(this.getInnDeb());
result.setKpp_deb(this.getKppDeb());
result.setAcc_deb(this.getAccDeb());
result.setRclientn1(this.getRclientn1());
result.setRclientn2(this.getRclientn1());
result.setRclientn3(this.getRclientn1());
result.setRclientn4(this.getRclientn1());
result.setInn_cred(this.getInnDeb());
result.setKpp_cred(this.getKppDeb());
result.setAcc_kr(this.getAccKr());
result.setSpecif(this.getSpecif());
result.setDoc_Num(this.getDocNum());
result.setDoc_Date(this.getDocDate().toString());
result.setDt_in(this.getDtIn());
result.setKt_in(this.getKtIn());
result.setDt_out(this.getDtOut());
result.setKt_out(this.getKtOut());
result.setFileName(filename);
result.setGenerationTime(Instant.now());
result.setGenerationId(fileId);

6
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/objects/ObjectTag.java
View file

@ -15,7 +15,7 @@ import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
@JsonSubTypes.Type(DF55ObjectTag.class),
@JsonSubTypes.Type(DF57ObjectTag.class)
})
public abstract class ObjectTag<T1 extends SpcexObjectBase, T2 extends ObjectTag<T1, T2>> {
public abstract class ObjectTag<T1 extends SpcexObjectBase> {
private final String prefix;
private final Class<T1> clazz;
private final String nameOfMap;
@ -30,9 +30,9 @@ public abstract class ObjectTag<T1 extends SpcexObjectBase, T2 extends ObjectTag
this.nameOfMap = nameOfMap;
}
public abstract T1 getEntity(T2 entity);
public abstract T1 getSDfEntity();
public void injectEntity(T1 obj) {
public void insertEntity(T1 obj) {
if (map == null) {
bootMap();
}

6
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/steps/ImportToDB.java
View file

@ -22,12 +22,12 @@ public class ImportToDB {
private final Logger log = LoggerFactory.getLogger(getClass());
private final XmlMapper xmlMapper;
private final HazelcastService hazelcastService;
private final Map<ETable, ObjectTag<? extends SpcexObjectBase, ?>> objectTagMap;
private final Map<ETable, ObjectTag<? extends SpcexObjectBase>> objectTagMap;
private final XmlImportKafkaMessenger kafkaMessenger;
public ImportToDB(@Qualifier("xmlMapper") XmlMapper xmlMapper,
HazelcastService hazelcastService,
@Qualifier("mapOfTable") Map<ETable, ObjectTag<? extends SpcexObjectBase, ?>> objectTagMap,
@Qualifier("mapOfTable") Map<ETable, ObjectTag<? extends SpcexObjectBase>> objectTagMap,
XmlImportKafkaMessenger kafkaMessenger) {
this.xmlMapper = xmlMapper;
this.hazelcastService = hazelcastService;
@ -63,7 +63,7 @@ public class ImportToDB {
i++;
continue;
}
objectTag.injectEntity(objectTag.getEntity(o));
objectTag.insertEntity(o.getSDfEntity());
i++;
}

2
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/steps/XmlImportKafkaMessenger.java
View file

@ -103,7 +103,7 @@ public class XmlImportKafkaMessenger implements InitializingBean {
groupId, table, msgId, destination);
}
public void sendPairSdfRequest(ObjectTag<? extends SpcexObjectBase, ?> tag, String tableSdf) {
public void sendPairSdfRequest(ObjectTag<? extends SpcexObjectBase> tag, String tableSdf) {
PairSdfRequest request = new PairSdfRequest();
request.setGenerationId(tag.getFileId());
request.setFileNameSDf(tag.getFilename());

10
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/services/XMLImporterService.java
View file

@ -20,6 +20,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.util.StopWatch;
import ru.spcex.clearing.xml.importer.logic.data.ResultContainer;
import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
import ru.spcex.clearing.xml.importer.logic.steps.ChangeDirOfFileStage;
@ -83,17 +84,18 @@ public class XMLImporterService {
for (Pair<File, ETable> newFilesEntry : orderByTimeFiles) {
ETable currTable = newFilesEntry.getSecond();
File xmlFile = newFilesEntry.getFirst();
ResultContainer task = ResultContainer.createNewTask(currTable, xmlFile);
ResultContainer task = new ResultContainer(currTable, xmlFile);
log.info("uuid {}. Task started", task.getUuid());
long startMills = System.currentTimeMillis();
StopWatch stopWatch = new StopWatch();
stopWatch.start();
task.setLastStageStatus(importToDB.process(task));
task.setLastStageStatus(changeDirOfFileStage.process(task));
long endMills = System.currentTimeMillis();
stopWatch.stop();
log.info("uuid {}. Task completed, result: {}, time working: {} ms",
task.getUuid(),
task,
endMills - startMills);
stopWatch.getTotalTimeMillis());
}
} finally {
if (newFiles != null && !newFiles.isEmpty()) {