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

clearing-service BalanceRevise ревизии 3 стадии AgainRevise, вынес стадию 1.

Browse source
This commit is contained in:
AKurakin 2023-09-04 11:23:45 +03:00
parent 210b855cb2
commit afb21eb2ba
10 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/session/StateBnConfig.java
View file

@ -147,6 +147,7 @@ public class StateBnConfig extends EnumStateMachineConfigurerAdapter<TaskType, S
})
.states(new HashSet<>(Arrays.asList(TaskType.StartRevise,
TaskType.ContinueRevise,
TaskType.StartRevisePart1,
TaskType.DealsPrepare,
TaskType.RequirementsAndObligationsCreate,
TaskType.ObligationsAdmission,
@ -173,11 +174,16 @@ public class StateBnConfig extends EnumStateMachineConfigurerAdapter<TaskType, S
.and()
.withExternal()
.event(SessionEvent.SdfReceived)
.source(TaskType.ContinueRevise).target(TaskType.DealsPrepare)
.source(TaskType.ContinueRevise).target(TaskType.StartRevisePart1)
.action(context -> {
log.info("SDF57 and SDF01 received, continue session");
})
.and()
.withExternal()
.event(SessionEvent.Revise)
.source(TaskType.StartRevisePart1).target(TaskType.DealsPrepare)
.action(balanceReviseAction)
.and()
.withExternal()
.source(TaskType.DealsPrepare).target(TaskType.RequirementsAndObligationsCreate)
.action(dealPrepareAction)

1
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/FinalMkrSession.java
View file

@ -159,6 +159,7 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean
log.error("cannot continue session, current stage is {}", currStage.get());
throw new StageException();
}
runStage(TaskType.StartRevisePart1, currSession.getId(), balanceRevise);
//stage 1
StageResult<List<ExecutionCommon>> dealsPreparationResult;
{

1
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/IntermediateMkrSession.java
View file

@ -153,6 +153,7 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ
log.error("cannot continue session, current stage is {}", currStage.get());
throw new StageException();
}
runStage(TaskType.StartRevisePart1, currSession.getId(), balanceRevise);
//stage 1
StageResult<List<ExecutionCommon>> dealsPreparationResult;
{

1
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionB0Session.java
View file

@ -147,6 +147,7 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali
log.error("cannot continue session, current stage is {}", currStage.get());
throw new StageException();
}
runStage(TaskType.StartRevisePart1, currSession.getId(), balanceRevise);
//stage 1
StageResult<List<ExecutionCommon>> dealsPreparationResult;
{

1
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java
View file

@ -148,6 +148,7 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali
log.error("cannot continue session, current stage is {}", currStage.get());
throw new StageException();
}
runStage(TaskType.StartRevisePart1, currSession.getId(), balanceRevise);
//stage 1
StageResult<List<ExecutionCommon>> dealsPreparationResult;
{

1
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java
View file

@ -148,6 +148,7 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali
log.error("cannot continue session, current stage is {}", currStage.get());
throw new StageException();
}
runStage(TaskType.StartRevisePart1, currSession.getId(), balanceRevise);
//stage 1
StageResult<List<ExecutionCommon>> dealsPreparationResult;
{

1
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java
View file

@ -139,6 +139,7 @@ public class ReturnDepositSession extends AbstractSession implements Initializin
log.error("cannot continue session, current stage is {}", currStage.get());
throw new StageException();
}
runStage(TaskType.StartRevisePart1, currSession.getId(), balanceRevise);
//stage 4
{
InclusionToPoolPayload inclusionToPoolPayload = new InclusionToPoolPayload();

1
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java
View file

@ -142,6 +142,7 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia
log.error("cannot continue session, current stage is {}", currStage.get());
throw new StageException();
}
runStage(TaskType.StartRevisePart1, currSession.getId(), balanceRevise);
//stage 1
StageResult<List<ExecutionCommon>> dealsPreparationResult;
{

1
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/TaskType.java
View file

@ -8,6 +8,7 @@ public enum TaskType implements IEnumKey {
*/
StartRevise("CLR0"),
ContinueRevise("CLR 0_0"),
StartRevisePart1("CLR 0_9"),
/**
* step 1

6
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/impl/BalanceRevise.java
View file

@ -64,10 +64,12 @@ public class BalanceRevise implements ISessionStage {
return sendSdfs();
}
case ContinueRevise -> {
revise(); // основная сверка
return revise(); // основная сверка
}
case StartRevisePart1 -> { // часть 1, часть 2 на стадии 5 (InspectionObligations)
return reviseStage1(); // подготовка к стадии 3 (к AgainRevise)
}
case AgainRevise -> {
case AgainRevise -> { // часть 3
return reviseStage3();
}
default -> throw new IllegalStateException("unknown task " + task.getTaskType());