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

securities-service поправил WorkflowStatus

Browse source
This commit is contained in:
AKurakin 2023-05-29 14:14:08 +03:00
parent c6a7ab20c1
commit 751da613a5
3 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/EquitySecurityService.java
View file

@ -23,13 +23,13 @@ import ru.spcex.clearing.util.security.UserRoleVerification;
import ru.spcex.clearing.validation.common.ValidationHelper;
import ru.spcex.platform.enumeration.Market;
import ru.spcex.platform.enumeration.UserRole;
import ru.spcex.platform.enumeration.WorkflowStatus;
import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgId;
import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.imdg.api.ImdgTransaction;
import java.time.Instant;
import java.util.Map;
@Service
public class EquitySecurityService extends QueueConsumer implements InitializingBean {
@ -93,7 +93,11 @@ public class EquitySecurityService extends QueueConsumer implements Initializing
equity.setIssuerId(req.getIssuerId());
equity.setShortNameEng(req.getShortNameEng());
equity.setFullNameEng(req.getFullNameEng());
equity.setWorkflowStatus(req.workflowStatus);
if (req.getWorkflowStatus() == null) {
equity.setWorkflowStatus(WorkflowStatus.Active.getKey());
} else {
equity.setWorkflowStatus(req.getWorkflowStatus());
}
equity.setInstrumentType(req.getInstrumentType());
equity.setSecurityId(equity.getId());
equity.setCreated(Instant.now());
@ -140,7 +144,9 @@ public class EquitySecurityService extends QueueConsumer implements Initializing
equity.setIssuerId(req.getIssuerId());
equity.setShortNameEng(req.getShortNameEng());
equity.setFullNameEng(req.getFullNameEng());
equity.setWorkflowStatus(req.workflowStatus);
if (req.getWorkflowStatus() != null) {
equity.setWorkflowStatus(req.getWorkflowStatus());
}
equity.setInstrumentType(req.getInstrumentType());
equitySecurityImdg.update(equity);

12
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/FixedIncomeSecurityService.java
View file

@ -22,13 +22,13 @@ import ru.spcex.clearing.securities.validation.ValidationProvider;
import ru.spcex.clearing.util.security.UserRoleVerification;
import ru.spcex.clearing.validation.common.ValidationHelper;
import ru.spcex.platform.enumeration.UserRole;
import ru.spcex.platform.enumeration.WorkflowStatus;
import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgId;
import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.imdg.api.ImdgTransaction;
import java.time.Instant;
import java.util.Map;
@Service
public class FixedIncomeSecurityService extends QueueConsumer implements InitializingBean {
@ -97,7 +97,11 @@ public class FixedIncomeSecurityService extends QueueConsumer implements Initial
fixedIncome.setIssuerId(req.getIssuerId());
fixedIncome.setShortNameEng(req.getShortNameEng());
fixedIncome.setFullNameEng(req.getFullNameEng());
fixedIncome.setWorkflowStatus(req.getWorkflowStatus());
if (req.getWorkflowStatus() == null) {
fixedIncome.setWorkflowStatus(WorkflowStatus.Active.getKey());
} else {
fixedIncome.setWorkflowStatus(req.getWorkflowStatus());
}
fixedIncome.setInstrumentType(req.getInstrumentType());
fixedIncome.setSecurityId(fixedIncome.getId());
fixedIncome.setCreated(Instant.now());
@ -149,7 +153,9 @@ public class FixedIncomeSecurityService extends QueueConsumer implements Initial
fixedIncome.setIssuerId(req.getIssuerId());
fixedIncome.setShortNameEng(req.getShortNameEng());
fixedIncome.setFullNameEng(req.getFullNameEng());
fixedIncome.setWorkflowStatus(req.getWorkflowStatus());
if (req.getWorkflowStatus() != null) {
fixedIncome.setWorkflowStatus(req.getWorkflowStatus());
}
fixedIncome.setInstrumentType(req.getInstrumentType());
fixedIncome.setSecurityId(fixedIncome.getId());

12
clearing-parent/securities-service/src/main/java/ru/spcex/clearing/securities/service/cud/MoneyMarketSecurityService.java
View file

@ -24,6 +24,7 @@ import ru.spcex.clearing.securities.validation.ValidationProvider;
import ru.spcex.clearing.util.security.UserRoleVerification;
import ru.spcex.clearing.validation.common.ValidationHelper;
import ru.spcex.platform.enumeration.UserRole;
import ru.spcex.platform.enumeration.WorkflowStatus;
import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgId;
import ru.spcex.platform.imdg.api.ImdgProvider;
@ -34,7 +35,6 @@ import ru.spcex.platform.utils.enumeration.IMessageResolver;
import ru.spcex.platform.utils.validation.IValidator;
import java.time.Instant;
import java.util.Map;
import java.util.Optional;
@Service
@ -131,7 +131,11 @@ public class MoneyMarketSecurityService extends QueueConsumer implements Initial
mms.setSecurityId(mms.getId());
mms.setDescription(req.getDescription());
mms.setCreated(Instant.now());
mms.setWorkflowStatus(req.getWorkflowStatus());
if (req.getWorkflowStatus() == null) {
mms.setWorkflowStatus(WorkflowStatus.Active.getKey());
} else {
mms.setWorkflowStatus(req.getWorkflowStatus());
}
try {
transaction.beginTransaction();
Imdg<MoneyMarketSecurity> moneyMarketSecurityMap = transaction.getImdg(IMDGDistributedNames.Map_MoneyMarketSecurity, MoneyMarketSecurity.class);
@ -188,7 +192,9 @@ public class MoneyMarketSecurityService extends QueueConsumer implements Initial
mms.setIssuerId(req.getIssuerId());
mms.setSecurityId(mms.getId());
mms.setDescription(req.getDescription());
mms.setWorkflowStatus(req.getWorkflowStatus());
if (req.getWorkflowStatus() != null) {
mms.setWorkflowStatus(req.getWorkflowStatus());
}
moneyMarketSecurityMap.update(mms);
// Listing listing = listingImdg.getSingleObjectByFieldValues(Map.of("securityId", mms.getId()));