diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/AdmittedLiabilitiesRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/AdmittedLiabilitiesRegisterController.java new file mode 100644 index 000000000..6dcf40871 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/AdmittedLiabilitiesRegisterController.java @@ -0,0 +1,44 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse; +import ru.spcex.clearing.backendapi.service.IOperator; +import ru.spcex.clearing.backendapi.service.IStateLoader; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/admitted-liabilities-registers") +public class AdmittedLiabilitiesRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public AdmittedLiabilitiesRegisterController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all admittedLiabilitiesRegister's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_AdmittedLiabilitiesRegister, + AdmittedLiabilitiesRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/CoveredLiabilitiesRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/CoveredLiabilitiesRegisterController.java new file mode 100644 index 000000000..f9b99b600 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/CoveredLiabilitiesRegisterController.java @@ -0,0 +1,44 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import ru.clearing.classes.statics.data.register.CoveredLiabilitiesRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse; +import ru.spcex.clearing.backendapi.service.IOperator; +import ru.spcex.clearing.backendapi.service.IStateLoader; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/covered-liabilities-registers") +public class CoveredLiabilitiesRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public CoveredLiabilitiesRegisterController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all coveredLiabilitiesRegister's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_CoveredLiabilitiesRegister, + CoveredLiabilitiesRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoBalanceRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoBalanceRegisterController.java new file mode 100644 index 000000000..012dd7dab --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoBalanceRegisterController.java @@ -0,0 +1,44 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import ru.clearing.classes.statics.data.register.DepoBalanceRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse; +import ru.spcex.clearing.backendapi.service.IOperator; +import ru.spcex.clearing.backendapi.service.IStateLoader; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/depo-balance-registers") +public class DepoBalanceRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public DepoBalanceRegisterController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all depoBalanceRegister's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_DepoBalanceRegister, + DepoBalanceRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterController.java new file mode 100644 index 000000000..8f3517d34 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterController.java @@ -0,0 +1,45 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import ru.clearing.classes.statics.data.register.DepoPaymentInstructionRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse; +import ru.spcex.clearing.backendapi.service.IOperator; +import ru.spcex.clearing.backendapi.service.IStateLoader; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/depo-payment-instruction-registers") +public class DepoPaymentInstructionRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public DepoPaymentInstructionRegisterController(IOperator operator, + IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all depoPaymentInstructionRegister's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_DepoPaymentInstructionRegister, + DepoPaymentInstructionRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterController.java new file mode 100644 index 000000000..5bee23387 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterController.java @@ -0,0 +1,44 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse; +import ru.spcex.clearing.backendapi.service.IOperator; +import ru.spcex.clearing.backendapi.service.IStateLoader; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/exclude-liabilities-registers") +public class ExcludeLiabilitiesRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public ExcludeLiabilitiesRegisterController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all excludeLiabilitiesRegister's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_ExcludeLiabilitiesRegister, + ExcludeLiabilitiesRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExecutionRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExecutionRegisterController.java new file mode 100644 index 000000000..17387b6a6 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ExecutionRegisterController.java @@ -0,0 +1,44 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import ru.clearing.classes.statics.data.register.ExecutionRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse; +import ru.spcex.clearing.backendapi.service.IOperator; +import ru.spcex.clearing.backendapi.service.IStateLoader; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/execution-registers") +public class ExecutionRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public ExecutionRegisterController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all executionRegister's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_ExecutionRegister, + ExecutionRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/LiabilitiesRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/LiabilitiesRegisterController.java new file mode 100644 index 000000000..2f8b1de40 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/LiabilitiesRegisterController.java @@ -0,0 +1,44 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import ru.clearing.classes.statics.data.register.LiabilitiesRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse; +import ru.spcex.clearing.backendapi.service.IOperator; +import ru.spcex.clearing.backendapi.service.IStateLoader; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/liabilities-registers") +public class LiabilitiesRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public LiabilitiesRegisterController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all liabilitiesRegister 's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_LiabilitiesRegister, + LiabilitiesRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyBalanceRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyBalanceRegisterController.java new file mode 100644 index 000000000..c079b4c98 --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyBalanceRegisterController.java @@ -0,0 +1,44 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import ru.clearing.classes.statics.data.register.MoneyBalanceRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse; +import ru.spcex.clearing.backendapi.service.IOperator; +import ru.spcex.clearing.backendapi.service.IStateLoader; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/money-balance-registers") +public class MoneyBalanceRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public MoneyBalanceRegisterController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all moneyBalanceRegister's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_MoneyBalanceRegister, + MoneyBalanceRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyPaymentInstructionRegisterController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyPaymentInstructionRegisterController.java new file mode 100644 index 000000000..83fff564d --- /dev/null +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyPaymentInstructionRegisterController.java @@ -0,0 +1,44 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import ru.clearing.classes.statics.data.register.MoneyPaymentInstructionRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse; +import ru.spcex.clearing.backendapi.service.IOperator; +import ru.spcex.clearing.backendapi.service.IStateLoader; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.util.Collection; +import java.util.Map; + +@Controller +@RequestMapping("/money-payment-instruction-register") +public class MoneyPaymentInstructionRegisterController extends AbstractQueueController { + private final IStateLoader stateLoader; + + @Autowired + public MoneyPaymentInstructionRegisterController(IOperator operator, IStateLoader stateLoader) { + super(operator); + this.stateLoader = stateLoader; + } + + @ApiOperation(value = "get all moneyPaymentInstructionRegister's") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)}) + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public CommonGetAllResponse getAll() { + Collection> all = stateLoader.getAllMetaTransform( + IMDGDistributedNames.Map_MoneyPaymentInstructionRegister, + MoneyPaymentInstructionRegister.class); + CommonGetAllResponse response = new CommonGetAllResponse(); + response.fromEntity(all); + return response; + } +} diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml index 096bf86a6..a3cf956b4 100644 --- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml +++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml @@ -1316,7 +1316,7 @@ - + @@ -1326,7 +1326,7 @@ - + @@ -1393,7 +1393,7 @@ - + @@ -1411,7 +1411,7 @@ - + diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java index 7a4783b30..367f97bff 100644 --- a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java @@ -117,6 +117,14 @@ import static ru.spcex.clearing.test.json.MatcherFactoryWithJson.usingIgnoringFi //payment PaymentInstructionController.class, //register + AdmittedLiabilitiesRegisterController.class, + CoveredLiabilitiesRegisterController.class, + DepoBalanceRegisterController.class, + DepoPaymentInstructionRegisterController.class, + ExcludeLiabilitiesRegisterController.class, + ExecutionRegisterController.class, + LiabilitiesRegisterController.class, + MoneyBalanceRegisterController.class, ContractRegisterController.class, ReportRegisterController.class, //registry diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/AdmittedLiabilitiesRegisterControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/AdmittedLiabilitiesRegisterControllerTest.java new file mode 100644 index 000000000..62e5ab035 --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/AdmittedLiabilitiesRegisterControllerTest.java @@ -0,0 +1,38 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.math.BigDecimal; +import java.time.LocalDate; + +class AdmittedLiabilitiesRegisterControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/admitted-liabilities-registers/"; + + /** + * {@link AdmittedLiabilitiesRegisterController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /admitted-liabilities-registers/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + AdmittedLiabilitiesRegister admittedLiabilitiesRegister = new AdmittedLiabilitiesRegister(); + admittedLiabilitiesRegister.setId(currentId.get()); + admittedLiabilitiesRegister.setCompanyFullName("fuill nme"); + admittedLiabilitiesRegister.setSessionId(111L); + admittedLiabilitiesRegister.setSecuritySymbol("RUB"); + admittedLiabilitiesRegister.setSecurityFullName("SEC NAME"); + admittedLiabilitiesRegister.setCompanyId(222L); + admittedLiabilitiesRegister.setClearingCode("CCDE"); + admittedLiabilitiesRegister.setAccount("ACC1"); + admittedLiabilitiesRegister.setAmount(BigDecimal.valueOf(12.15)); + admittedLiabilitiesRegister.setClearingDate(LocalDate.now()); + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_AdmittedLiabilitiesRegister, admittedLiabilitiesRegister, REST_URL); + } +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/CoveredLiabilitiesRegisterControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/CoveredLiabilitiesRegisterControllerTest.java new file mode 100644 index 000000000..42b5b7906 --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/CoveredLiabilitiesRegisterControllerTest.java @@ -0,0 +1,38 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.CoveredLiabilitiesRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.math.BigDecimal; +import java.time.LocalDate; + +class CoveredLiabilitiesRegisterControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/covered-liabilities-registers/"; + + /** + * {@link CoveredLiabilitiesRegisterController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /covered-liabilities-registers/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + CoveredLiabilitiesRegister coveredLiabilitiesRegister = new CoveredLiabilitiesRegister(); + coveredLiabilitiesRegister.setId(currentId.get()); + coveredLiabilitiesRegister.setCompanyFullName("fuill nme"); + coveredLiabilitiesRegister.setSessionId(111L); + coveredLiabilitiesRegister.setSecuritySymbol("RUB"); + coveredLiabilitiesRegister.setSecurityFullName("SEC NAME"); + coveredLiabilitiesRegister.setCompanyId(222L); + coveredLiabilitiesRegister.setClearingCode("CCDE"); + coveredLiabilitiesRegister.setAccount("ACC1"); + coveredLiabilitiesRegister.setAmount(BigDecimal.valueOf(12.15)); + coveredLiabilitiesRegister.setClearingDate(LocalDate.now()); + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_CoveredLiabilitiesRegister, coveredLiabilitiesRegister, REST_URL); + } +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoBalanceRegisterControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoBalanceRegisterControllerTest.java new file mode 100644 index 000000000..e0991d5d1 --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoBalanceRegisterControllerTest.java @@ -0,0 +1,30 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.DepoBalanceRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +class DepoBalanceRegisterControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/depo-balance-registers/"; + + /** + * {@link DepoBalanceRegisterController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /depo-balance-registers/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + DepoBalanceRegister depoBalanceRegister = new DepoBalanceRegister(); + depoBalanceRegister.setId(currentId.get()); + depoBalanceRegister.setSessionId(111L); + depoBalanceRegister.setSecuritySymbol("RUB"); + depoBalanceRegister.setCompanyId(222L); + depoBalanceRegister.setDepoCode("DCDE"); + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_DepoBalanceRegister, depoBalanceRegister, REST_URL); + } +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterControllerTest.java new file mode 100644 index 000000000..e3d54a241 --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/DepoPaymentInstructionRegisterControllerTest.java @@ -0,0 +1,35 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.DepoPaymentInstructionRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.math.BigDecimal; + +class DepoPaymentInstructionRegisterControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/depo-payment-instruction-registers/"; + + /** + * {@link DepoPaymentInstructionRegisterController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /depo-payment-instruction-registers/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + DepoPaymentInstructionRegister depoPaymentInstructionRegister = new DepoPaymentInstructionRegister(); + depoPaymentInstructionRegister.setId(currentId.get()); + depoPaymentInstructionRegister.setCompanyId(currentId.get()); + depoPaymentInstructionRegister.setTradingClearingRegistryType("TR"); + depoPaymentInstructionRegister.setTradingClearingRegistry("REG"); + depoPaymentInstructionRegister.setCbCode("CBCD"); + depoPaymentInstructionRegister.setQuantity(BigDecimal.valueOf(12.15)); + depoPaymentInstructionRegister.setDirection(currentId.get()); + depoPaymentInstructionRegister.setSessionId(currentId.get()); + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_DepoPaymentInstructionRegister, depoPaymentInstructionRegister, REST_URL); + } +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterControllerTest.java new file mode 100644 index 000000000..79b8a16a9 --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/ExcludeLiabilitiesRegisterControllerTest.java @@ -0,0 +1,42 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.math.BigDecimal; +import java.time.LocalDate; + +class ExcludeLiabilitiesRegisterControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/exclude-liabilities-registers/"; + + /** + * {@link ExcludeLiabilitiesRegisterController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /exclude-liabilities-registers/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + ExcludeLiabilitiesRegister excludeLiabilitiesRegister = new ExcludeLiabilitiesRegister(); + excludeLiabilitiesRegister.setId(currentId.get()); + excludeLiabilitiesRegister.setSessionId(222L); + excludeLiabilitiesRegister.setValidFromDate(LocalDate.now()); + excludeLiabilitiesRegister.setValidToDate(LocalDate.now()); + excludeLiabilitiesRegister.setCompanyId(333L); + excludeLiabilitiesRegister.setCompanyFullName("CompanyFullName"); + excludeLiabilitiesRegister.setInn("Inn"); + excludeLiabilitiesRegister.setSegment("Segment"); + excludeLiabilitiesRegister.setRegistryCode("RegistryCode"); + excludeLiabilitiesRegister.setAccount("Account"); + excludeLiabilitiesRegister.setRegistryStatus("RegistryStatus"); + excludeLiabilitiesRegister.setCurrency("Currency"); + excludeLiabilitiesRegister.setSumLiabilities(BigDecimal.valueOf(12.15)); + excludeLiabilitiesRegister.setSettlementDate(LocalDate.now()); + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_ExcludeLiabilitiesRegister, excludeLiabilitiesRegister, REST_URL); + } +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/ExecutionRegisterControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/ExecutionRegisterControllerTest.java new file mode 100644 index 000000000..40623b6e4 --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/ExecutionRegisterControllerTest.java @@ -0,0 +1,48 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.ExecutionRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.math.BigDecimal; +import java.time.Instant; +import java.time.LocalDate; + +class ExecutionRegisterControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/execution-registers/"; + + /** + * {@link ExecutionRegisterController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /execution-registers/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + ExecutionRegister executionRegister = new ExecutionRegister(); + executionRegister.setId(currentId.get()); + executionRegister.setTradingDate(LocalDate.now()); + executionRegister.setExchangeExecutionId(123L); + executionRegister.setExchangeExecutionTime(Instant.now()); + executionRegister.setSecurityId(123L); + executionRegister.setSellerId(123L); + executionRegister.setSellerClearingCode("CCDE"); + executionRegister.setSellerTradingClearingRegister("TCR"); + executionRegister.setSellerMoneyAccount("MACC-1"); + executionRegister.setSellerDepoAccount("DACC-1"); + executionRegister.setBuyerId(123L); + executionRegister.setBuyerClearingCode("BCCD"); + executionRegister.setBuyerTradingClearingRegister("REG2"); + executionRegister.setBuyerMoneyAccount("BMCCC-12"); + executionRegister.setBuyerDepoAccount("BCCC-12"); + executionRegister.setAmount(BigDecimal.valueOf(14.55)); + executionRegister.setQuantity(BigDecimal.valueOf(0.1)); + executionRegister.setClearingDate(LocalDate.now()); + + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_ExecutionRegister, executionRegister, REST_URL); + } +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/LiabilitiesRegisterControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/LiabilitiesRegisterControllerTest.java new file mode 100644 index 000000000..7b0edaa3d --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/LiabilitiesRegisterControllerTest.java @@ -0,0 +1,43 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.LiabilitiesRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.math.BigDecimal; +import java.time.LocalDate; + +class LiabilitiesRegisterControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/liabilities-registers/"; + + /** + * {@link LiabilitiesRegisterController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /liabilities-registers/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + LiabilitiesRegister liabilitiesRegister = new LiabilitiesRegister(); + liabilitiesRegister.setId(currentId.get()); + liabilitiesRegister.setSessionId(111L); + liabilitiesRegister.setValidFromDate(LocalDate.now()); + liabilitiesRegister.setValidToDate(LocalDate.now()); + liabilitiesRegister.setCompanyId(111L); + liabilitiesRegister.setCompanyFullName("Name "); + liabilitiesRegister.setInn("INN"); + liabilitiesRegister.setSegment("SIGSGM-nt"); + liabilitiesRegister.setRegistryCode("REG"); + liabilitiesRegister.setAccount("ACC"); + liabilitiesRegister.setRegistryStatus("ACTV"); + liabilitiesRegister.setCurrency("RUB"); + liabilitiesRegister.setSumLiabilities(BigDecimal.TEN); + liabilitiesRegister.setSettlementDate(LocalDate.now()); + + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_LiabilitiesRegister, liabilitiesRegister, REST_URL); + } +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyBalanceRegisterControllerTest.java b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyBalanceRegisterControllerTest.java new file mode 100644 index 000000000..680a08424 --- /dev/null +++ b/clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/MoneyBalanceRegisterControllerTest.java @@ -0,0 +1,39 @@ +package ru.spcex.clearing.backendapi.controller.queue.register; + +import org.junit.jupiter.api.Test; +import ru.clearing.classes.statics.data.register.MoneyBalanceRegister; +import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest; +import ru.spcex.clearing.imdg.IMDGDistributedNames; + +import java.math.BigDecimal; + +class MoneyBalanceRegisterControllerTest extends AbstractControllerTest { + private static final String REST_URL = "/money-balance-registers/"; + + /** + * {@link MoneyBalanceRegisterController#getAll()}
+ * Тест проверяет получение запроса по REST API.
+ * Входной запрос /money-balance-registers/
+ * Ответ CommonGetAllResponse
+ */ + @Test + void getAll() throws Exception { + //ARRANGE + MoneyBalanceRegister moneyBalanceRegister = new MoneyBalanceRegister(); + moneyBalanceRegister.setId(currentId.get()); + moneyBalanceRegister.setSetHouseName("setHouseName"); + moneyBalanceRegister.setAccount("account"); + moneyBalanceRegister.setInfoAccount("infoAccount"); + moneyBalanceRegister.setRemainderSum(BigDecimal.valueOf(11.22)); + moneyBalanceRegister.setBlockedSum(BigDecimal.valueOf(11.22)); + moneyBalanceRegister.setUnblockedSum(BigDecimal.valueOf(11.22)); + moneyBalanceRegister.setInn("inn"); + moneyBalanceRegister.setSessionId(456L); + moneyBalanceRegister.setCompanyFullName("companyFullName"); + moneyBalanceRegister.setCompanyId(currentId.get()); + + + //ACT and ASSERT + checkGettingAllFromRestApi(IMDGDistributedNames.Map_MoneyBalanceRegister, moneyBalanceRegister, REST_URL); + } +} \ No newline at end of file diff --git a/clearing-parent/backend-api/src/test/resources/meta.json b/clearing-parent/backend-api/src/test/resources/meta.json index 41f2242ea..b3bf979e0 100644 --- a/clearing-parent/backend-api/src/test/resources/meta.json +++ b/clearing-parent/backend-api/src/test/resources/meta.json @@ -5648,7 +5648,7 @@ "destination": "depo-balance-registers", - "class": "ru.clearing.classes.statics.data.misc.DepoBalanceRegister", + "class": "ru.clearing.classes.statics.data.register.DepoBalanceRegister", "table": "balance_depo_register", @@ -5694,7 +5694,7 @@ "destination": "money-balance-registers", - "class": "ru.clearing.classes.statics.data.misc.MoneyBalanceRegister", + "class": "ru.clearing.classes.statics.data.register.MoneyBalanceRegister", "table": "money_balance_register", @@ -5992,7 +5992,7 @@ "destination": "exclude-liabilities-registers", - "class": "ru.clearing.classes.statics.data.journal.ExcludeLiabilitiesRegister", + "class": "ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister", "table": "exclude_liabilities_register", @@ -6070,7 +6070,7 @@ "destination": "liabilities-registers", - "class": "ru.clearing.classes.statics.data.journal.LiabilitiesRegister", + "class": "ru.clearing.classes.statics.data.register.LiabilitiesRegister", "table": "liabilities_register", diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/AdmittedLiabilitiesRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/AdmittedLiabilitiesRegister.java index 067ad3e16..38b37227b 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/AdmittedLiabilitiesRegister.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/AdmittedLiabilitiesRegister.java @@ -1,92 +1,92 @@ -package ru.clearing.classes.statics.data.register; - -import ru.clearing.classes.ConstSerializable; -import ru.clearing.classes.objects.BusinessObject; -import ru.spcex.platform.classes.base.SpcexObjectBase; - -import java.math.BigDecimal; -import java.time.Instant; -import java.time.LocalDate; - -/** - * Реестр обязательств, допущенных к клирингу - * - * DB table: ADMITTED_LIABILITIES_REGISTER - **/ -public class AdmittedLiabilitiesRegister extends BusinessObject { - private static final long serialVersionUID = ConstSerializable.serialVersionUID; - - private String companyFullName; - private Long sessionId; - private String securitySymbol; - private String securityFullName; - private Long companyId; - private String clearingCode; - private String account; - private BigDecimal amount; - private LocalDate clearingDate; - - public String getCompanyFullName() { - return companyFullName; - } - public void setCompanyFullName(String value) { - this.companyFullName=value; - } - - public Long getSessionId() { - return sessionId; - } - public void setSessionId(Long value) { - this.sessionId=value; - } - - public String getSecuritySymbol() { - return securitySymbol; - } - public void setSecuritySymbol(String value) { - this.securitySymbol=value; - } - - public String getSecurityFullName() { - return securityFullName; - } - public void setSecurityFullName(String value) { - this.securityFullName=value; - } - - public Long getCompanyId() { - return companyId; - } - public void setCompanyId(Long value) { - this.companyId=value; - } - - public String getClearingCode() { - return clearingCode; - } - public void setClearingCode(String value) { - this.clearingCode=value; - } - - public String getAccount() { - return account; - } - public void setAccount(String value) { - this.account=value; - } - - public BigDecimal getAmount() { - return amount; - } - public void setAmount(BigDecimal value) { - this.amount=value; - } - - public LocalDate getClearingDate() { - return clearingDate; - } - public void setClearingDate(LocalDate value) { - this.clearingDate=value; - } - +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.math.BigDecimal; +import java.time.Instant; +import java.time.LocalDate; + +/** + * Реестр обязательств, допущенных к клирингу + * + * DB table: ADMITTED_LIABILITIES_REGISTER + **/ +public class AdmittedLiabilitiesRegister extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String companyFullName; + private Long sessionId; + private String securitySymbol; + private String securityFullName; + private Long companyId; + private String clearingCode; + private String account; + private BigDecimal amount; + private LocalDate clearingDate; + + public String getCompanyFullName() { + return companyFullName; + } + public void setCompanyFullName(String value) { + this.companyFullName=value; + } + + public Long getSessionId() { + return sessionId; + } + public void setSessionId(Long value) { + this.sessionId=value; + } + + public String getSecuritySymbol() { + return securitySymbol; + } + public void setSecuritySymbol(String value) { + this.securitySymbol=value; + } + + public String getSecurityFullName() { + return securityFullName; + } + public void setSecurityFullName(String value) { + this.securityFullName=value; + } + + public Long getCompanyId() { + return companyId; + } + public void setCompanyId(Long value) { + this.companyId=value; + } + + public String getClearingCode() { + return clearingCode; + } + public void setClearingCode(String value) { + this.clearingCode=value; + } + + public String getAccount() { + return account; + } + public void setAccount(String value) { + this.account=value; + } + + public BigDecimal getAmount() { + return amount; + } + public void setAmount(BigDecimal value) { + this.amount=value; + } + + public LocalDate getClearingDate() { + return clearingDate; + } + public void setClearingDate(LocalDate value) { + this.clearingDate=value; + } + } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/CoveredLiabilitiesRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/CoveredLiabilitiesRegister.java index 9fbddd902..19410c766 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/CoveredLiabilitiesRegister.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/CoveredLiabilitiesRegister.java @@ -1,101 +1,101 @@ -package ru.clearing.classes.statics.data.register; - -import ru.clearing.classes.ConstSerializable; -import ru.clearing.classes.objects.BusinessObject; -import ru.spcex.platform.classes.base.SpcexObjectBase; - -import java.math.BigDecimal; -import java.time.Instant; -import java.time.LocalDate; - -/** - * Реестр обязательств, прошедших процедуру контроля обеспечения - *

- * DB table: COVERED_LIABILITIES_REGISTER - **/ -public class CoveredLiabilitiesRegister extends BusinessObject { - private static final long serialVersionUID = ConstSerializable.serialVersionUID; - - private String companyFullName; - private Long sessionId; - private String securitySymbol; - private String securityFullName; - private Long companyId; - private String clearingCode; - private String account; - private BigDecimal amount; - private LocalDate clearingDate; - - public String getCompanyFullName() { - return companyFullName; - } - - public void setCompanyFullName(String value) { - this.companyFullName = value; - } - - public Long getSessionId() { - return sessionId; - } - - public void setSessionId(Long value) { - this.sessionId = value; - } - - public String getSecuritySymbol() { - return securitySymbol; - } - - public void setSecuritySymbol(String value) { - this.securitySymbol = value; - } - - public String getSecurityFullName() { - return securityFullName; - } - - public void setSecurityFullName(String value) { - this.securityFullName = value; - } - - public Long getCompanyId() { - return companyId; - } - - public void setCompanyId(Long value) { - this.companyId = value; - } - - public String getClearingCode() { - return clearingCode; - } - - public void setClearingCode(String value) { - this.clearingCode = value; - } - - public String getAccount() { - return account; - } - - public void setAccount(String value) { - this.account = value; - } - - public BigDecimal getAmount() { - return amount; - } - - public void setAmount(BigDecimal value) { - this.amount = value; - } - - public LocalDate getClearingDate() { - return clearingDate; - } - - public void setClearingDate(LocalDate value) { - this.clearingDate = value; - } - +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.math.BigDecimal; +import java.time.Instant; +import java.time.LocalDate; + +/** + * Реестр обязательств, прошедших процедуру контроля обеспечения + *

+ * DB table: COVERED_LIABILITIES_REGISTER + **/ +public class CoveredLiabilitiesRegister extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String companyFullName; + private Long sessionId; + private String securitySymbol; + private String securityFullName; + private Long companyId; + private String clearingCode; + private String account; + private BigDecimal amount; + private LocalDate clearingDate; + + public String getCompanyFullName() { + return companyFullName; + } + + public void setCompanyFullName(String value) { + this.companyFullName = value; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long value) { + this.sessionId = value; + } + + public String getSecuritySymbol() { + return securitySymbol; + } + + public void setSecuritySymbol(String value) { + this.securitySymbol = value; + } + + public String getSecurityFullName() { + return securityFullName; + } + + public void setSecurityFullName(String value) { + this.securityFullName = value; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long value) { + this.companyId = value; + } + + public String getClearingCode() { + return clearingCode; + } + + public void setClearingCode(String value) { + this.clearingCode = value; + } + + public String getAccount() { + return account; + } + + public void setAccount(String value) { + this.account = value; + } + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal value) { + this.amount = value; + } + + public LocalDate getClearingDate() { + return clearingDate; + } + + public void setClearingDate(LocalDate value) { + this.clearingDate = value; + } + } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoBalanceRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoBalanceRegister.java index 4b2611694..8571a4cc5 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoBalanceRegister.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoBalanceRegister.java @@ -1,60 +1,60 @@ -package ru.clearing.classes.statics.data.register; - -import ru.clearing.classes.ConstSerializable; -import ru.clearing.classes.objects.BusinessObject; -import ru.spcex.platform.classes.base.SpcexObjectBase; - -import java.math.BigDecimal; -import java.time.Instant; - -/** - * Реестр остатков ценных бумаг - * - * DB table: DEPO_BALANCE_REGISTER - **/ -public class DepoBalanceRegister extends BusinessObject { - private static final long serialVersionUID = ConstSerializable.serialVersionUID; - - private Long companyId; - private Long sessionId; - private String depoCode; - private BigDecimal quantity; - private String securitySymbol; - - - public Long getCompanyId() { - return companyId; - } - public void setCompanyId(Long value) { - this.companyId=value; - } - - public Long getSessionId() { - return sessionId; - } - public void setSessionId(Long value) { - this.sessionId=value; - } - - public String getDepoCode() { - return depoCode; - } - public void setDepoCode(String value) { - this.depoCode=value; - } - - public BigDecimal getQuantity() { - return quantity; - } - public void setQuantity(BigDecimal value) { - this.quantity=value; - } - - public String getSecuritySymbol() { - return securitySymbol; - } - public void setSecuritySymbol(String value) { - this.securitySymbol=value; - } - +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.math.BigDecimal; +import java.time.Instant; + +/** + * Реестр остатков ценных бумаг + * + * DB table: DEPO_BALANCE_REGISTER + **/ +public class DepoBalanceRegister extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Long companyId; + private Long sessionId; + private String depoCode; + private BigDecimal quantity; + private String securitySymbol; + + + public Long getCompanyId() { + return companyId; + } + public void setCompanyId(Long value) { + this.companyId=value; + } + + public Long getSessionId() { + return sessionId; + } + public void setSessionId(Long value) { + this.sessionId=value; + } + + public String getDepoCode() { + return depoCode; + } + public void setDepoCode(String value) { + this.depoCode=value; + } + + public BigDecimal getQuantity() { + return quantity; + } + public void setQuantity(BigDecimal value) { + this.quantity=value; + } + + public String getSecuritySymbol() { + return securitySymbol; + } + public void setSecuritySymbol(String value) { + this.securitySymbol=value; + } + } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoPaymentInstructionRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoPaymentInstructionRegister.java index b67352c33..9b0b00a81 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoPaymentInstructionRegister.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoPaymentInstructionRegister.java @@ -1,73 +1,73 @@ -package ru.clearing.classes.statics.data.register; - -import ru.clearing.classes.ConstSerializable; -import ru.clearing.classes.objects.BusinessObject; - -import java.math.BigDecimal; - -/** - * Реестр распоряжений, направленных расчетному депозитарию - * - * DB table: DEPO_PAYMENT_INSTRUCTION_REGISTER - **/ -public class DepoPaymentInstructionRegister extends BusinessObject { - private static final long serialVersionUID = ConstSerializable.serialVersionUID; - - private Long companyId; - private String tradingClearingRegistryType; - private String tradingClearingRegistry; - private String cbCode; - private BigDecimal quantity; - private Long direction; - private Long sessionId; - - public Long getCompanyId() { - return companyId; - } - public void setCompanyId(Long value) { - this.companyId=value; - } - - public String getTradingClearingRegistryType() { - return tradingClearingRegistryType; - } - public void setTradingClearingRegistryType(String value) { - this.tradingClearingRegistryType=value; - } - - public String getTradingClearingRegistry() { - return tradingClearingRegistry; - } - public void setTradingClearingRegistry(String value) { - this.tradingClearingRegistry=value; - } - - public String getCbCode() { - return cbCode; - } - public void setCbCode(String value) { - this.cbCode=value; - } - - public BigDecimal getQuantity() { - return quantity; - } - public void setQuantity(BigDecimal value) { - this.quantity=value; - } - - public Long getDirection() { - return direction; - } - public void setDirection(Long value) { - this.direction=value; - } - - public Long getSessionId() { - return sessionId; - } - public void setSessionId(Long value) { - this.sessionId=value; - } - +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; + +import java.math.BigDecimal; + +/** + * Реестр распоряжений, направленных расчетному депозитарию + * + * DB table: DEPO_PAYMENT_INSTRUCTION_REGISTER + **/ +public class DepoPaymentInstructionRegister extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Long companyId; + private String tradingClearingRegistryType; + private String tradingClearingRegistry; + private String cbCode; + private BigDecimal quantity; + private Long direction; + private Long sessionId; + + public Long getCompanyId() { + return companyId; + } + public void setCompanyId(Long value) { + this.companyId=value; + } + + public String getTradingClearingRegistryType() { + return tradingClearingRegistryType; + } + public void setTradingClearingRegistryType(String value) { + this.tradingClearingRegistryType=value; + } + + public String getTradingClearingRegistry() { + return tradingClearingRegistry; + } + public void setTradingClearingRegistry(String value) { + this.tradingClearingRegistry=value; + } + + public String getCbCode() { + return cbCode; + } + public void setCbCode(String value) { + this.cbCode=value; + } + + public BigDecimal getQuantity() { + return quantity; + } + public void setQuantity(BigDecimal value) { + this.quantity=value; + } + + public Long getDirection() { + return direction; + } + public void setDirection(Long value) { + this.direction=value; + } + + public Long getSessionId() { + return sessionId; + } + public void setSessionId(Long value) { + this.sessionId=value; + } + } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExcludeLiabilitiesRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExcludeLiabilitiesRegister.java index 2a8c8ef71..d0467dc5f 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExcludeLiabilitiesRegister.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExcludeLiabilitiesRegister.java @@ -1,124 +1,124 @@ -package ru.clearing.classes.statics.data.register; - -import ru.clearing.classes.ConstSerializable; -import ru.clearing.classes.objects.BusinessObject; -import ru.spcex.platform.classes.base.SpcexObjectBase; - -import java.math.BigDecimal; -import java.time.LocalDate; - -/** - * Реестр обязательств, исключенных из клирингового пула - * - * DB table: EXCLUDE_LIABILITIES_REGISTER - **/ -public class ExcludeLiabilitiesRegister extends BusinessObject { - private static final long serialVersionUID = ConstSerializable.serialVersionUID; - - private Long sessionId; - private LocalDate validFromDate; - private LocalDate validToDate; - private Long companyId; - private String companyFullName; - private String inn; - private String segment; - private String registryCode; - private String account; - private String registryStatus; - private String currency; - private BigDecimal sumLiabilities; - private LocalDate settlementDate; - - - public Long getSessionId() { - return sessionId; - } - public void setSessionId(Long value) { - this.sessionId=value; - } - - public LocalDate getValidFromDate() { - return validFromDate; - } - public void setValidFromDate(LocalDate value) { - this.validFromDate=value; - } - - public LocalDate getValidToDate() { - return validToDate; - } - public void setValidToDate(LocalDate value) { - this.validToDate=value; - } - - public Long getCompanyId() { - return companyId; - } - public void setCompanyId(Long value) { - this.companyId=value; - } - - public String getCompanyFullName() { - return companyFullName; - } - public void setCompanyFullName(String value) { - this.companyFullName=value; - } - - public String getInn() { - return inn; - } - public void setInn(String value) { - this.inn=value; - } - - public String getSegment() { - return segment; - } - public void setSegment(String value) { - this.segment=value; - } - - public String getRegistryCode() { - return registryCode; - } - public void setRegistryCode(String value) { - this.registryCode=value; - } - - public String getAccount() { - return account; - } - public void setAccount(String value) { - this.account=value; - } - - public String getRegistryStatus() { - return registryStatus; - } - public void setRegistryStatus(String value) { - this.registryStatus=value; - } - - public String getCurrency() { - return currency; - } - public void setCurrency(String value) { - this.currency=value; - } - - public BigDecimal getSumLiabilities() { - return sumLiabilities; - } - public void setSumLiabilities(BigDecimal value) { - this.sumLiabilities=value; - } - - public LocalDate getSettlementDate() { - return settlementDate; - } - public void setSettlementDate(LocalDate value) { - this.settlementDate=value; - } - +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.math.BigDecimal; +import java.time.LocalDate; + +/** + * Реестр обязательств, исключенных из клирингового пула + * + * DB table: EXCLUDE_LIABILITIES_REGISTER + **/ +public class ExcludeLiabilitiesRegister extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Long sessionId; + private LocalDate validFromDate; + private LocalDate validToDate; + private Long companyId; + private String companyFullName; + private String inn; + private String segment; + private String registryCode; + private String account; + private String registryStatus; + private String currency; + private BigDecimal sumLiabilities; + private LocalDate settlementDate; + + + public Long getSessionId() { + return sessionId; + } + public void setSessionId(Long value) { + this.sessionId=value; + } + + public LocalDate getValidFromDate() { + return validFromDate; + } + public void setValidFromDate(LocalDate value) { + this.validFromDate=value; + } + + public LocalDate getValidToDate() { + return validToDate; + } + public void setValidToDate(LocalDate value) { + this.validToDate=value; + } + + public Long getCompanyId() { + return companyId; + } + public void setCompanyId(Long value) { + this.companyId=value; + } + + public String getCompanyFullName() { + return companyFullName; + } + public void setCompanyFullName(String value) { + this.companyFullName=value; + } + + public String getInn() { + return inn; + } + public void setInn(String value) { + this.inn=value; + } + + public String getSegment() { + return segment; + } + public void setSegment(String value) { + this.segment=value; + } + + public String getRegistryCode() { + return registryCode; + } + public void setRegistryCode(String value) { + this.registryCode=value; + } + + public String getAccount() { + return account; + } + public void setAccount(String value) { + this.account=value; + } + + public String getRegistryStatus() { + return registryStatus; + } + public void setRegistryStatus(String value) { + this.registryStatus=value; + } + + public String getCurrency() { + return currency; + } + public void setCurrency(String value) { + this.currency=value; + } + + public BigDecimal getSumLiabilities() { + return sumLiabilities; + } + public void setSumLiabilities(BigDecimal value) { + this.sumLiabilities=value; + } + + public LocalDate getSettlementDate() { + return settlementDate; + } + public void setSettlementDate(LocalDate value) { + this.settlementDate=value; + } + } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/LiabilitiesRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/LiabilitiesRegister.java index c3a7ef58d..83b44a823 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/LiabilitiesRegister.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/LiabilitiesRegister.java @@ -1,123 +1,123 @@ -package ru.clearing.classes.statics.data.register; - -import ru.clearing.classes.ConstSerializable; -import ru.clearing.classes.objects.BusinessObject; -import ru.spcex.platform.classes.base.SpcexObjectBase; - -import java.math.BigDecimal; -import java.time.LocalDate; - -/** - * Реестр учета обязательств - * - * DB table: LIABILITIES_REGISTER - **/ -public class LiabilitiesRegister extends BusinessObject { - private static final long serialVersionUID = ConstSerializable.serialVersionUID; - - private Long sessionId; - private LocalDate validFromDate; - private LocalDate validToDate; - private Long companyId; - private String companyFullName; - private String inn; - private String segment; - private String registryCode; - private String account; - private String registryStatus; - private String currency; - private BigDecimal sumLiabilities; - private LocalDate settlementDate; - - public Long getSessionId() { - return sessionId; - } - public void setSessionId(Long value) { - this.sessionId=value; - } - - public LocalDate getValidFromDate() { - return validFromDate; - } - public void setValidFromDate(LocalDate value) { - this.validFromDate=value; - } - - public LocalDate getValidToDate() { - return validToDate; - } - public void setValidToDate(LocalDate value) { - this.validToDate=value; - } - - public Long getCompanyId() { - return companyId; - } - public void setCompanyId(Long value) { - this.companyId=value; - } - - public String getCompanyFullName() { - return companyFullName; - } - public void setCompanyFullName(String value) { - this.companyFullName=value; - } - - public String getInn() { - return inn; - } - public void setInn(String value) { - this.inn=value; - } - - public String getSegment() { - return segment; - } - public void setSegment(String value) { - this.segment=value; - } - - public String getRegistryCode() { - return registryCode; - } - public void setRegistryCode(String value) { - this.registryCode=value; - } - - public String getAccount() { - return account; - } - public void setAccount(String value) { - this.account=value; - } - - public String getRegistryStatus() { - return registryStatus; - } - public void setRegistryStatus(String value) { - this.registryStatus=value; - } - - public String getCurrency() { - return currency; - } - public void setCurrency(String value) { - this.currency=value; - } - - public BigDecimal getSumLiabilities() { - return sumLiabilities; - } - public void setSumLiabilities(BigDecimal value) { - this.sumLiabilities=value; - } - - public LocalDate getSettlementDate() { - return settlementDate; - } - public void setSettlementDate(LocalDate value) { - this.settlementDate=value; - } - +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; +import ru.spcex.platform.classes.base.SpcexObjectBase; + +import java.math.BigDecimal; +import java.time.LocalDate; + +/** + * Реестр учета обязательств + * + * DB table: LIABILITIES_REGISTER + **/ +public class LiabilitiesRegister extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private Long sessionId; + private LocalDate validFromDate; + private LocalDate validToDate; + private Long companyId; + private String companyFullName; + private String inn; + private String segment; + private String registryCode; + private String account; + private String registryStatus; + private String currency; + private BigDecimal sumLiabilities; + private LocalDate settlementDate; + + public Long getSessionId() { + return sessionId; + } + public void setSessionId(Long value) { + this.sessionId=value; + } + + public LocalDate getValidFromDate() { + return validFromDate; + } + public void setValidFromDate(LocalDate value) { + this.validFromDate=value; + } + + public LocalDate getValidToDate() { + return validToDate; + } + public void setValidToDate(LocalDate value) { + this.validToDate=value; + } + + public Long getCompanyId() { + return companyId; + } + public void setCompanyId(Long value) { + this.companyId=value; + } + + public String getCompanyFullName() { + return companyFullName; + } + public void setCompanyFullName(String value) { + this.companyFullName=value; + } + + public String getInn() { + return inn; + } + public void setInn(String value) { + this.inn=value; + } + + public String getSegment() { + return segment; + } + public void setSegment(String value) { + this.segment=value; + } + + public String getRegistryCode() { + return registryCode; + } + public void setRegistryCode(String value) { + this.registryCode=value; + } + + public String getAccount() { + return account; + } + public void setAccount(String value) { + this.account=value; + } + + public String getRegistryStatus() { + return registryStatus; + } + public void setRegistryStatus(String value) { + this.registryStatus=value; + } + + public String getCurrency() { + return currency; + } + public void setCurrency(String value) { + this.currency=value; + } + + public BigDecimal getSumLiabilities() { + return sumLiabilities; + } + public void setSumLiabilities(BigDecimal value) { + this.sumLiabilities=value; + } + + public LocalDate getSettlementDate() { + return settlementDate; + } + public void setSettlementDate(LocalDate value) { + this.settlementDate=value; + } + } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyBalanceRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyBalanceRegister.java index 0a46a9e6b..90dd23ad5 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyBalanceRegister.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyBalanceRegister.java @@ -1,97 +1,97 @@ -package ru.clearing.classes.statics.data.register; - -import ru.clearing.classes.ConstSerializable; -import ru.clearing.classes.objects.BusinessObject; - -import java.math.BigDecimal; - -/** - * Реестр остатков денежных средств - * - * DB table: MONEY_BALANCE_REGISTER - **/ -public class MoneyBalanceRegister extends BusinessObject { - private static final long serialVersionUID = ConstSerializable.serialVersionUID; - - private String setHouseName; - private String account; - private String infoAccount; - private BigDecimal remainderSum; - private BigDecimal blockedSum; - private BigDecimal unblockedSum; - private String inn; - private Long sessionId; - private String companyFullName; - private Long companyId; - - public String getSetHouseName() { - return setHouseName; - } - public void setSetHouseName(String value) { - this.setHouseName=value; - } - - public String getAccount() { - return account; - } - public void setAccount(String value) { - this.account=value; - } - - public String getInfoAccount() { - return infoAccount; - } - public void setInfoAccount(String value) { - this.infoAccount=value; - } - - public BigDecimal getRemainderSum() { - return remainderSum; - } - public void setRemainderSum(BigDecimal value) { - this.remainderSum=value; - } - - public BigDecimal getBlockedSum() { - return blockedSum; - } - public void setBlockedSum(BigDecimal value) { - this.blockedSum=value; - } - - public BigDecimal getUnblockedSum() { - return unblockedSum; - } - public void setUnblockedSum(BigDecimal value) { - this.unblockedSum=value; - } - - public String getInn() { - return inn; - } - public void setInn(String value) { - this.inn=value; - } - - public Long getSessionId() { - return sessionId; - } - public void setSessionId(Long value) { - this.sessionId=value; - } - - public String getCompanyFullName() { - return companyFullName; - } - public void setCompanyFullName(String value) { - this.companyFullName=value; - } - - public Long getCompanyId() { - return companyId; - } - public void setCompanyId(Long value) { - this.companyId=value; - } - +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; + +import java.math.BigDecimal; + +/** + * Реестр остатков денежных средств + * + * DB table: MONEY_BALANCE_REGISTER + **/ +public class MoneyBalanceRegister extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String setHouseName; + private String account; + private String infoAccount; + private BigDecimal remainderSum; + private BigDecimal blockedSum; + private BigDecimal unblockedSum; + private String inn; + private Long sessionId; + private String companyFullName; + private Long companyId; + + public String getSetHouseName() { + return setHouseName; + } + public void setSetHouseName(String value) { + this.setHouseName=value; + } + + public String getAccount() { + return account; + } + public void setAccount(String value) { + this.account=value; + } + + public String getInfoAccount() { + return infoAccount; + } + public void setInfoAccount(String value) { + this.infoAccount=value; + } + + public BigDecimal getRemainderSum() { + return remainderSum; + } + public void setRemainderSum(BigDecimal value) { + this.remainderSum=value; + } + + public BigDecimal getBlockedSum() { + return blockedSum; + } + public void setBlockedSum(BigDecimal value) { + this.blockedSum=value; + } + + public BigDecimal getUnblockedSum() { + return unblockedSum; + } + public void setUnblockedSum(BigDecimal value) { + this.unblockedSum=value; + } + + public String getInn() { + return inn; + } + public void setInn(String value) { + this.inn=value; + } + + public Long getSessionId() { + return sessionId; + } + public void setSessionId(Long value) { + this.sessionId=value; + } + + public String getCompanyFullName() { + return companyFullName; + } + public void setCompanyFullName(String value) { + this.companyFullName=value; + } + + public Long getCompanyId() { + return companyId; + } + public void setCompanyId(Long value) { + this.companyId=value; + } + } \ No newline at end of file diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyPaymentInstructionRegister.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyPaymentInstructionRegister.java index c9734d18e..75b89ec18 100644 --- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyPaymentInstructionRegister.java +++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyPaymentInstructionRegister.java @@ -1,74 +1,74 @@ -package ru.clearing.classes.statics.data.register; - -import ru.clearing.classes.ConstSerializable; -import ru.clearing.classes.objects.BusinessObject; - -import java.math.BigDecimal; -import java.time.LocalDate; - -/** - * Реестр распоряжений, направленных расчетной организации - * - * DB table: MONEY_PAYMENT_INSTRUCTION_REGISTER - **/ -public class MoneyPaymentInstructionRegister extends BusinessObject { - private static final long serialVersionUID = ConstSerializable.serialVersionUID; - - private String creditLegAccount; - private BigDecimal creditLegAmount; - private String creditLegCurrencyCode; - private String debitLegAccount; - private String sender; - private String addressee; - private LocalDate clearingDate; - - public String getCreditLegAccount() { - return creditLegAccount; - } - public void setCreditLegAccount(String value) { - this.creditLegAccount=value; - } - - public BigDecimal getCreditLegAmount() { - return creditLegAmount; - } - public void setCreditLegAmount(BigDecimal value) { - this.creditLegAmount=value; - } - - public String getCreditLegCurrencyCode() { - return creditLegCurrencyCode; - } - public void setCreditLegCurrencyCode(String value) { - this.creditLegCurrencyCode=value; - } - - public String getDebitLegAccount() { - return debitLegAccount; - } - public void setDebitLegAccount(String value) { - this.debitLegAccount=value; - } - - public String getSender() { - return sender; - } - public void setSender(String value) { - this.sender=value; - } - - public String getAddressee() { - return addressee; - } - public void setAddressee(String value) { - this.addressee=value; - } - - public LocalDate getClearingDate() { - return clearingDate; - } - public void setClearingDate(LocalDate value) { - this.clearingDate=value; - } - +package ru.clearing.classes.statics.data.register; + +import ru.clearing.classes.ConstSerializable; +import ru.clearing.classes.objects.BusinessObject; + +import java.math.BigDecimal; +import java.time.LocalDate; + +/** + * Реестр распоряжений, направленных расчетной организации + * + * DB table: MONEY_PAYMENT_INSTRUCTION_REGISTER + **/ +public class MoneyPaymentInstructionRegister extends BusinessObject { + private static final long serialVersionUID = ConstSerializable.serialVersionUID; + + private String creditLegAccount; + private BigDecimal creditLegAmount; + private String creditLegCurrencyCode; + private String debitLegAccount; + private String sender; + private String addressee; + private LocalDate clearingDate; + + public String getCreditLegAccount() { + return creditLegAccount; + } + public void setCreditLegAccount(String value) { + this.creditLegAccount=value; + } + + public BigDecimal getCreditLegAmount() { + return creditLegAmount; + } + public void setCreditLegAmount(BigDecimal value) { + this.creditLegAmount=value; + } + + public String getCreditLegCurrencyCode() { + return creditLegCurrencyCode; + } + public void setCreditLegCurrencyCode(String value) { + this.creditLegCurrencyCode=value; + } + + public String getDebitLegAccount() { + return debitLegAccount; + } + public void setDebitLegAccount(String value) { + this.debitLegAccount=value; + } + + public String getSender() { + return sender; + } + public void setSender(String value) { + this.sender=value; + } + + public String getAddressee() { + return addressee; + } + public void setAddressee(String value) { + this.addressee=value; + } + + public LocalDate getClearingDate() { + return clearingDate; + } + public void setClearingDate(LocalDate value) { + this.clearingDate=value; + } + } \ No newline at end of file diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedLiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedLiabilitiesRegisterService.java new file mode 100644 index 000000000..37a601135 --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/AdmittedLiabilitiesRegisterService.java @@ -0,0 +1,58 @@ +package ru.spcex.clearing.registry.service; + +import org.apache.kafka.clients.consumer.Consumer; +import org.apache.kafka.clients.producer.Producer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import ru.clearing.classes.statics.data.register.AdmittedLiabilitiesRegister; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.platform.messaging.domain.BaseRequest; +import ru.spcex.clearing.platform.messaging.domain.Consts; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.AdmittedLiabilitiesRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +public class AdmittedLiabilitiesRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg admittedLiabilitiesRegisterMap; + + @Autowired + public AdmittedLiabilitiesRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.admittedLiabilitiesRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_AdmittedLiabilitiesRegister, AdmittedLiabilitiesRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(AdmittedLiabilitiesRegisterNewRequest.class) + .setConsumer(this::admittedLiabilitiesRegisterNew) + .forDestination(Consts.REGISTRY_ADMITTED_LIABILITIES_REGISTER_NEW, callbacks::put); + init(); + } + + public void admittedLiabilitiesRegisterNew(BaseRequest userRequest) { + AdmittedLiabilitiesRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("AdmittedLiabilitiesRegisterNewRequest received"); + AdmittedLiabilitiesRegister register = new AdmittedLiabilitiesRegister(); + register.setSecuritySymbol(req.getSecuritySymbol()); + register.setSecurityFullName(req.getSecurityFullName()); + register.setSessionId(req.getSessionId()); + register.setClearingCode(req.getClearingCode()); + register.setAccount(req.getAccount()); + register.setCompanyId(req.getCompanyId()); + register.setAmount(req.getAmount()); + register.setId(req.getId()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); + register.setClearingDate(req.getClearingDate()); + register.setCompanyFullName(req.getCompanyFullName()); + admittedLiabilitiesRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } +} diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ContractRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ContractRegisterService.java deleted file mode 100644 index 7b52e2ccb..000000000 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ContractRegisterService.java +++ /dev/null @@ -1,63 +0,0 @@ -package ru.spcex.clearing.registry.service; - -import org.apache.kafka.clients.consumer.Consumer; -import org.apache.kafka.clients.producer.Producer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import ru.clearing.classes.statics.data.register.ContractRegister; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.platform.messaging.domain.BaseRequest; -import ru.spcex.clearing.platform.messaging.domain.Consts; -import ru.spcex.clearing.platform.messaging.domain.cud.registry.ContractRegisterNewRequest; -import ru.spcex.clearing.platform.messaging.service.QueueConsumer; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.api.ImdgProvider; - - -@Service -public class ContractRegisterService extends QueueConsumer implements InitializingBean { - private final Logger log = LoggerFactory.getLogger(getClass()); - - private final Imdg contractRegisterMap; - - @Autowired - public ContractRegisterService(Consumer kafkaQueue, Producer kafkaProducer, - ImdgProvider imdgProvider) { - super(kafkaQueue, kafkaProducer); - this.contractRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ContractRegister, ContractRegister.class); - } - - @Override - public void afterPropertiesSet() { - callback(ContractRegisterNewRequest.class) - .setConsumer(this::contractRegisterNew) - .forDestination(Consts.REGISTRY_CONTRACT_REGISTER_NEW, callbacks::put); - init(); - } - - public void contractRegisterNew(BaseRequest userRequest) { - ContractRegisterNewRequest req = userRequest.getRequestPayload(); - log.debug("ContractRegisterNewRequest received"); - ContractRegister register = new ContractRegister(); - register.setName(req.getName()); - register.setNumber(req.getNumber()); - register.setIssueDate(req.getIssueDate()); - register.setCompanyFullName(req.getCompanyFullName()); - register.setCompanyId(req.getCompanyId()); - register.setDocumentType(req.getDocumentType()); - register.setIssuePlace(req.getIssuePlace()); - register.setIssuer(req.getIssuer()); - register.setIssuerCode(req.getIssuerCode()); - register.setPlace(req.getPlace()); - register.setValidFromDate(req.getValidFromDate()); - register.setValidToDate(req.getValidToDate()); - register.setCloseDate(req.getCloseDate()); - register.setComment(req.getComment()); - - contractRegisterMap.insert(register); - log.debug("successfully processed, id {}", register.getId()); - } -} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredLiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredLiabilitiesRegisterService.java new file mode 100644 index 000000000..f658cbdb8 --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/CoveredLiabilitiesRegisterService.java @@ -0,0 +1,58 @@ +package ru.spcex.clearing.registry.service; + +import org.apache.kafka.clients.consumer.Consumer; +import org.apache.kafka.clients.producer.Producer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import ru.clearing.classes.statics.data.register.CoveredLiabilitiesRegister; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.platform.messaging.domain.BaseRequest; +import ru.spcex.clearing.platform.messaging.domain.Consts; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.CoveredLiabilitiesRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +public class CoveredLiabilitiesRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg coveredLiabilitiesRegisterMap; + + @Autowired + public CoveredLiabilitiesRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.coveredLiabilitiesRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_CoveredLiabilitiesRegister, CoveredLiabilitiesRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(CoveredLiabilitiesRegisterNewRequest.class) + .setConsumer(this::coveredLiabilitiesRegisterNew) + .forDestination(Consts.REGISTRY_COVERED_LIABILITIES_REGISTER_NEW, callbacks::put); + init(); + } + + public void coveredLiabilitiesRegisterNew(BaseRequest userRequest) { + CoveredLiabilitiesRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("CoveredLiabilitiesRegisterNewRequest received"); + CoveredLiabilitiesRegister register = new CoveredLiabilitiesRegister(); + register.setCompanyFullName(req.getCompanyFullName()); + register.setSessionId(req.getSessionId()); + register.setSecuritySymbol(req.getSecuritySymbol()); + register.setSecurityFullName(req.getSecurityFullName()); + register.setCompanyId(req.getCompanyId()); + register.setClearingCode(req.getClearingCode()); + register.setAccount(req.getAccount()); + register.setAmount(req.getAmount()); + register.setId(req.getId()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); + register.setClearingDate(req.getClearingDate()); + coveredLiabilitiesRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } +} diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java new file mode 100644 index 000000000..9ca959a81 --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoBalanceRegisterService.java @@ -0,0 +1,56 @@ +package ru.spcex.clearing.registry.service; + +import org.apache.kafka.clients.consumer.Consumer; +import org.apache.kafka.clients.producer.Producer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import ru.clearing.classes.statics.data.register.DepoBalanceRegister; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.platform.messaging.domain.BaseRequest; +import ru.spcex.clearing.platform.messaging.domain.Consts; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.DepoBalanceRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +@Service +public class DepoBalanceRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg depoBalanceRegisterMap; + + @Autowired + public DepoBalanceRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.depoBalanceRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_DepoBalanceRegister, DepoBalanceRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(DepoBalanceRegisterNewRequest.class) + .setConsumer(this::depoBalanceRegisterNew) + .forDestination(Consts.REGISTRY_DEPO_BALANCE_REGISTER_NEW, callbacks::put); + init(); + } + + public void depoBalanceRegisterNew(BaseRequest userRequest) { + DepoBalanceRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("DepoBalanceRegisterNewRequest received"); + DepoBalanceRegister register = new DepoBalanceRegister(); + register.setId(req.getId()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); + register.setCompanyId(req.getCompanyId()); + register.setSessionId(req.getSessionId()); + register.setDepoCode(req.getDepoCode()); + register.setQuantity(req.getQuantity()); + register.setSecuritySymbol(req.getSecuritySymbol()); + depoBalanceRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } +} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java new file mode 100644 index 000000000..263191948 --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/DepoPaymentInstructionRegisterService.java @@ -0,0 +1,56 @@ +package ru.spcex.clearing.registry.service; + +import org.apache.kafka.clients.consumer.Consumer; +import org.apache.kafka.clients.producer.Producer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import ru.clearing.classes.statics.data.register.DepoPaymentInstructionRegister; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.platform.messaging.domain.BaseRequest; +import ru.spcex.clearing.platform.messaging.domain.Consts; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.DepoPaymentInstructionRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +public class DepoPaymentInstructionRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg depoPaymentInstructionRegisterMap; + + @Autowired + public DepoPaymentInstructionRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.depoPaymentInstructionRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_DepoPaymentInstructionRegister, DepoPaymentInstructionRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(DepoPaymentInstructionRegisterNewRequest.class) + .setConsumer(this::depoPaymentInstructionRegisterNew) + .forDestination(Consts.REGISTRY_DEPO_PAYMENT_INSTRUCTION_REGISTER_NEW, callbacks::put); + init(); + } + + public void depoPaymentInstructionRegisterNew(BaseRequest userRequest) { + DepoPaymentInstructionRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("DepoPaymentInstructionRegisterNewRequest received"); + DepoPaymentInstructionRegister register = new DepoPaymentInstructionRegister(); + register.setId(req.getId()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); + register.setCompanyId(req.getCompanyId()); + register.setTradingClearingRegistryType(req.getTradingClearingRegistryType()); + register.setTradingClearingRegistry(req.getTradingClearingRegistry()); + register.setCbCode(req.getCbCode()); + register.setQuantity(req.getQuantity()); + register.setDirection(req.getDirection()); + register.setSessionId(req.getSessionId()); + depoPaymentInstructionRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } +} diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java new file mode 100644 index 000000000..f56dcd1b7 --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExcludeLiabilitiesRegisterService.java @@ -0,0 +1,62 @@ +package ru.spcex.clearing.registry.service; + +import org.apache.kafka.clients.consumer.Consumer; +import org.apache.kafka.clients.producer.Producer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import ru.clearing.classes.statics.data.register.ExcludeLiabilitiesRegister; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.platform.messaging.domain.BaseRequest; +import ru.spcex.clearing.platform.messaging.domain.Consts; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.ExcludeLiabilitiesRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +public class ExcludeLiabilitiesRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg excludeLiabilitiesRegisterMap; + + @Autowired + public ExcludeLiabilitiesRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.excludeLiabilitiesRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ExcludeLiabilitiesRegister, ExcludeLiabilitiesRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(ExcludeLiabilitiesRegisterNewRequest.class) + .setConsumer(this::excludeLiabilitiesRegisterNew) + .forDestination(Consts.REGISTRY_DEPO_PAYMENT_INSTRUCTION_REGISTER_NEW, callbacks::put); + init(); + } + + public void excludeLiabilitiesRegisterNew(BaseRequest userRequest) { + ExcludeLiabilitiesRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("ExcludeLiabilitiesRegisterNewRequest received"); + ExcludeLiabilitiesRegister register = new ExcludeLiabilitiesRegister(); + register.setId(req.getId()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); + register.setSessionId(req.getSessionId()); + register.setValidFromDate(req.getValidFromDate()); + register.setValidToDate(req.getValidToDate()); + register.setCompanyId(req.getCompanyId()); + register.setCompanyFullName(req.getCompanyFullName()); + register.setInn(req.getInn()); + register.setSegment(req.getSegment()); + register.setRegistryCode(req.getRegistryCode()); + register.setAccount(req.getAccount()); + register.setRegistryStatus(req.getRegistryStatus()); + register.setCurrency(req.getCurrency()); + register.setSumLiabilities(req.getSumLiabilities()); + + excludeLiabilitiesRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } +} diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java new file mode 100644 index 000000000..63caff003 --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java @@ -0,0 +1,83 @@ +package ru.spcex.clearing.registry.service; + +import org.apache.kafka.clients.consumer.Consumer; +import org.apache.kafka.clients.producer.Producer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import ru.clearing.classes.statics.data.register.ExecutionRegister; +import ru.spcex.clearing.platform.messaging.domain.BaseRequest; +import ru.spcex.clearing.platform.messaging.domain.Consts; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.ExecutionRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.ExecutionRegisterUpdateRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +import static ru.spcex.clearing.imdg.IMDGDistributedNames.Map_ExecutionRegister; + +public class ExecutionRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg executionRegisterMap; + + @Autowired + public ExecutionRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.executionRegisterMap = imdgProvider.getImdg(Map_ExecutionRegister, ExecutionRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(ExecutionRegisterNewRequest.class) + .setConsumer(this::executionRegisterNew) + .forDestination(Consts.REGISTRY_EXECUTION_REGISTER_NEW, callbacks::put); + callback(ExecutionRegisterUpdateRequest.class) + .setConsumer(this::executionRegisterUpdate) + .forDestination(Consts.REGISTRY_EXECUTION_REGISTER_UPDATE, callbacks::put); + init(); + } + + public void executionRegisterNew(BaseRequest userRequest) { + ExecutionRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("ExecutionRegisterNewRequest received"); + ExecutionRegister register = new ExecutionRegister(); + register.setTradingDate(req.getTradingDate()); + register.setExchangeExecutionId(req.getExchangeExecutionId()); + register.setExchangeExecutionTime(req.getExchangeExecutionTime()); + register.setSecurityId(req.getSecurityId()); + register.setSellerId(req.getSellerId()); + register.setSellerClearingCode(req.getSellerClearingCode()); + register.setSellerTradingClearingRegister(req.getSellerTradingClearingRegister()); + register.setSellerMoneyAccount(req.getSellerMoneyAccount()); + register.setSellerDepoAccount(req.getSellerDepoAccount()); + register.setBuyerId(req.getBuyerId()); + register.setBuyerClearingCode(req.getBuyerClearingCode()); + register.setBuyerTradingClearingRegister(req.getBuyerTradingClearingRegister()); + register.setBuyerMoneyAccount(req.getBuyerMoneyAccount()); + register.setBuyerDepoAccount(req.getBuyerDepoAccount()); + register.setAmount(req.getAmount()); + register.setQuantity(req.getQuantity()); + register.setId(req.getId()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); + register.setClearingDate(req.getClearingDate()); + executionRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } + + public void executionRegisterUpdate(BaseRequest userRequest) { + ExecutionRegisterUpdateRequest req = userRequest.getRequestPayload(); + log.debug("ExecutionRegisterUpdateRequest received"); + ExecutionRegister register = executionRegisterMap.getSingleObjectByID(req.getId()); + register.setSecurityId(req.getSecurityId()); + register.setExchangeExecutionTime(req.getExchangeExecutionTime()); + register.setQuantity(req.getQuantity()); + register.setAmount(req.getAmount()); + executionRegisterMap.update(register); + log.debug("successfully processed, id {}", register.getId()); + } +} \ No newline at end of file diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java new file mode 100644 index 000000000..f310b589a --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/LiabilitiesRegisterService.java @@ -0,0 +1,62 @@ +package ru.spcex.clearing.registry.service; + +import org.apache.kafka.clients.consumer.Consumer; +import org.apache.kafka.clients.producer.Producer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import ru.clearing.classes.statics.data.register.LiabilitiesRegister; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.platform.messaging.domain.BaseRequest; +import ru.spcex.clearing.platform.messaging.domain.Consts; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.LiabilitiesRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +public class LiabilitiesRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg liabilitiesRegisterMap; + + @Autowired + public LiabilitiesRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.liabilitiesRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_LiabilitiesRegister, LiabilitiesRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(LiabilitiesRegisterNewRequest.class) + .setConsumer(this::liabilitiesRegisterNew) + .forDestination(Consts.REGISTRY_LIABILITIES_REGISTER_NEW, callbacks::put); + init(); + } + + public void liabilitiesRegisterNew(BaseRequest userRequest) { + LiabilitiesRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("LiabilitiesRegisterNewRequest received"); + LiabilitiesRegister register = new LiabilitiesRegister(); + register.setId(req.getId()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); + register.setSessionId(req.getSessionId()); + register.setValidFromDate(req.getValidFromDate()); + register.setValidToDate(req.getValidToDate()); + register.setCompanyId(req.getCompanyId()); + register.setCompanyFullName(req.getCompanyFullName()); + register.setInn(req.getInn()); + register.setSegment(req.getSegment()); + register.setRegistryCode(req.getRegistryCode()); + register.setAccount(req.getAccount()); + register.setRegistryStatus(req.getRegistryStatus()); + register.setCurrency(req.getCurrency()); + register.setSumLiabilities(req.getSumLiabilities()); + register.setSettlementDate(req.getSettlementDate()); + liabilitiesRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } +} diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java new file mode 100644 index 000000000..d4b26a1ba --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyBalanceRegisterService.java @@ -0,0 +1,59 @@ +package ru.spcex.clearing.registry.service; + +import org.apache.kafka.clients.consumer.Consumer; +import org.apache.kafka.clients.producer.Producer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import ru.clearing.classes.statics.data.register.MoneyBalanceRegister; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.platform.messaging.domain.BaseRequest; +import ru.spcex.clearing.platform.messaging.domain.Consts; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.MoneyBalanceRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +public class MoneyBalanceRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg moneyBalanceRegisterMap; + + @Autowired + public MoneyBalanceRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.moneyBalanceRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_MoneyBalanceRegister, MoneyBalanceRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(MoneyBalanceRegisterNewRequest.class) + .setConsumer(this::moneyBalanceRegisterNew) + .forDestination(Consts.REGISTRY_MONEY_BALANCE_REGISTER_NEW, callbacks::put); + init(); + } + + public void moneyBalanceRegisterNew(BaseRequest userRequest) { + MoneyBalanceRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("MoneyBalanceRegisterNewRequest received"); + MoneyBalanceRegister register = new MoneyBalanceRegister(); + register.setSetHouseName(req.getSetHouseName()); + register.setAccount(req.getAccount()); + register.setInfoAccount(req.getInfoAccount()); + register.setRemainderSum(req.getRemainderSum()); + register.setBlockedSum(req.getBlockedSum()); + register.setUnblockedSum(req.getUnblockedSum()); + register.setInn(req.getInn()); + register.setSessionId(req.getSessionId()); + register.setCompanyFullName(req.getCompanyFullName()); + register.setCompanyId(req.getCompanyId()); + register.setId(req.getId()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); + moneyBalanceRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } +} diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java new file mode 100644 index 000000000..a342fac19 --- /dev/null +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/MoneyPaymentInstructionRegisterService.java @@ -0,0 +1,56 @@ +package ru.spcex.clearing.registry.service; + +import org.apache.kafka.clients.consumer.Consumer; +import org.apache.kafka.clients.producer.Producer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import ru.clearing.classes.statics.data.register.MoneyPaymentInstructionRegister; +import ru.spcex.clearing.imdg.IMDGDistributedNames; +import ru.spcex.clearing.platform.messaging.domain.BaseRequest; +import ru.spcex.clearing.platform.messaging.domain.Consts; +import ru.spcex.clearing.platform.messaging.domain.cud.registry.MoneyPaymentInstructionRegisterNewRequest; +import ru.spcex.clearing.platform.messaging.service.QueueConsumer; +import ru.spcex.platform.imdg.api.Imdg; +import ru.spcex.platform.imdg.api.ImdgProvider; + +public class MoneyPaymentInstructionRegisterService extends QueueConsumer implements InitializingBean { + private final Logger log = LoggerFactory.getLogger(getClass()); + + private final Imdg moneyPaymentInstructionRegisterMap; + + @Autowired + public MoneyPaymentInstructionRegisterService(Consumer kafkaQueue, + Producer kafkaProducer, + ImdgProvider imdgProvider) { + super(kafkaQueue, kafkaProducer); + this.moneyPaymentInstructionRegisterMap = imdgProvider.getImdg(IMDGDistributedNames.Map_MoneyPaymentInstructionRegister, MoneyPaymentInstructionRegister.class); + } + + @Override + public void afterPropertiesSet() { + callback(MoneyPaymentInstructionRegisterNewRequest.class) + .setConsumer(this::moneyPaymentInstructionRegisterNew) + .forDestination(Consts.REGISTRY_MONEY_PAYMENT_INSTRUCTION_REGISTER_NEW, callbacks::put); + init(); + } + + public void moneyPaymentInstructionRegisterNew(BaseRequest userRequest) { + MoneyPaymentInstructionRegisterNewRequest req = userRequest.getRequestPayload(); + log.debug("MoneyPaymentInstructionRegisterNewRequest received"); + MoneyPaymentInstructionRegister register = new MoneyPaymentInstructionRegister(); + register.setCreditLegAccount(req.getCreditLegAccount()); + register.setCreditLegAmount(req.getCreditLegAmount()); + register.setCreditLegCurrencyCode(req.getCreditLegCurrencyCode()); + register.setDebitLegAccount(req.getDebitLegAccount()); + register.setSender(req.getSender()); + register.setAddressee(req.getAddressee()); + register.setId(req.getId()); + register.setCreated(req.getCreatedAt()); + register.setUpdated(req.getUpdatedAt()); + register.setClearingDate(req.getClearingDate()); + moneyPaymentInstructionRegisterMap.insert(register); + log.debug("successfully processed, id {}", register.getId()); + } +} diff --git a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ContractRegisterServiceTest.java b/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ContractRegisterServiceTest.java deleted file mode 100644 index ddf2f397c..000000000 --- a/clearing-parent/registry-service/src/test/java/ru/spcex/clearing/registry/service/ContractRegisterServiceTest.java +++ /dev/null @@ -1,112 +0,0 @@ -package ru.spcex.clearing.registry.service; - -import org.apache.kafka.clients.consumer.MockConsumer; -import org.apache.kafka.clients.producer.MockProducer; -import org.apache.kafka.clients.producer.ProducerRecord; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.test.mock.mockito.SpyBean; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; -import ru.clearing.classes.statics.data.register.ContractRegister; -import ru.spcex.clearing.imdg.IMDGDistributedNames; -import ru.spcex.clearing.platform.messaging.domain.BaseRequest; -import ru.spcex.clearing.platform.messaging.domain.Consts; -import ru.spcex.clearing.platform.messaging.domain.cud.registry.ContractRegisterNewRequest; -import ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration; -import ru.spcex.clearing.registry.config.KafkaConfigTest; -import ru.spcex.clearing.registry.utils.MatcherFactory; -import ru.spcex.platform.imdg.api.Imdg; -import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService; - -import javax.annotation.PostConstruct; -import java.time.LocalDate; - -import static ru.spcex.clearing.registry.config.HazelcastServiceTestConfiguration.currentID; -import static ru.spcex.clearing.registry.utils.MatcherFactory.usingIgnoringFieldsComparator; -import static ru.spcex.clearing.registry.utils.TestUtils.*; - -@ExtendWith(SpringExtension.class) -@ContextConfiguration(classes = { - ContractRegisterService.class, - KafkaConfigTest.class, - HazelcastServiceTestConfiguration.class}) -class ContractRegisterServiceTest { - public static final MatcherFactory.Matcher CLEAR_MEMBER_REGISTER_MATCHER = usingIgnoringFieldsComparator(); - private static final int PARTITION = 0; - private static final String TOPIC_REGISTRY_CONTRACT_REGISTER_NEW = Consts.REGISTRY_CONTRACT_REGISTER_NEW; - private static final Long ID = currentID.getAndIncrement(); - @Autowired - ContractRegisterService contractRegisterService; - @Autowired - @Qualifier("hazelcastServiceTest") - private HazelcastService hazelcastServiceTest; - private Imdg contractRegisterMap; - - @Captor - private ArgumentCaptor producerRecord; - @SpyBean - private MockProducer mockProducer; - - @PostConstruct - private void init() { - hazelcastServiceTest.waitAvailable(); - this.contractRegisterMap = hazelcastServiceTest.getImdg(IMDGDistributedNames.Map_ContractRegister, ContractRegister.class); - } - - /** - * {@link ContractRegisterService#contractRegisterNew(BaseRequest)}
- * Тест проверяет создание сущности {@link ContractRegister} в Hazelcast при передаче из Apache Kafka.
- * Входной запрос {@link ContractRegisterNewRequest}:
- */ - @Test - void contractRegisterNew() { - //ARRANGE - Long companyId = 1234L; - ContractRegisterNewRequest contractRegisterNewRequest = new ContractRegisterNewRequest(); - contractRegisterNewRequest.setName("name"); - contractRegisterNewRequest.setNumber("number"); - contractRegisterNewRequest.setIssueDate(LocalDate.now()); - contractRegisterNewRequest.setCompanyFullName("CMP FN"); - contractRegisterNewRequest.setCompanyId(companyId); - contractRegisterNewRequest.setDocumentType("documentType"); - contractRegisterNewRequest.setIssuePlace("issuePlace"); - contractRegisterNewRequest.setIssuer("issuer"); - contractRegisterNewRequest.setIssuerCode("issuerCode"); - contractRegisterNewRequest.setPlace("place"); - contractRegisterNewRequest.setValidFromDate(LocalDate.now()); - contractRegisterNewRequest.setValidToDate(LocalDate.now()); - contractRegisterNewRequest.setCloseDate(LocalDate.now()); - contractRegisterNewRequest.setComment("comment"); - - ContractRegister predictableContractRegister = new ContractRegister(); - predictableContractRegister.setName(contractRegisterNewRequest.getName()); - predictableContractRegister.setNumber(contractRegisterNewRequest.getNumber()); - predictableContractRegister.setIssueDate(contractRegisterNewRequest.getIssueDate()); - predictableContractRegister.setCompanyFullName(contractRegisterNewRequest.getCompanyFullName()); - predictableContractRegister.setCompanyId(contractRegisterNewRequest.getCompanyId()); - predictableContractRegister.setDocumentType(contractRegisterNewRequest.getDocumentType()); - predictableContractRegister.setIssuePlace(contractRegisterNewRequest.getIssuePlace()); - predictableContractRegister.setIssuer(contractRegisterNewRequest.getIssuer()); - predictableContractRegister.setIssuerCode(contractRegisterNewRequest.getIssuerCode()); - predictableContractRegister.setPlace(contractRegisterNewRequest.getPlace()); - predictableContractRegister.setValidFromDate(contractRegisterNewRequest.getValidFromDate()); - predictableContractRegister.setValidToDate(contractRegisterNewRequest.getValidToDate()); - predictableContractRegister.setCloseDate(contractRegisterNewRequest.getCloseDate()); - predictableContractRegister.setComment(contractRegisterNewRequest.getComment()); - //ACT - String jsonString = getJsonStringForNew(contractRegisterNewRequest, ID); - - addRecordToKafka((MockConsumer) contractRegisterService.getConsumer(), TOPIC_REGISTRY_CONTRACT_REGISTER_NEW, PARTITION, 0, jsonString); - - //ASSERT - waitingWhenAddedRecordAndCheckIt(ID, mockProducer, producerRecord); - ContractRegister resultNew = contractRegisterMap.getSingleObjectBySQL(String.format("companyId = %d", companyId)); - predictableContractRegister.setId(resultNew.getId()); - CLEAR_MEMBER_REGISTER_MATCHER.assertMatch(resultNew, predictableContractRegister); - } -} \ No newline at end of file diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java index cace0e3ba..817c8567c 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java @@ -86,7 +86,7 @@ public interface Consts { String DESTINATION_CLIENT_CODE_UPDATE = "client-code-update"; String DESTINATION_CLIENT_CODE_DELETE = "client-code-delete"; - String DESTINATION_TRADING_CLEARING_REGISTRY_NEW = "trading-clearing-registry-new"; + String DESTINATION_TRADING_CLEARING_REGISTRY_NEW = "trading-clearing-registry-new"; // todo check buplicate REGISTRY_NEW? String DESTINATION_TRADING_CLEARING_REGISTRY_AUTO_NEW = "trading-clearing-registry-auto-new"; String DESTINATION_TRADING_CLEARING_REGISTRY_UPDATE = "trading-clearing-registry-update"; String DESTINATION_TRADING_CLEARING_REGISTRY_REPLY = "trading-clearing-registry-reply"; @@ -125,7 +125,18 @@ public interface Consts { String REGISTRY_ADMITTED_DEAL_REGISTER_NEW = "registry-admitted-deal-register-new"; String REGISTRY_DEAL_REGISTER_NEW = "registry-deal-register-new"; - String REGISTRY_ORDER_REGISTER_NEW = "registry-order-register-new"; + String REGISTRY_DEPO_BALANCE_REGISTER_NEW = "registry-depo-balance-register-new"; + String REGISTRY_MONEY_BALANCE_REGISTER_NEW = "registry-money-balance-register-new"; + String REGISTRY_ADMITTED_LIABILITIES_REGISTER_NEW = "registry-admitted-liabilities-register-new"; + String REGISTRY_COVERED_LIABILITIES_REGISTER_NEW = "registry-covered-liabilities-register-new"; + String REGISTRY_MONEY_PAYMENT_INSTRUCTION_REGISTER_NEW = "registry-money-payment-instruction-register-new"; + String REGISTRY_DEPO_PAYMENT_INSTRUCTION_REGISTER_NEW = "registry-depo-payment-instruction-register-new"; + String REGISTRY_EXCLUDE_LIABILITIES_REGISTER_NEW = "registry-exclude-liabilities-register-new"; + String REGISTRY_LIABILITIES_REGISTER_NEW = "registry-liabilities-register-new"; + String REGISTRY_EXECUTION_REGISTER_NEW = "registry-execution-register-new"; + String REGISTRY_EXECUTION_REGISTER_UPDATE = "registry-execution-register-update"; + + //TODO IS IT NEEDED RIGHT HERE? String REGISTRY_CONTRACT_REGISTER_NEW = "registry-contract-register-new"; String REGISTRY_BALANCE_REGISTER_NEW = "registry-balance-register-new"; String REGISTRY_UNCOVERED_DEAL_REGISTER_NEW = "registry-uncovered-deal-register-new"; diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/AdmittedLiabilitiesRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/AdmittedLiabilitiesRegisterNewRequest.java new file mode 100644 index 000000000..7f03e7c0a --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/AdmittedLiabilitiesRegisterNewRequest.java @@ -0,0 +1,142 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; + +import java.math.BigDecimal; +import java.time.Instant; +import java.time.LocalDate; + +public class AdmittedLiabilitiesRegisterNewRequest { + @JsonProperty + private String companyFullName; + @JsonProperty + private Long sessionId; + @JsonProperty + private String securitySymbol; + @JsonProperty + private String securityFullName; + @JsonProperty + private Long companyId; + @JsonProperty + private String clearingCode; + @JsonProperty + private String account; + @JsonProperty + private BigDecimal amount; + @JsonProperty + private Long id; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant createdAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant updatedAt; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + private LocalDate clearingDate; + + public String getCompanyFullName() { + return companyFullName; + } + + public void setCompanyFullName(String companyFullName) { + this.companyFullName = companyFullName; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public String getSecuritySymbol() { + return securitySymbol; + } + + public void setSecuritySymbol(String securitySymbol) { + this.securitySymbol = securitySymbol; + } + + public String getSecurityFullName() { + return securityFullName; + } + + public void setSecurityFullName(String securityFullName) { + this.securityFullName = securityFullName; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getClearingCode() { + return clearingCode; + } + + public void setClearingCode(String clearingCode) { + this.clearingCode = clearingCode; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public LocalDate getClearingDate() { + return clearingDate; + } + + public void setClearingDate(LocalDate clearingDate) { + this.clearingDate = clearingDate; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ContractRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ContractRegisterNewRequest.java index 71071ed4d..9c44f74ce 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ContractRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ContractRegisterNewRequest.java @@ -1,214 +1,214 @@ -package ru.spcex.clearing.platform.messaging.domain.cud.registry; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDateTimeDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantDateTimeSerializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; - -import java.time.Instant; -import java.time.LocalDate; - -public class ContractRegisterNewRequest { - - @JsonProperty - private String name; - - @JsonProperty - private String number; - - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - @JsonProperty - private LocalDate issueDate; - - @JsonProperty - private String companyFullName; - - @JsonProperty - private Long companyId; - - @JsonProperty - private String documentType; - - @JsonProperty - private String issuePlace; - - @JsonProperty - private String issuer; - - @JsonProperty - private String issuerCode; - - @JsonProperty - private String place; - - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - @JsonProperty - private LocalDate validFromDate; - - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - @JsonProperty - private LocalDate validToDate; - - @JsonSerialize(using = LocalDateSerializer.class) - @JsonDeserialize(using = LocalDateDeserializer.class) - @JsonProperty - private LocalDate closeDate; - - @JsonProperty - private String comment; - - @JsonProperty - private Long id; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant createdAt; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant updatedAt; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public LocalDate getCloseDate() { - return closeDate; - } - - public void setCloseDate(LocalDate closeDate) { - this.closeDate = closeDate; - } - - public String getComment() { - return comment; - } - - public void setComment(String comment) { - this.comment = comment; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Instant getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Instant createdAt) { - this.createdAt = createdAt; - } - - public Instant getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Instant updatedAt) { - this.updatedAt = updatedAt; - } - - public String getNumber() { - return number; - } - - public void setNumber(String number) { - this.number = number; - } - - public LocalDate getIssueDate() { - return issueDate; - } - - public void setIssueDate(LocalDate issueDate) { - this.issueDate = issueDate; - } - - public String getCompanyFullName() { - return companyFullName; - } - - public void setCompanyFullName(String companyFullName) { - this.companyFullName = companyFullName; - } - - public Long getCompanyId() { - return companyId; - } - - public void setCompanyId(Long companyId) { - this.companyId = companyId; - } - - public String getDocumentType() { - return documentType; - } - - public void setDocumentType(String documentType) { - this.documentType = documentType; - } - - public String getIssuePlace() { - return issuePlace; - } - - public void setIssuePlace(String issuePlace) { - this.issuePlace = issuePlace; - } - - public String getIssuer() { - return issuer; - } - - public void setIssuer(String issuer) { - this.issuer = issuer; - } - - public String getIssuerCode() { - return issuerCode; - } - - public void setIssuerCode(String issuerCode) { - this.issuerCode = issuerCode; - } - - public String getPlace() { - return place; - } - - public void setPlace(String place) { - this.place = place; - } - - public LocalDate getValidFromDate() { - return validFromDate; - } - - public void setValidFromDate(LocalDate validFromDate) { - this.validFromDate = validFromDate; - } - - public LocalDate getValidToDate() { - return validToDate; - } - - public void setValidToDate(LocalDate validToDate) { - this.validToDate = validToDate; - } -} +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDateTimeDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantDateTimeSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; + +import java.time.Instant; +import java.time.LocalDate; + +public class ContractRegisterNewRequest { + + @JsonProperty + private String name; + + @JsonProperty + private String number; + + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + private LocalDate issueDate; + + @JsonProperty + private String companyFullName; + + @JsonProperty + private Long companyId; + + @JsonProperty + private String documentType; + + @JsonProperty + private String issuePlace; + + @JsonProperty + private String issuer; + + @JsonProperty + private String issuerCode; + + @JsonProperty + private String place; + + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + private LocalDate validFromDate; + + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + private LocalDate validToDate; + + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + private LocalDate closeDate; + + @JsonProperty + private String comment; + + @JsonProperty + private Long id; + + @JsonSerialize(using = InstantDateTimeSerializer.class) + @JsonDeserialize(using = InstantDateTimeDeserializer.class) + @JsonProperty + private Instant createdAt; + + @JsonSerialize(using = InstantDateTimeSerializer.class) + @JsonDeserialize(using = InstantDateTimeDeserializer.class) + @JsonProperty + private Instant updatedAt; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public LocalDate getCloseDate() { + return closeDate; + } + + public void setCloseDate(LocalDate closeDate) { + this.closeDate = closeDate; + } + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public String getNumber() { + return number; + } + + public void setNumber(String number) { + this.number = number; + } + + public LocalDate getIssueDate() { + return issueDate; + } + + public void setIssueDate(LocalDate issueDate) { + this.issueDate = issueDate; + } + + public String getCompanyFullName() { + return companyFullName; + } + + public void setCompanyFullName(String companyFullName) { + this.companyFullName = companyFullName; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getDocumentType() { + return documentType; + } + + public void setDocumentType(String documentType) { + this.documentType = documentType; + } + + public String getIssuePlace() { + return issuePlace; + } + + public void setIssuePlace(String issuePlace) { + this.issuePlace = issuePlace; + } + + public String getIssuer() { + return issuer; + } + + public void setIssuer(String issuer) { + this.issuer = issuer; + } + + public String getIssuerCode() { + return issuerCode; + } + + public void setIssuerCode(String issuerCode) { + this.issuerCode = issuerCode; + } + + public String getPlace() { + return place; + } + + public void setPlace(String place) { + this.place = place; + } + + public LocalDate getValidFromDate() { + return validFromDate; + } + + public void setValidFromDate(LocalDate validFromDate) { + this.validFromDate = validFromDate; + } + + public LocalDate getValidToDate() { + return validToDate; + } + + public void setValidToDate(LocalDate validToDate) { + this.validToDate = validToDate; + } +} \ No newline at end of file diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredLiabilitiesRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredLiabilitiesRegisterNewRequest.java new file mode 100644 index 000000000..2d4045f76 --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/CoveredLiabilitiesRegisterNewRequest.java @@ -0,0 +1,142 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; + +import java.math.BigDecimal; +import java.time.Instant; +import java.time.LocalDate; + +public class CoveredLiabilitiesRegisterNewRequest { + @JsonProperty + private String companyFullName; + @JsonProperty + private Long sessionId; + @JsonProperty + private String securitySymbol; + @JsonProperty + private String securityFullName; + @JsonProperty + private Long companyId; + @JsonProperty + private String clearingCode; + @JsonProperty + private String account; + @JsonProperty + private BigDecimal amount; + @JsonProperty + private Long id; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant createdAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant updatedAt; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + private LocalDate clearingDate; + + public String getCompanyFullName() { + return companyFullName; + } + + public void setCompanyFullName(String companyFullName) { + this.companyFullName = companyFullName; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public String getSecuritySymbol() { + return securitySymbol; + } + + public void setSecuritySymbol(String securitySymbol) { + this.securitySymbol = securitySymbol; + } + + public String getSecurityFullName() { + return securityFullName; + } + + public void setSecurityFullName(String securityFullName) { + this.securityFullName = securityFullName; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getClearingCode() { + return clearingCode; + } + + public void setClearingCode(String clearingCode) { + this.clearingCode = clearingCode; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public LocalDate getClearingDate() { + return clearingDate; + } + + public void setClearingDate(LocalDate clearingDate) { + this.clearingDate = clearingDate; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoBalanceRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoBalanceRegisterNewRequest.java new file mode 100644 index 000000000..e3bcaec58 --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoBalanceRegisterNewRequest.java @@ -0,0 +1,98 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; + +import java.math.BigDecimal; +import java.time.Instant; + +public class DepoBalanceRegisterNewRequest { + @JsonProperty + private Long id; + + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant createdAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant updatedAt; + @JsonProperty + private Long companyId; + @JsonProperty + private Long sessionId; + @JsonProperty + private String depoCode; + @JsonProperty + private BigDecimal quantity; + @JsonProperty + private String securitySymbol; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public String getDepoCode() { + return depoCode; + } + + public void setDepoCode(String depoCode) { + this.depoCode = depoCode; + } + + public BigDecimal getQuantity() { + return quantity; + } + + public void setQuantity(BigDecimal quantity) { + this.quantity = quantity; + } + + public String getSecuritySymbol() { + return securitySymbol; + } + + public void setSecuritySymbol(String securitySymbol) { + this.securitySymbol = securitySymbol; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoPaymentInstructionRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoPaymentInstructionRegisterNewRequest.java new file mode 100644 index 000000000..90f7a9a58 --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/DepoPaymentInstructionRegisterNewRequest.java @@ -0,0 +1,117 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; + +import java.math.BigDecimal; +import java.time.Instant; + +public class DepoPaymentInstructionRegisterNewRequest { + @JsonProperty + private Long id; + @JsonProperty + private Long companyId; + @JsonProperty + private String tradingClearingRegistryType; + @JsonProperty + private String tradingClearingRegistry; + @JsonProperty + private String cbCode; + @JsonProperty + private BigDecimal quantity; + @JsonProperty + private Long direction; + @JsonProperty + private Long sessionId; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant createdAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant updatedAt; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getTradingClearingRegistryType() { + return tradingClearingRegistryType; + } + + public void setTradingClearingRegistryType(String tradingClearingRegistryType) { + this.tradingClearingRegistryType = tradingClearingRegistryType; + } + + public String getTradingClearingRegistry() { + return tradingClearingRegistry; + } + + public void setTradingClearingRegistry(String tradingClearingRegistry) { + this.tradingClearingRegistry = tradingClearingRegistry; + } + + public String getCbCode() { + return cbCode; + } + + public void setCbCode(String cbCode) { + this.cbCode = cbCode; + } + + public BigDecimal getQuantity() { + return quantity; + } + + public void setQuantity(BigDecimal quantity) { + this.quantity = quantity; + } + + public Long getDirection() { + return direction; + } + + public void setDirection(Long direction) { + this.direction = direction; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExcludeLiabilitiesRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExcludeLiabilitiesRegisterNewRequest.java new file mode 100644 index 000000000..6a0f7ff09 --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExcludeLiabilitiesRegisterNewRequest.java @@ -0,0 +1,187 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; + +import java.math.BigDecimal; +import java.time.Instant; +import java.time.LocalDate; + +public class ExcludeLiabilitiesRegisterNewRequest { + @JsonProperty + private Long id; + @JsonProperty + private Long sessionId; + @JsonProperty + private Long companyId; + @JsonProperty + private String companyFullName; + @JsonProperty + private String inn; + @JsonProperty + private String segment; + @JsonProperty + private String registryCode; + @JsonProperty + private String account; + @JsonProperty + private String registryStatus; + @JsonProperty + private String currency; + @JsonProperty + private BigDecimal sumLiabilities; + + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant settlementDate; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private LocalDate validFromDate; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + private LocalDate validToDate; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + private Instant createdAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant updatedAt; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getCompanyFullName() { + return companyFullName; + } + + public void setCompanyFullName(String companyFullName) { + this.companyFullName = companyFullName; + } + + public String getInn() { + return inn; + } + + public void setInn(String inn) { + this.inn = inn; + } + + public String getSegment() { + return segment; + } + + public void setSegment(String segment) { + this.segment = segment; + } + + public String getRegistryCode() { + return registryCode; + } + + public void setRegistryCode(String registryCode) { + this.registryCode = registryCode; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getRegistryStatus() { + return registryStatus; + } + + public void setRegistryStatus(String registryStatus) { + this.registryStatus = registryStatus; + } + + public String getCurrency() { + return currency; + } + + public void setCurrency(String currency) { + this.currency = currency; + } + + public BigDecimal getSumLiabilities() { + return sumLiabilities; + } + + public void setSumLiabilities(BigDecimal sumLiabilities) { + this.sumLiabilities = sumLiabilities; + } + + public Instant getSettlementDate() { + return settlementDate; + } + + public void setSettlementDate(Instant settlementDate) { + this.settlementDate = settlementDate; + } + + public LocalDate getValidFromDate() { + return validFromDate; + } + + public void setValidFromDate(LocalDate validFromDate) { + this.validFromDate = validFromDate; + } + + public LocalDate getValidToDate() { + return validToDate; + } + + public void setValidToDate(LocalDate validToDate) { + this.validToDate = validToDate; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterNewRequest.java new file mode 100644 index 000000000..8d87d0b2f --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterNewRequest.java @@ -0,0 +1,226 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; + +import java.math.BigDecimal; +import java.time.Instant; +import java.time.LocalDate; + +public class ExecutionRegisterNewRequest { + @JsonProperty + private Long exchangeExecutionId; + @JsonProperty + private Long securityId; + @JsonProperty + private Long sellerId; + @JsonProperty + private String sellerClearingCode; + @JsonProperty + private String sellerTradingClearingRegister; + @JsonProperty + private String sellerMoneyAccount; + @JsonProperty + private String sellerDepoAccount; + @JsonProperty + private Long buyerId; + @JsonProperty + private String buyerClearingCode; + @JsonProperty + private String buyerTradingClearingRegister; + @JsonProperty + private String buyerMoneyAccount; + @JsonProperty + private String buyerDepoAccount; + @JsonProperty + private BigDecimal amount; + @JsonProperty + private BigDecimal quantity; + @JsonProperty + private Long id; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant createdAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant updatedAt; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + private LocalDate clearingDate; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + private LocalDate tradingDate; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant exchangeExecutionTime; + + public Long getExchangeExecutionId() { + return exchangeExecutionId; + } + + public void setExchangeExecutionId(Long exchangeExecutionId) { + this.exchangeExecutionId = exchangeExecutionId; + } + + public Long getSecurityId() { + return securityId; + } + + public void setSecurityId(Long securityId) { + this.securityId = securityId; + } + + public String getSellerClearingCode() { + return sellerClearingCode; + } + + public void setSellerClearingCode(String sellerClearingCode) { + this.sellerClearingCode = sellerClearingCode; + } + + public String getSellerTradingClearingRegister() { + return sellerTradingClearingRegister; + } + + public void setSellerTradingClearingRegister(String sellerTradingClearingRegister) { + this.sellerTradingClearingRegister = sellerTradingClearingRegister; + } + + public String getSellerMoneyAccount() { + return sellerMoneyAccount; + } + + public void setSellerMoneyAccount(String sellerMoneyAccount) { + this.sellerMoneyAccount = sellerMoneyAccount; + } + + public String getSellerDepoAccount() { + return sellerDepoAccount; + } + + public void setSellerDepoAccount(String sellerDepoAccount) { + this.sellerDepoAccount = sellerDepoAccount; + } + + public String getBuyerClearingCode() { + return buyerClearingCode; + } + + public void setBuyerClearingCode(String buyerClearingCode) { + this.buyerClearingCode = buyerClearingCode; + } + + public String getBuyerTradingClearingRegister() { + return buyerTradingClearingRegister; + } + + public void setBuyerTradingClearingRegister(String buyerTradingClearingRegister) { + this.buyerTradingClearingRegister = buyerTradingClearingRegister; + } + + public String getBuyerMoneyAccount() { + return buyerMoneyAccount; + } + + public void setBuyerMoneyAccount(String buyerMoneyAccount) { + this.buyerMoneyAccount = buyerMoneyAccount; + } + + public String getBuyerDepoAccount() { + return buyerDepoAccount; + } + + public void setBuyerDepoAccount(String buyerDepoAccount) { + this.buyerDepoAccount = buyerDepoAccount; + } + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public BigDecimal getQuantity() { + return quantity; + } + + public void setQuantity(BigDecimal quantity) { + this.quantity = quantity; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public LocalDate getClearingDate() { + return clearingDate; + } + + public void setClearingDate(LocalDate clearingDate) { + this.clearingDate = clearingDate; + } + + public LocalDate getTradingDate() { + return tradingDate; + } + + public void setTradingDate(LocalDate tradingDate) { + this.tradingDate = tradingDate; + } + + public Instant getExchangeExecutionTime() { + return exchangeExecutionTime; + } + + public void setExchangeExecutionTime(Instant exchangeExecutionTime) { + this.exchangeExecutionTime = exchangeExecutionTime; + } + + public Long getSellerId() { + return sellerId; + } + + public void setSellerId(Long sellerId) { + this.sellerId = sellerId; + } + + public Long getBuyerId() { + return buyerId; + } + + public void setBuyerId(Long buyerId) { + this.buyerId = buyerId; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterUpdateRequest.java new file mode 100644 index 000000000..144376602 --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/ExecutionRegisterUpdateRequest.java @@ -0,0 +1,65 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; + +import java.math.BigDecimal; +import java.time.Instant; + +public class ExecutionRegisterUpdateRequest { + @JsonProperty + private Long securityId; + @JsonProperty + private BigDecimal amount; + @JsonProperty + private BigDecimal quantity; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant exchangeExecutionTime; + @JsonProperty + private Long id; + + public Long getSecurityId() { + return securityId; + } + + public void setSecurityId(Long securityId) { + this.securityId = securityId; + } + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public BigDecimal getQuantity() { + return quantity; + } + + public void setQuantity(BigDecimal quantity) { + this.quantity = quantity; + } + + public Instant getExchangeExecutionTime() { + return exchangeExecutionTime; + } + + public void setExchangeExecutionTime(Instant exchangeExecutionTime) { + this.exchangeExecutionTime = exchangeExecutionTime; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java new file mode 100644 index 000000000..da5827454 --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/LiabilitiesRegisterNewRequest.java @@ -0,0 +1,186 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; + +import java.math.BigDecimal; +import java.time.Instant; +import java.time.LocalDate; + +public class LiabilitiesRegisterNewRequest { + @JsonProperty + private Long id; + @JsonProperty + private Long sessionId; + @JsonProperty + private Long companyId; + @JsonProperty + private String companyFullName; + @JsonProperty + private String inn; + @JsonProperty + private String segment; + @JsonProperty + private String registryCode; + @JsonProperty + private String account; + @JsonProperty + private String registryStatus; + @JsonProperty + private String currency; + @JsonProperty + private BigDecimal sumLiabilities; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + private LocalDate settlementDate; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant createdAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant updatedAt; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + private LocalDate validFromDate; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + private LocalDate validToDate; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + + public String getCompanyFullName() { + return companyFullName; + } + + public void setCompanyFullName(String companyFullName) { + this.companyFullName = companyFullName; + } + + public String getInn() { + return inn; + } + + public void setInn(String inn) { + this.inn = inn; + } + + public String getSegment() { + return segment; + } + + public void setSegment(String segment) { + this.segment = segment; + } + + public String getRegistryCode() { + return registryCode; + } + + public void setRegistryCode(String registryCode) { + this.registryCode = registryCode; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getRegistryStatus() { + return registryStatus; + } + + public void setRegistryStatus(String registryStatus) { + this.registryStatus = registryStatus; + } + + public String getCurrency() { + return currency; + } + + public void setCurrency(String currency) { + this.currency = currency; + } + + public BigDecimal getSumLiabilities() { + return sumLiabilities; + } + + public void setSumLiabilities(BigDecimal sumLiabilities) { + this.sumLiabilities = sumLiabilities; + } + + public LocalDate getSettlementDate() { + return settlementDate; + } + + public void setSettlementDate(LocalDate settlementDate) { + this.settlementDate = settlementDate; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public LocalDate getValidFromDate() { + return validFromDate; + } + + public void setValidFromDate(LocalDate validFromDate) { + this.validFromDate = validFromDate; + } + + public LocalDate getValidToDate() { + return validToDate; + } + + public void setValidToDate(LocalDate validToDate) { + this.validToDate = validToDate; + } +} diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/BalanceRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyBalanceRegisterNewRequest.java similarity index 64% rename from platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/BalanceRegisterNewRequest.java rename to platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyBalanceRegisterNewRequest.java index 171468da2..6e00189b5 100644 --- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/BalanceRegisterNewRequest.java +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyBalanceRegisterNewRequest.java @@ -3,85 +3,44 @@ package ru.spcex.clearing.platform.messaging.domain.cud.registry; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDateTimeDeserializer; -import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantDateTimeSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; import java.math.BigDecimal; import java.time.Instant; -public class BalanceRegisterNewRequest { - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) - @JsonProperty - private Instant sDf01Date; - - @JsonProperty - private String currencyCode; - +public class MoneyBalanceRegisterNewRequest { @JsonProperty private String setHouseName; - @JsonProperty private String account; - @JsonProperty private String infoAccount; - @JsonProperty private BigDecimal remainderSum; - @JsonProperty private BigDecimal blockedSum; - @JsonProperty private BigDecimal unblockedSum; - @JsonProperty private String inn; - @JsonProperty - private Long market; - + private Long sessionId; @JsonProperty - private String fullName; - - @JsonProperty - private String typeRemains; - - @JsonProperty - private String docNumber; - + private String companyFullName; @JsonProperty private Long companyId; - @JsonProperty private Long id; - + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty private Instant createdAt; - - @JsonSerialize(using = InstantDateTimeSerializer.class) - @JsonDeserialize(using = InstantDateTimeDeserializer.class) + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) @JsonProperty private Instant updatedAt; - public Instant getsDf01Date() { - return sDf01Date; - } - - public void setsDf01Date(Instant sDf01Date) { - this.sDf01Date = sDf01Date; - } - - public String getCurrencyCode() { - return currencyCode; - } - - public void setCurrencyCode(String currencyCode) { - this.currencyCode = currencyCode; - } - public String getSetHouseName() { return setHouseName; } @@ -138,36 +97,20 @@ public class BalanceRegisterNewRequest { this.inn = inn; } - public Long getMarket() { - return market; + public Long getSessionId() { + return sessionId; } - public void setMarket(Long market) { - this.market = market; + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; } - public String getFullName() { - return fullName; + public String getCompanyFullName() { + return companyFullName; } - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public String getTypeRemains() { - return typeRemains; - } - - public void setTypeRemains(String typeRemains) { - this.typeRemains = typeRemains; - } - - public String getDocNumber() { - return docNumber; - } - - public void setDocNumber(String docNumber) { - this.docNumber = docNumber; + public void setCompanyFullName(String companyFullName) { + this.companyFullName = companyFullName; } public Long getCompanyId() { diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyPaymentInstructionRegisterNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyPaymentInstructionRegisterNewRequest.java new file mode 100644 index 000000000..c1e8c60ad --- /dev/null +++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/MoneyPaymentInstructionRegisterNewRequest.java @@ -0,0 +1,122 @@ +package ru.spcex.clearing.platform.messaging.domain.cud.registry; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer; +import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer; + +import java.math.BigDecimal; +import java.time.Instant; +import java.time.LocalDate; + +public class MoneyPaymentInstructionRegisterNewRequest { + @JsonProperty + private String creditLegAccount; + @JsonProperty + private BigDecimal creditLegAmount; + @JsonProperty + private String creditLegCurrencyCode; + @JsonProperty + private String debitLegAccount; + @JsonProperty + private String sender; + @JsonProperty + private String addressee; + @JsonProperty + private Long id; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant createdAt; + @JsonSerialize(using = InstantSerializer.class) + @JsonDeserialize(using = InstantDeserializer.class) + @JsonProperty + private Instant updatedAt; + @JsonSerialize(using = LocalDateSerializer.class) + @JsonDeserialize(using = LocalDateDeserializer.class) + @JsonProperty + private LocalDate clearingDate; + + public String getCreditLegAccount() { + return creditLegAccount; + } + + public void setCreditLegAccount(String creditLegAccount) { + this.creditLegAccount = creditLegAccount; + } + + public BigDecimal getCreditLegAmount() { + return creditLegAmount; + } + + public void setCreditLegAmount(BigDecimal creditLegAmount) { + this.creditLegAmount = creditLegAmount; + } + + public String getCreditLegCurrencyCode() { + return creditLegCurrencyCode; + } + + public void setCreditLegCurrencyCode(String creditLegCurrencyCode) { + this.creditLegCurrencyCode = creditLegCurrencyCode; + } + + public String getDebitLegAccount() { + return debitLegAccount; + } + + public void setDebitLegAccount(String debitLegAccount) { + this.debitLegAccount = debitLegAccount; + } + + public String getSender() { + return sender; + } + + public void setSender(String sender) { + this.sender = sender; + } + + public String getAddressee() { + return addressee; + } + + public void setAddressee(String addressee) { + this.addressee = addressee; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public LocalDate getClearingDate() { + return clearingDate; + } + + public void setClearingDate(LocalDate clearingDate) { + this.clearingDate = clearingDate; + } +}