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

Merge branch 'meta_4' into dev

Browse source
This commit is contained in:
AKurakin 2023-05-11 17:33:11 +03:00
commit 7a858cf422
217 changed files with 10331 additions and 13478 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/account/AccountBalanceController.java
View file

@ -1,40 +0,0 @@
package ru.spcex.clearing.backendapi.controller.queue.account;
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.account.AccountBalance;
import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
import ru.spcex.clearing.backendapi.service.IStateLoader;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.util.Collection;
import java.util.Map;
@Deprecated
@Controller
@RequestMapping("/account-balances")
public class AccountBalanceController {
private final IStateLoader stateLoader;
@Autowired
public AccountBalanceController(IStateLoader stateLoader) {
this.stateLoader = stateLoader;
}
@ApiOperation(value = "get all account balances.")
@ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public CommonGetAllResponse getAll() {
Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_AccountBalance, AccountBalance.class);
CommonGetAllResponse response = new CommonGetAllResponse();
response.fromEntity(all);
return response;
}
}

44
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/liabilities/LiabilitiesClaimsAssetController.java
View file

@ -1,44 +0,0 @@
package ru.spcex.clearing.backendapi.controller.queue.liabilities;
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.liabilities.LiabilitiesClaimsAssets;
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-claims-assets")
public class LiabilitiesClaimsAssetController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public LiabilitiesClaimsAssetController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}
@ApiOperation(value = "get all LiabilitiesClaimsAssets.")
@ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public CommonGetAllResponse getAll() {
Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
IMDGDistributedNames.Map_LiabilitiesClaimsAssets,
LiabilitiesClaimsAssets.class);
CommonGetAllResponse response = new CommonGetAllResponse();
response.fromEntity(all);
return response;
}
}

44
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/liabilities/LiabilitiesClaimsMoneyController.java
View file

@ -1,44 +0,0 @@
package ru.spcex.clearing.backendapi.controller.queue.liabilities;
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.liabilities.LiabilitiesClaimsMoney;
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-claims-money")
public class LiabilitiesClaimsMoneyController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public LiabilitiesClaimsMoneyController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}
@ApiOperation(value = "get all LiabilitiesClaimsMoney.")
@ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public CommonGetAllResponse getAll() {
Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
IMDGDistributedNames.Map_LiabilitiesClaimsMoney,
LiabilitiesClaimsMoney.class);
CommonGetAllResponse response = new CommonGetAllResponse();
response.fromEntity(all);
return response;
}
}

44
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/AdmittedDealRegisterController.java
View file

@ -1,44 +0,0 @@
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.AdmittedDealRegister;
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-deal-registers")
public class AdmittedDealRegisterController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public AdmittedDealRegisterController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}
@ApiOperation(value = "get all admitted deal registers.")
@ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public CommonGetAllResponse getAll() {
Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
IMDGDistributedNames.Map_AdmittedDealRegister,
AdmittedDealRegister.class);
CommonGetAllResponse response = new CommonGetAllResponse();
response.fromEntity(all);
return response;
}
}

44
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/BalanceRegisterController.java
View file

@ -1,44 +0,0 @@
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.misc.BalanceRegister;
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("/balance-registers")
public class BalanceRegisterController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public BalanceRegisterController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}
@ApiOperation(value = "get all money balance registers.")
@ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public CommonGetAllResponse getAll() {
Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
IMDGDistributedNames.Map_BalanceRegister,
BalanceRegister.class);
CommonGetAllResponse response = new CommonGetAllResponse();
response.fromEntity(all);
return response;
}
}

44
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/ClearMemberRegisterController.java
View file

@ -1,44 +0,0 @@
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.misc.ClearMemberRegister;
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("/clearmember-registers")
public class ClearMemberRegisterController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public ClearMemberRegisterController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}
@ApiOperation(value = "get all money ClearMemberRegisters.")
@ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public CommonGetAllResponse getAll() {
Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
IMDGDistributedNames.Map_ClearMemberRegister,
ClearMemberRegister.class);
CommonGetAllResponse response = new CommonGetAllResponse();
response.fromEntity(all);
return response;
}
}

44
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/CoveredDealRegisterController.java
View file

@ -1,44 +0,0 @@
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.CoveredDealRegister;
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-deal-registers")
public class CoveredDealRegisterController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public CoveredDealRegisterController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}
@ApiOperation(value = "get all covered deal registers.")
@ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public CommonGetAllResponse getAll() {
Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
IMDGDistributedNames.Map_CoveredDealRegister,
CoveredDealRegister.class);
CommonGetAllResponse response = new CommonGetAllResponse();
response.fromEntity(all);
return response;
}
}

44
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/DealRegisterController.java
View file

@ -1,44 +0,0 @@
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.DealRegister;
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("/deal-registers")
public class DealRegisterController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public DealRegisterController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}
@ApiOperation(value = "get all deal registers.")
@ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public CommonGetAllResponse getAll() {
Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
IMDGDistributedNames.Map_DealRegister,
DealRegister.class);
CommonGetAllResponse response = new CommonGetAllResponse();
response.fromEntity(all);
return response;
}
}

44
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/OrderRegisterController.java
View file

@ -1,44 +0,0 @@
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.OrderRegister;
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("/order-registers")
public class OrderRegisterController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public OrderRegisterController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}
@ApiOperation(value = "get all order registers.")
@ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public CommonGetAllResponse getAll() {
Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
IMDGDistributedNames.Map_OrderRegister,
OrderRegister.class);
CommonGetAllResponse response = new CommonGetAllResponse();
response.fromEntity(all);
return response;
}
}

44
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/UncoveredDealRegisterController.java
View file

@ -1,44 +0,0 @@
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.UncoveredDealRegister;
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("/uncovered-deal-registers")
public class UncoveredDealRegisterController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public UncoveredDealRegisterController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}
@ApiOperation(value = "get all uncovered deal registers.")
@ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public CommonGetAllResponse getAll() {
Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(
IMDGDistributedNames.Map_UncoveredDealRegister,
UncoveredDealRegister.class);
CommonGetAllResponse response = new CommonGetAllResponse();
response.fromEntity(all);
return response;
}
}

83
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/utilities/CudKeyRateController.java
View file

@ -1,83 +0,0 @@
package ru.spcex.clearing.backendapi.controller.queue.utilities;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import ru.clearing.classes.statics.data.misc.KeyRate;
import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController;
import ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction;
import ru.spcex.clearing.backendapi.controller.request.cud.utilities.KeyRateNewAction;
import ru.spcex.clearing.backendapi.controller.request.cud.utilities.KeyRateUpdateAction;
import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse;
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 ru.spcex.clearing.platform.messaging.domain.Consts;
import java.util.Collection;
import java.util.Map;
import java.util.concurrent.ExecutionException;
@Controller
@RequestMapping("/utilities/key-rates")
public class CudKeyRateController extends AbstractQueueController {
private final IStateLoader stateLoader;
@Autowired
public CudKeyRateController(IOperator operator, IStateLoader stateLoader) {
super(operator);
this.stateLoader = stateLoader;
}
@ApiOperation(value = "create key rate.")
@ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
@RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
public CudResponse add(
@ApiParam(value = "Параметры команды в JSON формате.", required = true)
@RequestBody KeyRateNewAction keyRateNewAction) throws ExecutionException, InterruptedException {
return processRequest(Consts.DESTINATION_KEY_RATE_NEW, keyRateNewAction);
}
@ApiOperation(value = "update key rate.")
@ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
@RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
public CudResponse update(
@ApiParam(value = "Идентификатор изменяемого объекта.", required = true, example = "1234")
@PathVariable("id") Long id,
@ApiParam(value = "Новые значения полей объекта.", required = true)
@RequestBody KeyRateUpdateAction keyRateUpdateAction) throws ExecutionException, InterruptedException {
keyRateUpdateAction.setId(id);
return processRequest(Consts.DESTINATION_KEY_RATE_UPDATE, keyRateUpdateAction);
}
@ApiOperation(value = "delete key rate.")
@ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ResponseBody
public CudResponse delete(@ApiParam(value = "Идентификатор удаляемого объекта", required = true, example = "1234")
@PathVariable("id") Long id) throws ExecutionException, InterruptedException {
CommonDeleteAction deleteAction = new CommonDeleteAction();
deleteAction.setId(id);
return processRequest(Consts.DESTINATION_KEY_RATE_DELETE, deleteAction);
}
@ApiOperation(value = "get all KeyRate's.")
@ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public CommonGetAllResponse getAll() {
Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_KeyRate, KeyRate.class);
CommonGetAllResponse response = new CommonGetAllResponse();
response.fromEntity(all);
return response;
}
}

92
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/utilities/KeyRateNewAction.java
View file

@ -1,92 +0,0 @@
package ru.spcex.clearing.backendapi.controller.request.cud.utilities;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.swagger.annotations.ApiModelProperty;
import ru.spcex.clearing.backendapi.domain.actions.IAction;
import ru.spcex.clearing.backendapi.errors.BackEndError;
import ru.spcex.clearing.platform.messaging.domain.ActionType;
import ru.spcex.clearing.platform.messaging.domain.cud.utilities.KeyRateNewRequest;
import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer;
import ru.spcex.platform.utils.enumeration.EnumMessage;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
public class KeyRateNewAction implements IAction<KeyRateNewRequest> {
@ApiModelProperty(value = "Ключевая ставка ЦБ РФ", example = "12.5")
@JsonProperty
public BigDecimal rate;
@ApiModelProperty(value = "Дата начала действия ключевой ставки", example = "2022-01-20")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow")
@JsonDeserialize(using = LocalDateDeserializer.class)
@JsonProperty
public LocalDate startDate;
@ApiModelProperty(value = "Дата окончания действия ключевой ставки", example = "2022-04-20")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow")
@JsonDeserialize(using = LocalDateDeserializer.class)
@JsonProperty
public LocalDate endDate;
@ApiModelProperty(value = "Документ ЦБ", example = "Lorem ipsum")
@JsonProperty
public String document;
@Override
public Collection<EnumMessage> validate() {
if (this.startDate == null)
return List.of(new EnumMessage(BackEndError.ValidationError, "startDate"));
else return Collections.emptyList();
}
@ApiModelProperty(hidden = true)
@Override
public ActionType getActionType() {
return ActionType.NEW;
}
@Override
public KeyRateNewRequest toRequest() {
var req = new KeyRateNewRequest();
req.setStartDate(this.getStartDate());
req.setEndDate(this.getEndDate());
req.setKeyRate(this.getRate());
req.setDocument(this.getDocument());
return req;
}
public BigDecimal getRate() {
return rate;
}
public void setRate(BigDecimal rate) {
this.rate = rate;
}
public LocalDate getStartDate() {
return startDate;
}
public void setStartDate(LocalDate startDate) {
this.startDate = startDate;
}
public LocalDate getEndDate() {
return endDate;
}
public void setEndDate(LocalDate endDate) {
this.endDate = endDate;
}
public String getDocument() {
return document;
}
public void setDocument(String document) {
this.document = document;
}
}

92
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/utilities/KeyRateUpdateAction.java
View file

@ -1,92 +0,0 @@
package ru.spcex.clearing.backendapi.controller.request.cud.utilities;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.swagger.annotations.ApiModelProperty;
import ru.spcex.clearing.backendapi.domain.actions.IAction;
import ru.spcex.clearing.platform.messaging.domain.ActionType;
import ru.spcex.clearing.platform.messaging.domain.cud.utilities.KeyRateUpdateRequest;
import ru.spcex.clearing.platform.messaging.domain.json.deserialize.LocalDateDeserializer;
import java.math.BigDecimal;
import java.time.LocalDate;
public class KeyRateUpdateAction implements IAction<KeyRateUpdateRequest> {
@ApiModelProperty(hidden = true)
@JsonProperty
public Long id;
@ApiModelProperty(value = "Ключевая ставка ЦБ РФ", example = "12.5")
@JsonProperty
public BigDecimal rate;
@ApiModelProperty(value = "Дата начала действия ключевой ставки", example = "2022-01-20")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow")
@JsonDeserialize(using = LocalDateDeserializer.class)
@JsonProperty
public LocalDate startDate;
@ApiModelProperty(value = "Дата окончания действия ключевой ставки", example = "2022-04-20")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "Europe/Moscow")
@JsonDeserialize(using = LocalDateDeserializer.class)
@JsonProperty
public LocalDate endDate;
@ApiModelProperty(value = "Документ ЦБ", example = "Lorem ipsum")
@JsonProperty
public String document;
@ApiModelProperty(hidden = true)
@Override
public ActionType getActionType() {
return ActionType.UPDATE;
}
@Override
public KeyRateUpdateRequest toRequest() {
var req = new KeyRateUpdateRequest();
req.setId(this.getId());
req.setStartDate(this.getStartDate());
req.setEndDate(this.getEndDate());
req.setKeyRate(this.getRate());
req.setDocument(this.getDocument());
return req;
}
public BigDecimal getRate() {
return rate;
}
public void setRate(BigDecimal rate) {
this.rate = rate;
}
public LocalDate getStartDate() {
return startDate;
}
public void setStartDate(LocalDate startDate) {
this.startDate = startDate;
}
public LocalDate getEndDate() {
return endDate;
}
public void setEndDate(LocalDate endDate) {
this.endDate = endDate;
}
public String getDocument() {
return document;
}
public void setDocument(String document) {
this.document = document;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
}

54
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/utilities/KeyRateBackendGetAll.java
View file

@ -1,54 +0,0 @@
package ru.spcex.clearing.backendapi.controller.response.entity.utilities;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import ru.clearing.classes.statics.data.misc.KeyRate;
import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@ApiModel(description = "Ответ при получении объектов KeyRate.")
public class KeyRateBackendGetAll extends BasicSpcexResponse {
@JsonProperty
@ApiModelProperty(value = "Полезная нагрузка")
private KeyRateBackendPayload payload = new KeyRateBackendPayload();
private static class KeyRateBackendPayload {
private List<KeyRateBackendGetFields> items = new ArrayList<>();
public List<KeyRateBackendGetFields> getItems() {
return items;
}
public void setItems(List<KeyRateBackendGetFields> items) {
this.items = items;
}
}
public KeyRateBackendPayload getPayload() {
return payload;
}
public void setPayload(KeyRateBackendPayload payload) {
this.payload = payload;
}
public void fromEntity(Collection<KeyRate> keyRates) {
var payload = this.getPayload();
for (var keyRate : keyRates) {
var singleItem = new KeyRateBackendGetFields();
singleItem.setId(keyRate.getId());
singleItem.setKeyRate(keyRate.getRate());
singleItem.setStartDate(keyRate.getStartDate());
singleItem.setEndDate(keyRate.getEndDate());
singleItem.setDocument(keyRate.getDocument());
singleItem.setWorkflowStatus(keyRate.getWorkflowStatus());
payload.getItems().add(singleItem);
}
}
}

73
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/utilities/KeyRateBackendGetFields.java
View file

@ -1,73 +0,0 @@
package ru.spcex.clearing.backendapi.controller.response.entity.utilities;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSerializer;
import java.math.BigDecimal;
import java.time.LocalDate;
public class KeyRateBackendGetFields {
@JsonProperty
private Long id;
@JsonProperty
private BigDecimal keyRate;
@JsonSerialize(using = LocalDateSerializer.class)
@JsonProperty
private LocalDate startDate;
@JsonSerialize(using = LocalDateSerializer.class)
@JsonProperty
private LocalDate endDate;
@JsonProperty
private String document;
@JsonProperty
private String workflowStatus;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public BigDecimal getKeyRate() {
return keyRate;
}
public void setKeyRate(BigDecimal keyRate) {
this.keyRate = keyRate;
}
public LocalDate getStartDate() {
return startDate;
}
public void setStartDate(LocalDate startDate) {
this.startDate = startDate;
}
public LocalDate getEndDate() {
return endDate;
}
public void setEndDate(LocalDate endDate) {
this.endDate = endDate;
}
public String getDocument() {
return document;
}
public void setDocument(String document) {
this.document = document;
}
public String getWorkflowStatus() {
return workflowStatus;
}
public void setWorkflowStatus(String workflowStatus) {
this.workflowStatus = workflowStatus;
}
}

1005
clearing-parent/backend-api/src/main/resources/meta/data.xml
View file

File diff suppressed because it is too large Load diff

4252
clearing-parent/backend-api/src/main/resources/meta/meta.xml
View file

File diff suppressed because it is too large Load diff

14
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/AbstractControllerTest.java
View file

@ -35,8 +35,6 @@ import ru.spcex.clearing.backendapi.controller.queue.execution.ExecutionFondCont
import ru.spcex.clearing.backendapi.controller.queue.journal.InDocumentJournalController; import ru.spcex.clearing.backendapi.controller.queue.journal.InDocumentJournalController;
import ru.spcex.clearing.backendapi.controller.queue.journal.ManagementJournalController; import ru.spcex.clearing.backendapi.controller.queue.journal.ManagementJournalController;
import ru.spcex.clearing.backendapi.controller.queue.journal.OutDocumentJournalController; import ru.spcex.clearing.backendapi.controller.queue.journal.OutDocumentJournalController;
import ru.spcex.clearing.backendapi.controller.queue.liabilities.LiabilitiesClaimsAssetController;
import ru.spcex.clearing.backendapi.controller.queue.liabilities.LiabilitiesClaimsMoneyController;
import ru.spcex.clearing.backendapi.controller.queue.misc.*; import ru.spcex.clearing.backendapi.controller.queue.misc.*;
import ru.spcex.clearing.backendapi.controller.queue.payment.PaymentInstructionController; import ru.spcex.clearing.backendapi.controller.queue.payment.PaymentInstructionController;
import ru.spcex.clearing.backendapi.controller.queue.register.*; import ru.spcex.clearing.backendapi.controller.queue.register.*;
@ -45,7 +43,6 @@ import ru.spcex.clearing.backendapi.controller.queue.scheduler.*;
import ru.spcex.clearing.backendapi.controller.queue.securities.*; import ru.spcex.clearing.backendapi.controller.queue.securities.*;
import ru.spcex.clearing.backendapi.controller.queue.user.UserController; import ru.spcex.clearing.backendapi.controller.queue.user.UserController;
import ru.spcex.clearing.backendapi.controller.queue.user.UserRoleSessionController; import ru.spcex.clearing.backendapi.controller.queue.user.UserRoleSessionController;
import ru.spcex.clearing.backendapi.controller.queue.utilities.CudKeyRateController;
import ru.spcex.clearing.backendapi.controller.queue.utilities.StatementController; import ru.spcex.clearing.backendapi.controller.queue.utilities.StatementController;
import ru.spcex.clearing.backendapi.controller.queue.utilities.UserSettingsController; import ru.spcex.clearing.backendapi.controller.queue.utilities.UserSettingsController;
import ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction; import ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction;
@ -85,7 +82,6 @@ import static ru.spcex.clearing.test.json.MatcherFactoryWithJson.usingIgnoringFi
@ContextConfiguration(classes = { @ContextConfiguration(classes = {
//account //account
AccountBalanceController.class,
AccountController.class, AccountController.class,
BankAccountController.class, BankAccountController.class,
ClearingAccountController.class, ClearingAccountController.class,
@ -109,8 +105,6 @@ import static ru.spcex.clearing.test.json.MatcherFactoryWithJson.usingIgnoringFi
ManagementJournalController.class, ManagementJournalController.class,
OutDocumentJournalController.class, OutDocumentJournalController.class,
//liabilities //liabilities
LiabilitiesClaimsAssetController.class,
LiabilitiesClaimsMoneyController.class,
//misc //misc
CurrencyController.class, CurrencyController.class,
ErrorTextController.class, ErrorTextController.class,
@ -121,15 +115,8 @@ import static ru.spcex.clearing.test.json.MatcherFactoryWithJson.usingIgnoringFi
//payment //payment
PaymentInstructionController.class, PaymentInstructionController.class,
//register //register
AdmittedDealRegisterController.class,
BalanceRegisterController.class,
ClearMemberRegisterController.class,
ContractRegisterController.class, ContractRegisterController.class,
CoveredDealRegisterController.class,
DealRegisterController.class,
OrderRegisterController.class,
ReportRegisterController.class, ReportRegisterController.class,
UncoveredDealRegisterController.class,
//registry //registry
TradingClearingRegistryController.class, TradingClearingRegistryController.class,
//scheduler //scheduler
@ -150,7 +137,6 @@ import static ru.spcex.clearing.test.json.MatcherFactoryWithJson.usingIgnoringFi
UserController.class, UserController.class,
UserRoleSessionController.class, UserRoleSessionController.class,
//utilities //utilities
CudKeyRateController.class,
StatementController.class, StatementController.class,
UserSettingsController.class, UserSettingsController.class,
//******* common configs ******* //******* common configs *******

29
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/account/AccountBalanceControllerTest.java
View file

@ -1,29 +0,0 @@
package ru.spcex.clearing.backendapi.controller.queue.account;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.account.AccountBalance;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
@Deprecated
class AccountBalanceControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/account-balances/";
/**
* {@link AccountBalanceController#getAll()} <br>
* Тест проверяет получение запроса по REST API и отправку всех записей из таблицы hazelcast Map_BankAccount.<br>
* Входной запрос /account-balances/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
AccountBalance existBankAccount = new AccountBalance();
existBankAccount.setAccountType("99");
existBankAccount.setAccount("123456789123");
existBankAccount.setId(currentId.get());
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_AccountBalance, existBankAccount, REST_URL);
}
}

53
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/liabilities/LiabilitiesClaimsAssetControllerTest.java
View file

@ -1,53 +0,0 @@
package ru.spcex.clearing.backendapi.controller.queue.liabilities;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsAssets;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.math.BigDecimal;
import java.time.LocalDate;
class LiabilitiesClaimsAssetControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/liabilities-claims-assets/";
/**
* {@link LiabilitiesClaimsAssetController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /liabilities-claims-assets/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
LiabilitiesClaimsAssets liabilitiesClaimsAssets = new LiabilitiesClaimsAssets();
liabilitiesClaimsAssets.setId(currentId.get());
liabilitiesClaimsAssets.setCompanyId(currentId.get());
liabilitiesClaimsAssets.setClearingDate(LocalDate.now());
liabilitiesClaimsAssets.setAccountId(currentId.get());
liabilitiesClaimsAssets.setAccountType("man");
liabilitiesClaimsAssets.setAccount("res");
liabilitiesClaimsAssets.setLiabilitiesQuantity(new BigDecimal(0));
liabilitiesClaimsAssets.setClaimsQuantity(new BigDecimal(0));
liabilitiesClaimsAssets.setCurrency("dos");
liabilitiesClaimsAssets.setSettlementDate(LocalDate.now());
liabilitiesClaimsAssets.setTradingDate(LocalDate.now());
liabilitiesClaimsAssets.setRefundDate(LocalDate.now());
liabilitiesClaimsAssets.setPrice(new BigDecimal(0));
liabilitiesClaimsAssets.setSecurityId(currentId.get());
liabilitiesClaimsAssets.setTradingCode("tra");
liabilitiesClaimsAssets.setClearingCode("cle");
liabilitiesClaimsAssets.setShortName("man");
liabilitiesClaimsAssets.setContract("res");
liabilitiesClaimsAssets.setComment("com");
liabilitiesClaimsAssets.setFullName("send");
liabilitiesClaimsAssets.setParentId(currentId.get());
liabilitiesClaimsAssets.setLiabilitiesClaimsMoneyId(currentId.get());
liabilitiesClaimsAssets.setClearingStatus(currentId.get());
liabilitiesClaimsAssets.setPaymentId(currentId.get());
liabilitiesClaimsAssets.setRefundPaymentId(currentId.get());
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_LiabilitiesClaimsAssets, liabilitiesClaimsAssets, REST_URL);
}
}

42
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/liabilities/LiabilitiesClaimsMoneyControllerTest.java
View file

@ -1,42 +0,0 @@
package ru.spcex.clearing.backendapi.controller.queue.liabilities;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.liabilities.LiabilitiesClaimsMoney;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.math.BigDecimal;
import java.time.LocalDate;
class LiabilitiesClaimsMoneyControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/liabilities-claims-money/";
/**
* {@link LiabilitiesClaimsMoneyController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /liabilities-claims-money/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
LiabilitiesClaimsMoney liabilitiesClaimsMoney = new LiabilitiesClaimsMoney();
liabilitiesClaimsMoney.setId(currentId.get());
liabilitiesClaimsMoney.setCompanyId(currentId.get());
liabilitiesClaimsMoney.setAccountId(currentId.get());
liabilitiesClaimsMoney.setAccountType("acc");
liabilitiesClaimsMoney.setAccount("acc");
liabilitiesClaimsMoney.setLiabilitiesAmount(new BigDecimal(0));
liabilitiesClaimsMoney.setClaimsAmount(new BigDecimal(0));
liabilitiesClaimsMoney.setSettlementDate(LocalDate.now());
liabilitiesClaimsMoney.setTradingDate(LocalDate.now());
liabilitiesClaimsMoney.setCurrency("dos");
liabilitiesClaimsMoney.setTradingCode("tra");
liabilitiesClaimsMoney.setShortName("short");
liabilitiesClaimsMoney.setFullName("full");
liabilitiesClaimsMoney.setClearingDate(LocalDate.now());
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_LiabilitiesClaimsMoney, liabilitiesClaimsMoney, REST_URL);
}
}

2
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/misc/NotificationControllerTest.java
View file

@ -36,7 +36,7 @@ class NotificationControllerTest extends AbstractControllerTest {
profileDocument.setSenderId(1000L); profileDocument.setSenderId(1000L);
profileDocument.setAddresseeId(1000L); profileDocument.setAddresseeId(1000L);
profileDocument.setObjectType("ObjectType"); profileDocument.setObjectType("ObjectType");
profileDocument.setObjectId(Instant.now()); profileDocument.setObjectId(1111122222L);
profileDocument.setNotificationStatus("Status"); profileDocument.setNotificationStatus("Status");
profileDocument.setId(currentId.get()); profileDocument.setId(currentId.get());

31
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/payment/PaymentInstructionControllerTest.java
View file

@ -9,6 +9,7 @@ import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse; import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.math.BigDecimal;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Collection; import java.util.Collection;
@ -32,6 +33,7 @@ class PaymentInstructionControllerTest extends AbstractControllerTest {
void getAll() throws Exception { void getAll() throws Exception {
//ARRANGE //ARRANGE
PaymentInstruction paymentInstruction = new PaymentInstruction(); PaymentInstruction paymentInstruction = new PaymentInstruction();
paymentInstruction.setSenderId(1010L); paymentInstruction.setSenderId(1010L);
paymentInstruction.setAddresseeId(1010L); paymentInstruction.setAddresseeId(1010L);
paymentInstruction.setAdresseeBic("123456789"); paymentInstruction.setAdresseeBic("123456789");
@ -41,21 +43,24 @@ class PaymentInstructionControllerTest extends AbstractControllerTest {
paymentInstruction.setPaymentDate(Instant.now()); paymentInstruction.setPaymentDate(Instant.now());
paymentInstruction.setPaymentPurpose("Purpose"); paymentInstruction.setPaymentPurpose("Purpose");
paymentInstruction.setSettlementDate(LocalDate.now()); paymentInstruction.setSettlementDate(LocalDate.now());
paymentInstruction.setCreditLegAmount(2020L); paymentInstruction.setCreditLeg_amount(BigDecimal.valueOf(123.456));
paymentInstruction.setDebitLegAmount(2020L); paymentInstruction.setDebitLeg_amount(BigDecimal.valueOf(123.256));
paymentInstruction.setCreditLegAccountId(2020L); paymentInstruction.setCreditLeg_accountId(currentId.get());
paymentInstruction.setCreditCsAccount("Ok"); paymentInstruction.setCredit_csAccount("ACCT1");
paymentInstruction.setCreditLegAccount("123456789"); paymentInstruction.setCreditLeg_account("ACCT2");
paymentInstruction.setDebitLegAccountId(3030L); paymentInstruction.setDebitLeg_accountId(222L);
paymentInstruction.setDebitCsAccount("123456789"); paymentInstruction.setDebit_csAccount("ACCC3");
paymentInstruction.setDebitLegAccount("123456789"); paymentInstruction.setDebitLeg_account("AC-1");
paymentInstruction.setCreditLegDirection(3030L); paymentInstruction.setCreditLeg_direction("BUY");
paymentInstruction.setDebitLegDirection(3030L); paymentInstruction.setDebitLeg_direction("SELL");
paymentInstruction.setCreditLegCurrencyCode("123456789"); paymentInstruction.setCreditLeg_currencyCode("RUB");
paymentInstruction.setDebitLegCurrencyCode("123456789"); paymentInstruction.setDebitLeg_currencyCode("RUB");
paymentInstruction.setClearingDate(LocalDate.now()); paymentInstruction.setCreditLeg_securityId(12L);
paymentInstruction.setDebitLeg_securityId(15L);
paymentInstruction.setTransactionStatus("Status"); paymentInstruction.setTransactionStatus("Status");
paymentInstruction.setDocumentNumber("123456789"); paymentInstruction.setDocumentNumber("123456789");
paymentInstruction.setClearingDate(LocalDate.now());
paymentInstruction.setSessionId(555L);
paymentInstruction.setId(currentId.get()); paymentInstruction.setId(currentId.get());
IMap<Long, PaymentInstruction> iMap = hazelcastServiceTest.getHazelcast().getMap(IMDGDistributedNames.Map_PaymentInstruction); IMap<Long, PaymentInstruction> iMap = hazelcastServiceTest.getHazelcast().getMap(IMDGDistributedNames.Map_PaymentInstruction);

45
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/AdmittedDealRegisterControllerTest.java
View file

@ -1,45 +0,0 @@
package ru.spcex.clearing.backendapi.controller.queue.register;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.register.AdmittedDealRegister;
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 AdmittedDealRegisterControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/admitted-deal-registers/";
/**
* {@link AdmittedDealRegisterController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /admitted-deal-registers/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
AdmittedDealRegister admittedDealRegister = new AdmittedDealRegister();
admittedDealRegister.setId(currentId.get());
admittedDealRegister.setExecutionId(currentId.get());
admittedDealRegister.setCompanyFullName("com");
admittedDealRegister.setTradingDate(LocalDate.now());
admittedDealRegister.setExchangeExecutionId(currentId.get());
admittedDealRegister.setExchangeExecutionTime(Instant.now());
admittedDealRegister.setSecuritySymbol("symb");
admittedDealRegister.setSecurityFullName("name");
admittedDealRegister.setSellerFullName("dos");
admittedDealRegister.setSellerClearingCode("code");
admittedDealRegister.setSellerAccount("acc");
admittedDealRegister.setBuyerFullName("name");
admittedDealRegister.setBuyerClearingCode("code");
admittedDealRegister.setBuyerAccount("buy");
admittedDealRegister.setAmount(new BigDecimal(0));
admittedDealRegister.setClearingDate(LocalDate.now());
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_AdmittedDealRegister, admittedDealRegister, REST_URL);
}
}

43
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/BalanceRegisterControllerTest.java
View file

@ -1,43 +0,0 @@
package ru.spcex.clearing.backendapi.controller.queue.register;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.misc.BalanceRegister;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.math.BigDecimal;
import java.time.Instant;
class BalanceRegisterControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/balance-registers/";
/**
* {@link BalanceRegisterController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /balance-registers/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
BalanceRegister balanceRegister = new BalanceRegister();
balanceRegister.setId(currentId.get());
balanceRegister.setsDf01Date(Instant.now());
balanceRegister.setCurrencyCode("com");
balanceRegister.setSetHouseName("name");
balanceRegister.setAccount("acc");
balanceRegister.setInfoAccount("acc");
balanceRegister.setRemainderSum(new BigDecimal(0));
balanceRegister.setBlockedSum(new BigDecimal(0));
balanceRegister.setUnblockedSum(new BigDecimal(0));
balanceRegister.setInn("code");
balanceRegister.setMarket(currentId.get());
balanceRegister.setFullName("name");
balanceRegister.setTypeRemains("code");
balanceRegister.setDocNumber("buy");
balanceRegister.setCompanyId(currentId.get());
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_BalanceRegister, balanceRegister, REST_URL);
}
}

54
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/ClearMemberRegisterControllerTest.java
View file

@ -1,54 +0,0 @@
package ru.spcex.clearing.backendapi.controller.queue.register;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.misc.ClearMemberRegister;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.time.Instant;
import java.time.LocalDate;
class ClearMemberRegisterControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/clearmember-registers/";
/**
* {@link ClearMemberRegisterController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /clearmember-registers/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
ClearMemberRegister clearMemberRegister = new ClearMemberRegister();
clearMemberRegister.setId(currentId.get());
clearMemberRegister.setTradingCode("code");
clearMemberRegister.setClearingCode("com");
clearMemberRegister.setFullName("name");
clearMemberRegister.setShortName("name");
clearMemberRegister.setCategoryList("cat");
clearMemberRegister.setCorporationSole("symb");
clearMemberRegister.setAccount("name");
clearMemberRegister.setBank(currentId.get());
clearMemberRegister.setBankName("code");
clearMemberRegister.setInn("acc");
clearMemberRegister.setBic("name");
clearMemberRegister.setOgrn("code");
clearMemberRegister.setCpp("buy");
clearMemberRegister.setOcpo("ocpo");
clearMemberRegister.setContractNumber("cont");
clearMemberRegister.setContractDate(LocalDate.now());
clearMemberRegister.setRegistrationDate(LocalDate.now());
clearMemberRegister.setSystemDate(LocalDate.now());
clearMemberRegister.setAccessDate(Instant.now());
clearMemberRegister.setSuspentionDate(Instant.now());
clearMemberRegister.setReopeningDate(Instant.now());
clearMemberRegister.setCloseDate(Instant.now());
clearMemberRegister.setExclusionDate(Instant.now());
clearMemberRegister.setAddress("code");
clearMemberRegister.setEmail("acc");
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_ClearMemberRegister, clearMemberRegister, REST_URL);
}
}

2
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/ContractRegisterControllerTest.java
View file

@ -24,7 +24,7 @@ class ContractRegisterControllerTest extends AbstractControllerTest {
contractRegister.setName("code"); contractRegister.setName("code");
contractRegister.setNumber("com"); contractRegister.setNumber("com");
contractRegister.setIssueDate(LocalDate.now()); contractRegister.setIssueDate(LocalDate.now());
contractRegister.setCompanyFullName(currentId.get()); contractRegister.setCompanyFullName("CF name C");
contractRegister.setCompanyId(currentId.get()); contractRegister.setCompanyId(currentId.get());
contractRegister.setDocumentType("symb"); contractRegister.setDocumentType("symb");
contractRegister.setIssuePlace("name"); contractRegister.setIssuePlace("name");

45
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/CoveredDealRegisterControllerTest.java
View file

@ -1,45 +0,0 @@
package ru.spcex.clearing.backendapi.controller.queue.register;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.register.CoveredDealRegister;
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 CoveredDealRegisterControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/covered-deal-registers/";
/**
* {@link CoveredDealRegisterController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /covered-deal-registers/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
CoveredDealRegister coveredDealRegister = new CoveredDealRegister();
coveredDealRegister.setId(currentId.get());
coveredDealRegister.setExecutionId(currentId.get());
coveredDealRegister.setCompanyFullName("com");
coveredDealRegister.setTradingDate(LocalDate.now());
coveredDealRegister.setExchangeExecutionId(currentId.get());
coveredDealRegister.setExchangeExecutionTime(Instant.now());
coveredDealRegister.setSecuritySymbol("symb");
coveredDealRegister.setSecurityFullName("name");
coveredDealRegister.setSellerFullName("name");
coveredDealRegister.setSellerClearingCode("code");
coveredDealRegister.setSellerAccount("acc");
coveredDealRegister.setBuyerFullName("name");
coveredDealRegister.setBuyerClearingCode("code");
coveredDealRegister.setBuyerAccount("buy");
coveredDealRegister.setAmount(new BigDecimal(0));
coveredDealRegister.setClearingDate(LocalDate.now());
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_CoveredDealRegister, coveredDealRegister, REST_URL);
}
}

50
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/DealRegisterControllerTest.java
View file

@ -1,50 +0,0 @@
package ru.spcex.clearing.backendapi.controller.queue.register;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.register.DealRegister;
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 DealRegisterControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/deal-registers/";
/**
* {@link DealRegisterController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /deal-registers/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
DealRegister dealRegister = new DealRegister();
dealRegister.setId(currentId.get());
dealRegister.setExecutionId(currentId.get());
dealRegister.setExchangeExecutionId(currentId.get());
dealRegister.setExchangeExecutionTime(Instant.now());
dealRegister.setTradingDate(LocalDate.now());
dealRegister.setAccount("cat");
dealRegister.setMarket("symb");
dealRegister.setPrice(new BigDecimal(0));
dealRegister.setAmount(new BigDecimal(0));
dealRegister.setSide("code");
dealRegister.setSettlementCurrency("acc");
dealRegister.setCompanyId(currentId.get());
dealRegister.setFirstLegSettlementDate(LocalDate.now());
dealRegister.setSecondLegSettlementDate(LocalDate.now());
dealRegister.setSecurityFullName("ocpo");
dealRegister.setSecuritySymbol("cont");
dealRegister.setSecurityId(currentId.get());
dealRegister.setCounterPartyId(currentId.get());
dealRegister.setCoverageStatus("status");
dealRegister.setSessionId(currentId.get());
dealRegister.setClearingDate(LocalDate.now());
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_DealRegister, dealRegister, REST_URL);
}
}

38
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/OrderRegisterControllerTest.java
View file

@ -1,38 +0,0 @@
package ru.spcex.clearing.backendapi.controller.queue.register;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.register.OrderRegister;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import java.math.BigDecimal;
import java.time.LocalDate;
class OrderRegisterControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/order-registers/";
/**
* {@link OrderRegisterController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /order-registers/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
OrderRegister orderRegister = new OrderRegister();
orderRegister.setId(currentId.get());
orderRegister.setCreditLegAccount("code");
orderRegister.setCreditLegAmount(new BigDecimal(0));
orderRegister.setCreditLegCurrencyCode("name");
orderRegister.setCreditLegDirection(currentId.get());
orderRegister.setDebitLegAccount("cat");
orderRegister.setSender("symb");
orderRegister.setAddressee("name");
orderRegister.setDocumentNumber("doc");
orderRegister.setClearingDate(LocalDate.now());
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_OrderRegister, orderRegister, REST_URL);
}
}

46
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/register/UncoveredDealRegisterControllerTest.java
View file

@ -1,46 +0,0 @@
package ru.spcex.clearing.backendapi.controller.queue.register;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.register.UncoveredDealRegister;
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 UncoveredDealRegisterControllerTest extends AbstractControllerTest {
private static final String REST_URL = "/uncovered-deal-registers/";
/**
* {@link UncoveredDealRegisterController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /uncovered-deal-registers/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
UncoveredDealRegister uncoveredDealRegister = new UncoveredDealRegister();
uncoveredDealRegister.setId(currentId.get());
uncoveredDealRegister.setExecutionId(currentId.get());
uncoveredDealRegister.setCompanyFullName("code");
uncoveredDealRegister.setTradingDate(LocalDate.now());
uncoveredDealRegister.setExchangeExecutionId(currentId.get());
uncoveredDealRegister.setExchangeExecutionTime(Instant.now());
uncoveredDealRegister.setSecuritySymbol("sec");
uncoveredDealRegister.setSecurityFullName("code");
uncoveredDealRegister.setSellerFullName("code");
uncoveredDealRegister.setSellerClearingCode("sell");
uncoveredDealRegister.setSellerAccount("coment");
uncoveredDealRegister.setBuyerFullName("cat");
uncoveredDealRegister.setBuyerClearingCode("buyer");
uncoveredDealRegister.setBuyerAccount("code");
uncoveredDealRegister.setAmount(new BigDecimal(0));
uncoveredDealRegister.setResultStatus("res");
uncoveredDealRegister.setClearingDate(LocalDate.now());
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_UncoveredDealRegister, uncoveredDealRegister, REST_URL);
}
}

95
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/utilities/CudKeyRateControllerTest.java
View file

@ -1,95 +0,0 @@
package ru.spcex.clearing.backendapi.controller.queue.utilities;
import org.junit.jupiter.api.Test;
import ru.clearing.classes.statics.data.misc.KeyRate;
import ru.spcex.clearing.backendapi.controller.queue.AbstractControllerTest;
import ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction;
import ru.spcex.clearing.backendapi.controller.request.cud.utilities.KeyRateNewAction;
import ru.spcex.clearing.backendapi.controller.request.cud.utilities.KeyRateUpdateAction;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.Consts;
import java.math.BigDecimal;
import java.time.LocalDate;
class CudKeyRateControllerTest extends AbstractControllerTest {
public static final String REST_URL = "/utilities/key-rates/";
/**
* {@link CudKeyRateController#add(KeyRateNewAction)} <br>
* Тест проверяет получение сущности {@link KeyRateNewAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link KeyRateNewAction}:<br>
*/
@Test
void add() throws Exception {
//ARRANGE
KeyRateNewAction keyRateUpdateAction = new KeyRateNewAction();
// keyRateUpdateAction.setId(currentId.get());
keyRateUpdateAction.setRate(new BigDecimal(0));
keyRateUpdateAction.setStartDate(LocalDate.now());
keyRateUpdateAction.setEndDate(LocalDate.now());
keyRateUpdateAction.setDocument("name");
//ACT and ASSERT
checkAddingByRestApi(REST_URL, keyRateUpdateAction);
checkSendedMessegeFromKafka(Consts.DESTINATION_KEY_RATE_NEW, keyRateUpdateAction);
}
/**
* {@link CudKeyRateController#update(Long, KeyRateUpdateAction)} <br>
* Тест проверяет получение сущности {@link KeyRateNewAction} по REST API и отправку в Apache Kafka.<br>
* Входной запрос {@link KeyRateNewAction}:<br>
*/
@Test
void update() throws Exception {
//ARRANGE
long id = currentId.get();
KeyRateUpdateAction keyRateUpdateAction = new KeyRateUpdateAction();
keyRateUpdateAction.setId(id);
keyRateUpdateAction.setRate(new BigDecimal(0));
keyRateUpdateAction.setStartDate(LocalDate.now());
keyRateUpdateAction.setEndDate(LocalDate.now());
keyRateUpdateAction.setDocument("name");
//ACT and ASSERT
checkUpdatingByRestApi(REST_URL, keyRateUpdateAction, id);
checkSendedMessegeFromKafka(Consts.DESTINATION_KEY_RATE_UPDATE, keyRateUpdateAction);
}
/**
* {@link CudKeyRateController#delete(Long)} <br>
* Тест проверяет получение id сущности {@link Long} по REST API и отправку в Apache Kafka.<br>
* Входной запрос /utilities/key-rates/{@link Long}: - 0L<br>
*/
@Test
void delete() throws Exception {
//ARRANGE
long id = currentId.getAndIncrement();
CommonDeleteAction deleteAction = new CommonDeleteAction();
deleteAction.setId(id);
//ACT and ASSERT
checkDeletingByRestApi(REST_URL, id);
checkSendedMessegeFromKafka(Consts.DESTINATION_KEY_RATE_DELETE, deleteAction);
}
/**
* {@link CudKeyRateController#getAll()} <br>
* Тест проверяет получение запроса по REST API.<br>
* Входной запрос /utilities/key-rates/ <br>
* Ответ CommonGetAllResponse <br>
*/
@Test
void getAll() throws Exception {
//ARRANGE
KeyRate keyRate = new KeyRate();
keyRate.setId(currentId.get());
keyRate.setRate(new BigDecimal(0));
keyRate.setStartDate(LocalDate.now());
keyRate.setEndDate(LocalDate.now());
keyRate.setDocument("name");
keyRate.setWorkflowStatus("name");
//ACT and ASSERT
checkGettingAllFromRestApi(IMDGDistributedNames.Map_KeyRate, keyRate, REST_URL);
}
}

5
clearing-parent/backend-api/src/test/java/ru/spcex/clearing/backendapi/controller/queue/utilities/StatementControllerTest.java
View file

@ -77,10 +77,9 @@ class StatementControllerTest extends AbstractControllerTest {
statement.setInOutDirection("direction"); statement.setInOutDirection("direction");
statement.setSettlementDate(LocalDate.now()); statement.setSettlementDate(LocalDate.now());
statement.setAmount(new BigDecimal(0)); statement.setAmount(new BigDecimal(0));
statement.setCashMovementCurrencyCode("cash");
statement.setOperationStatus("status"); statement.setOperationStatus("status");
statement.setErrorCode("error"); statement.setErrorCodeId(122L);
statement.setErrorText("name"); statement.setErrorTextId(123L);
statement.setInSDfId(currentId.get()); statement.setInSDfId(currentId.get());
statement.setOutSDfId(currentId.get()); statement.setOutSDfId(currentId.get());
statement.setInOutSDfType("type"); statement.setInOutSDfType("type");

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

@ -4,7 +4,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import ru.spcex.clearing.balance.service.AbstractExecutor; import ru.spcex.clearing.balance.service.AbstractExecutor;
import ru.spcex.clearing.balance.service.Sdf01Executor; import ru.spcex.clearing.balance.service.Sdf01Executor;
import ru.spcex.clearing.balance.service.Sdf09Executor;
import ru.spcex.clearing.balance.service.Sdf16Executor; import ru.spcex.clearing.balance.service.Sdf16Executor;
import ru.spcex.platform.classes.base.interfaces.WithAccount; import ru.spcex.platform.classes.base.interfaces.WithAccount;
import ru.spcex.platform.enumeration.SdfTable; import ru.spcex.platform.enumeration.SdfTable;
@ -17,11 +16,11 @@ public class SdfExecutorsConfig {
@Bean("sdfExecutors") @Bean("sdfExecutors")
public Map<SdfTable, AbstractExecutor<? extends WithAccount>> executorsMap(Sdf01Executor sdf01Executor, public Map<SdfTable, AbstractExecutor<? extends WithAccount>> executorsMap(Sdf01Executor sdf01Executor,
Sdf09Executor sdf09Executor, //Sdf09Executor sdf09Executor,
Sdf16Executor sdf16Executor) { Sdf16Executor sdf16Executor) {
Map<SdfTable, AbstractExecutor<? extends WithAccount>> executors = new HashMap<>(); Map<SdfTable, AbstractExecutor<? extends WithAccount>> executors = new HashMap<>();
executors.put(SdfTable.SDF_01, sdf01Executor); executors.put(SdfTable.SDF_01, sdf01Executor);
executors.put(SdfTable.SDF_09, sdf09Executor); // todo возможно удалят или переделают: executors.put(SdfTable.SDF_09, sdf09Executor);
executors.put(SdfTable.SDF_16, sdf16Executor); executors.put(SdfTable.SDF_16, sdf16Executor);
return executors; return executors;
} }

4
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/config/ValidationConfig.java
View file

@ -94,8 +94,8 @@ public class ValidationConfig {
return new ValidatorImpl<>(context, return new ValidatorImpl<>(context,
Sdf09ValidationRule.CompanyPresent, Sdf09ValidationRule.CompanyPresent,
Sdf09ValidationRule.AccountPresent, Sdf09ValidationRule.AccountPresent,
MarketIsUValidationRule.instance, MarketIsUValidationRule.instance
AccountBalanceFreeAmountEnough.instance(SDf09.class) //,AccountBalanceFreeAmountEnough.instance(SDf09.class)
); );
}; };
} }

1
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/AccountBalanceService.java
View file

@ -30,6 +30,7 @@ import java.util.function.Function;
import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD; import static ru.spcex.platform.utils.number.BigDecimalUtil.safeBD;
@Deprecated
@Component @Component
public class AccountBalanceService { public class AccountBalanceService {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());

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

@ -101,10 +101,11 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
SDf02 sdf02New = createSuccessSdf02(sdf01, generationIdForGroup); SDf02 sdf02New = createSuccessSdf02(sdf01, generationIdForGroup);
sdf02Imdg.insert(sdf02New); sdf02Imdg.insert(sdf02New);
statement.setOutSDfId(sdf02New.getId()); statement.setOutSDfId(sdf02New.getId());
AccountResult accountResult = accountBalanceService.createAccountBalance(statement.getAddresseeId(), statement.getAccountId(), statement.getAmount(), statement.getCashMovementCurrencyCode()); AccountResult accountResult = accountBalanceService.createAccountBalance(statement.getAddresseeId(), statement.getAccountId(), statement.getAmount(),
null/*statement.getCashMovementCurrencyCode()*/);
if (accountResult.getError() != null) { if (accountResult.getError() != null) {
statement.setErrorCode(accountResult.getError().getSubject().getId().toString()); statement.setErrorCodeId(accountResult.getError().getSubject().getId());
statement.setErrorText(errorResolver.resolve(accountResult.getError())); // todo statement.setErrorText(errorResolver.resolve(accountResult.getError()));
} else { } else {
accountBalanceImdg.insert(accountResult.getAccount()); //insert == update? accountBalanceImdg.insert(accountResult.getAccount()); //insert == update?
statement.setOperationStatus(OperationStatus.Executed.getKey()); statement.setOperationStatus(OperationStatus.Executed.getKey());
@ -126,7 +127,6 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
statement.setInOutDirection(InOutDirection.in.getKey()); statement.setInOutDirection(InOutDirection.in.getKey());
statement.setSettlementDate(LocalDate.parse(sdf01.getDat(), datFormatter)); statement.setSettlementDate(LocalDate.parse(sdf01.getDat(), datFormatter));
statement.setAmount(BigDecimalUtil.parse(sdf01.getRemainder())); statement.setAmount(BigDecimalUtil.parse(sdf01.getRemainder()));
statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey());
statement.setOperationStatus(OperationStatus.Pending.getKey()); statement.setOperationStatus(OperationStatus.Pending.getKey());
statement.setInSDfId(sdf01.getId()); statement.setInSDfId(sdf01.getId());
statement.setInOutSDfType(InOutSDfType.type1.getKey()); statement.setInOutSDfType(InOutSDfType.type1.getKey());
@ -141,7 +141,6 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
statement.setInOutDirection(InOutDirection.in.getKey()); statement.setInOutDirection(InOutDirection.in.getKey());
statement.setSettlementDate(LocalDate.parse(sdf01.getDat(), datFormatter)); statement.setSettlementDate(LocalDate.parse(sdf01.getDat(), datFormatter));
statement.setAmount(BigDecimalUtil.parse(sdf01.getRemainder())); statement.setAmount(BigDecimalUtil.parse(sdf01.getRemainder()));
statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey());
statementImdg.update(statement); statementImdg.update(statement);
} }
@ -169,7 +168,7 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
sDf02.setSumengage(sdf01.getSumengage()); sDf02.setSumengage(sdf01.getSumengage());
sDf02.setSumunblock(sdf01.getSumunblock()); sDf02.setSumunblock(sdf01.getSumunblock());
sDf02.setFile_type(sdf01.getFile_type()); sDf02.setFile_type(sdf01.getFile_type());
sDf02.setInSDf01Id(sdf01.getId()); sDf02.setInSDfId(sdf01.getId());
String errorId = error.getSubject().getId().toString(); String errorId = error.getSubject().getId().toString();
sDf02.setResult(errorId.substring(errorId.length() - 3)); sDf02.setResult(errorId.substring(errorId.length() - 3));
sDf02.setGenerationId(generationIdForGroup); sDf02.setGenerationId(generationIdForGroup);
@ -191,7 +190,7 @@ public class Sdf01Executor extends AbstractExecutor<SDf01> {
sDf02.setSumengage(sdf01.getSumengage()); sDf02.setSumengage(sdf01.getSumengage());
sDf02.setSumunblock(sdf01.getSumunblock()); sDf02.setSumunblock(sdf01.getSumunblock());
sDf02.setFile_type(sdf01.getFile_type()); sDf02.setFile_type(sdf01.getFile_type());
sDf02.setInSDf01Id(sdf01.getId()); sDf02.setInSDfId(sdf01.getId());
sDf02.setGenerationId(generationIdForGroup); sDf02.setGenerationId(generationIdForGroup);
sDf02.setGenerationTime(Instant.now()); sDf02.setGenerationTime(Instant.now());
sDf02.setResult("OK!"); sDf02.setResult("OK!");

4
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf08Service.java
View file

@ -45,9 +45,9 @@ public class Sdf08Service extends QueueConsumer implements InitializingBean {
private void newSDf08(BaseRequest<Object> userRequest) { private void newSDf08(BaseRequest<Object> userRequest) {
log.debug("getAllBalance request received"); log.debug("getAllBalance request received");
SDf08 sDf08 = new SDf08(); SDf08 sDf08 = new SDf08();
sDf08.setNumber(idGenerator.nextId().toString()); // sDf08.setNumber(idGenerator.nextId().toString());
Instant now = Instant.now(); Instant now = Instant.now();
sDf08.setDatetime(String.valueOf(now.toEpochMilli())); // sDf08.setDatetime(String.valueOf(now.toEpochMilli()));
sDf08.setGenerationTime(now); sDf08.setGenerationTime(now);
sDf08.setGenerationId(idGenerator.nextId()); sDf08.setGenerationId(idGenerator.nextId());
sdf8Map.insert(sDf08); sdf8Map.insert(sDf08);

351
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf09Executor.java
View file

@ -1,175 +1,176 @@
package ru.spcex.clearing.balance.service; //package ru.spcex.clearing.balance.service;
//
import org.slf4j.Logger; //import org.slf4j.Logger;
import org.slf4j.LoggerFactory; //import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
import ru.clearing.classes.statics.data.account.Account; //import ru.clearing.classes.statics.data.account.Account;
import ru.clearing.classes.statics.data.account.AccountBalance; //import ru.clearing.classes.statics.data.account.AccountBalance;
import ru.clearing.classes.statics.data.company.Company; //import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.statics.data.sdf.SDf09; //import ru.clearing.classes.statics.data.sdf.SDf09;
import ru.clearing.classes.statics.data.sdf.SDf10; //import ru.clearing.classes.statics.data.sdf.SDf10;
import ru.clearing.classes.statics.data.statement.Statement; //import ru.clearing.classes.statics.data.statement.Statement;
import ru.spcex.clearing.balance.errors.BalanceError; //import ru.spcex.clearing.balance.errors.BalanceError;
import ru.spcex.clearing.balance.validation.ValidationStored; //import ru.spcex.clearing.balance.validation.ValidationStored;
import ru.spcex.clearing.imdg.IMDGDistributedNames; //import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdfRequestPart; //import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdfRequestPart;
import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest; //import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest;
import ru.spcex.platform.enumeration.*; //import ru.spcex.platform.enumeration.*;
import ru.spcex.platform.imdg.api.Imdg; //import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; //import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.utils.enumeration.EnumMessage; //import ru.spcex.platform.utils.enumeration.EnumMessage;
import ru.spcex.platform.utils.enumeration.IMessageResolver; //import ru.spcex.platform.utils.enumeration.IMessageResolver;
import ru.spcex.platform.utils.validation.IValidator; //import ru.spcex.platform.utils.validation.IValidator;
//
import java.time.Instant; //import java.time.Instant;
import java.time.LocalDate; //import java.time.LocalDate;
import java.time.format.DateTimeFormatter; //import java.time.format.DateTimeFormatter;
import java.util.Collection; //import java.util.Collection;
import java.util.Map; //import java.util.Map;
import java.util.Optional; //import java.util.Optional;
import java.util.function.Function; //import java.util.function.Function;
//
@Service ////todo SDf09 был изменён. Sdf09Executor теперь не работает.
public class Sdf09Executor extends AbstractExecutor<SDf09> { //@Service
private final Logger log = LoggerFactory.getLogger(getClass()); //public class Sdf09Executor extends AbstractExecutor<SDf09> {
private final static DateTimeFormatter datFormatter = DateTimeFormatter.ofPattern("dd.MM.yy"); // private final Logger log = LoggerFactory.getLogger(getClass());
private final Imdg<Statement> statementImdg; // private final static DateTimeFormatter datFormatter = DateTimeFormatter.ofPattern("dd.MM.yy");
private final Function<SDf09, IValidator> sDf09Validator; // private final Imdg<Statement> statementImdg;
private final LoggingService errorLogger; // private final Function<SDf09, IValidator> sDf09Validator;
private final Imdg<SDf10> sdf10Imdg; // private final LoggingService errorLogger;
private final ImdgProvider imdgProvider; // private final Imdg<SDf10> sdf10Imdg;
private final AccountBalanceService accountBalanceService; // private final ImdgProvider imdgProvider;
private final IMessageResolver errorResolver; // private final AccountBalanceService accountBalanceService;
private final Imdg<AccountBalance> accountBalanceImdg; // private final IMessageResolver errorResolver;
// private final Imdg<AccountBalance> accountBalanceImdg;
public Sdf09Executor(Function<SDf09, IValidator> sDf09Validator, //
LoggingService errorLogger, // public Sdf09Executor(Function<SDf09, IValidator> sDf09Validator,
ImdgProvider imdgProvider, // LoggingService errorLogger,
AccountBalanceService accountBalanceService, // ImdgProvider imdgProvider,
IMessageResolver errorResolver) { // AccountBalanceService accountBalanceService,
this.statementImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Statement, Statement.class); // IMessageResolver errorResolver) {
this.sdf10Imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SDf10, SDf10.class); // this.statementImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Statement, Statement.class);
this.accountBalanceImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_AccountBalance, AccountBalance.class);; // this.sdf10Imdg = imdgProvider.getImdg(IMDGDistributedNames.Map_SDf10, SDf10.class);
this.sDf09Validator = sDf09Validator; // this.accountBalanceImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_AccountBalance, AccountBalance.class);;
this.errorLogger = errorLogger; // this.sDf09Validator = sDf09Validator;
this.imdgProvider = imdgProvider; // this.errorLogger = errorLogger;
this.accountBalanceService = accountBalanceService; // this.imdgProvider = imdgProvider;
this.errorResolver = errorResolver; // this.accountBalanceService = accountBalanceService;
} // this.errorResolver = errorResolver;
// }
@Override //
String exportTableName() { // @Override
return "DF-10"; // String exportTableName() {
} // return "DF-10";
// }
public Result execute(Collection<SDf09> sdf, StatementRequest statementRequest){ //
Result result = new Result(); // public Result execute(Collection<SDf09> sdf, StatementRequest statementRequest){
Long generationIdForGroup = imdgProvider.getImdgIdGenerator().nextId(); // Result result = new Result();
result.setGenerationId(generationIdForGroup); // Long generationIdForGroup = imdgProvider.getImdgIdGenerator().nextId();
for (SDf09 sdf09 : sdf) { // result.setGenerationId(generationIdForGroup);
IValidator validator = sDf09Validator.apply(sdf09); // for (SDf09 sdf09 : sdf) {
Optional<EnumMessage> error = validator.tillFirstError(); // IValidator validator = sDf09Validator.apply(sdf09);
Company company = validator.getStored(ValidationStored.Company); // Optional<EnumMessage> error = validator.tillFirstError();
if (statementRequest.getAccountCreationResults().size() == 0 // Company company = validator.getStored(ValidationStored.Company);
&& BalanceError.AccountNotPresent.equals(error.map(EnumMessage::getSubject).orElse(null))) { // if (statementRequest.getAccountCreationResults().size() == 0
//на данном шаге company существует -> getId ok // && BalanceError.AccountNotPresent.equals(error.map(EnumMessage::getSubject).orElse(null))) {
//формируем пакетный запрос на добавление account // //на данном шаге company существует -> getId ok
//ответ придет в этот же метод, process // //формируем пакетный запрос на добавление account
result.getAccountRequests().add(createAccountRequestPart(sdf09.getId(), sdf09.getAccount(), company.getId())); // //ответ придет в этот же метод, process
log.info("account {} for sdf01.id={} not found - send request for creation", sdf09.getAccount(), sdf09.getId()); // result.getAccountRequests().add(createAccountRequestPart(sdf09.getId(), sdf09.getAccount(), company.getId()));
continue; // log.info("account {} for sdf01.id={} not found - send request for creation", sdf09.getAccount(), sdf09.getId());
} else if (BalanceError.AccountNotPresent.equals(error.map(EnumMessage::getSubject).orElse(null))) { // continue;
log.error("fatal error: resumed processing after generating accounts, but no account found for sdf01.id={}", sdf09.getId()); // } else if (BalanceError.AccountNotPresent.equals(error.map(EnumMessage::getSubject).orElse(null))) {
} // log.error("fatal error: resumed processing after generating accounts, but no account found for sdf01.id={}", sdf09.getId());
if (error.isPresent()) { // }
errorLogger.logError("sdf01.id={}", error.get(), sdf09.getId()); // if (error.isPresent()) {
sdf10Imdg.insert(createErrorSdf10(sdf09, error.get(), generationIdForGroup)); // errorLogger.logError("sdf01.id={}", error.get(), sdf09.getId());
continue; // sdf10Imdg.insert(createErrorSdf10(sdf09, error.get(), generationIdForGroup));
} // continue;
Statement statement = statementImdg.getSingleObjectByFieldValues(Map.of("account", sdf09.getAccount())); // }
if (statement == null) { // Statement statement = statementImdg.getSingleObjectByFieldValues(Map.of("account", sdf09.getAccount()));
statement = createFlow(sdf09, // if (statement == null) {
company, // statement = createFlow(sdf09,
validator.getStored(ValidationStored.Account)); // company,
} else { // validator.getStored(ValidationStored.Account));
updateFlow(statement, sdf09, // } else {
validator.getStored(ValidationStored.Account)); // updateFlow(statement, sdf09,
} // validator.getStored(ValidationStored.Account));
SDf10 sdf10New = createSuccessSdf10(sdf09, generationIdForGroup); // }
sdf10Imdg.insert(sdf10New); // SDf10 sdf10New = createSuccessSdf10(sdf09, generationIdForGroup);
statement.setOutSDfId(sdf10New.getId()); // sdf10Imdg.insert(sdf10New);
AccountResult accountResult = accountBalanceService.createAccountBalance(statement.getAddresseeId(), statement.getAccountId(), statement.getAmount(), statement.getCashMovementCurrencyCode()); // statement.setOutSDfId(sdf10New.getId());
if (accountResult.getError() != null) { // AccountResult accountResult = accountBalanceService.createAccountBalance(statement.getAddresseeId(), statement.getAccountId(), statement.getAmount(), statement.getCashMovementCurrencyCode());
statement.setErrorCode(accountResult.getError().getSubject().getId().toString()); // if (accountResult.getError() != null) {
statement.setErrorText(errorResolver.resolve(accountResult.getError())); // statement.setErrorCode(accountResult.getError().getSubject().getId().toString());
} else { // statement.setErrorText(errorResolver.resolve(accountResult.getError()));
accountBalanceImdg.insert(accountResult.getAccount()); //insert == update? // } else {
statement.setOperationStatus(OperationStatus.Executed.getKey()); // accountBalanceImdg.insert(accountResult.getAccount()); //insert == update?
} // statement.setOperationStatus(OperationStatus.Executed.getKey());
statementImdg.update(statement); // }
} // statementImdg.update(statement);
return result; // }
} // return result;
// }
private Statement createFlow(SDf09 sdf09, Company company, Account account) { //
Statement statement = new Statement(); // private Statement createFlow(SDf09 sdf09, Company company, Account account) {
statement.setAddresseeId(company.getId()); // Statement statement = new Statement();
statement.setSenderId(Sender.Prc.getId()); // statement.setAddresseeId(company.getId());
statement.setCreated(Instant.now()); // statement.setSenderId(Sender.Prc.getId());
statement.setClearingDate(LocalDate.now()); // statement.setCreated(Instant.now());
statement.setStatementType(StatementType.incr.getKey()); // statement.setClearingDate(LocalDate.now());
statement.setAccountId(account.getId()); // statement.setStatementType(StatementType.incr.getKey());
statement.setAccount(sdf09.getAccount()); // statement.setAccountId(account.getId());
statement.setInOutDirection(InOutDirection.in.getKey()); // statement.setAccount(sdf09.getAccount());
statement.setAmount(sdf09.getSum()); // statement.setInOutDirection(InOutDirection.in.getKey());
statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey()); // statement.setAmount(sdf09.getSum());
statement.setOperationStatus(OperationStatus.Pending.getKey()); // statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey());
statement.setInSDfId(sdf09.getId()); // statement.setOperationStatus(OperationStatus.Pending.getKey());
statement.setInOutSDfType(InOutSDfType.type9.getKey()); // statement.setInSDfId(sdf09.getId());
statementImdg.insert(statement); // statement.setInOutSDfType(InOutSDfType.type9.getKey());
return statement; // statementImdg.insert(statement);
} // return statement;
// }
private void updateFlow(Statement statement, SDf09 sdf09, Account account) { //
statement.setUpdated(Instant.now()); // private void updateFlow(Statement statement, SDf09 sdf09, Account account) {
statement.setAccountId(account.getId()); // statement.setUpdated(Instant.now());
statement.setAccount(sdf09.getAccount()); // statement.setAccountId(account.getId());
statement.setInOutDirection(InOutDirection.in.getKey()); // statement.setAccount(sdf09.getAccount());
statement.setAmount(sdf09.getSum()); // statement.setInOutDirection(InOutDirection.in.getKey());
statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey()); // statement.setAmount(sdf09.getSum());
statement.setInSDfId(sdf09.getId()); // statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey());
// statement.setOutSDfId(sdf10.getId()); заполняется внешним кодом // statement.setInSDfId(sdf09.getId());
statement.setInOutSDfType(InOutSDfType.type9.getKey()); //// statement.setOutSDfId(sdf10.getId()); заполняется внешним кодом
statementImdg.update(statement); // statement.setInOutSDfType(InOutSDfType.type9.getKey());
} // statementImdg.update(statement);
// }
private AccountSdfRequestPart createAccountRequestPart(Long sdf09Id, String account, Long companyId) { //
AccountSdfRequestPart req = new AccountSdfRequestPart(); // private AccountSdfRequestPart createAccountRequestPart(Long sdf09Id, String account, Long companyId) {
req.setAccount(account); // AccountSdfRequestPart req = new AccountSdfRequestPart();
req.setCompanyId(companyId); // req.setAccount(account);
req.setSdfId(sdf09Id); // req.setCompanyId(companyId);
return req; // req.setSdfId(sdf09Id);
} // return req;
// }
private SDf10 createErrorSdf10(SDf09 sdf09, EnumMessage error, Long generationIdForGroup) { //
SDf10 sDf10 = createSuccessSdf10(sdf09, generationIdForGroup); // private SDf10 createErrorSdf10(SDf09 sdf09, EnumMessage error, Long generationIdForGroup) {
String errorId = error.getSubject().getId().toString(); // SDf10 sDf10 = createSuccessSdf10(sdf09, generationIdForGroup);
sDf10.setResult(errorId.substring(errorId.length() - 3)); // String errorId = error.getSubject().getId().toString();
return sDf10; // sDf10.setResult(errorId.substring(errorId.length() - 3));
} // return sDf10;
// }
private SDf10 createSuccessSdf10(SDf09 sdf09, Long generationIdForGroup) { //
SDf10 sDf10 = new SDf10(); // private SDf10 createSuccessSdf10(SDf09 sdf09, Long generationIdForGroup) {
sDf10.setAccount(sdf09.getAccount()); // SDf10 sDf10 = new SDf10();
sDf10.setSum(sdf09.getSum()); // sDf10.setAccount(sdf09.getAccount());
sDf10.setMarket(sdf09.getMarket()); // sDf10.setSum(sdf09.getSum());
sDf10.setType(sdf09.getType()); // sDf10.setMarket(sdf09.getMarket());
sDf10.setNumber(sdf09.getNumber()); // sDf10.setType(sdf09.getType());
sDf10.setInn(sdf09.getInn()); // sDf10.setNumber(sdf09.getNumber());
sDf10.setResult("OK"); // sDf10.setInn(sdf09.getInn());
sDf10.setGenerationId(generationIdForGroup); // sDf10.setResult("OK");
sDf10.setGenerationTime(Instant.now()); // sDf10.setGenerationId(generationIdForGroup);
sDf10.setInSDf09Id(sdf09.getId()); // sDf10.setGenerationTime(Instant.now());
return sDf10; // sDf10.setInSDf09Id(sdf09.getId());
} // return sDf10;
} // }
//}

8
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf16Executor.java
View file

@ -105,10 +105,10 @@ public class Sdf16Executor extends AbstractExecutor<SDf16> {
sdf17Imdg.insert(sdfNew); sdf17Imdg.insert(sdfNew);
statement.setOutSDfId(sdfNew.getId()); statement.setOutSDfId(sdfNew.getId());
AccountResult accountResult = accountBalanceService.createAccountBalance(statement.getAddresseeId(), AccountResult accountResult = accountBalanceService.createAccountBalance(statement.getAddresseeId(),
statement.getAccountId(), statement.getAmount(), statement.getCashMovementCurrencyCode()); statement.getAccountId(), statement.getAmount(), null /*todo statement.getCashMovementCurrencyCode() */);
if (accountResult.getError() != null) { if (accountResult.getError() != null) {
statement.setErrorCode(accountResult.getError().getSubject().getId().toString()); statement.setErrorCodeId(accountResult.getError().getSubject().getId());
statement.setErrorText(errorResolver.resolve(accountResult.getError())); //todo аполнение statement.setErrorTextId(errorResolver.resolve(accountResult.getError()));
} else { } else {
accountBalanceImdg.insert(accountResult.getAccount()); accountBalanceImdg.insert(accountResult.getAccount());
statement.setOperationStatus(OperationStatus.Executed.getKey()); statement.setOperationStatus(OperationStatus.Executed.getKey());
@ -143,7 +143,6 @@ public class Sdf16Executor extends AbstractExecutor<SDf16> {
statement.setAccount(sdf.getAccount()); statement.setAccount(sdf.getAccount());
statement.setInOutDirection(InOutDirection.in.getKey()); statement.setInOutDirection(InOutDirection.in.getKey());
statement.setAmount(sdf.getSum()); statement.setAmount(sdf.getSum());
statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey());
statement.setOperationStatus(OperationStatus.Pending.getKey()); statement.setOperationStatus(OperationStatus.Pending.getKey());
statement.setInSDfId(sdf.getId()); statement.setInSDfId(sdf.getId());
statement.setInOutSDfType(InOutSDfType.type16.getKey()); statement.setInOutSDfType(InOutSDfType.type16.getKey());
@ -158,7 +157,6 @@ public class Sdf16Executor extends AbstractExecutor<SDf16> {
statement.setAccount(sdf.getAccount()); statement.setAccount(sdf.getAccount());
statement.setInOutDirection(InOutDirection.in.getKey()); statement.setInOutDirection(InOutDirection.in.getKey());
statement.setAmount(sdf.getSum()); statement.setAmount(sdf.getSum());
statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey());
statement.setInSDfId(sdf.getId()); statement.setInSDfId(sdf.getId());
statement.setInOutSDfType(InOutSDfType.type16.getKey()); statement.setInOutSDfType(InOutSDfType.type16.getKey());
statementImdg.update(statement); statementImdg.update(statement);

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

@ -54,7 +54,7 @@ public class StatementService extends QueueConsumer implements InitializingBean
this.kafkaReqProducer = kafkaReqProducer; this.kafkaReqProducer = kafkaReqProducer;
this.executorsMap = executorsMap; this.executorsMap = executorsMap;
this.sdfImdgs.put(SdfTable.SDF_01, imdgProvider.getImdg(IMDGDistributedNames.Map_SDf01, SDf01.class)); this.sdfImdgs.put(SdfTable.SDF_01, imdgProvider.getImdg(IMDGDistributedNames.Map_SDf01, SDf01.class));
this.sdfImdgs.put(SdfTable.SDF_09, imdgProvider.getImdg(IMDGDistributedNames.Map_SDf09, SDf09.class)); // todo изменение классов. this.sdfImdgs.put(SdfTable.SDF_09, imdgProvider.getImdg(IMDGDistributedNames.Map_SDf09, SDf09.class));
this.sdfImdgs.put(SdfTable.SDF_16, imdgProvider.getImdg(IMDGDistributedNames.Map_SDf16, SDf16.class)); this.sdfImdgs.put(SdfTable.SDF_16, imdgProvider.getImdg(IMDGDistributedNames.Map_SDf16, SDf16.class));
} }

57
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/validation/Sdf09ValidationRule.java
View file

@ -17,6 +17,7 @@ import java.math.RoundingMode;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
@Deprecated // связан с Sdf09Executor , он в переработке или удалении.
public enum Sdf09ValidationRule implements IValidationRule<ImdgValidationContext<SDf09>> { public enum Sdf09ValidationRule implements IValidationRule<ImdgValidationContext<SDf09>> {
CompanyPresent() { CompanyPresent() {
@Override @Override
@ -24,48 +25,48 @@ public enum Sdf09ValidationRule implements IValidationRule<ImdgValidationContext
SDf09 sdf09 = context.getValidatedObject(); SDf09 sdf09 = context.getValidatedObject();
Imdg<CompanySymbols> companySymbolImdg = context.obtainMap(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class); Imdg<CompanySymbols> companySymbolImdg = context.obtainMap(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);
Imdg<Company> companyImdg = context.obtainMap(IMDGDistributedNames.Map_Company, Company.class); Imdg<Company> companyImdg = context.obtainMap(IMDGDistributedNames.Map_Company, Company.class);
if (sdf09.getInn() == null) { // todo изменения классов. if (sdf09.getInn() == null) {
return of(BalanceError.CompanyNotFound, "empty inn"); // return of(BalanceError.CompanyNotFound, "empty inn");
} // }
String innStr = sdf09.getInn().setScale(0, RoundingMode.DOWN).toString(); // String innStr = sdf09.getInn().setScale(0, RoundingMode.DOWN).toString();
CompanySymbols symbol = companySymbolImdg // CompanySymbols symbol = companySymbolImdg
.getSingleObjectByFieldValues(Map.of("companySymbol", CompanySymbol.INN.getKey(), // .getSingleObjectByFieldValues(Map.of("companySymbol", CompanySymbol.INN.getKey(),
"companySymbolValue", innStr)); // "companySymbolValue", innStr));
Company company = null; // Company company = null;
if (symbol != null) { // if (symbol != null) {
company = companyImdg.getSingleObjectByID(symbol.getCompanyId()); // company = companyImdg.getSingleObjectByID(symbol.getCompanyId());
} // }
if (company == null) { // if (company == null) {
return of(BalanceError.CompanyNotFound); return of(BalanceError.CompanyNotFound);
} // }
context.storeObject(ValidationStored.Company, company); // context.storeObject(ValidationStored.Company, company);
return empty(); // return empty();
} }
}, },
AccountPresent() { AccountPresent() {
@Override @Override
public Optional<EnumMessage> validate(ImdgValidationContext<SDf09> context) { public Optional<EnumMessage> validate(ImdgValidationContext<SDf09> context) {
SDf09 sdf09 = context.getValidatedObject(); SDf09 sdf09 = context.getValidatedObject();
if (sdf09.getAccount() == null) { // if (sdf09.getAccount() == null) {
return of(BalanceError.AccountNotPresent); return of(BalanceError.AccountNotPresent);
} // }
Imdg<Account> accountImdg = context.obtainMap(IMDGDistributedNames.Map_Account, Account.class); // Imdg<Account> accountImdg = context.obtainMap(IMDGDistributedNames.Map_Account, Account.class);
Account account = accountImdg.getSingleObjectByFieldValues(Map.of("account", sdf09.getAccount(), // Account account = accountImdg.getSingleObjectByFieldValues(Map.of("account", sdf09.getAccount(),
"accountType", AccountType.Clrn.getKey())); // "accountType", AccountType.Clrn.getKey()));
if (account == null) { // if (account == null) {
return of(BalanceError.AccountNotPresent); // return of(BalanceError.AccountNotPresent);
} // }
context.storeObject(ValidationStored.Account, account); // context.storeObject(ValidationStored.Account, account);
return empty(); // return empty();
} }
}, },
Market() { Market() {
@Override @Override
public Optional<EnumMessage> validate(ImdgValidationContext<SDf09> context) { public Optional<EnumMessage> validate(ImdgValidationContext<SDf09> context) {
SDf09 sdf09 = context.getValidatedObject(); SDf09 sdf09 = context.getValidatedObject();
if (!"U".equals(sdf09.getMarket())) { // if (!"U".equals(sdf09.getMarket())) {
return of(BalanceError.WrongMarket); // return of(BalanceError.WrongMarket);
} // }
return empty(); return empty();
} }
}; };

2
clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/AbstractServiceTest.java
View file

@ -34,7 +34,7 @@ import static ru.spcex.clearing.balance.utils.MatcherFactory.usingIgnoringFields
AccountBalanceService.class, AccountBalanceService.class,
Sdf01Executor.class, Sdf01Executor.class,
Sdf08Service.class, Sdf08Service.class,
Sdf09Executor.class, // Sdf09Executor.class,
Sdf16Executor.class, Sdf16Executor.class,
StatementService.class, StatementService.class,
LoggingService.class, LoggingService.class,

5
clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/Sdf01ExecutorTest.java
View file

@ -203,7 +203,7 @@ class Sdf01ExecutorTest extends AbstractServiceTest {
sDf02.setSumengage(sdf01.getSumengage()); sDf02.setSumengage(sdf01.getSumengage());
sDf02.setSumunblock(sdf01.getSumunblock()); sDf02.setSumunblock(sdf01.getSumunblock());
sDf02.setFile_type(sdf01.getFile_type()); sDf02.setFile_type(sdf01.getFile_type());
sDf02.setInSDf01Id(sdf01.getId()); sDf02.setInSDfId(sdf01.getId());
sDf02.setGenerationId(generationIdForGroup); sDf02.setGenerationId(generationIdForGroup);
sDf02.setGenerationTime(Instant.now()); sDf02.setGenerationTime(Instant.now());
sDf02.setResult("OK!"); sDf02.setResult("OK!");
@ -223,7 +223,6 @@ class Sdf01ExecutorTest extends AbstractServiceTest {
statement.setInOutDirection(InOutDirection.in.getKey()); statement.setInOutDirection(InOutDirection.in.getKey());
statement.setSettlementDate(LocalDate.parse(sdf01.getDat(), datFormatter)); statement.setSettlementDate(LocalDate.parse(sdf01.getDat(), datFormatter));
statement.setAmount(BigDecimalUtil.parse(sdf01.getRemainder())); statement.setAmount(BigDecimalUtil.parse(sdf01.getRemainder()));
statement.setCashMovementCurrencyCode(cashMovementCurrencyCode);
statement.setOperationStatus(OperationStatus.Pending.getKey()); statement.setOperationStatus(OperationStatus.Pending.getKey());
statement.setInSDfId(sdf01.getId()); statement.setInSDfId(sdf01.getId());
statement.setInOutSDfType(InOutSDfType.type1.getKey()); statement.setInOutSDfType(InOutSDfType.type1.getKey());
@ -245,7 +244,7 @@ class Sdf01ExecutorTest extends AbstractServiceTest {
sDf02.setSumengage(sdf01.getSumengage()); sDf02.setSumengage(sdf01.getSumengage());
sDf02.setSumunblock(sdf01.getSumunblock()); sDf02.setSumunblock(sdf01.getSumunblock());
sDf02.setFile_type(sdf01.getFile_type()); sDf02.setFile_type(sdf01.getFile_type());
sDf02.setInSDf01Id(sdf01.getId()); sDf02.setInSDfId(sdf01.getId());
String errorId = error.getSubject().getId().toString(); String errorId = error.getSubject().getId().toString();
sDf02.setResult(errorId.substring(errorId.length() - 3)); sDf02.setResult(errorId.substring(errorId.length() - 3));
sDf02.setGenerationId(generationIdForGroup); sDf02.setGenerationId(generationIdForGroup);

486
clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/Sdf09ExecutorTest.java
View file

@ -1,243 +1,243 @@
package ru.spcex.clearing.balance.service; //package ru.spcex.clearing.balance.service;
//
import org.apache.kafka.clients.producer.MockProducer; //import org.apache.kafka.clients.producer.MockProducer;
import org.junit.jupiter.api.Test; //import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.SpyBean; //import org.springframework.boot.test.mock.mockito.SpyBean;
import ru.clearing.classes.statics.data.account.Account; //import ru.clearing.classes.statics.data.account.Account;
import ru.clearing.classes.statics.data.account.AccountBalance; //import ru.clearing.classes.statics.data.account.AccountBalance;
import ru.clearing.classes.statics.data.company.Company; //import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.statics.data.company.CompanySymbols; //import ru.clearing.classes.statics.data.company.CompanySymbols;
import ru.clearing.classes.statics.data.sdf.SDf09; //import ru.clearing.classes.statics.data.sdf.SDf09;
import ru.clearing.classes.statics.data.sdf.SDf10; //import ru.clearing.classes.statics.data.sdf.SDf10;
import ru.clearing.classes.statics.data.statement.Statement; //import ru.clearing.classes.statics.data.statement.Statement;
import ru.spcex.clearing.balance.errors.BalanceError; //import ru.spcex.clearing.balance.errors.BalanceError;
import ru.spcex.clearing.balance.utils.MatcherFactory; //import ru.spcex.clearing.balance.utils.MatcherFactory;
import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdfRequestPart; //import ru.spcex.clearing.platform.messaging.domain.cud.account.sdf01.AccountSdfRequestPart;
import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest; //import ru.spcex.clearing.platform.messaging.domain.cud.balance.StatementRequest;
import ru.spcex.platform.enumeration.*; //import ru.spcex.platform.enumeration.*;
import ru.spcex.platform.utils.enumeration.EnumMessage; //import ru.spcex.platform.utils.enumeration.EnumMessage;
//
import javax.annotation.PostConstruct; //import javax.annotation.PostConstruct;
import java.math.BigDecimal; //import java.math.BigDecimal;
import java.time.Instant; //import java.time.Instant;
import java.time.LocalDate; //import java.time.LocalDate;
import java.util.Collection; //import java.util.Collection;
import java.util.Collections; //import java.util.Collections;
import java.util.Map; //import java.util.Map;
//
import static ru.spcex.clearing.balance.utils.MatcherFactory.usingIgnoringFieldsComparator; //import static ru.spcex.clearing.balance.utils.MatcherFactory.usingIgnoringFieldsComparator;
//
class Sdf09ExecutorTest extends AbstractServiceTest { //class Sdf09ExecutorTest extends AbstractServiceTest {
private static final MatcherFactory.Matcher<SDf10> SDF_10_MATCHER = usingIgnoringFieldsComparator("created", "comment", "outSDfId", "generationTime", "generationId", "id"); // private static final MatcherFactory.Matcher<SDf10> SDF_10_MATCHER = usingIgnoringFieldsComparator("created", "comment", "outSDfId", "generationTime", "generationId", "id");
private final Long ID = 2L; // private final Long ID = 2L;
private final String acc = "213456789"; // private final String acc = "213456789";
@Autowired // @Autowired
Sdf09Executor sdf09Executor; // Sdf09Executor sdf09Executor;
private SDf09 sdf09; // private SDf09 sdf09;
private StatementRequest statementRequest; // private StatementRequest statementRequest;
@SpyBean // @SpyBean
private MockProducer<String, Object> producer; // private MockProducer<String, Object> producer;
//
@PostConstruct // @PostConstruct
void init() { // void init() {
super.init(); // super.init();
sdf09 = getTestSdf09(); // sdf09 = getTestSdf09();
statementRequest = new StatementRequest(); // statementRequest = new StatementRequest();
} // }
//
/** // /**
* {@link Sdf09Executor#execute(Collection collection, StatementRequest statementRequest)}<br> // * {@link Sdf09Executor#execute(Collection collection, StatementRequest statementRequest)}<br>
* Тест проверяет генерацию сущностей {@link Result}, {@link Statement}, {@link SDf10}<br> // * Тест проверяет генерацию сущностей {@link Result}, {@link Statement}, {@link SDf10}<br>
* Входные параметры:<br> // * Входные параметры:<br>
* accountId - {@link StatementRequest}: new StatementRequest()<br> // * accountId - {@link StatementRequest}: new StatementRequest()<br>
* addresseeId - {@link Collection<SDf09>}<br> // * addresseeId - {@link Collection<SDf09>}<br>
* addresseeId - {@link SDf09}<br> // * addresseeId - {@link SDf09}<br>
* {@link SDf09#market} - "U"<br> // * {@link SDf09#market} - "U"<br>
* {@link SDf09#account} - "123456789"<br> // * {@link SDf09#account} - "123456789"<br>
* {@link SDf09#inn} - 987654321<br> // * {@link SDf09#inn} - 987654321<br>
* {@link SDf09#sum} - 1000<br> // * {@link SDf09#sum} - 1000<br>
*/ // */
@Test // @Test
void execute() { // void execute() {
//check create statement, SDf10 and AccountBalance // //check create statement, SDf10 and AccountBalance
Company company = getTestCompany(); // Company company = getTestCompany();
companyMap.put(addresseeIdNew, company); // companyMap.put(addresseeIdNew, company);
//
CompanySymbols companySymbols = getTestCompanySymbols(); // CompanySymbols companySymbols = getTestCompanySymbols();
companySymbolsMap.put(addresseeIdNew, companySymbols); // companySymbolsMap.put(addresseeIdNew, companySymbols);
//
Account account = getTestAccount(ID, acc); // Account account = getTestAccount(ID, acc);
accountMap.put(accountIdNew, account); // accountMap.put(accountIdNew, account);
//
Result predictableResult = new Result(); // Result predictableResult = new Result();
predictableResult.setGenerationId(ID); // predictableResult.setGenerationId(ID);
Statement predictableStatement = getTestStatement(currentId.getAndIncrement(), company, account, sdf09); // Statement predictableStatement = getTestStatement(currentId.getAndIncrement(), company, account, sdf09);
predictableStatement.setOperationStatus(OperationStatus.Executed.getKey()); // predictableStatement.setOperationStatus(OperationStatus.Executed.getKey());
SDf10 predictableSdf10 = getTestSdf10(currentId.getAndIncrement(), sdf09, ID); // SDf10 predictableSdf10 = getTestSdf10(currentId.getAndIncrement(), sdf09, ID);
predictableStatement.setOutSDfId(predictableSdf10.getId()); // predictableStatement.setOutSDfId(predictableSdf10.getId());
AccountResult predictableNewResult = getTestAccountResult(currentId.getAndIncrement(), account, company); // AccountResult predictableNewResult = getTestAccountResult(currentId.getAndIncrement(), account, company);
//
Result result = sdf09Executor.execute(Collections.singletonList(sdf09), statementRequest); // Result result = sdf09Executor.execute(Collections.singletonList(sdf09), statementRequest);
Statement resultStatement = statementImdg.getSingleObjectByFieldValues(Map.of("account", acc)); // Statement resultStatement = statementImdg.getSingleObjectByFieldValues(Map.of("account", acc));
SDf10 resultSdf10 = sdf10Imdg.getSingleObjectByFieldValues(Map.of("account", acc)); // SDf10 resultSdf10 = sdf10Imdg.getSingleObjectByFieldValues(Map.of("account", acc));
AccountBalance resultAccountBalance = accountBalanceImdg.getSingleObjectByFieldValues(Map.of("account", acc)); // AccountBalance resultAccountBalance = accountBalanceImdg.getSingleObjectByFieldValues(Map.of("account", acc));
//
RESULT_MATCHER.assertMatch(result, predictableResult); // RESULT_MATCHER.assertMatch(result, predictableResult);
STATEMENT_MATCHER.assertMatch(resultStatement, predictableStatement); // STATEMENT_MATCHER.assertMatch(resultStatement, predictableStatement);
SDF_10_MATCHER.assertMatch(resultSdf10, predictableSdf10); // SDF_10_MATCHER.assertMatch(resultSdf10, predictableSdf10);
ACCOUNT_BALANCE_MATCHER.assertMatch(resultAccountBalance, predictableNewResult.getAccount()); // ACCOUNT_BALANCE_MATCHER.assertMatch(resultAccountBalance, predictableNewResult.getAccount());
} // }
//
/** // /**
* {@link Sdf09Executor#execute(Collection collection, StatementRequest statementRequest)}<br> // * {@link Sdf09Executor#execute(Collection collection, StatementRequest statementRequest)}<br>
* Тест проверяет валидацию<br> // * Тест проверяет валидацию<br>
* Входные параметры:<br> // * Входные параметры:<br>
* accountId - {@link StatementRequest}: new StatementRequest()<br> // * accountId - {@link StatementRequest}: new StatementRequest()<br>
* addresseeId - {@link Collection<SDf09>}<br> // * addresseeId - {@link Collection<SDf09>}<br>
* addresseeId - {@link SDf09}<br> // * addresseeId - {@link SDf09}<br>
* {@link SDf09#market} - "U"<br> // * {@link SDf09#market} - "U"<br>
* {@link SDf09#account} - "123456789"<br> // * {@link SDf09#account} - "123456789"<br>
* {@link SDf09#inn} - 987654321<br> // * {@link SDf09#inn} - 987654321<br>
* {@link SDf09#sum} - 1000<br> // * {@link SDf09#sum} - 1000<br>
*/ // */
@Test // @Test
void validatedExecute() { // void validatedExecute() {
//CompanyNotFound // //CompanyNotFound
companyMap.delete(addresseeIdNew); // companyMap.delete(addresseeIdNew);
checkError(new EnumMessage(BalanceError.CompanyNotFound)); // checkError(new EnumMessage(BalanceError.CompanyNotFound));
//
Company company = getTestCompany(); // Company company = getTestCompany();
companyMap.put(addresseeIdNew, company); // companyMap.put(addresseeIdNew, company);
companySymbolsMap.delete(addresseeIdNew); // companySymbolsMap.delete(addresseeIdNew);
checkError(new EnumMessage(BalanceError.CompanyNotFound)); // checkError(new EnumMessage(BalanceError.CompanyNotFound));
//
CompanySymbols companySymbols = getTestCompanySymbols(); // CompanySymbols companySymbols = getTestCompanySymbols();
companySymbolsMap.put(addresseeIdNew, companySymbols); // companySymbolsMap.put(addresseeIdNew, companySymbols);
sdf09.setInn(null); // sdf09.setInn(null);
checkError(new EnumMessage(BalanceError.CompanyNotFound)); // checkError(new EnumMessage(BalanceError.CompanyNotFound));
//
//AccountNotPresent // //AccountNotPresent
sdf09.setInn(inn); // sdf09.setInn(inn);
accountMap.delete(accountIdNew); // accountMap.delete(accountIdNew);
checkErrorAccountNotPresent(company); // checkErrorAccountNotPresent(company);
//
//AccountNotPresent // //AccountNotPresent
Account account = new Account(); // Account account = new Account();
account.setAccount(null); // account.setAccount(null);
account.setAccountType(AccountType.Clrn.getKey()); // account.setAccountType(AccountType.Clrn.getKey());
account.setStatus(Status.Active.getKey()); // account.setStatus(Status.Active.getKey());
accountMap.put(accountIdNew, account); // accountMap.put(accountIdNew, account);
checkErrorAccountNotPresent(company); // checkErrorAccountNotPresent(company);
//
//AccountNotPresent // //AccountNotPresent
account = getTestAccount(ID, acc); // account = getTestAccount(ID, acc);
accountMap.put(accountIdNew, account); // accountMap.put(accountIdNew, account);
sdf09.setAccount(null); // sdf09.setAccount(null);
checkErrorAccountNotPresent(company); // checkErrorAccountNotPresent(company);
//
//WrongMarket // //WrongMarket
sdf09.setAccount(acc); // sdf09.setAccount(acc);
sdf09.setMarket(null); // sdf09.setMarket(null);
checkError(new EnumMessage(BalanceError.WrongMarket)); // checkError(new EnumMessage(BalanceError.WrongMarket));
//
//BalanceNotEnough // //BalanceNotEnough
sdf09.setMarket("U"); // sdf09.setMarket("U");
sdf09.setSum(null); // sdf09.setSum(null);
checkError(new EnumMessage(BalanceError.BalanceNotEnough)); // checkError(new EnumMessage(BalanceError.BalanceNotEnough));
//
//BalanceNotEnough // //BalanceNotEnough
sdf09.setSum(new BigDecimal(-1000)); // sdf09.setSum(new BigDecimal(-1000));
AccountBalance balance = accountBalanceImdg.getSingleObjectByFieldValues(Map.of("account", sdf09.getAccount(), // AccountBalance balance = accountBalanceImdg.getSingleObjectByFieldValues(Map.of("account", sdf09.getAccount(),
"accountType", AccountType.Clrn.getKey())); // "accountType", AccountType.Clrn.getKey()));
if (balance != null) accountBalanceImdg.delete(balance); // if (balance != null) accountBalanceImdg.delete(balance);
else balance = getTestAccountBalance(ID, account, company); // else balance = getTestAccountBalance(ID, account, company);
checkError(new EnumMessage(BalanceError.BalanceNotEnough)); // checkError(new EnumMessage(BalanceError.BalanceNotEnough));
//
//BalanceNotEnough // //BalanceNotEnough
balance.setFreeBalanceAmount(new BigDecimal(999)); // balance.setFreeBalanceAmount(new BigDecimal(999));
accountBalanceImdg.insert(balance); // accountBalanceImdg.insert(balance);
checkError(new EnumMessage(BalanceError.BalanceNotEnough)); // checkError(new EnumMessage(BalanceError.BalanceNotEnough));
//
balance.setFreeBalanceAmount(amountNew); // balance.setFreeBalanceAmount(amountNew);
accountBalanceImdg.insert(balance); // accountBalanceImdg.insert(balance);
} // }
//
private void checkError(EnumMessage enumMessage) { // private void checkError(EnumMessage enumMessage) {
SDf10 predictableSdf10 = getTestErrorSdf10(sdf09, enumMessage, ID); // SDf10 predictableSdf10 = getTestErrorSdf10(sdf09, enumMessage, ID);
Result result = sdf09Executor.execute(Collections.singletonList(sdf09), statementRequest); // Result result = sdf09Executor.execute(Collections.singletonList(sdf09), statementRequest);
Collection<SDf10> resultsSdf10 = sdf10Imdg.getCollectionObjectsByFieldValues(Map.of("account", acc)); // Collection<SDf10> resultsSdf10 = sdf10Imdg.getCollectionObjectsByFieldValues(Map.of("account", acc));
SDf10 resultSdf10 = resultsSdf10.stream().max((entry1, entry2) -> entry1.getId() > entry2.getId() ? 1 : -1).get(); // SDf10 resultSdf10 = resultsSdf10.stream().max((entry1, entry2) -> entry1.getId() > entry2.getId() ? 1 : -1).get();
SDF_10_MATCHER.assertMatch(resultSdf10, predictableSdf10); // SDF_10_MATCHER.assertMatch(resultSdf10, predictableSdf10);
} // }
//
protected Statement getTestStatement(Long id, Company company, Account account, SDf09 sdf09) { // protected Statement getTestStatement(Long id, Company company, Account account, SDf09 sdf09) {
Statement statement = new Statement(); // Statement statement = new Statement();
statement.setId(id); // statement.setId(id);
statement.setAddresseeId(company.getId()); // statement.setAddresseeId(company.getId());
statement.setSenderId(Sender.Prc.getId()); // statement.setSenderId(Sender.Prc.getId());
statement.setCreated(Instant.now()); // statement.setCreated(Instant.now());
statement.setClearingDate(LocalDate.now()); // statement.setClearingDate(LocalDate.now());
statement.setStatementType(StatementType.incr.getKey()); // statement.setStatementType(StatementType.incr.getKey());
statement.setAccountId(account.getId()); // statement.setAccountId(account.getId());
statement.setAccount(sdf09.getAccount()); // statement.setAccount(sdf09.getAccount());
statement.setInOutDirection(InOutDirection.in.getKey()); // statement.setInOutDirection(InOutDirection.in.getKey());
statement.setAmount(sdf09.getSum()); // statement.setAmount(sdf09.getSum());
statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey()); // statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey());
statement.setOperationStatus(OperationStatus.Pending.getKey()); // statement.setOperationStatus(OperationStatus.Pending.getKey());
statement.setInSDfId(sdf09.getId()); // statement.setInSDfId(sdf09.getId());
statement.setInOutSDfType(InOutSDfType.type9.getKey()); // statement.setInOutSDfType(InOutSDfType.type9.getKey());
statementImdg.insert(statement); // statementImdg.insert(statement);
return statement; // return statement;
} // }
//
private SDf10 getTestSdf10(Long id, SDf09 sdf09, Long generationIdForGroup) { // private SDf10 getTestSdf10(Long id, SDf09 sdf09, Long generationIdForGroup) {
SDf10 sDf10 = new SDf10(); // SDf10 sDf10 = new SDf10();
sDf10.setId(id); // sDf10.setId(id);
sDf10.setAccount(sdf09.getAccount()); // sDf10.setAccount(sdf09.getAccount());
sDf10.setSum(sdf09.getSum()); // sDf10.setSum(sdf09.getSum());
sDf10.setMarket(sdf09.getMarket()); // sDf10.setMarket(sdf09.getMarket());
sDf10.setType(sdf09.getType()); // sDf10.setType(sdf09.getType());
sDf10.setNumber(sdf09.getNumber()); // sDf10.setNumber(sdf09.getNumber());
sDf10.setInn(sdf09.getInn()); // sDf10.setInn(sdf09.getInn());
sDf10.setResult("OK"); // sDf10.setResult("OK");
sDf10.setGenerationId(generationIdForGroup); // sDf10.setGenerationId(generationIdForGroup);
sDf10.setGenerationTime(Instant.now()); // sDf10.setGenerationTime(Instant.now());
sDf10.setInSDf09Id(sdf09.getId()); // sDf10.setInSDf09Id(sdf09.getId());
return sDf10; // return sDf10;
} // }
//
private SDf09 getTestSdf09() { // private SDf09 getTestSdf09() {
SDf09 sdf09 = new SDf09(); // SDf09 sdf09 = new SDf09();
sdf09.setId(ID); // sdf09.setId(ID);
sdf09.setMarket("U"); // sdf09.setMarket("U");
sdf09.setAccount(acc); // sdf09.setAccount(acc);
sdf09.setInn(inn); // sdf09.setInn(inn);
sdf09.setSum(amountNew); // sdf09.setSum(amountNew);
return sdf09; // return sdf09;
} // }
//
private SDf10 getTestErrorSdf10(SDf09 sdf09, EnumMessage error, Long generationIdForGroup) { // private SDf10 getTestErrorSdf10(SDf09 sdf09, EnumMessage error, Long generationIdForGroup) {
SDf10 sDf10 = getTestSdf10(ID, sdf09, generationIdForGroup); // SDf10 sDf10 = getTestSdf10(ID, sdf09, generationIdForGroup);
sDf10.setId(ID); // sDf10.setId(ID);
String errorId = error.getSubject().getId().toString(); // String errorId = error.getSubject().getId().toString();
sDf10.setResult(errorId.substring(errorId.length() - 3)); // sDf10.setResult(errorId.substring(errorId.length() - 3));
return sDf10; // return sDf10;
} // }
//
private void checkErrorAccountNotPresent(Company company) { // private void checkErrorAccountNotPresent(Company company) {
Result predictableResult = new Result(); // Result predictableResult = new Result();
predictableResult.getAccountRequests().add(createAccountRequestPart(sdf09.getId(), sdf09.getAccount(), company.getId())); // predictableResult.getAccountRequests().add(createAccountRequestPart(sdf09.getId(), sdf09.getAccount(), company.getId()));
Result result = sdf09Executor.execute(Collections.singletonList(sdf09), statementRequest); // Result result = sdf09Executor.execute(Collections.singletonList(sdf09), statementRequest);
RESULT_MATCHER.assertMatch(result, predictableResult); // RESULT_MATCHER.assertMatch(result, predictableResult);
} // }
//
private AccountSdfRequestPart createAccountRequestPart(Long sdf09Id, String account, Long companyId) { // private AccountSdfRequestPart createAccountRequestPart(Long sdf09Id, String account, Long companyId) {
AccountSdfRequestPart req = new AccountSdfRequestPart(); // AccountSdfRequestPart req = new AccountSdfRequestPart();
req.setAccount(account); // req.setAccount(account);
req.setCompanyId(companyId); // req.setCompanyId(companyId);
// req.setAccountType(AccountType.Clrn.getKey()); //// req.setAccountType(AccountType.Clrn.getKey());
req.setSdfId(sdf09Id); // req.setSdfId(sdf09Id);
return req; // return req;
} // }
} //}

1
clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/service/Sdf16ExecutorTest.java
View file

@ -211,7 +211,6 @@ class Sdf16ExecutorTest extends AbstractServiceTest {
statement.setAccount(sdf16.getAccount()); statement.setAccount(sdf16.getAccount());
statement.setInOutDirection(InOutDirection.in.getKey()); statement.setInOutDirection(InOutDirection.in.getKey());
statement.setAmount(sdf16.getSum()); statement.setAmount(sdf16.getSum());
statement.setCashMovementCurrencyCode(CurrencyCode.RUB.getKey());
statement.setOperationStatus(OperationStatus.Pending.getKey()); statement.setOperationStatus(OperationStatus.Pending.getKey());
statement.setInSDfId(sdf16.getId()); statement.setInSDfId(sdf16.getId());
statement.setInOutSDfType(InOutSDfType.type16.getKey()); statement.setInOutSDfType(InOutSDfType.type16.getKey());

2
clearing-parent/balance-service/src/test/java/ru/spcex/clearing/balance/validation/Sdf16ValidationRuleTest.java
View file

@ -12,7 +12,7 @@ import java.math.BigDecimal;
import java.util.Optional; import java.util.Optional;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
@Deprecated // sDf16 was deleted
class Sdf16ValidationRuleTest { class Sdf16ValidationRuleTest {
@Test @Test

1
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/liabilities/LiabilitiesClaimsAssets.java
View file

@ -6,6 +6,7 @@ import ru.clearing.classes.objects.BusinessObject;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
@Deprecated
public class LiabilitiesClaimsAssets extends BusinessObject { public class LiabilitiesClaimsAssets extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;

1
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/liabilities/LiabilitiesClaimsMoney.java
View file

@ -6,6 +6,7 @@ import ru.clearing.classes.objects.BusinessObject;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
@Deprecated
public class LiabilitiesClaimsMoney extends BusinessObject { public class LiabilitiesClaimsMoney extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private Long companyId; private Long companyId;

138
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/BalanceRegister.java
View file

@ -1,138 +0,0 @@
package ru.clearing.classes.statics.data.misc;
import ru.clearing.classes.ConstSerializable;
import ru.clearing.classes.objects.BusinessObject;
import java.math.BigDecimal;
import java.time.Instant;
public class BalanceRegister extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private Instant sDf01Date;
private String currencyCode;
private String setHouseName;
private String account;
private String infoAccount;
private BigDecimal remainderSum;
private BigDecimal blockedSum;
private BigDecimal unblockedSum;
private String inn;
private Long market;
private String fullName;
private String typeRemains;
private String docNumber;
private Long companyId;
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;
}
public void setSetHouseName(String setHouseName) {
this.setHouseName = setHouseName;
}
public String getAccount() {
return account;
}
public void setAccount(String account) {
this.account = account;
}
public String getInfoAccount() {
return infoAccount;
}
public void setInfoAccount(String infoAccount) {
this.infoAccount = infoAccount;
}
public BigDecimal getRemainderSum() {
return remainderSum;
}
public void setRemainderSum(BigDecimal remainderSum) {
this.remainderSum = remainderSum;
}
public BigDecimal getBlockedSum() {
return blockedSum;
}
public void setBlockedSum(BigDecimal blockedSum) {
this.blockedSum = blockedSum;
}
public BigDecimal getUnblockedSum() {
return unblockedSum;
}
public void setUnblockedSum(BigDecimal unblockedSum) {
this.unblockedSum = unblockedSum;
}
public String getInn() {
return inn;
}
public void setInn(String inn) {
this.inn = inn;
}
public Long getMarket() {
return market;
}
public void setMarket(Long market) {
this.market = market;
}
public String getFullName() {
return fullName;
}
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 Long getCompanyId() {
return companyId;
}
public void setCompanyId(Long companyId) {
this.companyId = companyId;
}
}

236
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/ClearMemberRegister.java
View file

@ -1,236 +0,0 @@
package ru.clearing.classes.statics.data.misc;
import ru.clearing.classes.ConstSerializable;
import ru.clearing.classes.objects.BusinessObject;
import java.time.Instant;
import java.time.LocalDate;
public class ClearMemberRegister extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String tradingCode;
private String clearingCode;
private String fullName;
private String shortName;
private String categoryList;
private String corporationSole;
private String account;
private Long bank;
private String bankName;
private String inn;
private String bic;
private String ogrn;
private String cpp;
private String ocpo;
private String contractNumber;
private LocalDate contractDate;
private LocalDate registrationDate;
private LocalDate systemDate;
private Instant accessDate;
private Instant suspentionDate;
private Instant reopeningDate;
private Instant closeDate;
private Instant exclusionDate;
private String address;
private String email;
public String getTradingCode() {
return tradingCode;
}
public void setTradingCode(String tradingCode) {
this.tradingCode = tradingCode;
}
public String getClearingCode() {
return clearingCode;
}
public void setClearingCode(String clearingCode) {
this.clearingCode = clearingCode;
}
public String getFullName() {
return fullName;
}
public void setFullName(String fullName) {
this.fullName = fullName;
}
public String getShortName() {
return shortName;
}
public void setShortName(String shortName) {
this.shortName = shortName;
}
public String getCategoryList() {
return categoryList;
}
public void setCategoryList(String categoryList) {
this.categoryList = categoryList;
}
public String getCorporationSole() {
return corporationSole;
}
public void setCorporationSole(String corporationSole) {
this.corporationSole = corporationSole;
}
public String getAccount() {
return account;
}
public void setAccount(String account) {
this.account = account;
}
public Long getBank() {
return bank;
}
public void setBank(Long bank) {
this.bank = bank;
}
public String getBankName() {
return bankName;
}
public void setBankName(String bankName) {
this.bankName = bankName;
}
public String getInn() {
return inn;
}
public void setInn(String inn) {
this.inn = inn;
}
public String getBic() {
return bic;
}
public void setBic(String bic) {
this.bic = bic;
}
public String getOgrn() {
return ogrn;
}
public void setOgrn(String ogrn) {
this.ogrn = ogrn;
}
public String getCpp() {
return cpp;
}
public void setCpp(String cpp) {
this.cpp = cpp;
}
public String getOcpo() {
return ocpo;
}
public void setOcpo(String ocpo) {
this.ocpo = ocpo;
}
public String getContractNumber() {
return contractNumber;
}
public void setContractNumber(String contractNumber) {
this.contractNumber = contractNumber;
}
public LocalDate getContractDate() {
return contractDate;
}
public void setContractDate(LocalDate contractDate) {
this.contractDate = contractDate;
}
public LocalDate getRegistrationDate() {
return registrationDate;
}
public void setRegistrationDate(LocalDate registrationDate) {
this.registrationDate = registrationDate;
}
public LocalDate getSystemDate() {
return systemDate;
}
public void setSystemDate(LocalDate systemDate) {
this.systemDate = systemDate;
}
public Instant getAccessDate() {
return accessDate;
}
public void setAccessDate(Instant accessDate) {
this.accessDate = accessDate;
}
public Instant getSuspentionDate() {
return suspentionDate;
}
public void setSuspentionDate(Instant suspentionDate) {
this.suspentionDate = suspentionDate;
}
public Instant getReopeningDate() {
return reopeningDate;
}
public void setReopeningDate(Instant reopeningDate) {
this.reopeningDate = reopeningDate;
}
public Instant getCloseDate() {
return closeDate;
}
public void setCloseDate(Instant closeDate) {
this.closeDate = closeDate;
}
public Instant getExclusionDate() {
return exclusionDate;
}
public void setExclusionDate(Instant exclusionDate) {
this.exclusionDate = exclusionDate;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
}

1
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/KeyRate.java
View file

@ -10,6 +10,7 @@ import java.time.LocalDate;
* <p> * <p>
* DB table: KEY_RATE * DB table: KEY_RATE
**/ **/
@Deprecated
public class KeyRate extends SpcexObjectBase { public class KeyRate extends SpcexObjectBase {
private BigDecimal rate; private BigDecimal rate;
private LocalDate startDate; private LocalDate startDate;

9
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/Market.java
View file

@ -10,6 +10,7 @@ public class Market extends BusinessObject {
private String code; private String code;
private String settlementCurrency; private String settlementCurrency;
private String section; private String section;
private String marketType;
public String getDescription() { public String getDescription() {
return description; return description;
@ -58,4 +59,12 @@ public class Market extends BusinessObject {
public void setSection(String section) { public void setSection(String section) {
this.section = section; this.section = section;
} }
public String getMarketType() {
return marketType;
}
public void setMarketType(String marketType) {
this.marketType = marketType;
}
} }

45
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/MarketDataLiquidation.java Normal file
View file

@ -0,0 +1,45 @@
package ru.clearing.classes.statics.data.misc;
import ru.clearing.classes.ConstSerializable;
import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
* Статичная ценовая информация для ликвидации активов
* <p>
* DB table: MARKET_DATA_LIQUIDATION
**/
public class MarketDataLiquidation extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private Long securityId;
private BigDecimal price;
private LocalDate clearingDate;
public Long getSecurityId() {
return securityId;
}
public void setSecurityId(Long value) {
this.securityId = value;
}
public BigDecimal getPrice() {
return price;
}
public void setPrice(BigDecimal value) {
this.price = value;
}
public LocalDate getClearingDate() {
return clearingDate;
}
public void setClearingDate(LocalDate value) {
this.clearingDate = value;
}
}

6
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/Notification.java
View file

@ -13,7 +13,7 @@ public class Notification extends BusinessObject {
private Long senderId; private Long senderId;
private Long addresseeId; private Long addresseeId;
private String objectType; private String objectType;
private Instant objectId; private Long objectId;
private String notificationStatus; private String notificationStatus;
public LocalDate getClearingDate() { public LocalDate getClearingDate() {
@ -48,11 +48,11 @@ public class Notification extends BusinessObject {
this.objectType = objectType; this.objectType = objectType;
} }
public Instant getObjectId() { public Long getObjectId() {
return objectId; return objectId;
} }
public void setObjectId(Instant objectId) { public void setObjectId(Long objectId) {
this.objectId = objectId; this.objectId = objectId;
} }

28
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/NotificationHistory.java Normal file
View file

@ -0,0 +1,28 @@
package ru.clearing.classes.statics.data.misc;
import ru.clearing.classes.ConstSerializable;
import ru.clearing.classes.objects.BusinessEvent;
import java.io.Serial;
/**
* Изменение состояния объекта Сообщения
* <p>
* DB table: NOTIFICATION_HISTORY
**/
public class NotificationHistory extends BusinessEvent<Notification> {
@Serial
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private Notification object;
@Override
public Notification getObject() {
return object;
}
@Override
public void setObject(Notification object) {
this.object = object;
}
}

3
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/STrades.java
View file

@ -1,6 +1,7 @@
package ru.clearing.classes.statics.data.misc; package ru.clearing.classes.statics.data.misc;
import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.ConstSerializable;
import ru.clearing.classes.objects.BusinessObject;
import ru.spcex.platform.classes.base.SpcexObjectBase; import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -12,7 +13,7 @@ import java.time.LocalDate;
* <p> * <p>
* DB table: S_TRADE * DB table: S_TRADE
**/ **/
public class STrades extends SpcexObjectBase { public class STrades extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private Long tradeNum; private Long tradeNum;

61
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/payment/Operation.java Normal file
View file

@ -0,0 +1,61 @@
package ru.clearing.classes.statics.data.payment;
import ru.clearing.classes.ConstSerializable;
import ru.clearing.classes.objects.BusinessObject;
import java.time.LocalDate;
/**
* Проводки
*
* DB table: OPERATION
**/
public class Operation extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private Long addresseeId;
private Long senderId;
private LocalDate clearingDate;
private Long operationTypeId;
private String operationStatus;
public Long getAddresseeId() {
return addresseeId;
}
public void setAddresseeId(Long value) {
this.addresseeId = value;
}
public Long getSenderId() {
return senderId;
}
public void setSenderId(Long value) {
this.senderId = value;
}
public LocalDate getClearingDate() {
return clearingDate;
}
public void setClearingDate(LocalDate value) {
this.clearingDate = value;
}
public Long getOperationTypeId() {
return operationTypeId;
}
public void setOperationTypeId(Long value) {
this.operationTypeId = value;
}
public String getOperationStatus() {
return operationStatus;
}
public void setOperationStatus(String value) {
this.operationStatus = value;
}
}

197
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/payment/PaymentInstruction.java
View file

@ -3,35 +3,40 @@ package ru.clearing.classes.statics.data.payment;
import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.ConstSerializable;
import ru.clearing.classes.objects.BusinessObject; import ru.clearing.classes.objects.BusinessObject;
import java.math.BigDecimal;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDate; import java.time.LocalDate;
public class PaymentInstruction extends BusinessObject { public class PaymentInstruction extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private Long senderId; // type="1"
private Long addresseeId; // type="1" private Long senderId;
private String adresseeBic; // type="2" private Long addresseeId;
private String payeeBankName; // type="2" private String payeeBic;
private String payeeBic; // type="2" private String adresseeBic;
private String addresseeBankName; // type="2" private String payeeBankName;
private Instant paymentDate; // type="4" private String addresseeBankName;
private String paymentPurpose; // type="2" private Instant paymentDate;
private LocalDate settlementDate; // type="6" private String paymentPurpose;
private Long creditLegAmount; // type="1" private LocalDate settlementDate;
private Long debitLegAmount; // type="1" private BigDecimal creditLeg_amount;
private Long creditLegAccountId; // type="1" private BigDecimal debitLeg_amount;
private String creditCsAccount; // type="2" private Long creditLeg_accountId;
private String creditLegAccount; // type="2" private String credit_csAccount;
private Long debitLegAccountId; // type="1" private String creditLeg_account;
private String debitCsAccount; // type="2" private Long debitLeg_accountId;
private String debitLegAccount; // type="2" private String debit_csAccount;
private Long creditLegDirection; // type="1" private String debitLeg_account;
private Long debitLegDirection; // type="1" private String creditLeg_direction;
private String creditLegCurrencyCode; // type="12" private String debitLeg_direction;
private String debitLegCurrencyCode; // type="12" private String creditLeg_currencyCode;
private LocalDate clearingDate; // type="6" private String debitLeg_currencyCode;
private String transactionStatus; // type="12" private Long creditLeg_securityId;
private String documentNumber; // type="2" private Long debitLeg_securityId;
private String transactionStatus;
private String documentNumber;
private LocalDate clearingDate;
private Long sessionId;
public Long getSenderId() { public Long getSenderId() {
return senderId; return senderId;
@ -49,6 +54,14 @@ public class PaymentInstruction extends BusinessObject {
this.addresseeId = addresseeId; this.addresseeId = addresseeId;
} }
public String getPayeeBic() {
return payeeBic;
}
public void setPayeeBic(String payeeBic) {
this.payeeBic = payeeBic;
}
public String getAdresseeBic() { public String getAdresseeBic() {
return adresseeBic; return adresseeBic;
} }
@ -65,14 +78,6 @@ public class PaymentInstruction extends BusinessObject {
this.payeeBankName = payeeBankName; this.payeeBankName = payeeBankName;
} }
public String getPayeeBic() {
return payeeBic;
}
public void setPayeeBic(String payeeBic) {
this.payeeBic = payeeBic;
}
public String getAddresseeBankName() { public String getAddresseeBankName() {
return addresseeBankName; return addresseeBankName;
} }
@ -105,108 +110,116 @@ public class PaymentInstruction extends BusinessObject {
this.settlementDate = settlementDate; this.settlementDate = settlementDate;
} }
public Long getCreditLegAmount() { public BigDecimal getCreditLeg_amount() {
return creditLegAmount; return creditLeg_amount;
} }
public void setCreditLegAmount(Long creditLegAmount) { public void setCreditLeg_amount(BigDecimal creditLeg_amount) {
this.creditLegAmount = creditLegAmount; this.creditLeg_amount = creditLeg_amount;
} }
public Long getDebitLegAmount() { public BigDecimal getDebitLeg_amount() {
return debitLegAmount; return debitLeg_amount;
} }
public void setDebitLegAmount(Long debitLegAmount) { public void setDebitLeg_amount(BigDecimal debitLeg_amount) {
this.debitLegAmount = debitLegAmount; this.debitLeg_amount = debitLeg_amount;
} }
public Long getCreditLegAccountId() { public Long getCreditLeg_accountId() {
return creditLegAccountId; return creditLeg_accountId;
} }
public void setCreditLegAccountId(Long creditLegAccountId) { public void setCreditLeg_accountId(Long creditLeg_accountId) {
this.creditLegAccountId = creditLegAccountId; this.creditLeg_accountId = creditLeg_accountId;
} }
public String getCreditCsAccount() { public String getCredit_csAccount() {
return creditCsAccount; return credit_csAccount;
} }
public void setCreditCsAccount(String creditCsAccount) { public void setCredit_csAccount(String credit_csAccount) {
this.creditCsAccount = creditCsAccount; this.credit_csAccount = credit_csAccount;
} }
public String getCreditLegAccount() { public String getCreditLeg_account() {
return creditLegAccount; return creditLeg_account;
} }
public void setCreditLegAccount(String creditLegAccount) { public void setCreditLeg_account(String creditLeg_account) {
this.creditLegAccount = creditLegAccount; this.creditLeg_account = creditLeg_account;
} }
public Long getDebitLegAccountId() { public Long getDebitLeg_accountId() {
return debitLegAccountId; return debitLeg_accountId;
} }
public void setDebitLegAccountId(Long debitLegAccountId) { public void setDebitLeg_accountId(Long debitLeg_accountId) {
this.debitLegAccountId = debitLegAccountId; this.debitLeg_accountId = debitLeg_accountId;
} }
public String getDebitCsAccount() { public String getDebit_csAccount() {
return debitCsAccount; return debit_csAccount;
} }
public void setDebitCsAccount(String debitCsAccount) { public void setDebit_csAccount(String debit_csAccount) {
this.debitCsAccount = debitCsAccount; this.debit_csAccount = debit_csAccount;
} }
public String getDebitLegAccount() { public String getDebitLeg_account() {
return debitLegAccount; return debitLeg_account;
} }
public void setDebitLegAccount(String debitLegAccount) { public void setDebitLeg_account(String debitLeg_account) {
this.debitLegAccount = debitLegAccount; this.debitLeg_account = debitLeg_account;
} }
public Long getCreditLegDirection() { public String getCreditLeg_direction() {
return creditLegDirection; return creditLeg_direction;
} }
public void setCreditLegDirection(Long creditLegDirection) { public void setCreditLeg_direction(String creditLeg_direction) {
this.creditLegDirection = creditLegDirection; this.creditLeg_direction = creditLeg_direction;
} }
public Long getDebitLegDirection() { public String getDebitLeg_direction() {
return debitLegDirection; return debitLeg_direction;
} }
public void setDebitLegDirection(Long debitLegDirection) { public void setDebitLeg_direction(String debitLeg_direction) {
this.debitLegDirection = debitLegDirection; this.debitLeg_direction = debitLeg_direction;
} }
public String getCreditLegCurrencyCode() { public String getCreditLeg_currencyCode() {
return creditLegCurrencyCode; return creditLeg_currencyCode;
} }
public void setCreditLegCurrencyCode(String creditLegCurrencyCode) { public void setCreditLeg_currencyCode(String creditLeg_currencyCode) {
this.creditLegCurrencyCode = creditLegCurrencyCode; this.creditLeg_currencyCode = creditLeg_currencyCode;
} }
public String getDebitLegCurrencyCode() { public String getDebitLeg_currencyCode() {
return debitLegCurrencyCode; return debitLeg_currencyCode;
} }
public void setDebitLegCurrencyCode(String debitLegCurrencyCode) { public void setDebitLeg_currencyCode(String debitLeg_currencyCode) {
this.debitLegCurrencyCode = debitLegCurrencyCode; this.debitLeg_currencyCode = debitLeg_currencyCode;
} }
public LocalDate getClearingDate() { public Long getCreditLeg_securityId() {
return clearingDate; return creditLeg_securityId;
} }
public void setClearingDate(LocalDate clearingDate) { public void setCreditLeg_securityId(Long creditLeg_securityId) {
this.clearingDate = clearingDate; this.creditLeg_securityId = creditLeg_securityId;
}
public Long getDebitLeg_securityId() {
return debitLeg_securityId;
}
public void setDebitLeg_securityId(Long debitLeg_securityId) {
this.debitLeg_securityId = debitLeg_securityId;
} }
public String getTransactionStatus() { public String getTransactionStatus() {
@ -224,4 +237,20 @@ public class PaymentInstruction extends BusinessObject {
public void setDocumentNumber(String documentNumber) { public void setDocumentNumber(String documentNumber) {
this.documentNumber = documentNumber; this.documentNumber = documentNumber;
} }
public LocalDate getClearingDate() {
return clearingDate;
}
public void setClearingDate(LocalDate clearingDate) {
this.clearingDate = clearingDate;
}
public Long getSessionId() {
return sessionId;
}
public void setSessionId(Long sessionId) {
this.sessionId = sessionId;
}
} }

153
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/AdmittedDealRegister.java
View file

@ -1,153 +0,0 @@
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.Instant;
import java.time.LocalDate;
/**
* Реестр сделок допущенных к клирингу
* <p>
* DB table: ADMITTED_DEAL_REGISTER
**/
public class AdmittedDealRegister extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private Long executionId;
private String companyFullName;
private LocalDate tradingDate;
private Long exchangeExecutionId;
private Instant exchangeExecutionTime;
private String securitySymbol;
private String securityFullName;
private String sellerFullName;
private String sellerClearingCode;
private String sellerAccount;
private String buyerFullName;
private String buyerClearingCode;
private String buyerAccount;
private BigDecimal amount;
private LocalDate clearingDate;
public Long getExecutionId() {
return executionId;
}
public void setExecutionId(Long executionId) {
this.executionId = executionId;
}
public String getCompanyFullName() {
return companyFullName;
}
public void setCompanyFullName(String companyFullName) {
this.companyFullName = companyFullName;
}
public LocalDate getTradingDate() {
return tradingDate;
}
public void setTradingDate(LocalDate tradingDate) {
this.tradingDate = tradingDate;
}
public Long getExchangeExecutionId() {
return exchangeExecutionId;
}
public void setExchangeExecutionId(Long exchangeExecutionId) {
this.exchangeExecutionId = exchangeExecutionId;
}
public Instant getExchangeExecutionTime() {
return exchangeExecutionTime;
}
public void setExchangeExecutionTime(Instant exchangeExecutionTime) {
this.exchangeExecutionTime = exchangeExecutionTime;
}
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 String getSellerFullName() {
return sellerFullName;
}
public void setSellerFullName(String sellerFullName) {
this.sellerFullName = sellerFullName;
}
public String getSellerClearingCode() {
return sellerClearingCode;
}
public void setSellerClearingCode(String sellerClearingCode) {
this.sellerClearingCode = sellerClearingCode;
}
public String getSellerAccount() {
return sellerAccount;
}
public void setSellerAccount(String sellerAccount) {
this.sellerAccount = sellerAccount;
}
public String getBuyerFullName() {
return buyerFullName;
}
public void setBuyerFullName(String buyerFullName) {
this.buyerFullName = buyerFullName;
}
public String getBuyerClearingCode() {
return buyerClearingCode;
}
public void setBuyerClearingCode(String buyerClearingCode) {
this.buyerClearingCode = buyerClearingCode;
}
public String getBuyerAccount() {
return buyerAccount;
}
public void setBuyerAccount(String buyerAccount) {
this.buyerAccount = buyerAccount;
}
public BigDecimal getAmount() {
return amount;
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
public LocalDate getClearingDate() {
return clearingDate;
}
public void setClearingDate(LocalDate clearingDate) {
this.clearingDate = clearingDate;
}
}

92
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/AdmittedLiabilitiesRegister.java Normal file
View file

@ -0,0 +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;
}
}

41
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ClearMemberRegisterChange.java
View file

@ -1,41 +0,0 @@
package ru.clearing.classes.statics.data.register;
import ru.clearing.classes.ConstSerializable;
import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.time.Instant;
/**
* Журнал изменений информации участников клиринга
**/
public class ClearMemberRegisterChange extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private Instant date;
private String comment;
private String clearingCode;
public Instant getDate() {
return date;
}
public void setDate(Instant date) {
this.date = date;
}
public String getComment() {
return comment;
}
public void setComment(String comment) {
this.comment = comment;
}
public String getClearingCode() {
return clearingCode;
}
public void setClearingCode(String clearingCode) {
this.clearingCode = clearingCode;
}
}

6
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ContractRegister.java
View file

@ -11,7 +11,7 @@ public class ContractRegister extends BusinessObject {
private String name; private String name;
private String number; private String number;
private LocalDate issueDate; private LocalDate issueDate;
private Long companyFullName; private String companyFullName;
private Long companyId; private Long companyId;
private String documentType; private String documentType;
private String issuePlace; private String issuePlace;
@ -47,11 +47,11 @@ public class ContractRegister extends BusinessObject {
this.issueDate = issueDate; this.issueDate = issueDate;
} }
public Long getCompanyFullName() { public String getCompanyFullName() {
return companyFullName; return companyFullName;
} }
public void setCompanyFullName(Long companyFullName) { public void setCompanyFullName(String companyFullName) {
this.companyFullName = companyFullName; this.companyFullName = companyFullName;
} }

148
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/CoveredDealRegister.java
View file

@ -1,148 +0,0 @@
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.Instant;
import java.time.LocalDate;
public class CoveredDealRegister extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private Long executionId;
private String companyFullName;
private LocalDate tradingDate;
private Long exchangeExecutionId;
private Instant exchangeExecutionTime;
private String securitySymbol;
private String securityFullName;
private String sellerFullName;
private String sellerClearingCode;
private String sellerAccount;
private String buyerFullName;
private String buyerClearingCode;
private String buyerAccount;
private BigDecimal amount;
private LocalDate clearingDate;
public Long getExecutionId() {
return executionId;
}
public void setExecutionId(Long executionId) {
this.executionId = executionId;
}
public String getCompanyFullName() {
return companyFullName;
}
public void setCompanyFullName(String companyFullName) {
this.companyFullName = companyFullName;
}
public LocalDate getTradingDate() {
return tradingDate;
}
public void setTradingDate(LocalDate tradingDate) {
this.tradingDate = tradingDate;
}
public Long getExchangeExecutionId() {
return exchangeExecutionId;
}
public void setExchangeExecutionId(Long exchangeExecutionId) {
this.exchangeExecutionId = exchangeExecutionId;
}
public Instant getExchangeExecutionTime() {
return exchangeExecutionTime;
}
public void setExchangeExecutionTime(Instant exchangeExecutionTime) {
this.exchangeExecutionTime = exchangeExecutionTime;
}
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 String getSellerFullName() {
return sellerFullName;
}
public void setSellerFullName(String sellerFullName) {
this.sellerFullName = sellerFullName;
}
public String getSellerClearingCode() {
return sellerClearingCode;
}
public void setSellerClearingCode(String sellerClearingCode) {
this.sellerClearingCode = sellerClearingCode;
}
public String getSellerAccount() {
return sellerAccount;
}
public void setSellerAccount(String sellerAccount) {
this.sellerAccount = sellerAccount;
}
public String getBuyerFullName() {
return buyerFullName;
}
public void setBuyerFullName(String buyerFullName) {
this.buyerFullName = buyerFullName;
}
public String getBuyerClearingCode() {
return buyerClearingCode;
}
public void setBuyerClearingCode(String buyerClearingCode) {
this.buyerClearingCode = buyerClearingCode;
}
public String getBuyerAccount() {
return buyerAccount;
}
public void setBuyerAccount(String buyerAccount) {
this.buyerAccount = buyerAccount;
}
public BigDecimal getAmount() {
return amount;
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
public LocalDate getClearingDate() {
return clearingDate;
}
public void setClearingDate(LocalDate clearingDate) {
this.clearingDate = clearingDate;
}
}

101
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/CoveredLiabilitiesRegister.java Normal file
View file

@ -0,0 +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;
/**
* Реестр обязательств, прошедших процедуру контроля обеспечения
* <p>
* 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;
}
}

190
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DealRegister.java
View file

@ -1,190 +0,0 @@
package ru.clearing.classes.statics.data.register;
import ru.clearing.classes.objects.BusinessObject;
import java.math.BigDecimal;
import java.time.Instant;
import java.time.LocalDate;
public class DealRegister extends BusinessObject {
private Long executionId;
private Long exchangeExecutionId;
private Instant exchangeExecutionTime;
private LocalDate tradingDate;
private String account;
private String market;
private BigDecimal price;
private BigDecimal amount;
private String side;
private String settlementCurrency;
private Long companyId;
private LocalDate firstLegSettlementDate;
private LocalDate secondLegSettlementDate;
private String securityFullName;
private String securitySymbol;
private Long securityId;
private Long counterPartyId;
private String coverageStatus;
private Long sessionId;
private LocalDate clearingDate;
public Long getExecutionId() {
return executionId;
}
public void setExecutionId(Long executionId) {
this.executionId = executionId;
}
public Long getExchangeExecutionId() {
return exchangeExecutionId;
}
public void setExchangeExecutionId(Long exchangeExecutionId) {
this.exchangeExecutionId = exchangeExecutionId;
}
public Instant getExchangeExecutionTime() {
return exchangeExecutionTime;
}
public void setExchangeExecutionTime(Instant exchangeExecutionTime) {
this.exchangeExecutionTime = exchangeExecutionTime;
}
public LocalDate getTradingDate() {
return tradingDate;
}
public void setTradingDate(LocalDate tradingDate) {
this.tradingDate = tradingDate;
}
public String getAccount() {
return account;
}
public void setAccount(String account) {
this.account = account;
}
public String getMarket() {
return market;
}
public void setMarket(String market) {
this.market = market;
}
public BigDecimal getPrice() {
return price;
}
public void setPrice(BigDecimal price) {
this.price = price;
}
public BigDecimal getAmount() {
return amount;
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
public String getSide() {
return side;
}
public void setSide(String side) {
this.side = side;
}
public String getSettlementCurrency() {
return settlementCurrency;
}
public void setSettlementCurrency(String settlementCurrency) {
this.settlementCurrency = settlementCurrency;
}
public Long getCompanyId() {
return companyId;
}
public void setCompanyId(Long companyId) {
this.companyId = companyId;
}
public LocalDate getFirstLegSettlementDate() {
return firstLegSettlementDate;
}
public void setFirstLegSettlementDate(LocalDate firstLegSettlementDate) {
this.firstLegSettlementDate = firstLegSettlementDate;
}
public LocalDate getSecondLegSettlementDate() {
return secondLegSettlementDate;
}
public void setSecondLegSettlementDate(LocalDate secondLegSettlementDate) {
this.secondLegSettlementDate = secondLegSettlementDate;
}
public String getSecurityFullName() {
return securityFullName;
}
public void setSecurityFullName(String securityFullName) {
this.securityFullName = securityFullName;
}
public String getSecuritySymbol() {
return securitySymbol;
}
public void setSecuritySymbol(String securitySymbol) {
this.securitySymbol = securitySymbol;
}
public Long getSecurityId() {
return securityId;
}
public void setSecurityId(Long securityId) {
this.securityId = securityId;
}
public Long getCounterPartyId() {
return counterPartyId;
}
public void setCounterPartyId(Long counterPartyId) {
this.counterPartyId = counterPartyId;
}
public String getCoverageStatus() {
return coverageStatus;
}
public void setCoverageStatus(String coverageStatus) {
this.coverageStatus = coverageStatus;
}
public Long getSessionId() {
return sessionId;
}
public void setSessionId(Long sessionId) {
this.sessionId = sessionId;
}
public LocalDate getClearingDate() {
return clearingDate;
}
public void setClearingDate(LocalDate clearingDate) {
this.clearingDate = clearingDate;
}
}

60
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoBalanceRegister.java Normal file
View file

@ -0,0 +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;
}
}

73
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/DepoPaymentInstructionRegister.java Normal file
View file

@ -0,0 +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;
}
}

124
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExcludeLiabilitiesRegister.java Normal file
View file

@ -0,0 +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;
}
}

157
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ExecutionRegister.java Normal file
View file

@ -0,0 +1,157 @@
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: EXECUTION_REGISTER
**/
public class ExecutionRegister extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private LocalDate tradingDate;
private Long exchangeExecutionId;
private Instant exchangeExecutionTime;
private Long securityId;
private Long sellerId;
private String sellerClearingCode;
private String sellerTradingClearingRegister;
private String sellerMoneyAccount;
private String sellerDepoAccount;
private Long buyerId;
private String buyerClearingCode;
private String buyerTradingClearingRegister;
private String buyerMoneyAccount;
private String buyerDepoAccount;
private BigDecimal amount;
private BigDecimal quantity;
private LocalDate clearingDate;
public LocalDate getTradingDate() {
return tradingDate;
}
public void setTradingDate(LocalDate value) {
this.tradingDate=value;
}
public Long getExchangeExecutionId() {
return exchangeExecutionId;
}
public void setExchangeExecutionId(Long value) {
this.exchangeExecutionId=value;
}
public Instant getExchangeExecutionTime() {
return exchangeExecutionTime;
}
public void setExchangeExecutionTime(Instant value) {
this.exchangeExecutionTime=value;
}
public Long getSecurityId() {
return securityId;
}
public void setSecurityId(Long value) {
this.securityId=value;
}
public Long getSellerId() {
return sellerId;
}
public void setSellerId(Long value) {
this.sellerId=value;
}
public String getSellerClearingCode() {
return sellerClearingCode;
}
public void setSellerClearingCode(String value) {
this.sellerClearingCode=value;
}
public String getSellerTradingClearingRegister() {
return sellerTradingClearingRegister;
}
public void setSellerTradingClearingRegister(String value) {
this.sellerTradingClearingRegister=value;
}
public String getSellerMoneyAccount() {
return sellerMoneyAccount;
}
public void setSellerMoneyAccount(String value) {
this.sellerMoneyAccount=value;
}
public String getSellerDepoAccount() {
return sellerDepoAccount;
}
public void setSellerDepoAccount(String value) {
this.sellerDepoAccount=value;
}
public Long getBuyerId() {
return buyerId;
}
public void setBuyerId(Long value) {
this.buyerId=value;
}
public String getBuyerClearingCode() {
return buyerClearingCode;
}
public void setBuyerClearingCode(String value) {
this.buyerClearingCode=value;
}
public String getBuyerTradingClearingRegister() {
return buyerTradingClearingRegister;
}
public void setBuyerTradingClearingRegister(String value) {
this.buyerTradingClearingRegister=value;
}
public String getBuyerMoneyAccount() {
return buyerMoneyAccount;
}
public void setBuyerMoneyAccount(String value) {
this.buyerMoneyAccount=value;
}
public String getBuyerDepoAccount() {
return buyerDepoAccount;
}
public void setBuyerDepoAccount(String value) {
this.buyerDepoAccount=value;
}
public BigDecimal getAmount() {
return amount;
}
public void setAmount(BigDecimal value) {
this.amount=value;
}
public BigDecimal getQuantity() {
return quantity;
}
public void setQuantity(BigDecimal value) {
this.quantity=value;
}
public LocalDate getClearingDate() {
return clearingDate;
}
public void setClearingDate(LocalDate value) {
this.clearingDate=value;
}
}

123
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/LiabilitiesRegister.java Normal file
View file

@ -0,0 +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;
}
}

97
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyBalanceRegister.java Normal file
View file

@ -0,0 +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;
}
}

74
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/MoneyPaymentInstructionRegister.java Normal file
View file

@ -0,0 +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;
}
}

93
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/OrderRegister.java
View file

@ -1,93 +0,0 @@
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;
public class OrderRegister extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String creditLegAccount;
private BigDecimal creditLegAmount;
private String creditLegCurrencyCode;
private Long creditLegDirection;
private String debitLegAccount;
private String sender;
private String addressee;
private String documentNumber;
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 Long getCreditLegDirection() {
return creditLegDirection;
}
public void setCreditLegDirection(Long creditLegDirection) {
this.creditLegDirection = creditLegDirection;
}
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 String getDocumentNumber() {
return documentNumber;
}
public void setDocumentNumber(String documentNumber) {
this.documentNumber = documentNumber;
}
public LocalDate getClearingDate() {
return clearingDate;
}
public void setClearingDate(LocalDate clearingDate) {
this.clearingDate = clearingDate;
}
}

3
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/ReportRegister.java
View file

@ -5,6 +5,9 @@ import ru.clearing.classes.objects.BusinessObject;
import java.time.LocalDate; import java.time.LocalDate;
/**
* DB table: REPORT_REGISTER
*/
public class ReportRegister extends BusinessObject { public class ReportRegister extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;

157
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/register/UncoveredDealRegister.java
View file

@ -1,157 +0,0 @@
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.Instant;
import java.time.LocalDate;
public class UncoveredDealRegister extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private Long executionId;
private String companyFullName;
private LocalDate tradingDate;
private Long exchangeExecutionId;
private Instant exchangeExecutionTime;
private String securitySymbol;
private String securityFullName;
private String sellerFullName;
private String sellerClearingCode;
private String sellerAccount;
private String buyerFullName;
private String buyerClearingCode;
private String buyerAccount;
private BigDecimal amount;
private String resultStatus;
private LocalDate clearingDate;
public Long getExecutionId() {
return executionId;
}
public void setExecutionId(Long executionId) {
this.executionId = executionId;
}
public String getCompanyFullName() {
return companyFullName;
}
public void setCompanyFullName(String companyFullName) {
this.companyFullName = companyFullName;
}
public LocalDate getTradingDate() {
return tradingDate;
}
public void setTradingDate(LocalDate tradingDate) {
this.tradingDate = tradingDate;
}
public Long getExchangeExecutionId() {
return exchangeExecutionId;
}
public void setExchangeExecutionId(Long exchangeExecutionId) {
this.exchangeExecutionId = exchangeExecutionId;
}
public Instant getExchangeExecutionTime() {
return exchangeExecutionTime;
}
public void setExchangeExecutionTime(Instant exchangeExecutionTime) {
this.exchangeExecutionTime = exchangeExecutionTime;
}
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 String getSellerFullName() {
return sellerFullName;
}
public void setSellerFullName(String sellerFullName) {
this.sellerFullName = sellerFullName;
}
public String getSellerClearingCode() {
return sellerClearingCode;
}
public void setSellerClearingCode(String sellerClearingCode) {
this.sellerClearingCode = sellerClearingCode;
}
public String getSellerAccount() {
return sellerAccount;
}
public void setSellerAccount(String sellerAccount) {
this.sellerAccount = sellerAccount;
}
public String getBuyerFullName() {
return buyerFullName;
}
public void setBuyerFullName(String buyerFullName) {
this.buyerFullName = buyerFullName;
}
public String getBuyerClearingCode() {
return buyerClearingCode;
}
public void setBuyerClearingCode(String buyerClearingCode) {
this.buyerClearingCode = buyerClearingCode;
}
public String getBuyerAccount() {
return buyerAccount;
}
public void setBuyerAccount(String buyerAccount) {
this.buyerAccount = buyerAccount;
}
public BigDecimal getAmount() {
return amount;
}
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
public String getResultStatus() {
return resultStatus;
}
public void setResultStatus(String resultStatus) {
this.resultStatus = resultStatus;
}
public LocalDate getClearingDate() {
return clearingDate;
}
public void setClearingDate(LocalDate clearingDate) {
this.clearingDate = clearingDate;
}
}

218
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/registry/Registry.java
View file

@ -1,6 +1,7 @@
package ru.clearing.classes.statics.data.registry; package ru.clearing.classes.statics.data.registry;
import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.ConstSerializable;
import ru.clearing.classes.objects.BusinessObject;
import ru.spcex.platform.classes.base.SpcexObjectBase; import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -12,7 +13,7 @@ import java.time.LocalDate;
* <p> * <p>
* DB table: REGISTRY * DB table: REGISTRY
**/ **/
public class Registry extends SpcexObjectBase { public class Registry extends BusinessObject {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private Long companyId; private Long companyId;
@ -32,6 +33,7 @@ public class Registry extends SpcexObjectBase {
private String tradingClearingRegistry; private String tradingClearingRegistry;
private String registryStatus; private String registryStatus;
private Long securityId; private Long securityId;
private String securitySymbol;
private BigDecimal balance; private BigDecimal balance;
private BigDecimal openBalance; private BigDecimal openBalance;
private BigDecimal closeBalance; private BigDecimal closeBalance;
@ -56,370 +58,358 @@ public class Registry extends SpcexObjectBase {
private Long parentId; private Long parentId;
private Long groupId; private Long groupId;
private Long sessionId; private Long sessionId;
private String sessionType;
private Long paymentId; private Long paymentId;
private Long refundPaymentId;
// (in parent) private Long id;
private Instant createdAt;
private Instant updatedAt;
public Long getCompanyId() { public Long getCompanyId() {
return companyId; return companyId;
} }
public void setCompanyId(Long value) { public void setCompanyId(Long companyId) {
this.companyId = value; this.companyId = companyId;
} }
public String getTradingCode() { public String getTradingCode() {
return tradingCode; return tradingCode;
} }
public void setTradingCode(String value) { public void setTradingCode(String tradingCode) {
this.tradingCode = value; this.tradingCode = tradingCode;
} }
public String getClearingCode() { public String getClearingCode() {
return clearingCode; return clearingCode;
} }
public void setClearingCode(String value) { public void setClearingCode(String clearingCode) {
this.clearingCode = value; this.clearingCode = clearingCode;
} }
public String getShortName() { public String getShortName() {
return shortName; return shortName;
} }
public void setShortName(String value) { public void setShortName(String shortName) {
this.shortName = value; this.shortName = shortName;
} }
public String getFullName() { public String getFullName() {
return fullName; return fullName;
} }
public void setFullName(String value) { public void setFullName(String fullName) {
this.fullName = value; this.fullName = fullName;
} }
public Long getAccountId() { public Long getAccountId() {
return accountId; return accountId;
} }
public void setAccountId(Long value) { public void setAccountId(Long accountId) {
this.accountId = value; this.accountId = accountId;
} }
public String getAccountType() { public String getAccountType() {
return accountType; return accountType;
} }
public void setAccountType(String value) { public void setAccountType(String accountType) {
this.accountType = value; this.accountType = accountType;
} }
public String getAccount() { public String getAccount() {
return account; return account;
} }
public void setAccount(String value) { public void setAccount(String account) {
this.account = value; this.account = account;
} }
public String getRegistryDesignation() { public String getRegistryDesignation() {
return registryDesignation; return registryDesignation;
} }
public void setRegistryDesignation(String value) { public void setRegistryDesignation(String registryDesignation) {
this.registryDesignation = value; this.registryDesignation = registryDesignation;
} }
public String getRegistryInstrumentType() { public String getRegistryInstrumentType() {
return registryInstrumentType; return registryInstrumentType;
} }
public void setRegistryInstrumentType(String value) { public void setRegistryInstrumentType(String registryInstrumentType) {
this.registryInstrumentType = value; this.registryInstrumentType = registryInstrumentType;
} }
public String getRegistryCapacity() { public String getRegistryCapacity() {
return registryCapacity; return registryCapacity;
} }
public void setRegistryCapacity(String value) { public void setRegistryCapacity(String registryCapacity) {
this.registryCapacity = value; this.registryCapacity = registryCapacity;
} }
public String getRegistryUnit() { public String getRegistryUnit() {
return registryUnit; return registryUnit;
} }
public void setRegistryUnit(String value) { public void setRegistryUnit(String registryUnit) {
this.registryUnit = value; this.registryUnit = registryUnit;
} }
public String getRegistryCode() { public String getRegistryCode() {
return registryCode; return registryCode;
} }
public void setRegistryCode(String value) { public void setRegistryCode(String registryCode) {
this.registryCode = value; this.registryCode = registryCode;
} }
public Long getTradingClearingRegistryId() { public Long getTradingClearingRegistryId() {
return tradingClearingRegistryId; return tradingClearingRegistryId;
} }
public void setTradingClearingRegistryId(Long value) { public void setTradingClearingRegistryId(Long tradingClearingRegistryId) {
this.tradingClearingRegistryId = value; this.tradingClearingRegistryId = tradingClearingRegistryId;
} }
public String getTradingClearingRegistry() { public String getTradingClearingRegistry() {
return tradingClearingRegistry; return tradingClearingRegistry;
} }
public void setTradingClearingRegistry(String value) { public void setTradingClearingRegistry(String tradingClearingRegistry) {
this.tradingClearingRegistry = value; this.tradingClearingRegistry = tradingClearingRegistry;
} }
public String getRegistryStatus() { public String getRegistryStatus() {
return registryStatus; return registryStatus;
} }
public void setRegistryStatus(String value) { public void setRegistryStatus(String registryStatus) {
this.registryStatus = value; this.registryStatus = registryStatus;
} }
public Long getSecurityId() { public Long getSecurityId() {
return securityId; return securityId;
} }
public void setSecurityId(Long value) { public void setSecurityId(Long securityId) {
this.securityId = value; this.securityId = securityId;
}
public String getSecuritySymbol() {
return securitySymbol;
}
public void setSecuritySymbol(String securitySymbol) {
this.securitySymbol = securitySymbol;
} }
public BigDecimal getBalance() { public BigDecimal getBalance() {
return balance; return balance;
} }
public void setBalance(BigDecimal value) { public void setBalance(BigDecimal balance) {
this.balance = value; this.balance = balance;
} }
public BigDecimal getOpenBalance() { public BigDecimal getOpenBalance() {
return openBalance; return openBalance;
} }
public void setOpenBalance(BigDecimal value) { public void setOpenBalance(BigDecimal openBalance) {
this.openBalance = value; this.openBalance = openBalance;
} }
public BigDecimal getCloseBalance() { public BigDecimal getCloseBalance() {
return closeBalance; return closeBalance;
} }
public void setCloseBalance(BigDecimal value) { public void setCloseBalance(BigDecimal closeBalance) {
this.closeBalance = value; this.closeBalance = closeBalance;
} }
public BigDecimal getCredit() { public BigDecimal getCredit() {
return credit; return credit;
} }
public void setCredit(BigDecimal value) { public void setCredit(BigDecimal credit) {
this.credit = value; this.credit = credit;
} }
public BigDecimal getDebit() { public BigDecimal getDebit() {
return debit; return debit;
} }
public void setDebit(BigDecimal value) { public void setDebit(BigDecimal debit) {
this.debit = value; this.debit = debit;
} }
public BigDecimal getSettledCredit() { public BigDecimal getSettledCredit() {
return settledCredit; return settledCredit;
} }
public void setSettledCredit(BigDecimal value) { public void setSettledCredit(BigDecimal settledCredit) {
this.settledCredit = value; this.settledCredit = settledCredit;
} }
public BigDecimal getSettledDebit() { public BigDecimal getSettledDebit() {
return settledDebit; return settledDebit;
} }
public void setSettledDebit(BigDecimal value) { public void setSettledDebit(BigDecimal settledDebit) {
this.settledDebit = value; this.settledDebit = settledDebit;
} }
public BigDecimal getCheckBalance() { public BigDecimal getCheckBalance() {
return checkBalance; return checkBalance;
} }
public void setCheckBalance(BigDecimal value) { public void setCheckBalance(BigDecimal checkBalance) {
this.checkBalance = value; this.checkBalance = checkBalance;
} }
public BigDecimal getDiffBalance() { public BigDecimal getDiffBalance() {
return diffBalance; return diffBalance;
} }
public void setDiffBalance(BigDecimal value) { public void setDiffBalance(BigDecimal diffBalance) {
this.diffBalance = value; this.diffBalance = diffBalance;
} }
public BigDecimal getPlanBalance() { public BigDecimal getPlanBalance() {
return planBalance; return planBalance;
} }
public void setPlanBalance(BigDecimal value) { public void setPlanBalance(BigDecimal planBalance) {
this.planBalance = value; this.planBalance = planBalance;
} }
public String getBalanceDimension() { public String getBalanceDimension() {
return balanceDimension; return balanceDimension;
} }
public void setBalanceDimension(String value) { public void setBalanceDimension(String balanceDimension) {
this.balanceDimension = value; this.balanceDimension = balanceDimension;
} }
public LocalDate getSettlementDate() { public LocalDate getSettlementDate() {
return settlementDate; return settlementDate;
} }
public void setSettlementDate(LocalDate value) { public void setSettlementDate(LocalDate settlementDate) {
this.settlementDate = value; this.settlementDate = settlementDate;
} }
public String getSettlementCode() { public String getSettlementCode() {
return settlementCode; return settlementCode;
} }
public void setSettlementCode(String value) { public void setSettlementCode(String settlementCode) {
this.settlementCode = value; this.settlementCode = settlementCode;
} }
public LocalDate getTradingDate() { public LocalDate getTradingDate() {
return tradingDate; return tradingDate;
} }
public void setTradingDate(LocalDate value) { public void setTradingDate(LocalDate tradingDate) {
this.tradingDate = value; this.tradingDate = tradingDate;
} }
public LocalDate getClearingDate() { public LocalDate getClearingDate() {
return clearingDate; return clearingDate;
} }
public void setClearingDate(LocalDate value) { public void setClearingDate(LocalDate clearingDate) {
this.clearingDate = value; this.clearingDate = clearingDate;
} }
public LocalDate getRefundDate() { public LocalDate getRefundDate() {
return refundDate; return refundDate;
} }
public void setRefundDate(LocalDate value) { public void setRefundDate(LocalDate refundDate) {
this.refundDate = value; this.refundDate = refundDate;
} }
public LocalDate getValueDate() { public LocalDate getValueDate() {
return valueDate; return valueDate;
} }
public void setValueDate(LocalDate value) { public void setValueDate(LocalDate valueDate) {
this.valueDate = value; this.valueDate = valueDate;
} }
public BigDecimal getPrice() { public BigDecimal getPrice() {
return price; return price;
} }
public void setPrice(BigDecimal value) { public void setPrice(BigDecimal price) {
this.price = value; this.price = price;
} }
public String getContract() { public String getContract() {
return contract; return contract;
} }
public void setContract(String value) { public void setContract(String contract) {
this.contract = value; this.contract = contract;
} }
public Long getCounterPartyId() { public Long getCounterPartyId() {
return counterPartyId; return counterPartyId;
} }
public void setCounterPartyId(Long value) { public void setCounterPartyId(Long counterPartyId) {
this.counterPartyId = value; this.counterPartyId = counterPartyId;
} }
public String getComment() { public String getComment() {
return comment; return comment;
} }
public void setComment(String value) { public void setComment(String comment) {
this.comment = value; this.comment = comment;
} }
public Long getParentId() { public Long getParentId() {
return parentId; return parentId;
} }
public void setParentId(Long value) { public void setParentId(Long parentId) {
this.parentId = value; this.parentId = parentId;
} }
public Long getGroupId() { public Long getGroupId() {
return groupId; return groupId;
} }
public void setGroupId(Long value) { public void setGroupId(Long groupId) {
this.groupId = value; this.groupId = groupId;
} }
public Long getSessionId() { public Long getSessionId() {
return sessionId; return sessionId;
} }
public void setSessionId(Long value) { public void setSessionId(Long sessionId) {
this.sessionId = value; this.sessionId = sessionId;
}
public String getSessionType() {
return sessionType;
}
public void setSessionType(String sessionType) {
this.sessionType = sessionType;
} }
public Long getPaymentId() { public Long getPaymentId() {
return paymentId; return paymentId;
} }
public void setPaymentId(Long value) { public void setPaymentId(Long paymentId) {
this.paymentId = value; this.paymentId = paymentId;
} }
public Long getRefundPaymentId() {
return refundPaymentId;
}
public void setRefundPaymentId(Long value) {
this.refundPaymentId = value;
}
public Instant getCreatedAt() {
return createdAt;
}
public void setCreatedAt(Instant value) {
this.createdAt = value;
}
public Instant getUpdatedAt() {
return updatedAt;
}
public void setUpdatedAt(Instant value) {
this.updatedAt = value;
}
} }

54
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Planner.java
View file

@ -18,6 +18,8 @@ public class Planner extends BusinessObject {
private LocalTime taskTime; private LocalTime taskTime;
private LocalDate clearingDate; private LocalDate clearingDate;
private String market; private String market;
private String section;
private String sessionType;
private String taskStatus; private String taskStatus;
private Long companyId; private Long companyId;
private Long securityId; private Long securityId;
@ -27,48 +29,56 @@ public class Planner extends BusinessObject {
return task; return task;
} }
public void setTask(String value) { public void setTask(String task) {
this.task = value; this.task = task;
} }
public LocalTime getTaskTime() { public LocalTime getTaskTime() {
return taskTime; return taskTime;
} }
public void setTaskTime(LocalTime value) { public void setTaskTime(LocalTime taskTime) {
this.taskTime = value; this.taskTime = taskTime;
} }
public LocalDate getClearingDate() { public LocalDate getClearingDate() {
return clearingDate; return clearingDate;
} }
public void setClearingDate(LocalDate value) { public void setClearingDate(LocalDate clearingDate) {
this.clearingDate = value; this.clearingDate = clearingDate;
} }
public String getMarket() { public String getMarket() {
return market; return market;
} }
public void setMarket(String value) { public void setMarket(String market) {
this.market = value; this.market = market;
}
public String getSection() {
return section;
}
public void setSection(String section) {
this.section = section;
}
public String getSessionType() {
return sessionType;
}
public void setSessionType(String sessionType) {
this.sessionType = sessionType;
} }
public String getTaskStatus() { public String getTaskStatus() {
return taskStatus; return taskStatus;
} }
public void setTaskStatus(String value) { public void setTaskStatus(String taskStatus) {
this.taskStatus = value; this.taskStatus = taskStatus;
}
public Long getSecurityId() {
return securityId;
}
public void setSecurityId(Long value) {
this.securityId = value;
} }
public Long getCompanyId() { public Long getCompanyId() {
@ -78,4 +88,12 @@ public class Planner extends BusinessObject {
public void setCompanyId(Long companyId) { public void setCompanyId(Long companyId) {
this.companyId = companyId; this.companyId = companyId;
} }
public Long getSecurityId() {
return securityId;
}
public void setSecurityId(Long securityId) {
this.securityId = securityId;
}
} }

86
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerAllToday.java
View file

@ -18,6 +18,8 @@ public class PlannerAllToday extends SpcexObjectBase {
private LocalTime taskTime; private LocalTime taskTime;
private LocalDate clearingDate; private LocalDate clearingDate;
private String market; private String market;
private String section;
private String sessionType;
private String taskStatus; private String taskStatus;
private Long companyId; private Long companyId;
private Long securityId; private Long securityId;
@ -28,64 +30,56 @@ public class PlannerAllToday extends SpcexObjectBase {
return task; return task;
} }
public void setTask(String value) { public void setTask(String task) {
this.task = value; this.task = task;
} }
public LocalTime getTaskTime() { public LocalTime getTaskTime() {
return taskTime; return taskTime;
} }
public void setTaskTime(LocalTime value) { public void setTaskTime(LocalTime taskTime) {
this.taskTime = value; this.taskTime = taskTime;
} }
public LocalDate getClearingDate() { public LocalDate getClearingDate() {
return clearingDate; return clearingDate;
} }
public void setClearingDate(LocalDate value) { public void setClearingDate(LocalDate clearingDate) {
this.clearingDate = value; this.clearingDate = clearingDate;
} }
public String getMarket() { public String getMarket() {
return market; return market;
} }
public void setMarket(String value) { public void setMarket(String market) {
this.market = value; this.market = market;
}
public String getSection() {
return section;
}
public void setSection(String section) {
this.section = section;
}
public String getSessionType() {
return sessionType;
}
public void setSessionType(String sessionType) {
this.sessionType = sessionType;
} }
public String getTaskStatus() { public String getTaskStatus() {
return taskStatus; return taskStatus;
} }
public void setTaskStatus(String value) { public void setTaskStatus(String taskStatus) {
this.taskStatus = value; this.taskStatus = taskStatus;
}
public Long getSecurityId() {
return securityId;
}
public void setSecurityId(Long value) {
this.securityId = value;
}
public String getParent() {
return parent;
}
public void setParent(String value) {
this.parent = value;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long value) {
this.parentId = value;
} }
public Long getCompanyId() { public Long getCompanyId() {
@ -95,4 +89,28 @@ public class PlannerAllToday extends SpcexObjectBase {
public void setCompanyId(Long companyId) { public void setCompanyId(Long companyId) {
this.companyId = companyId; this.companyId = companyId;
} }
public Long getSecurityId() {
return securityId;
}
public void setSecurityId(Long securityId) {
this.securityId = securityId;
}
public String getParent() {
return parent;
}
public void setParent(String parent) {
this.parent = parent;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
} }

39
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerTemplate.java
View file

@ -15,6 +15,9 @@ public class PlannerTemplate extends BusinessObject {
private String task; private String task;
private LocalTime taskTime; private LocalTime taskTime;
private String market;
private String section;
private String sessionType;
private String taskStatus; private String taskStatus;
private Long companyId; private Long companyId;
private Long securityId; private Long securityId;
@ -23,24 +26,48 @@ public class PlannerTemplate extends BusinessObject {
return task; return task;
} }
public void setTask(String value) { public void setTask(String task) {
this.task = value; this.task = task;
} }
public LocalTime getTaskTime() { public LocalTime getTaskTime() {
return taskTime; return taskTime;
} }
public void setTaskTime(LocalTime value) { public void setTaskTime(LocalTime taskTime) {
this.taskTime = value; this.taskTime = taskTime;
}
public String getMarket() {
return market;
}
public void setMarket(String market) {
this.market = market;
}
public String getSection() {
return section;
}
public void setSection(String section) {
this.section = section;
}
public String getSessionType() {
return sessionType;
}
public void setSessionType(String sessionType) {
this.sessionType = sessionType;
} }
public String getTaskStatus() { public String getTaskStatus() {
return taskStatus; return taskStatus;
} }
public void setTaskStatus(String value) { public void setTaskStatus(String taskStatus) {
this.taskStatus = value; this.taskStatus = taskStatus;
} }
public Long getCompanyId() { public Long getCompanyId() {

2
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf01.java
View file

@ -8,7 +8,7 @@ import ru.spcex.platform.classes.base.interfaces.WithMarket;
import java.time.Instant; import java.time.Instant;
/** /**
* ДФ-01 Информация о денежных средствах, находящихся на торговых банковских счетах Участников клиринга * ДФ-01 Информации о денежных средствах, находящихся на торговых банковских счетах участников клиринга
* <p> * <p>
* DB table: S_DF01 * DB table: S_DF01
**/ **/

11
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf02.java
View file

@ -29,7 +29,7 @@ public class SDf02 extends SpcexObjectBase implements WithAccount {
private String result; private String result;
private Instant generationTime; private Instant generationTime;
private Long generationId; private Long generationId;
private Long inSDf01Id; private Long inSDfId;
public String getCurr_code() { public String getCurr_code() {
return curr_code; return curr_code;
@ -152,12 +152,11 @@ public class SDf02 extends SpcexObjectBase implements WithAccount {
this.generationId = value; this.generationId = value;
} }
public Long getInSDf01Id() { public Long getInSDfId() {
return inSDf01Id; return inSDfId;
} }
public void setInSDf01Id(Long value) { public void setInSDfId(Long inSDfId) {
this.inSDf01Id = value; this.inSDfId = inSDfId;
} }
} }

235
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf03.java
View file

@ -6,7 +6,7 @@ import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.time.Instant; import java.time.Instant;
/** /**
* ДФ-03 Сводное платежное поручение * ДФ-03 Реестр платежных поручений
* <p> * <p>
* DB table: S_DF03 * DB table: S_DF03
**/ **/
@ -17,15 +17,12 @@ public class SDf03 extends SpcexObjectBase {
private String doc_type; private String doc_type;
private String docnm_ref; private String docnm_ref;
private String docnmprev; private String docnmprev;
private String priority;
private String sbankcode;
private String c_acc_deb; private String c_acc_deb;
private String sbanknam1; private String sbanknam1;
private String sbanknam2; private String sbanknam2;
private String sbanknam3; private String sbanknam3;
private String sbanknam4; private String sbanknam4;
private String sbanknam5; private String sbanknam5;
private String rbankcode;
private String c_acc_cred; private String c_acc_cred;
private String rbanknam1; private String rbanknam1;
private String rbanknam2; private String rbanknam2;
@ -33,31 +30,9 @@ public class SDf03 extends SpcexObjectBase {
private String rbanknam4; private String rbanknam4;
private String rbanknam5; private String rbanknam5;
private String pay_date; private String pay_date;
private String ext_date;
private String pay_val; private String pay_val;
private String sum_deb; private String sum_deb;
private String sclientn1;
private String sclientn2;
private String sclientn3;
private String sclientn4;
private String sc_code;
private String acc_deb;
private String rclientn1;
private String rclientn2;
private String rclientn3;
private String rclientn4;
private String acc_kr_1;
private String acc_kr_2;
private String sp_code;
private String specif_1; private String specif_1;
private String specif_2;
private String specif_3;
private String specif_4;
private String specif_5;
private String specif_6;
private String send_type;
private String servdate;
private String doc_result;
private String imp_result; private String imp_result;
private Instant generationTime; private Instant generationTime;
private Long generationId; private Long generationId;
@ -87,20 +62,12 @@ public class SDf03 extends SpcexObjectBase {
this.docnm_ref = docnm_ref; this.docnm_ref = docnm_ref;
} }
public String getPriority() { public String getDocnmprev() {
return priority; return docnmprev;
} }
public void setPriority(String priority) { public void setDocnmprev(String docnmprev) {
this.priority = priority; this.docnmprev = docnmprev;
}
public String getSbankcode() {
return sbankcode;
}
public void setSbankcode(String sbankcode) {
this.sbankcode = sbankcode;
} }
public String getC_acc_deb() { public String getC_acc_deb() {
@ -151,14 +118,6 @@ public class SDf03 extends SpcexObjectBase {
this.sbanknam5 = sbanknam5; this.sbanknam5 = sbanknam5;
} }
public String getRbankcode() {
return rbankcode;
}
public void setRbankcode(String rbankcode) {
this.rbankcode = rbankcode;
}
public String getC_acc_cred() { public String getC_acc_cred() {
return c_acc_cred; return c_acc_cred;
} }
@ -215,14 +174,6 @@ public class SDf03 extends SpcexObjectBase {
this.pay_date = pay_date; this.pay_date = pay_date;
} }
public String getExt_date() {
return ext_date;
}
public void setExt_date(String ext_date) {
this.ext_date = ext_date;
}
public String getPay_val() { public String getPay_val() {
return pay_val; return pay_val;
} }
@ -239,110 +190,6 @@ public class SDf03 extends SpcexObjectBase {
this.sum_deb = sum_deb; this.sum_deb = sum_deb;
} }
public String getSclientn1() {
return sclientn1;
}
public void setSclientn1(String sclientn1) {
this.sclientn1 = sclientn1;
}
public String getSclientn2() {
return sclientn2;
}
public void setSclientn2(String sclientn2) {
this.sclientn2 = sclientn2;
}
public String getSclientn3() {
return sclientn3;
}
public void setSclientn3(String sclientn3) {
this.sclientn3 = sclientn3;
}
public String getSclientn4() {
return sclientn4;
}
public void setSclientn4(String sclientn4) {
this.sclientn4 = sclientn4;
}
public String getSc_code() {
return sc_code;
}
public void setSc_code(String sc_code) {
this.sc_code = sc_code;
}
public String getAcc_deb() {
return acc_deb;
}
public void setAcc_deb(String acc_deb) {
this.acc_deb = acc_deb;
}
public String getRclientn1() {
return rclientn1;
}
public void setRclientn1(String rclientn1) {
this.rclientn1 = rclientn1;
}
public String getRclientn2() {
return rclientn2;
}
public void setRclientn2(String rclientn2) {
this.rclientn2 = rclientn2;
}
public String getRclientn3() {
return rclientn3;
}
public void setRclientn3(String rclientn3) {
this.rclientn3 = rclientn3;
}
public String getRclientn4() {
return rclientn4;
}
public void setRclientn4(String rclientn4) {
this.rclientn4 = rclientn4;
}
public String getAcc_kr_1() {
return acc_kr_1;
}
public void setAcc_kr_1(String acc_kr_1) {
this.acc_kr_1 = acc_kr_1;
}
public String getAcc_kr_2() {
return acc_kr_2;
}
public void setAcc_kr_2(String acc_kr_2) {
this.acc_kr_2 = acc_kr_2;
}
public String getSp_code() {
return sp_code;
}
public void setSp_code(String sp_code) {
this.sp_code = sp_code;
}
public String getSpecif_1() { public String getSpecif_1() {
return specif_1; return specif_1;
} }
@ -351,70 +198,6 @@ public class SDf03 extends SpcexObjectBase {
this.specif_1 = specif_1; this.specif_1 = specif_1;
} }
public String getSpecif_2() {
return specif_2;
}
public void setSpecif_2(String specif_2) {
this.specif_2 = specif_2;
}
public String getSpecif_3() {
return specif_3;
}
public void setSpecif_3(String specif_3) {
this.specif_3 = specif_3;
}
public String getSpecif_4() {
return specif_4;
}
public void setSpecif_4(String specif_4) {
this.specif_4 = specif_4;
}
public String getSpecif_5() {
return specif_5;
}
public void setSpecif_5(String specif_5) {
this.specif_5 = specif_5;
}
public String getSpecif_6() {
return specif_6;
}
public void setSpecif_6(String specif_6) {
this.specif_6 = specif_6;
}
public String getSend_type() {
return send_type;
}
public void setSend_type(String send_type) {
this.send_type = send_type;
}
public String getServdate() {
return servdate;
}
public void setServdate(String servdate) {
this.servdate = servdate;
}
public String getDoc_result() {
return doc_result;
}
public void setDoc_result(String doc_result) {
this.doc_result = doc_result;
}
public String getImp_result() { public String getImp_result() {
return imp_result; return imp_result;
} }
@ -439,14 +222,6 @@ public class SDf03 extends SpcexObjectBase {
this.generationId = generationId; this.generationId = generationId;
} }
public String getDocnmprev() {
return docnmprev;
}
public void setDocnmprev(String docnmprev) {
this.docnmprev = docnmprev;
}
public Long getPaymentInstructionId() { public Long getPaymentInstructionId() {
return paymentInstructionId; return paymentInstructionId;
} }

237
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf04.java
View file

@ -6,7 +6,7 @@ import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.time.Instant; import java.time.Instant;
/** /**
* ДФ-03 Сводное платежное поручение * ДФ-04 Подтверждение проведения расчетов
* *
* DB table: S_DF03 * DB table: S_DF03
**/ **/
@ -17,15 +17,12 @@ public class SDf04 extends SpcexObjectBase {
private String doc_type; private String doc_type;
private String docnm_ref; private String docnm_ref;
private String docnmprev; private String docnmprev;
private String priority;
private String sbankcode;
private String c_acc_deb; private String c_acc_deb;
private String sbanknam1; private String sbanknam1;
private String sbanknam2; private String sbanknam2;
private String sbanknam3; private String sbanknam3;
private String sbanknam4; private String sbanknam4;
private String sbanknam5; private String sbanknam5;
private String rbankcode;
private String c_acc_cred; private String c_acc_cred;
private String rbanknam1; private String rbanknam1;
private String rbanknam2; private String rbanknam2;
@ -33,33 +30,11 @@ public class SDf04 extends SpcexObjectBase {
private String rbanknam4; private String rbanknam4;
private String rbanknam5; private String rbanknam5;
private String pay_date; private String pay_date;
private String ext_date;
private String pay_val; private String pay_val;
private String sum_deb; private String sum_deb;
private String sclientn1;
private String sclientn2;
private String sclientn3;
private String sclientn4;
private String sc_code;
private String acc_deb;
private String rclientn1;
private String rclientn2;
private String rclientn3;
private String rclientn4;
private String acc_kr_1;
private String acc_kr_2;
private String sp_code;
private String specif_1; private String specif_1;
private String specif_2;
private String specif_3;
private String specif_4;
private String specif_5;
private String specif_6;
private String send_type;
private String servdate;
private String doc_result;
private String imp_result; private String imp_result;
private String file_name; private String fileName;
private Instant generationTime; private Instant generationTime;
private Long generationId; private Long generationId;
@ -95,22 +70,6 @@ public class SDf04 extends SpcexObjectBase {
this.docnmprev = docnmprev; this.docnmprev = docnmprev;
} }
public String getPriority() {
return priority;
}
public void setPriority(String priority) {
this.priority = priority;
}
public String getSbankcode() {
return sbankcode;
}
public void setSbankcode(String sbankcode) {
this.sbankcode = sbankcode;
}
public String getC_acc_deb() { public String getC_acc_deb() {
return c_acc_deb; return c_acc_deb;
} }
@ -159,14 +118,6 @@ public class SDf04 extends SpcexObjectBase {
this.sbanknam5 = sbanknam5; this.sbanknam5 = sbanknam5;
} }
public String getRbankcode() {
return rbankcode;
}
public void setRbankcode(String rbankcode) {
this.rbankcode = rbankcode;
}
public String getC_acc_cred() { public String getC_acc_cred() {
return c_acc_cred; return c_acc_cred;
} }
@ -223,14 +174,6 @@ public class SDf04 extends SpcexObjectBase {
this.pay_date = pay_date; this.pay_date = pay_date;
} }
public String getExt_date() {
return ext_date;
}
public void setExt_date(String ext_date) {
this.ext_date = ext_date;
}
public String getPay_val() { public String getPay_val() {
return pay_val; return pay_val;
} }
@ -247,110 +190,6 @@ public class SDf04 extends SpcexObjectBase {
this.sum_deb = sum_deb; this.sum_deb = sum_deb;
} }
public String getSclientn1() {
return sclientn1;
}
public void setSclientn1(String sclientn1) {
this.sclientn1 = sclientn1;
}
public String getSclientn2() {
return sclientn2;
}
public void setSclientn2(String sclientn2) {
this.sclientn2 = sclientn2;
}
public String getSclientn3() {
return sclientn3;
}
public void setSclientn3(String sclientn3) {
this.sclientn3 = sclientn3;
}
public String getSclientn4() {
return sclientn4;
}
public void setSclientn4(String sclientn4) {
this.sclientn4 = sclientn4;
}
public String getSc_code() {
return sc_code;
}
public void setSc_code(String sc_code) {
this.sc_code = sc_code;
}
public String getAcc_deb() {
return acc_deb;
}
public void setAcc_deb(String acc_deb) {
this.acc_deb = acc_deb;
}
public String getRclientn1() {
return rclientn1;
}
public void setRclientn1(String rclientn1) {
this.rclientn1 = rclientn1;
}
public String getRclientn2() {
return rclientn2;
}
public void setRclientn2(String rclientn2) {
this.rclientn2 = rclientn2;
}
public String getRclientn3() {
return rclientn3;
}
public void setRclientn3(String rclientn3) {
this.rclientn3 = rclientn3;
}
public String getRclientn4() {
return rclientn4;
}
public void setRclientn4(String rclientn4) {
this.rclientn4 = rclientn4;
}
public String getAcc_kr_1() {
return acc_kr_1;
}
public void setAcc_kr_1(String acc_kr_1) {
this.acc_kr_1 = acc_kr_1;
}
public String getAcc_kr_2() {
return acc_kr_2;
}
public void setAcc_kr_2(String acc_kr_2) {
this.acc_kr_2 = acc_kr_2;
}
public String getSp_code() {
return sp_code;
}
public void setSp_code(String sp_code) {
this.sp_code = sp_code;
}
public String getSpecif_1() { public String getSpecif_1() {
return specif_1; return specif_1;
} }
@ -359,70 +198,6 @@ public class SDf04 extends SpcexObjectBase {
this.specif_1 = specif_1; this.specif_1 = specif_1;
} }
public String getSpecif_2() {
return specif_2;
}
public void setSpecif_2(String specif_2) {
this.specif_2 = specif_2;
}
public String getSpecif_3() {
return specif_3;
}
public void setSpecif_3(String specif_3) {
this.specif_3 = specif_3;
}
public String getSpecif_4() {
return specif_4;
}
public void setSpecif_4(String specif_4) {
this.specif_4 = specif_4;
}
public String getSpecif_5() {
return specif_5;
}
public void setSpecif_5(String specif_5) {
this.specif_5 = specif_5;
}
public String getSpecif_6() {
return specif_6;
}
public void setSpecif_6(String specif_6) {
this.specif_6 = specif_6;
}
public String getSend_type() {
return send_type;
}
public void setSend_type(String send_type) {
this.send_type = send_type;
}
public String getServdate() {
return servdate;
}
public void setServdate(String servdate) {
this.servdate = servdate;
}
public String getDoc_result() {
return doc_result;
}
public void setDoc_result(String doc_result) {
this.doc_result = doc_result;
}
public String getImp_result() { public String getImp_result() {
return imp_result; return imp_result;
} }
@ -431,12 +206,12 @@ public class SDf04 extends SpcexObjectBase {
this.imp_result = imp_result; this.imp_result = imp_result;
} }
public String getFile_name() { public String getFileName() {
return file_name; return fileName;
} }
public void setFile_name(String file_name) { public void setFileName(String fileName) {
this.file_name = file_name; this.fileName = fileName;
} }
public Instant getGenerationTime() { public Instant getGenerationTime() {

135
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf06.java Normal file
View file

@ -0,0 +1,135 @@
package ru.clearing.classes.statics.data.sdf;
import ru.clearing.classes.ConstSerializable;
import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.math.BigDecimal;
import java.time.Instant;
/**
* ДФ-06 Запрос на зачисление/списание денежных средств
* <p>
* DB table: S_DF06
**/
public class SDf06 extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String account;
private BigDecimal sum;
private String market;
private String type;
private String deal;
private String clientN;
private BigDecimal inn;
private BigDecimal bic;
private String spec;
private BigDecimal number;
private String fileName;
private Instant generationTime;
private Long generationId;
public String getAccount() {
return account;
}
public void setAccount(String value) {
this.account = value;
}
public BigDecimal getSum() {
return sum;
}
public void setSum(BigDecimal value) {
this.sum = value;
}
public String getMarket() {
return market;
}
public void setMarket(String value) {
this.market = value;
}
public String getType() {
return type;
}
public void setType(String value) {
this.type = value;
}
public String getDeal() {
return deal;
}
public void setDeal(String value) {
this.deal = value;
}
public String getClientN() {
return clientN;
}
public void setClientN(String value) {
this.clientN = value;
}
public BigDecimal getInn() {
return inn;
}
public void setInn(BigDecimal value) {
this.inn = value;
}
public BigDecimal getBic() {
return bic;
}
public void setBic(BigDecimal value) {
this.bic = value;
}
public String getSpec() {
return spec;
}
public void setSpec(String value) {
this.spec = value;
}
public BigDecimal getNumber() {
return number;
}
public void setNumber(BigDecimal value) {
this.number = value;
}
public String getFileName() {
return fileName;
}
public void setFileName(String value) {
this.fileName = value;
}
public Instant getGenerationTime() {
return generationTime;
}
public void setGenerationTime(Instant value) {
this.generationTime = value;
}
public Long getGenerationId() {
return generationId;
}
public void setGenerationId(Long value) {
this.generationId = value;
}
}

144
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf07.java Normal file
View file

@ -0,0 +1,144 @@
package ru.clearing.classes.statics.data.sdf;
import ru.clearing.classes.ConstSerializable;
import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.math.BigDecimal;
import java.time.Instant;
/**
* ДФ-07 Ответ на запрос по зачислению/списанию денежных средств
* <p>
* DB table: S_DF07
**/
public class SDf07 extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String account;
private BigDecimal sum;
private String market;
private String type;
private String deal;
private String clientN;
private BigDecimal inn;
private BigDecimal bic;
private String spec;
private BigDecimal number;
private BigDecimal result;
private Instant generationTime;
private Long generationId;
private Long inSDfId;
public String getAccount() {
return account;
}
public void setAccount(String value) {
this.account = value;
}
public BigDecimal getSum() {
return sum;
}
public void setSum(BigDecimal value) {
this.sum = value;
}
public String getMarket() {
return market;
}
public void setMarket(String value) {
this.market = value;
}
public String getType() {
return type;
}
public void setType(String value) {
this.type = value;
}
public String getDeal() {
return deal;
}
public void setDeal(String value) {
this.deal = value;
}
public String getClientN() {
return clientN;
}
public void setClientN(String value) {
this.clientN = value;
}
public BigDecimal getInn() {
return inn;
}
public void setInn(BigDecimal value) {
this.inn = value;
}
public BigDecimal getBic() {
return bic;
}
public void setBic(BigDecimal value) {
this.bic = value;
}
public String getSpec() {
return spec;
}
public void setSpec(String value) {
this.spec = value;
}
public BigDecimal getNumber() {
return number;
}
public void setNumber(BigDecimal value) {
this.number = value;
}
public BigDecimal getResult() {
return result;
}
public void setResult(BigDecimal value) {
this.result = value;
}
public Instant getGenerationTime() {
return generationTime;
}
public void setGenerationTime(Instant value) {
this.generationTime = value;
}
public Long getGenerationId() {
return generationId;
}
public void setGenerationId(Long value) {
this.generationId = value;
}
public Long getInSDfId() {
return inSDfId;
}
public void setInSDfId(Long value) {
this.inSDfId = value;
}
}

67
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf08.java
View file

@ -6,48 +6,83 @@ import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.time.Instant; import java.time.Instant;
/** /**
* ДФ-08 Запрос остатков по всем счетам * ДФ-08 Загрузка счетов с остатками
* <p> * <p>
* DB table: S_DF08 * DB table: S_DF08
**/ **/
public class SDf08 extends SpcexObjectBase { public class SDf08 extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String number; private String outDocument;
private String datetime; private String depoCode;
private String quantity;
private String securityCode;
private String clientName;
private String fileName;
private Instant generationTime; private Instant generationTime;
private Long generationId; private Long generationId;
public String getNumber() { public String getOutDocument() {
return number; return outDocument;
} }
public void setNumber(String value) { public void setOutDocument(String outDocument) {
this.number = value; this.outDocument = outDocument;
} }
public String getDatetime() { public String getDepoCode() {
return datetime; return depoCode;
} }
public void setDatetime(String value) { public void setDepoCode(String depoCode) {
this.datetime = value; this.depoCode = depoCode;
}
public String getQuantity() {
return quantity;
}
public void setQuantity(String quantity) {
this.quantity = quantity;
}
public String getSecurityCode() {
return securityCode;
}
public void setSecurityCode(String securityCode) {
this.securityCode = securityCode;
}
public String getClientName() {
return clientName;
}
public void setClientName(String clientName) {
this.clientName = clientName;
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName;
} }
public Instant getGenerationTime() { public Instant getGenerationTime() {
return generationTime; return generationTime;
} }
public void setGenerationTime(Instant value) { public void setGenerationTime(Instant generationTime) {
this.generationTime = value; this.generationTime = generationTime;
} }
public Long getGenerationId() { public Long getGenerationId() {
return generationId; return generationId;
} }
public void setGenerationId(Long value) { public void setGenerationId(Long generationId) {
this.generationId = value; this.generationId = generationId;
} }
} }

78
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf09.java
View file

@ -2,86 +2,82 @@ package ru.clearing.classes.statics.data.sdf;
import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.ConstSerializable;
import ru.spcex.platform.classes.base.SpcexObjectBase; import ru.spcex.platform.classes.base.SpcexObjectBase;
import ru.spcex.platform.classes.base.interfaces.WithAccount;
import ru.spcex.platform.classes.base.interfaces.WithMarket;
import ru.spcex.platform.classes.base.interfaces.WithSum;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.Instant; import java.time.Instant;
/** /**
* ДФ-08 Запрос остатков по всем счетам * ДФ-09 Ответ на загрузку счетов с остатками
* <p> * <p>
* DB table: S_DF08 * DB table: S_DF08
**/ **/
public class SDf09 extends SpcexObjectBase implements WithAccount, WithMarket, WithSum { public class SDf09 extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String account; private String outDocument;
private BigDecimal sum; private String inDocument;
private String market; private String depoCode;
private String type; private String quantity;
private BigDecimal number; private String securityCode;
private BigDecimal inn; private String clientName;
private String fileName; private BigDecimal result;
private Instant generationTime; private Instant generationTime;
private Long generationId; private Long generationId;
@Override public String getOutDocument() {
public String getAccount() { return outDocument;
return account;
} }
public void setAccount(String account) { public void setOutDocument(String outDocument) {
this.account = account; this.outDocument = outDocument;
} }
public BigDecimal getSum() { public String getInDocument() {
return sum; return inDocument;
} }
public void setSum(BigDecimal sum) { public void setInDocument(String inDocument) {
this.sum = sum; this.inDocument = inDocument;
} }
public String getMarket() { public String getDepoCode() {
return market; return depoCode;
} }
public void setMarket(String market) { public void setDepoCode(String depoCode) {
this.market = market; this.depoCode = depoCode;
} }
public String getType() { public String getQuantity() {
return type; return quantity;
} }
public void setType(String type) { public void setQuantity(String quantity) {
this.type = type; this.quantity = quantity;
} }
public BigDecimal getNumber() { public String getSecurityCode() {
return number; return securityCode;
} }
public void setNumber(BigDecimal number) { public void setSecurityCode(String securityCode) {
this.number = number; this.securityCode = securityCode;
} }
public BigDecimal getInn() { public String getClientName() {
return inn; return clientName;
} }
public void setInn(BigDecimal inn) { public void setClientName(String clientName) {
this.inn = inn; this.clientName = clientName;
} }
public String getFileName() { public BigDecimal getResult() {
return fileName; return result;
} }
public void setFileName(String fileName) { public void setResult(BigDecimal result) {
this.fileName = fileName; this.result = result;
} }
public Instant getGenerationTime() { public Instant getGenerationTime() {

85
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf10.java
View file

@ -2,85 +2,72 @@ package ru.clearing.classes.statics.data.sdf;
import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.ConstSerializable;
import ru.spcex.platform.classes.base.SpcexObjectBase; import ru.spcex.platform.classes.base.SpcexObjectBase;
import ru.spcex.platform.classes.base.interfaces.WithAccount;
import java.math.BigDecimal;
import java.time.Instant; import java.time.Instant;
/** /**
* ДФ-10 Подтверждение о загрузке по поступлению на клиринговый счет * sDf10 - ДФ-10 Запрос на зачисление/списание ценных бумаг
* <p> * <p>
* DB table: S_DF10 * DB table: S_DF10
*/ */
public class SDf10 extends SpcexObjectBase implements WithAccount { public class SDf10 extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String account; private String outDocument;
private BigDecimal sum; private String depoCode;
private String market; private String quantity;
private String type; private String securityCode;
private BigDecimal number; private String clientName;
private BigDecimal inn; private String fileName;
private String result;
private Instant generationTime; private Instant generationTime;
private Long generationId; private Long generationId;
private Long inSDf09Id;
@Override public String getOutDocument() {
public String getAccount() { return outDocument;
return account;
} }
public void setAccount(String account) { public void setOutDocument(String outDocument) {
this.account = account; this.outDocument = outDocument;
} }
public BigDecimal getSum() { public String getDepoCode() {
return sum; return depoCode;
} }
public void setSum(BigDecimal sum) { public void setDepoCode(String depoCode) {
this.sum = sum; this.depoCode = depoCode;
} }
public String getMarket() { public String getQuantity() {
return market; return quantity;
} }
public void setMarket(String market) { public void setQuantity(String quantity) {
this.market = market; this.quantity = quantity;
} }
public String getType() { public String getSecurityCode() {
return type; return securityCode;
} }
public void setType(String type) { public void setSecurityCode(String securityCode) {
this.type = type; this.securityCode = securityCode;
} }
public BigDecimal getNumber() { public String getClientName() {
return number; return clientName;
} }
public void setNumber(BigDecimal number) { public void setClientName(String clientName) {
this.number = number; this.clientName = clientName;
} }
public BigDecimal getInn() { public String getFileName() {
return inn; return fileName;
} }
public void setInn(BigDecimal inn) { public void setFileName(String fileName) {
this.inn = inn; this.fileName = fileName;
}
public String getResult() {
return result;
}
public void setResult(String result) {
this.result = result;
} }
public Instant getGenerationTime() { public Instant getGenerationTime() {
@ -98,12 +85,4 @@ public class SDf10 extends SpcexObjectBase implements WithAccount {
public void setGenerationId(Long generationId) { public void setGenerationId(Long generationId) {
this.generationId = generationId; this.generationId = generationId;
} }
public Long getInSDf09Id() {
return inSDf09Id;
}
public void setInSDf09Id(Long inSDf09Id) {
this.inSDf09Id = inSDf09Id;
}
} }

424
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf11.java
View file

@ -3,423 +3,81 @@ package ru.clearing.classes.statics.data.sdf;
import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.ConstSerializable;
import ru.spcex.platform.classes.base.SpcexObjectBase; import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.math.BigDecimal;
import java.time.Instant; import java.time.Instant;
/** /**
* ДФ-11 Из КС в ПРЦ Платежное распоряжение на перевод средств с ТБС Участника на КС Инициатора * ДФ-11 Ответ на Запрос на зачисление/списание ценных бумаг
* <p> * <p>
* DB table: S_DF11 * DB table: S_DF11
**/ **/
public class SDf11 extends SpcexObjectBase { public class SDf11 extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String seg_type; private String outDocument;
private String doc_type; private String inDocument;
private String docnm_ref; private String depoCode;
private String docnmprev; private String quantity;
private String priority; private String securityCode;
private String sbankcode; private String clientName;
private String c_acc_deb; private BigDecimal result;
private String sbanknam1;
private String sbanknam2;
private String sbanknam3;
private String sbanknam4;
private String sbanknam5;
private String rbankcode;
private String c_acc_cred;
private String rbanknam1;
private String rbanknam2;
private String rbanknam3;
private String rbanknam4;
private String rbanknam5;
private String pay_date;
private String ext_date;
private String pay_val;
private String sum_deb;
private String sclientn1;
private String sclientn2;
private String sclientn3;
private String sclientn4;
private String sc_code;
private String acc_deb;
private String rclientn1;
private String rclientn2;
private String rclientn3;
private String rclientn4;
private String acc_kr_1;
private String acc_kr_2;
private String sp_code;
private String specif_1;
private String specif_2;
private String specif_3;
private String specif_4;
private String specif_5;
private String specif_6;
private String send_type;
private String servdate;
private String doc_result;
private Instant generationTime; private Instant generationTime;
private Long generationId; private Long generationId;
private Long paymentInstructionId;
public String getSeg_type() { public String getOutDocument() {
return seg_type; return outDocument;
} }
public void setSeg_type(String seg_type) { public void setOutDocument(String outDocument) {
this.seg_type = seg_type; this.outDocument = outDocument;
} }
public String getDoc_type() { public String getInDocument() {
return doc_type; return inDocument;
} }
public void setDoc_type(String doc_type) { public void setInDocument(String inDocument) {
this.doc_type = doc_type; this.inDocument = inDocument;
} }
public String getDocnm_ref() { public String getDepoCode() {
return docnm_ref; return depoCode;
} }
public void setDocnm_ref(String docnm_ref) { public void setDepoCode(String depoCode) {
this.docnm_ref = docnm_ref; this.depoCode = depoCode;
} }
public String getDocnmprev() { public String getQuantity() {
return docnmprev; return quantity;
} }
public void setDocnmprev(String docnmprev) { public void setQuantity(String quantity) {
this.docnmprev = docnmprev; this.quantity = quantity;
} }
public String getPriority() { public String getSecurityCode() {
return priority; return securityCode;
} }
public void setPriority(String priority) { public void setSecurityCode(String securityCode) {
this.priority = priority; this.securityCode = securityCode;
} }
public String getSbankcode() { public String getClientName() {
return sbankcode; return clientName;
} }
public void setSbankcode(String sbankcode) { public void setClientName(String clientName) {
this.sbankcode = sbankcode; this.clientName = clientName;
} }
public String getC_acc_deb() { public BigDecimal getResult() {
return c_acc_deb; return result;
} }
public void setC_acc_deb(String c_acc_deb) { public void setResult(BigDecimal result) {
this.c_acc_deb = c_acc_deb; this.result = result;
}
public String getSbanknam1() {
return sbanknam1;
}
public void setSbanknam1(String sbanknam1) {
this.sbanknam1 = sbanknam1;
}
public String getSbanknam2() {
return sbanknam2;
}
public void setSbanknam2(String sbanknam2) {
this.sbanknam2 = sbanknam2;
}
public String getSbanknam3() {
return sbanknam3;
}
public void setSbanknam3(String sbanknam3) {
this.sbanknam3 = sbanknam3;
}
public String getSbanknam4() {
return sbanknam4;
}
public void setSbanknam4(String sbanknam4) {
this.sbanknam4 = sbanknam4;
}
public String getSbanknam5() {
return sbanknam5;
}
public void setSbanknam5(String sbanknam5) {
this.sbanknam5 = sbanknam5;
}
public String getRbankcode() {
return rbankcode;
}
public void setRbankcode(String rbankcode) {
this.rbankcode = rbankcode;
}
public String getC_acc_cred() {
return c_acc_cred;
}
public void setC_acc_cred(String c_acc_cred) {
this.c_acc_cred = c_acc_cred;
}
public String getRbanknam1() {
return rbanknam1;
}
public void setRbanknam1(String rbanknam1) {
this.rbanknam1 = rbanknam1;
}
public String getRbanknam2() {
return rbanknam2;
}
public void setRbanknam2(String rbanknam2) {
this.rbanknam2 = rbanknam2;
}
public String getRbanknam3() {
return rbanknam3;
}
public void setRbanknam3(String rbanknam3) {
this.rbanknam3 = rbanknam3;
}
public String getRbanknam4() {
return rbanknam4;
}
public void setRbanknam4(String rbanknam4) {
this.rbanknam4 = rbanknam4;
}
public String getRbanknam5() {
return rbanknam5;
}
public void setRbanknam5(String rbanknam5) {
this.rbanknam5 = rbanknam5;
}
public String getPay_date() {
return pay_date;
}
public void setPay_date(String pay_date) {
this.pay_date = pay_date;
}
public String getExt_date() {
return ext_date;
}
public void setExt_date(String ext_date) {
this.ext_date = ext_date;
}
public String getPay_val() {
return pay_val;
}
public void setPay_val(String pay_val) {
this.pay_val = pay_val;
}
public String getSum_deb() {
return sum_deb;
}
public void setSum_deb(String sum_deb) {
this.sum_deb = sum_deb;
}
public String getSclientn1() {
return sclientn1;
}
public void setSclientn1(String sclientn1) {
this.sclientn1 = sclientn1;
}
public String getSclientn2() {
return sclientn2;
}
public void setSclientn2(String sclientn2) {
this.sclientn2 = sclientn2;
}
public String getSclientn3() {
return sclientn3;
}
public void setSclientn3(String sclientn3) {
this.sclientn3 = sclientn3;
}
public String getSclientn4() {
return sclientn4;
}
public void setSclientn4(String sclientn4) {
this.sclientn4 = sclientn4;
}
public String getSc_code() {
return sc_code;
}
public void setSc_code(String sc_code) {
this.sc_code = sc_code;
}
public String getAcc_deb() {
return acc_deb;
}
public void setAcc_deb(String acc_deb) {
this.acc_deb = acc_deb;
}
public String getRclientn1() {
return rclientn1;
}
public void setRclientn1(String rclientn1) {
this.rclientn1 = rclientn1;
}
public String getRclientn2() {
return rclientn2;
}
public void setRclientn2(String rclientn2) {
this.rclientn2 = rclientn2;
}
public String getRclientn3() {
return rclientn3;
}
public void setRclientn3(String rclientn3) {
this.rclientn3 = rclientn3;
}
public String getRclientn4() {
return rclientn4;
}
public void setRclientn4(String rclientn4) {
this.rclientn4 = rclientn4;
}
public String getAcc_kr_1() {
return acc_kr_1;
}
public void setAcc_kr_1(String acc_kr_1) {
this.acc_kr_1 = acc_kr_1;
}
public String getAcc_kr_2() {
return acc_kr_2;
}
public void setAcc_kr_2(String acc_kr_2) {
this.acc_kr_2 = acc_kr_2;
}
public String getSp_code() {
return sp_code;
}
public void setSp_code(String sp_code) {
this.sp_code = sp_code;
}
public String getSpecif_1() {
return specif_1;
}
public void setSpecif_1(String specif_1) {
this.specif_1 = specif_1;
}
public String getSpecif_2() {
return specif_2;
}
public void setSpecif_2(String specif_2) {
this.specif_2 = specif_2;
}
public String getSpecif_3() {
return specif_3;
}
public void setSpecif_3(String specif_3) {
this.specif_3 = specif_3;
}
public String getSpecif_4() {
return specif_4;
}
public void setSpecif_4(String specif_4) {
this.specif_4 = specif_4;
}
public String getSpecif_5() {
return specif_5;
}
public void setSpecif_5(String specif_5) {
this.specif_5 = specif_5;
}
public String getSpecif_6() {
return specif_6;
}
public void setSpecif_6(String specif_6) {
this.specif_6 = specif_6;
}
public String getSend_type() {
return send_type;
}
public void setSend_type(String send_type) {
this.send_type = send_type;
}
public String getServdate() {
return servdate;
}
public void setServdate(String servdate) {
this.servdate = servdate;
}
public String getDoc_result() {
return doc_result;
}
public void setDoc_result(String doc_result) {
this.doc_result = doc_result;
} }
public Instant getGenerationTime() { public Instant getGenerationTime() {
@ -437,12 +95,4 @@ public class SDf11 extends SpcexObjectBase {
public void setGenerationId(Long generationId) { public void setGenerationId(Long generationId) {
this.generationId = generationId; this.generationId = generationId;
} }
public Long getPaymentInstructionId() {
return paymentInstructionId;
}
public void setPaymentInstructionId(Long paymentInstructionId) {
this.paymentInstructionId = paymentInstructionId;
}
} }

74
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf12.java
View file

@ -2,72 +2,88 @@ package ru.clearing.classes.statics.data.sdf;
import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.ConstSerializable;
import ru.spcex.platform.classes.base.SpcexObjectBase; import ru.spcex.platform.classes.base.SpcexObjectBase;
import ru.spcex.platform.classes.base.interfaces.WithAccount;
import java.math.BigDecimal;
import java.time.Instant; import java.time.Instant;
/** /**
* ДФ-12 Из ПРЦ в КС Информация о блокировке/разблокировке/закрытии ТБС УК * ДФ-12 Распоряжение на проведение операций по итогам клиринга
* <p> * <p>
* DB table: S_DF12 * DB table: S_DF12
**/ **/
public class SDf12 extends SpcexObjectBase implements WithAccount { public class SDf12 extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String account; private String outDocument;
private String deal; private String quantity;
private Long status; private String securityCode;
private String fileName; private String depoCodeSender;
private String depoCodeAdressee;
private BigDecimal result;
private Instant generationTime; private Instant generationTime;
private Long generationId; private Long generationId;
@Override public String getOutDocument() {
public String getAccount() { return outDocument;
return account;
} }
public void setAccount(String value) { public void setOutDocument(String outDocument) {
this.account = value; this.outDocument = outDocument;
} }
public String getDeal() { public String getQuantity() {
return deal; return quantity;
} }
public void setDeal(String value) { public void setQuantity(String quantity) {
this.deal = value; this.quantity = quantity;
} }
public Long getStatus() { public String getSecurityCode() {
return status; return securityCode;
} }
public void setStatus(Long value) { public void setSecurityCode(String securityCode) {
this.status = value; this.securityCode = securityCode;
} }
public String getFileName() { public String getDepoCodeSender() {
return fileName; return depoCodeSender;
} }
public void setFileName(String value) { public void setDepoCodeSender(String depoCodeSender) {
this.fileName = value; this.depoCodeSender = depoCodeSender;
}
public String getDepoCodeAdressee() {
return depoCodeAdressee;
}
public void setDepoCodeAdressee(String depoCodeAdressee) {
this.depoCodeAdressee = depoCodeAdressee;
}
public BigDecimal getResult() {
return result;
}
public void setResult(BigDecimal result) {
this.result = result;
} }
public Instant getGenerationTime() { public Instant getGenerationTime() {
return generationTime; return generationTime;
} }
public void setGenerationTime(Instant value) { public void setGenerationTime(Instant generationTime) {
this.generationTime = value; this.generationTime = generationTime;
} }
public Long getGenerationId() { public Long getGenerationId() {
return generationId; return generationId;
} }
public void setGenerationId(Long value) { public void setGenerationId(Long generationId) {
this.generationId = value; this.generationId = generationId;
} }
} }

413
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf13.java
View file

@ -3,422 +3,63 @@ package ru.clearing.classes.statics.data.sdf;
import ru.clearing.classes.ConstSerializable; import ru.clearing.classes.ConstSerializable;
import ru.spcex.platform.classes.base.SpcexObjectBase; import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.math.BigDecimal;
import java.time.Instant; import java.time.Instant;
/** /**
* ДФ-13 Вывод свободных средств для инициаторов категории В с клирингового счета 30414/7 - платежное поручение АО СПВБ на вывод средств из РО * ДФ-13 Уведомление о статусе исполнения или мотивированный отказ
* <p> * <p>
* DB table: S_DF13 * DB table: S_DF13
**/ **/
public class SDf13 extends SpcexObjectBase { public class SDf13 extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String seg_type; private String outDocument;
private String doc_type; private String inDocument;
private String docnm_ref; private BigDecimal result;
private String docnmprev; private String textError;
private String priority; private String fileName;
private String sbankcode;
private String c_acc_deb;
private String sbanknam1;
private String sbanknam2;
private String sbanknam3;
private String sbanknam4;
private String sbanknam5;
private String rbankcode;
private String c_acc_cred;
private String rbanknam1;
private String op_type;
private String op_order;
private String rbanknam4;
private String rbanknam5;
private String pay_date;
private String ext_date;
private String pay_val;
private String sum_deb;
private String sclientn1;
private String inn_deb;
private String kpp_deb;
private String sclientn4;
private String sc_code;
private String acc_deb;
private String rclientn1;
private String inn_cred;
private String kpp_cred;
private String rclientn4;
private String acc_kr_1;
private String acc_kr_2;
private String sp_code;
private String specif_1;
private String specif_2;
private String specif_3;
private String specif_4;
private String specif_5;
private String specif_6;
private String send_type;
private String servdate;
private String doc_result;
private Instant generationTime; private Instant generationTime;
private Long generationId; private Long generationId;
public String getSeg_type() { public String getOutDocument() {
return seg_type; return outDocument;
} }
public void setSeg_type(String seg_type) { public void setOutDocument(String outDocument) {
this.seg_type = seg_type; this.outDocument = outDocument;
} }
public String getDoc_type() { public String getInDocument() {
return doc_type; return inDocument;
} }
public void setDoc_type(String doc_type) { public void setInDocument(String inDocument) {
this.doc_type = doc_type; this.inDocument = inDocument;
} }
public String getDocnm_ref() { public BigDecimal getResult() {
return docnm_ref; return result;
} }
public void setDocnm_ref(String docnm_ref) { public void setResult(BigDecimal result) {
this.docnm_ref = docnm_ref; this.result = result;
} }
public String getDocnmprev() { public String getTextError() {
return docnmprev; return textError;
} }
public void setDocnmprev(String docnmprev) { public void setTextError(String textError) {
this.docnmprev = docnmprev; this.textError = textError;
} }
public String getPriority() { public String getFileName() {
return priority; return fileName;
} }
public void setPriority(String priority) { public void setFileName(String fileName) {
this.priority = priority; this.fileName = fileName;
}
public String getSbankcode() {
return sbankcode;
}
public void setSbankcode(String sbankcode) {
this.sbankcode = sbankcode;
}
public String getC_acc_deb() {
return c_acc_deb;
}
public void setC_acc_deb(String c_acc_deb) {
this.c_acc_deb = c_acc_deb;
}
public String getSbanknam1() {
return sbanknam1;
}
public void setSbanknam1(String sbanknam1) {
this.sbanknam1 = sbanknam1;
}
public String getSbanknam2() {
return sbanknam2;
}
public void setSbanknam2(String sbanknam2) {
this.sbanknam2 = sbanknam2;
}
public String getSbanknam3() {
return sbanknam3;
}
public void setSbanknam3(String sbanknam3) {
this.sbanknam3 = sbanknam3;
}
public String getSbanknam4() {
return sbanknam4;
}
public void setSbanknam4(String sbanknam4) {
this.sbanknam4 = sbanknam4;
}
public String getSbanknam5() {
return sbanknam5;
}
public void setSbanknam5(String sbanknam5) {
this.sbanknam5 = sbanknam5;
}
public String getRbankcode() {
return rbankcode;
}
public void setRbankcode(String rbankcode) {
this.rbankcode = rbankcode;
}
public String getC_acc_cred() {
return c_acc_cred;
}
public void setC_acc_cred(String c_acc_cred) {
this.c_acc_cred = c_acc_cred;
}
public String getRbanknam1() {
return rbanknam1;
}
public void setRbanknam1(String rbanknam1) {
this.rbanknam1 = rbanknam1;
}
public String getOp_type() {
return op_type;
}
public void setOp_type(String op_type) {
this.op_type = op_type;
}
public String getOp_order() {
return op_order;
}
public void setOp_order(String op_order) {
this.op_order = op_order;
}
public String getRbanknam4() {
return rbanknam4;
}
public void setRbanknam4(String rbanknam4) {
this.rbanknam4 = rbanknam4;
}
public String getRbanknam5() {
return rbanknam5;
}
public void setRbanknam5(String rbanknam5) {
this.rbanknam5 = rbanknam5;
}
public String getPay_date() {
return pay_date;
}
public void setPay_date(String pay_date) {
this.pay_date = pay_date;
}
public String getExt_date() {
return ext_date;
}
public void setExt_date(String ext_date) {
this.ext_date = ext_date;
}
public String getPay_val() {
return pay_val;
}
public void setPay_val(String pay_val) {
this.pay_val = pay_val;
}
public String getSum_deb() {
return sum_deb;
}
public void setSum_deb(String sum_deb) {
this.sum_deb = sum_deb;
}
public String getSclientn1() {
return sclientn1;
}
public void setSclientn1(String sclientn1) {
this.sclientn1 = sclientn1;
}
public String getInn_deb() {
return inn_deb;
}
public void setInn_deb(String inn_deb) {
this.inn_deb = inn_deb;
}
public String getKpp_deb() {
return kpp_deb;
}
public void setKpp_deb(String kpp_deb) {
this.kpp_deb = kpp_deb;
}
public String getSclientn4() {
return sclientn4;
}
public void setSclientn4(String sclientn4) {
this.sclientn4 = sclientn4;
}
public String getSc_code() {
return sc_code;
}
public void setSc_code(String sc_code) {
this.sc_code = sc_code;
}
public String getAcc_deb() {
return acc_deb;
}
public void setAcc_deb(String acc_deb) {
this.acc_deb = acc_deb;
}
public String getRclientn1() {
return rclientn1;
}
public void setRclientn1(String rclientn1) {
this.rclientn1 = rclientn1;
}
public String getInn_cred() {
return inn_cred;
}
public void setInn_cred(String inn_cred) {
this.inn_cred = inn_cred;
}
public String getKpp_cred() {
return kpp_cred;
}
public void setKpp_cred(String kpp_cred) {
this.kpp_cred = kpp_cred;
}
public String getRclientn4() {
return rclientn4;
}
public void setRclientn4(String rclientn4) {
this.rclientn4 = rclientn4;
}
public String getAcc_kr_1() {
return acc_kr_1;
}
public void setAcc_kr_1(String acc_kr_1) {
this.acc_kr_1 = acc_kr_1;
}
public String getAcc_kr_2() {
return acc_kr_2;
}
public void setAcc_kr_2(String acc_kr_2) {
this.acc_kr_2 = acc_kr_2;
}
public String getSp_code() {
return sp_code;
}
public void setSp_code(String sp_code) {
this.sp_code = sp_code;
}
public String getSpecif_1() {
return specif_1;
}
public void setSpecif_1(String specif_1) {
this.specif_1 = specif_1;
}
public String getSpecif_2() {
return specif_2;
}
public void setSpecif_2(String specif_2) {
this.specif_2 = specif_2;
}
public String getSpecif_3() {
return specif_3;
}
public void setSpecif_3(String specif_3) {
this.specif_3 = specif_3;
}
public String getSpecif_4() {
return specif_4;
}
public void setSpecif_4(String specif_4) {
this.specif_4 = specif_4;
}
public String getSpecif_5() {
return specif_5;
}
public void setSpecif_5(String specif_5) {
this.specif_5 = specif_5;
}
public String getSpecif_6() {
return specif_6;
}
public void setSpecif_6(String specif_6) {
this.specif_6 = specif_6;
}
public String getSend_type() {
return send_type;
}
public void setSend_type(String send_type) {
this.send_type = send_type;
}
public String getServdate() {
return servdate;
}
public void setServdate(String servdate) {
this.servdate = servdate;
}
public String getDoc_result() {
return doc_result;
}
public void setDoc_result(String doc_result) {
this.doc_result = doc_result;
} }
public Instant getGenerationTime() { public Instant getGenerationTime() {

54
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf14.java Normal file
View file

@ -0,0 +1,54 @@
package ru.clearing.classes.statics.data.sdf;
import ru.clearing.classes.ConstSerializable;
import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.math.BigDecimal;
import java.time.Instant;
/**
* ДФ-14 Уведомление о завершении расчетов
* <p>
* DB table: S_DF14
**/
public class SDf14 extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String outDocument;
private BigDecimal result;
private Instant generationTime;
private Long generationId;
public String getOutDocument() {
return outDocument;
}
public void setOutDocument(String value) {
this.outDocument = value;
}
public BigDecimal getResult() {
return result;
}
public void setResult(BigDecimal value) {
this.result = value;
}
public Instant getGenerationTime() {
return generationTime;
}
public void setGenerationTime(Instant value) {
this.generationTime = value;
}
public Long getGenerationId() {
return generationId;
}
public void setGenerationId(Long value) {
this.generationId = value;
}
}

1
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf16.java
View file

@ -14,6 +14,7 @@ import java.time.Instant;
* <p> * <p>
* DB table: S_DF16 * DB table: S_DF16
**/ **/
@Deprecated
public class SDf16 extends SpcexObjectBase implements WithAccount, WithMarket, WithSum { public class SDf16 extends SpcexObjectBase implements WithAccount, WithMarket, WithSum {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;

1
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf17.java
View file

@ -12,6 +12,7 @@ import java.time.Instant;
* <p> * <p>
* DB table: S_DF17 * DB table: S_DF17
**/ **/
@Deprecated
public class SDf17 extends SpcexObjectBase implements WithAccount { public class SDf17 extends SpcexObjectBase implements WithAccount {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;

1
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf18.java
View file

@ -12,6 +12,7 @@ import java.time.Instant;
* <p> * <p>
* DB table: S_DF18 * DB table: S_DF18
**/ **/
@Deprecated
public class SDf18 extends SpcexObjectBase implements WithAccount { public class SDf18 extends SpcexObjectBase implements WithAccount {
private static final long serialVersionUID = ConstSerializable.serialVersionUID; private static final long serialVersionUID = ConstSerializable.serialVersionUID;

134
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf20.java Normal file
View file

@ -0,0 +1,134 @@
package ru.clearing.classes.statics.data.sdf;
import ru.clearing.classes.ConstSerializable;
import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.time.Instant;
/**
* ДФ-20 Отчет об исполнении поручения на зачисление/списание ценных бумаг
* <p>
* DB table: S_DF20
**/
public class SDf20 extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String outDocument;
private String inDocument;
private String security;
private String openBalance;
private String depoCodeCl;
private String quantity;
private String operationCode;
private String depoCodeCorr;
private String operationDate;
private String closeBalance;
private String fileName;
private Instant generationTime;
private Long generationId;
public String getOutDocument() {
return outDocument;
}
public void setOutDocument(String value) {
this.outDocument = value;
}
public String getInDocument() {
return inDocument;
}
public void setInDocument(String value) {
this.inDocument = value;
}
public String getSecurity() {
return security;
}
public void setSecurity(String value) {
this.security = value;
}
public String getOpenBalance() {
return openBalance;
}
public void setOpenBalance(String value) {
this.openBalance = value;
}
public String getDepoCodeCl() {
return depoCodeCl;
}
public void setDepoCodeCl(String value) {
this.depoCodeCl = value;
}
public String getQuantity() {
return quantity;
}
public void setQuantity(String value) {
this.quantity = value;
}
public String getOperationCode() {
return operationCode;
}
public void setOperationCode(String value) {
this.operationCode = value;
}
public String getDepoCodeCorr() {
return depoCodeCorr;
}
public void setDepoCodeCorr(String value) {
this.depoCodeCorr = value;
}
public String getOperationDate() {
return operationDate;
}
public void setOperationDate(String value) {
this.operationDate = value;
}
public String getCloseBalance() {
return closeBalance;
}
public void setCloseBalance(String value) {
this.closeBalance = value;
}
public String getFileName() {
return fileName;
}
public void setFileName(String value) {
this.fileName = value;
}
public Instant getGenerationTime() {
return generationTime;
}
public void setGenerationTime(Instant value) {
this.generationTime = value;
}
public Long getGenerationId() {
return generationId;
}
public void setGenerationId(Long value) {
this.generationId = value;
}
}

395
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf54.java Normal file
View file

@ -0,0 +1,395 @@
package ru.clearing.classes.statics.data.sdf;
import ru.clearing.classes.ConstSerializable;
import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.time.Instant;
/**
* ДФ-54 Вывод свободных средств для инициаторов категории В с клирингового счета 30414
* <p>
* DB table: S_DF54
**/
public class SDf54 extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String seg_type;
private String doc_type;
private String docnm_ref;
private String docnmprev;
private String sbankcode;
private String c_acc_deb;
private String sbanknam1;
private String sbanknam2;
private String sbanknam3;
private String sbanknam4;
private String sbanknam5;
private String rbankcode;
private String c_acc_cred;
private String rbanknam1;
private String rbanknam2;
private String rbanknam3;
private String rbanknam4;
private String rbanknam5;
private String op_type;
private String op_order;
private String pay_date;
private String pay_val;
private String sum_deb;
private String sclientn1;
private String sclientn2;
private String sclientn3;
private String sclientn4;
private String inn_deb;
private String kpp_deb;
private String acc_deb;
private String rclientn1;
private String rclientn2;
private String rclientn3;
private String rclientn4;
private String inn_cred;
private String kpp_cred;
private String acc_kr_1;
private String specif_1;
private String send_type;
private String doc_result;
private Instant generationTime;
private Long generationId;
public String getSeg_type() {
return seg_type;
}
public void setSeg_type(String value) {
this.seg_type = value;
}
public String getDoc_type() {
return doc_type;
}
public void setDoc_type(String value) {
this.doc_type = value;
}
public String getDocnm_ref() {
return docnm_ref;
}
public void setDocnm_ref(String value) {
this.docnm_ref = value;
}
public String getDocnmprev() {
return docnmprev;
}
public void setDocnmprev(String value) {
this.docnmprev = value;
}
public String getSbankcode() {
return sbankcode;
}
public void setSbankcode(String value) {
this.sbankcode = value;
}
public String getC_acc_deb() {
return c_acc_deb;
}
public void setC_acc_deb(String value) {
this.c_acc_deb = value;
}
public String getSbanknam1() {
return sbanknam1;
}
public void setSbanknam1(String value) {
this.sbanknam1 = value;
}
public String getSbanknam2() {
return sbanknam2;
}
public void setSbanknam2(String value) {
this.sbanknam2 = value;
}
public String getSbanknam3() {
return sbanknam3;
}
public void setSbanknam3(String value) {
this.sbanknam3 = value;
}
public String getSbanknam4() {
return sbanknam4;
}
public void setSbanknam4(String value) {
this.sbanknam4 = value;
}
public String getSbanknam5() {
return sbanknam5;
}
public void setSbanknam5(String value) {
this.sbanknam5 = value;
}
public String getRbankcode() {
return rbankcode;
}
public void setRbankcode(String value) {
this.rbankcode = value;
}
public String getC_acc_cred() {
return c_acc_cred;
}
public void setC_acc_cred(String value) {
this.c_acc_cred = value;
}
public String getRbanknam1() {
return rbanknam1;
}
public void setRbanknam1(String value) {
this.rbanknam1 = value;
}
public String getRbanknam2() {
return rbanknam2;
}
public void setRbanknam2(String value) {
this.rbanknam2 = value;
}
public String getRbanknam3() {
return rbanknam3;
}
public void setRbanknam3(String value) {
this.rbanknam3 = value;
}
public String getRbanknam4() {
return rbanknam4;
}
public void setRbanknam4(String value) {
this.rbanknam4 = value;
}
public String getRbanknam5() {
return rbanknam5;
}
public void setRbanknam5(String value) {
this.rbanknam5 = value;
}
public String getOp_type() {
return op_type;
}
public void setOp_type(String value) {
this.op_type = value;
}
public String getOp_order() {
return op_order;
}
public void setOp_order(String value) {
this.op_order = value;
}
public String getPay_date() {
return pay_date;
}
public void setPay_date(String value) {
this.pay_date = value;
}
public String getPay_val() {
return pay_val;
}
public void setPay_val(String value) {
this.pay_val = value;
}
public String getSum_deb() {
return sum_deb;
}
public void setSum_deb(String value) {
this.sum_deb = value;
}
public String getSclientn1() {
return sclientn1;
}
public void setSclientn1(String value) {
this.sclientn1 = value;
}
public String getSclientn2() {
return sclientn2;
}
public void setSclientn2(String value) {
this.sclientn2 = value;
}
public String getSclientn3() {
return sclientn3;
}
public void setSclientn3(String value) {
this.sclientn3 = value;
}
public String getSclientn4() {
return sclientn4;
}
public void setSclientn4(String value) {
this.sclientn4 = value;
}
public String getInn_deb() {
return inn_deb;
}
public void setInn_deb(String value) {
this.inn_deb = value;
}
public String getKpp_deb() {
return kpp_deb;
}
public void setKpp_deb(String value) {
this.kpp_deb = value;
}
public String getAcc_deb() {
return acc_deb;
}
public void setAcc_deb(String value) {
this.acc_deb = value;
}
public String getRclientn1() {
return rclientn1;
}
public void setRclientn1(String value) {
this.rclientn1 = value;
}
public String getRclientn2() {
return rclientn2;
}
public void setRclientn2(String value) {
this.rclientn2 = value;
}
public String getRclientn3() {
return rclientn3;
}
public void setRclientn3(String value) {
this.rclientn3 = value;
}
public String getRclientn4() {
return rclientn4;
}
public void setRclientn4(String value) {
this.rclientn4 = value;
}
public String getInn_cred() {
return inn_cred;
}
public void setInn_cred(String value) {
this.inn_cred = value;
}
public String getKpp_cred() {
return kpp_cred;
}
public void setKpp_cred(String value) {
this.kpp_cred = value;
}
public String getAcc_kr_1() {
return acc_kr_1;
}
public void setAcc_kr_1(String value) {
this.acc_kr_1 = value;
}
public String getSpecif_1() {
return specif_1;
}
public void setSpecif_1(String value) {
this.specif_1 = value;
}
public String getSend_type() {
return send_type;
}
public void setSend_type(String value) {
this.send_type = value;
}
public String getDoc_result() {
return doc_result;
}
public void setDoc_result(String value) {
this.doc_result = value;
}
public Instant getGenerationTime() {
return generationTime;
}
public void setGenerationTime(Instant value) {
this.generationTime = value;
}
public Long getGenerationId() {
return generationId;
}
public void setGenerationId(Long value) {
this.generationId = value;
}
}

404
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf55.java Normal file
View file

@ -0,0 +1,404 @@
package ru.clearing.classes.statics.data.sdf;
import ru.clearing.classes.ConstSerializable;
import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.time.Instant;
/**
* ДФ-55 Квитанция об обработке ДФ-54
* <p>
* DB table: S_DF55
**/
public class SDf55 extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String seg_type;
private String doc_type;
private String docnm_ref;
private String docnmprev;
private String sbankcode;
private String c_acc_deb;
private String sbanknam1;
private String sbanknam2;
private String sbanknam3;
private String sbanknam4;
private String sbanknam5;
private String rbankcode;
private String c_acc_cred;
private String rbanknam1;
private String rbanknam2;
private String rbanknam3;
private String rbanknam4;
private String rbanknam5;
private String op_type;
private String op_order;
private String pay_date;
private String pay_val;
private String sum_deb;
private String sclientn1;
private String sclientn2;
private String sclientn3;
private String sclientn4;
private String inn_deb;
private String kpp_deb;
private String acc_deb;
private String rclientn1;
private String rclientn2;
private String rclientn3;
private String rclientn4;
private String inn_cred;
private String kpp_cred;
private String acc_kr_1;
private String specif_1;
private String send_type;
private String doc_result;
private String fileName;
private Instant generationTime;
private Long generationId;
public String getSeg_type() {
return seg_type;
}
public void setSeg_type(String value) {
this.seg_type = value;
}
public String getDoc_type() {
return doc_type;
}
public void setDoc_type(String value) {
this.doc_type = value;
}
public String getDocnm_ref() {
return docnm_ref;
}
public void setDocnm_ref(String value) {
this.docnm_ref = value;
}
public String getDocnmprev() {
return docnmprev;
}
public void setDocnmprev(String value) {
this.docnmprev = value;
}
public String getSbankcode() {
return sbankcode;
}
public void setSbankcode(String value) {
this.sbankcode = value;
}
public String getC_acc_deb() {
return c_acc_deb;
}
public void setC_acc_deb(String value) {
this.c_acc_deb = value;
}
public String getSbanknam1() {
return sbanknam1;
}
public void setSbanknam1(String value) {
this.sbanknam1 = value;
}
public String getSbanknam2() {
return sbanknam2;
}
public void setSbanknam2(String value) {
this.sbanknam2 = value;
}
public String getSbanknam3() {
return sbanknam3;
}
public void setSbanknam3(String value) {
this.sbanknam3 = value;
}
public String getSbanknam4() {
return sbanknam4;
}
public void setSbanknam4(String value) {
this.sbanknam4 = value;
}
public String getSbanknam5() {
return sbanknam5;
}
public void setSbanknam5(String value) {
this.sbanknam5 = value;
}
public String getRbankcode() {
return rbankcode;
}
public void setRbankcode(String value) {
this.rbankcode = value;
}
public String getC_acc_cred() {
return c_acc_cred;
}
public void setC_acc_cred(String value) {
this.c_acc_cred = value;
}
public String getRbanknam1() {
return rbanknam1;
}
public void setRbanknam1(String value) {
this.rbanknam1 = value;
}
public String getRbanknam2() {
return rbanknam2;
}
public void setRbanknam2(String value) {
this.rbanknam2 = value;
}
public String getRbanknam3() {
return rbanknam3;
}
public void setRbanknam3(String value) {
this.rbanknam3 = value;
}
public String getRbanknam4() {
return rbanknam4;
}
public void setRbanknam4(String value) {
this.rbanknam4 = value;
}
public String getRbanknam5() {
return rbanknam5;
}
public void setRbanknam5(String value) {
this.rbanknam5 = value;
}
public String getOp_type() {
return op_type;
}
public void setOp_type(String value) {
this.op_type = value;
}
public String getOp_order() {
return op_order;
}
public void setOp_order(String value) {
this.op_order = value;
}
public String getPay_date() {
return pay_date;
}
public void setPay_date(String value) {
this.pay_date = value;
}
public String getPay_val() {
return pay_val;
}
public void setPay_val(String value) {
this.pay_val = value;
}
public String getSum_deb() {
return sum_deb;
}
public void setSum_deb(String value) {
this.sum_deb = value;
}
public String getSclientn1() {
return sclientn1;
}
public void setSclientn1(String value) {
this.sclientn1 = value;
}
public String getSclientn2() {
return sclientn2;
}
public void setSclientn2(String value) {
this.sclientn2 = value;
}
public String getSclientn3() {
return sclientn3;
}
public void setSclientn3(String value) {
this.sclientn3 = value;
}
public String getSclientn4() {
return sclientn4;
}
public void setSclientn4(String value) {
this.sclientn4 = value;
}
public String getInn_deb() {
return inn_deb;
}
public void setInn_deb(String value) {
this.inn_deb = value;
}
public String getKpp_deb() {
return kpp_deb;
}
public void setKpp_deb(String value) {
this.kpp_deb = value;
}
public String getAcc_deb() {
return acc_deb;
}
public void setAcc_deb(String value) {
this.acc_deb = value;
}
public String getRclientn1() {
return rclientn1;
}
public void setRclientn1(String value) {
this.rclientn1 = value;
}
public String getRclientn2() {
return rclientn2;
}
public void setRclientn2(String value) {
this.rclientn2 = value;
}
public String getRclientn3() {
return rclientn3;
}
public void setRclientn3(String value) {
this.rclientn3 = value;
}
public String getRclientn4() {
return rclientn4;
}
public void setRclientn4(String value) {
this.rclientn4 = value;
}
public String getInn_cred() {
return inn_cred;
}
public void setInn_cred(String value) {
this.inn_cred = value;
}
public String getKpp_cred() {
return kpp_cred;
}
public void setKpp_cred(String value) {
this.kpp_cred = value;
}
public String getAcc_kr_1() {
return acc_kr_1;
}
public void setAcc_kr_1(String value) {
this.acc_kr_1 = value;
}
public String getSpecif_1() {
return specif_1;
}
public void setSpecif_1(String value) {
this.specif_1 = value;
}
public String getSend_type() {
return send_type;
}
public void setSend_type(String value) {
this.send_type = value;
}
public String getDoc_result() {
return doc_result;
}
public void setDoc_result(String value) {
this.doc_result = value;
}
public String getFileName() {
return fileName;
}
public void setFileName(String value) {
this.fileName = value;
}
public Instant getGenerationTime() {
return generationTime;
}
public void setGenerationTime(Instant value) {
this.generationTime = value;
}
public Long getGenerationId() {
return generationId;
}
public void setGenerationId(Long value) {
this.generationId = value;
}
}

79
clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/sdf/SDf56.java Normal file
View file

@ -0,0 +1,79 @@
package ru.clearing.classes.statics.data.sdf;
import ru.clearing.classes.ConstSerializable;
import ru.spcex.platform.classes.base.SpcexObjectBase;
import java.time.Instant;
/**
* ДФ-56 Запрос транзакций за период
* <p>
* DB table: S_DF56
**/
public class SDf56 extends SpcexObjectBase {
private static final long serialVersionUID = ConstSerializable.serialVersionUID;
private String number;
private String start_datetime;
private String end_datetime;
private String account;
private String deal;
private Instant generationTime;
private Long generationId;
public String getNumber() {
return number;
}
public void setNumber(String value) {
this.number = value;
}
public String getStart_datetime() {
return start_datetime;
}
public void setStart_datetime(String value) {
this.start_datetime = value;
}
public String getEnd_datetime() {
return end_datetime;
}
public void setEnd_datetime(String value) {
this.end_datetime = value;
}
public String getAccount() {
return account;
}
public void setAccount(String value) {
this.account = value;
}
public String getDeal() {
return deal;
}
public void setDeal(String value) {
this.deal = value;
}
public Instant getGenerationTime() {
return generationTime;
}
public void setGenerationTime(Instant value) {
this.generationTime = value;
}
public Long getGenerationId() {
return generationId;
}
public void setGenerationId(Long value) {
this.generationId = value;
}
}

Some files were not shown because too many files have changed in this diff Show more