session#updated/created
dm** registries sessionId/sessionType dm** registryStatus update
This commit is contained in:
parent
6dc5133d10
commit
112fee67e4
10 changed files with 22 additions and 1 deletions
|
|
@ -391,6 +391,8 @@ public class Sdf57Executor extends AbstractExecutor<SDf57> {
|
||||||
rgsD.setRegistryUnit(unit.getKey());
|
rgsD.setRegistryUnit(unit.getKey());
|
||||||
rgsD.setRegistryCode(RegistryUtil.clearingCode(rgsD));
|
rgsD.setRegistryCode(RegistryUtil.clearingCode(rgsD));
|
||||||
rgsD.setBalance(stmt.getAmount());
|
rgsD.setBalance(stmt.getAmount());
|
||||||
|
rgsD.setSessionId(null);
|
||||||
|
rgsD.setSessionType(null);
|
||||||
return rgsD;
|
return rgsD;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,7 @@ public abstract class AbstractSession {
|
||||||
if (session != null) {
|
if (session != null) {
|
||||||
session.setSessionStatus(SessionStatus.CLOS.getKey());
|
session.setSessionStatus(SessionStatus.CLOS.getKey());
|
||||||
session.setWorkflowStatus(WorkflowStatus.Blocked.getKey());
|
session.setWorkflowStatus(WorkflowStatus.Blocked.getKey());
|
||||||
|
session.setUpdated(Instant.now());
|
||||||
sessionImdg.update(session);
|
sessionImdg.update(session);
|
||||||
}
|
}
|
||||||
this.currStage.set(null);
|
this.currStage.set(null);
|
||||||
|
|
@ -75,6 +76,7 @@ public abstract class AbstractSession {
|
||||||
synchronized (this.currStage) {
|
synchronized (this.currStage) {
|
||||||
this.currStage.set(t);
|
this.currStage.set(t);
|
||||||
this.currSession.setSessionStatus(t.getKey());
|
this.currSession.setSessionStatus(t.getKey());
|
||||||
|
this.currSession.setUpdated(Instant.now());
|
||||||
sessionImdg.update(this.currSession);
|
sessionImdg.update(this.currSession);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider;
|
||||||
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
|
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
|
||||||
import ru.spcex.platform.utils.enumeration.IMessageResolver;
|
import ru.spcex.platform.utils.enumeration.IMessageResolver;
|
||||||
|
|
||||||
|
import java.time.Instant;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -249,6 +250,7 @@ public class FinalMkrSession extends AbstractSession implements InitializingBean
|
||||||
newSession.setSessionStatus(startStatus.getKey());
|
newSession.setSessionStatus(startStatus.getKey());
|
||||||
newSession.setWorkflowStatus(SessionStatus.ACTV.getKey());
|
newSession.setWorkflowStatus(SessionStatus.ACTV.getKey());
|
||||||
newSession.setClearingDate(LocalDate.now());
|
newSession.setClearingDate(LocalDate.now());
|
||||||
|
newSession.setCreated(Instant.now());
|
||||||
|
|
||||||
//todo companyId/securityId/userId передается из сообщения очереди
|
//todo companyId/securityId/userId передается из сообщения очереди
|
||||||
sessionImdg.insert(newSession);
|
sessionImdg.insert(newSession);
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider;
|
||||||
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
|
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
|
||||||
import ru.spcex.platform.utils.enumeration.IMessageResolver;
|
import ru.spcex.platform.utils.enumeration.IMessageResolver;
|
||||||
|
|
||||||
|
import java.time.Instant;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -237,6 +238,7 @@ public class IntermediateMkrSession extends AbstractSession implements Initializ
|
||||||
newSession.setSessionStatus(startStatus.getKey());
|
newSession.setSessionStatus(startStatus.getKey());
|
||||||
newSession.setWorkflowStatus(SessionStatus.ACTV.getKey());
|
newSession.setWorkflowStatus(SessionStatus.ACTV.getKey());
|
||||||
newSession.setClearingDate(LocalDate.now());
|
newSession.setClearingDate(LocalDate.now());
|
||||||
|
newSession.setCreated(Instant.now());
|
||||||
|
|
||||||
//todo companyId/securityId/userId передается из сообщения очереди
|
//todo companyId/securityId/userId передается из сообщения очереди
|
||||||
sessionImdg.insert(newSession);
|
sessionImdg.insert(newSession);
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider;
|
||||||
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
|
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
|
||||||
import ru.spcex.platform.utils.enumeration.IMessageResolver;
|
import ru.spcex.platform.utils.enumeration.IMessageResolver;
|
||||||
|
|
||||||
|
import java.time.Instant;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -220,6 +221,7 @@ public class PrimaryAuctionB0Session extends AbstractSession implements Initiali
|
||||||
newSession.setSessionStatus(startStatus.getKey());
|
newSession.setSessionStatus(startStatus.getKey());
|
||||||
newSession.setWorkflowStatus(SessionStatus.ACTV.getKey());
|
newSession.setWorkflowStatus(SessionStatus.ACTV.getKey());
|
||||||
newSession.setClearingDate(LocalDate.now());
|
newSession.setClearingDate(LocalDate.now());
|
||||||
|
newSession.setCreated(Instant.now());
|
||||||
//todo companyId/securityId/userId передается из сообщения очереди
|
//todo companyId/securityId/userId передается из сообщения очереди
|
||||||
sessionImdg.insert(newSession);
|
sessionImdg.insert(newSession);
|
||||||
currSession = newSession;
|
currSession = newSession;
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider;
|
||||||
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
|
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
|
||||||
import ru.spcex.platform.utils.enumeration.IMessageResolver;
|
import ru.spcex.platform.utils.enumeration.IMessageResolver;
|
||||||
|
|
||||||
|
import java.time.Instant;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -220,6 +221,7 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali
|
||||||
newSession.setSessionStatus(startStatus.getKey());
|
newSession.setSessionStatus(startStatus.getKey());
|
||||||
newSession.setWorkflowStatus(SessionStatus.ACTV.getKey());
|
newSession.setWorkflowStatus(SessionStatus.ACTV.getKey());
|
||||||
newSession.setClearingDate(LocalDate.now());
|
newSession.setClearingDate(LocalDate.now());
|
||||||
|
newSession.setCreated(Instant.now());
|
||||||
|
|
||||||
//todo companyId/securityId/userId передается из сообщения очереди
|
//todo companyId/securityId/userId передается из сообщения очереди
|
||||||
sessionImdg.insert(newSession);
|
sessionImdg.insert(newSession);
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider;
|
||||||
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
|
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
|
||||||
import ru.spcex.platform.utils.enumeration.IMessageResolver;
|
import ru.spcex.platform.utils.enumeration.IMessageResolver;
|
||||||
|
|
||||||
|
import java.time.Instant;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -218,6 +219,7 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali
|
||||||
newSession.setSessionStatus(TaskType.StartRevise.getKey());
|
newSession.setSessionStatus(TaskType.StartRevise.getKey());
|
||||||
newSession.setWorkflowStatus(SessionStatus.ACTV.getKey());
|
newSession.setWorkflowStatus(SessionStatus.ACTV.getKey());
|
||||||
newSession.setClearingDate(LocalDate.now());
|
newSession.setClearingDate(LocalDate.now());
|
||||||
|
newSession.setCreated(Instant.now());
|
||||||
//todo companyId/securityId/userId передается из сообщения очереди
|
//todo companyId/securityId/userId передается из сообщения очереди
|
||||||
sessionImdg.insert(newSession);
|
sessionImdg.insert(newSession);
|
||||||
currSession = newSession;
|
currSession = newSession;
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider;
|
||||||
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
|
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
|
||||||
import ru.spcex.platform.utils.enumeration.IMessageResolver;
|
import ru.spcex.platform.utils.enumeration.IMessageResolver;
|
||||||
|
|
||||||
|
import java.time.Instant;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
|
||||||
|
|
@ -193,6 +194,7 @@ public class ReturnDepositSession extends AbstractSession implements Initializin
|
||||||
newSession.setSessionStatus(startStatus.getKey());
|
newSession.setSessionStatus(startStatus.getKey());
|
||||||
newSession.setWorkflowStatus(SessionStatus.ACTV.getKey());
|
newSession.setWorkflowStatus(SessionStatus.ACTV.getKey());
|
||||||
newSession.setClearingDate(LocalDate.now());
|
newSession.setClearingDate(LocalDate.now());
|
||||||
|
newSession.setCreated(Instant.now());
|
||||||
|
|
||||||
//todo companyId/securityId/userId передается из сообщения очереди
|
//todo companyId/securityId/userId передается из сообщения очереди
|
||||||
sessionImdg.insert(newSession);
|
sessionImdg.insert(newSession);
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ import ru.spcex.platform.imdg.api.ImdgProvider;
|
||||||
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
|
import ru.spcex.platform.imdg.api.predicate.ImdgPredicateBuilder;
|
||||||
import ru.spcex.platform.utils.enumeration.IMessageResolver;
|
import ru.spcex.platform.utils.enumeration.IMessageResolver;
|
||||||
|
|
||||||
|
import java.time.Instant;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
|
@ -223,6 +224,7 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia
|
||||||
newSession.setSessionStatus(startStatus.getKey());
|
newSession.setSessionStatus(startStatus.getKey());
|
||||||
newSession.setWorkflowStatus(SessionStatus.ACTV.getKey());
|
newSession.setWorkflowStatus(SessionStatus.ACTV.getKey());
|
||||||
newSession.setClearingDate(LocalDate.now());
|
newSession.setClearingDate(LocalDate.now());
|
||||||
|
newSession.setCreated(Instant.now());
|
||||||
|
|
||||||
//todo companyId/securityId/userId передается из сообщения очереди
|
//todo companyId/securityId/userId передается из сообщения очереди
|
||||||
sessionImdg.insert(newSession);
|
sessionImdg.insert(newSession);
|
||||||
|
|
|
||||||
|
|
@ -126,8 +126,10 @@ public class InspectionObligationsDepositReturn implements ISessionStage {
|
||||||
);
|
);
|
||||||
if (dmtBalance.compareTo(omtBalance) >= 0 && amfBalance.compareTo(omtBalance) >=0) {
|
if (dmtBalance.compareTo(omtBalance) >= 0 && amfBalance.compareTo(omtBalance) >=0) {
|
||||||
group.forEach(rgs -> updateStatus(rgs, RegistryStatus.OK));
|
group.forEach(rgs -> updateStatus(rgs, RegistryStatus.OK));
|
||||||
|
updateStatus(dmtInfo.get(), RegistryStatus.OK);
|
||||||
} else {
|
} else {
|
||||||
group.forEach(rgs -> updateStatus(rgs, registryStatusFailed()));
|
group.forEach(rgs -> updateStatus(rgs, registryStatusFailed()));
|
||||||
|
updateStatus(dmtInfo.get(), RegistryStatus.UNCV);
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
@ -141,9 +143,10 @@ public class InspectionObligationsDepositReturn implements ISessionStage {
|
||||||
);
|
);
|
||||||
if (dmtBalance.compareTo(omtBalance) >= 0 && amfBalance.compareTo(omtBalance) >= 0) {
|
if (dmtBalance.compareTo(omtBalance) >= 0 && amfBalance.compareTo(omtBalance) >= 0) {
|
||||||
group.forEach(rgs -> updateStatus(rgs, RegistryStatus.OK));
|
group.forEach(rgs -> updateStatus(rgs, RegistryStatus.OK));
|
||||||
|
updateStatus(dmtClnr.get(), RegistryStatus.OK);
|
||||||
} else {
|
} else {
|
||||||
group.forEach(rgs -> updateStatus(rgs, registryStatusFailed()));
|
group.forEach(rgs -> updateStatus(rgs, registryStatusFailed()));
|
||||||
updateStatus(dmtClnr.get(), registryStatusFailed());
|
updateStatus(dmtClnr.get(), RegistryStatus.UNCV);
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue