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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2022-11-01 12:13:42 +03:00
commit 1cbee9a716
4 changed files with 35 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/config/SdfExecutorsConfig.java Normal file
View file

@ -0,0 +1,22 @@
package ru.spcex.clearing.balance.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import ru.spcex.clearing.balance.service.AbstractExecutor;
import ru.spcex.clearing.balance.service.Sdf01Executor;
import ru.spcex.platform.classes.base.interfaces.WithAccount;
import ru.spcex.platform.enumeration.SdfTable;
import java.util.HashMap;
import java.util.Map;
@Configuration
public class SdfExecutorsConfig {
@Bean("sdfExecutors")
public Map<SdfTable, AbstractExecutor<? extends WithAccount>> executorsMap(Sdf01Executor sdf01Executor) {
Map<SdfTable, AbstractExecutor<? extends WithAccount>> executors = new HashMap<>();
executors.put(SdfTable.SDF_01, sdf01Executor);
return executors;
}
}

2
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/AbstactExecutor.java → clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/AbstractExecutor.java
View file

@ -5,6 +5,6 @@ import ru.spcex.platform.classes.base.interfaces.WithAccount;
import java.util.Collection;
public abstract class AbstactExecutor<T extends WithAccount> {
public abstract class AbstractExecutor<T extends WithAccount> {
abstract Result execute(Collection<T> sdf, StatementRequest statementRequest);
}

2
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf01Executor.java
View file

@ -31,7 +31,7 @@ import java.util.Optional;
import java.util.function.Function;
@Service
public class Sdf01Executor extends AbstactExecutor<SDf01> {
public class Sdf01Executor extends AbstractExecutor<SDf01> {
private final Logger log = LoggerFactory.getLogger(getClass());
private final static DateTimeFormatter datFormatter = DateTimeFormatter.ofPattern("dd.MM.yy");

46
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/StatementService.java
View file

@ -7,10 +7,7 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import ru.clearing.classes.statics.data.account.AccountBalance;
import ru.clearing.classes.statics.data.sdf.SDf01;
import ru.clearing.classes.statics.data.sdf.SDf02;
import ru.clearing.classes.statics.data.statement.Statement;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
import ru.spcex.clearing.platform.messaging.domain.Consts;
@ -24,14 +21,10 @@ import ru.spcex.platform.classes.base.interfaces.WithAccount;
import ru.spcex.platform.enumeration.SdfTable;
import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.utils.enumeration.IMessageResolver;
import ru.spcex.platform.utils.validation.IValidator;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
@Service
@ -40,34 +33,19 @@ public class StatementService extends QueueConsumer implements InitializingBean
private final ImdgProvider imdgProvider;
private final KafkaSender kafkaReqProducer;
private final LoggingService errorLogger;
private final Imdg<? extends WithAccount> sdf01Imdg;
private final Imdg<SDf02> sdf02Imdg;
private final Imdg<AccountBalance> accountBalanceImdg;
private final Imdg<Statement> statementImdg;
private final Function<SDf01, IValidator> sDf01Validator;
private final AccountBalanceService accountBalanceService;
private final IMessageResolver errorResolver;
private final Map<SdfTable, AbstactExecutor<? extends WithAccount>> executorsMap = new HashMap() {{
// put(SdfTable.SDF_01, new Sdf01Executor());
}};
private final Map<SdfTable, AbstractExecutor<? extends WithAccount>> executorsMap;
@Autowired
public StatementService(Consumer<String, Object> kafkaQueue, ImdgProvider imdgProvider, KafkaSender kafkaReqProducer, LoggingService errorLogger,
@Qualifier("sdf01Validator") Function<SDf01, IValidator> sDf01Validator,
AccountBalanceService accountBalanceService,
IMessageResolver errorResolver) {
public StatementService(Consumer<String, Object> kafkaQueue,
ImdgProvider imdgProvider,
KafkaSender kafkaReqProducer,
@Qualifier("sdfExecutors") Map<SdfTable, AbstractExecutor<? extends WithAccount>> executorsMap) {
super(kafkaQueue);
this.imdgProvider = imdgProvider;
this.sdf01Imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SDf01, SDf01.class);
this.sdf02Imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SDf02, SDf02.class);
this.accountBalanceService = accountBalanceService;
this.statementImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Statement, Statement.class);
this.accountBalanceImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_AccountBalance, AccountBalance.class);
this.kafkaReqProducer = kafkaReqProducer;
this.errorLogger = errorLogger;
this.sDf01Validator = sDf01Validator;
this.errorResolver = errorResolver;
this.executorsMap = executorsMap;
}
@Override
@ -80,13 +58,13 @@ public class StatementService extends QueueConsumer implements InitializingBean
private void process(BaseRequest<StatementRequest> systemRequest) {
StatementRequest statementRequest = systemRequest.getRequestPayload();
Collection<? extends WithAccount> sdf01Group;
Collection<? extends WithAccount> sdfGroup;
SdfTable table = statementRequest.getTable();
//map = getMapByTable(table)
if (statementRequest.getAccountCreationResults().size() == 0) {
sdf01Group = sdf01Imdg.getCollectionObjectsByFieldValues(Map.of("generationId", statementRequest.getGroupId()));
sdfGroup = sdf01Imdg.getCollectionObjectsByFieldValues(Map.of("generationId", statementRequest.getGroupId()));
} else {
sdf01Group = statementRequest.getAccountCreationResults()
sdfGroup = statementRequest.getAccountCreationResults()
.stream()
.filter(part -> part.getErrorCode() == null) //fixme эти случае должны попадать в ошибочный sdf02
.map(part -> sdf01Imdg.getSingleObjectByID(part.getSdfId()))
@ -96,10 +74,8 @@ public class StatementService extends QueueConsumer implements InitializingBean
// .stream()
// .sorted(Comparator.comparing(SpcexObjectBase::getId))
// .collect(Collectors.toList());
//questions: делаем абстракцию или нет
AbstactExecutor service = executorsMap.get(table);
Result res = service.execute(sdf01Group, statementRequest);
AbstractExecutor service = executorsMap.get(table);
Result res = service.execute(sdfGroup, statementRequest);
if (res.getAccountRequests().size() == 0) {
ExportToFileRequest exportRequest = new ExportToFileRequest();
exportRequest.setSdfGroupId(res.getGenerationId());