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

Merge branch 'dev' into spring-state-machine-template-v2

Browse source
This commit is contained in:
ialbert 2025-06-27 17:05:11 +03:00
commit c341878e54
62 changed files with 6239 additions and 961 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clearing-parent/account-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
clearing-parent/backend-api/pom.xml
View file

@ -11,7 +11,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>

11
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/registry/ReturnDepositActionNew.java
View file

@ -22,15 +22,12 @@ public class ReturnDepositActionNew implements IAction<RegistryReturnDepositRequ
@ApiModelProperty(value = "Сумма", example = "1600.20")
@JsonProperty
public BigDecimal balance;
@JsonProperty
public String market;
@Override
public RegistryReturnDepositRequest toRequest() {
var req = new RegistryReturnDepositRequest();
req.setId(id);
req.setBalance(balance);
req.setMarket(market);
return req;
}
@ -68,12 +65,4 @@ public class ReturnDepositActionNew implements IAction<RegistryReturnDepositRequ
public void setBalance(BigDecimal balance) {
this.balance = balance;
}
public String getMarket() {
return market;
}
public void setMarket(String market) {
this.market = market;
}
}

6
clearing-parent/backend-api/src/main/resources/meta/meta.json
View file

@ -1,6 +1,6 @@
{
"version": "3.18.244.133",
"version": "3.19.244.135",
"enums": {
@ -4656,10 +4656,6 @@
{"code": "balance",
"type": 10,"name": "Сумма","shortname": "Сумма","required": true
}
,
{"code": "market",
"type": 2,"length": 8,"name": "Код класса","shortname": "Код","visible": false
}
]
}
,

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--?xml-stylesheet type="text/xsl" href="\..\corp-reports\src\data\meta\meta.server.xslt"?-->
<meta version="3.18.244.133">
<meta version="3.19.244.135">
<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
<!--Здесь словари-->
<enums>
@ -1083,7 +1083,6 @@
<post name="Отметить средства на возврат депозита" destination="registries/returnDeposit" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.ReturnDepositActionNew">
<id type="1" name="Регистр требований" shortname="Регистр требований" required="true" enabled="false" visible="false"/>
<balance type="10" name="Сумма" shortname="Сумма" required="true"/>
<market type="2" length="8" name="Код класса" shortname="Код" visible="false"/>
</post>
<post name="Идентификация неразмеченных средств" destination="registries/identificationFunds" confirmation="securitySymbol,balance,tradingClearingRegistryId" class="ru.spcex.clearing.backendapi.controller.request.cud.registry.IdentificationFundsActionNew">
<id type="1" name="Идентификатор записи" shortname="ID" link="registry" linkCode="id" required="true"/>

2
clearing-parent/balance-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
clearing-parent/classes/pom.xml
View file

@ -12,7 +12,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<properties>

6
clearing-parent/cleaning-builders/pom.xml
View file

@ -6,13 +6,13 @@
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<artifactId>cleaning-builders</artifactId>
<name>cleaning-builders</name>
<description>Cleaning builders module</description>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<packaging>jar</packaging>
@ -26,7 +26,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<scope>compile</scope>
</dependency>
<dependency>

2
clearing-parent/clearing-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<modelVersion>4.0.0</modelVersion>

1
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionCurrencyComponent.java
View file

@ -315,6 +315,7 @@ public class ExecutionCurrencyComponent implements IExecutionUploadComponent {
STrades counterSTrades = sTradeImdg.getFirstObjectByPredicate(strPb.and(
strPb.equals("tradeNum", sTrades.getTradeNum()),
strPb.equals("section", sTrades.getSection()),
strPb.equals("classCode", sTrades.getClassCode()),
strPb.not(strPb.equals("operation", sTrades.getOperation()))));
if (counterSTrades != null) {
eCurrency.setCounterPartyTradingClearingRegistry(counterSTrades.getAccount());

1
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionDepositComponent.java
View file

@ -319,6 +319,7 @@ public class ExecutionDepositComponent implements IExecutionUploadComponent {
STrades counterSTrades = sTradeImdg.getFirstObjectByPredicate(strPb.and(
strPb.equals("tradeNum", sTrades.getTradeNum()),
strPb.equals("section", sTrades.getSection()),
strPb.equals("classCode", sTrades.getClassCode()),
strPb.not(strPb.equals("operation", sTrades.getOperation()))));
if (counterSTrades != null) {
eDeposit.setCounterPartyTradingClearingRegistry(counterSTrades.getAccount());

1
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/execution/ExecutionFondComponent.java
View file

@ -391,6 +391,7 @@ public class ExecutionFondComponent implements IExecutionUploadComponent {
STrades counterSTrades = sTradeImdg.getFirstObjectByPredicate(strPb.and(
strPb.equals("tradeNum", sTrades.getTradeNum()),
strPb.equals("section", sTrades.getSection()),
strPb.equals("classCode", sTrades.getClassCode()),
strPb.not(strPb.equals("operation", sTrades.getOperation()))));
if (counterSTrades != null) {
eFond.setCounterPartyTradingClearingRegistry(counterSTrades.getAccount());

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

@ -19,8 +19,7 @@ import ru.spcex.clearing.session.stage.StageResult;
import ru.spcex.clearing.session.stage.Task;
import ru.spcex.clearing.session.stage.TaskType;
import ru.spcex.clearing.session.stage.task.RequirementsAndObligationCreationCompoundPayload;
import static ru.spcex.clearing.util.ComparatorUtil.execIdComparator;
import static ru.spcex.clearing.util.ComparatorUtil.tradeTimeComparator;
import static ru.spcex.clearing.util.ComparatorUtil.*;
import ru.spcex.platform.classes.base.interfaces.ExecutionType;
import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.utils.collection.Pair;
@ -65,7 +64,7 @@ public class RequirementsAndObligationCreationCompound extends RequirementsAndOb
List<ExecutionCommon> executionCurrency = data.getExecutionsCurrency();
List<ExecutionCommon> executionDeposit = data.getExecutionsFinal();
Map<Long, Registry> newRgss = storageMap(executionFond, executionCurrency, executionDeposit);
Stream.of(executionFond, executionCurrency, executionDeposit).forEach(c -> c.sort(tradeTimeComparator.thenComparing(execIdComparator)));
Stream.of(executionFond, executionCurrency, executionDeposit).forEach(c -> c.sort(tradeTimeComparator.thenComparing(execIdComparator).thenComparing(execMarketComparator)));
int efs = executionFond.size();
int eds = executionDeposit.size();

3
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/util/ComparatorUtil.java
View file

@ -10,4 +10,7 @@ public class ComparatorUtil {
public static final Comparator<ExecutionCommon> execIdComparator
= Comparator.comparing(ExecutionCommon::getExchangeExecutionId);
public static final Comparator<ExecutionCommon> execMarketComparator
= Comparator.comparing(ExecutionCommon::getMarket);
}

8
clearing-parent/clearing-validation/pom.xml
View file

@ -8,12 +8,12 @@
<name>clearing-validation</name>
<description>Clearing-module, dependency version of platform-utils</description>
<packaging>jar</packaging>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<properties>
@ -35,13 +35,13 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>dictionary</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<scope>compile</scope>
</dependency>
<dependency>

2
clearing-parent/company-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
clearing-parent/db-scripts/pom.xml
View file

@ -7,12 +7,12 @@
<artifactId>db-scripts</artifactId>
<name>db-scripts</name>
<description>db-scripts for PostgreSQL</description>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<build>

4
clearing-parent/db-scripts/src/main/resources/db/DDL.sql
View file

@ -1,4 +1,4 @@
-- DB version: 3.18
-- DB version: 3.19
/* Dictionaries */
-- allowed - Справочник признаков допустимости использования объектов
@ -5536,4 +5536,4 @@ GRANT ALL PRIVILEGES ON TABLE UTILITARIAN_DIGITAL_RIGHT_HISTORY TO clearing;
-- Data types
INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.18') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION
INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.19') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION

5536
clearing-parent/db-scripts/src/main/resources/db/DDL_3.18.sql Normal file
View file

File diff suppressed because it is too large Load diff

2
clearing-parent/db-scripts/src/main/resources/db/updateDDL_3.19.sql
View file

@ -6,4 +6,4 @@ COMMENT ON COLUMN REGISTRY.MARKET IS 'Код класса инструмента
ALTER TABLE REGISTRY_HISTORY ADD COLUMN IF NOT EXISTS MARKET VARCHAR(8);
COMMENT ON COLUMN REGISTRY_HISTORY.MARKET IS 'Код класса инструмента';
INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.19') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION
INSERT INTO DB_VERSION(ID, VERSION) values (1, '3.19') ON CONFLICT (ID) DO UPDATE SET VERSION = EXCLUDED.VERSION;

4
clearing-parent/dbf-exporter/pom.xml
View file

@ -7,12 +7,12 @@
<artifactId>dbf-exporter</artifactId>
<name>dbf-exporter</name>
<description>DBF exporter for DBF files</description>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<dependencies>

4
clearing-parent/dbf-importer/pom.xml
View file

@ -8,12 +8,12 @@
<artifactId>dbf-importer</artifactId>
<name>dbf-importer</name>
<description>DBF loader for DBF files</description>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<dependencies>

4
clearing-parent/dictionary/pom.xml
View file

@ -8,12 +8,12 @@
<name>Clearing dictionary</name>
<description>Clearing dictionary</description>
<packaging>jar</packaging>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<properties>

4
clearing-parent/extdb-importer/pom.xml
View file

@ -4,12 +4,12 @@
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<artifactId>extdb-importer</artifactId>
<name>extdb-importer</name>
<description>Extdb importer module. Аналог trade-importer.</description>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<packaging>jar</packaging>
<properties>

2
clearing-parent/gateway-api/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<modelVersion>4.0.0</modelVersion>

10
clearing-parent/imdg-hist/pom.xml
View file

@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>imdg-hist</artifactId>
<packaging>jar</packaging>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
@ -36,13 +36,13 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>dictionary</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<scope>compile</scope>
</dependency>
@ -82,7 +82,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>cleaning-builders</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<scope>compile</scope>
</dependency>
<dependency>

10
clearing-parent/imdg/pom.xml
View file

@ -7,12 +7,12 @@
<artifactId>imdg</artifactId>
<name>Clearing in memory data grid</name>
<packaging>jar</packaging>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<properties>
@ -32,13 +32,13 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>dictionary</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<scope>compile</scope>
</dependency>
@ -89,7 +89,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>cleaning-builders</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<scope>compile</scope>
</dependency>
<dependency>

6
clearing-parent/lim-exporter/pom.xml
View file

@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>lim-exporter</artifactId>
<name>Lim exporter</name>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<packaging>jar</packaging>
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<properties>
@ -35,7 +35,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<scope>compile</scope>
</dependency>
<dependency>

4
clearing-parent/pom.xml
View file

@ -7,12 +7,12 @@
<name>_parent_clearing</name>
<description>Clearing parent module</description>
<packaging>pom</packaging>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<parent>
<artifactId>clearing</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<modules>

2
clearing-parent/registry-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
clearing-parent/reports-service/pom.xml
View file

@ -8,12 +8,12 @@
<artifactId>reports-service</artifactId>
<name>reports-service</name>
<description>Service for creating reports</description>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<dependencies>
<!-- Spring boot -->

4
clearing-parent/scheduler-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -51,7 +51,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>cleaning-builders</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<scope>compile</scope>
</dependency>
<dependency>

2
clearing-parent/securities-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<modelVersion>4.0.0</modelVersion>

8
clearing-parent/security-util/pom.xml
View file

@ -8,12 +8,12 @@
<name>security-util clearing</name>
<description>Clearing misc util for verify user roles</description>
<packaging>jar</packaging>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<properties>
@ -35,13 +35,13 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>dictionary</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<scope>compile</scope>
</dependency>
<dependency>

6
clearing-parent/swt-exporter/pom.xml
View file

@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>swt-exporter</artifactId>
<name>Swt exporter</name>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<packaging>jar</packaging>
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<properties>
@ -35,7 +35,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<scope>compile</scope>
</dependency>
<dependency>

2
clearing-parent/swt-importer/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
clearing-parent/test-clearing/pom.xml
View file

@ -4,11 +4,11 @@
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<artifactId>test-clearing</artifactId>
<name>Test-clearing</name>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<dependencies>
<dependency>
<groupId>ru.spcex.platform</groupId>

6
clearing-parent/trade-importer/pom.xml
View file

@ -4,12 +4,12 @@
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<artifactId>trade-importer</artifactId>
<name>trade-importer</name>
<description>Trade importer module</description>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<packaging>jar</packaging>
<properties>
@ -55,7 +55,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<scope>compile</scope>
</dependency>
<dependency>

2
clearing-parent/utility-service/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
clearing-parent/xml-exporter/pom.xml
View file

@ -7,12 +7,12 @@
<artifactId>xml-exporter</artifactId>
<name>xml-exporter</name>
<description>XML exporter for XML files</description>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<dependencies>

138
clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF03ObjectTag.java
View file

@ -1,7 +1,6 @@
package ru.spcex.clearing.xml.exporter.logic.data.tags.objects;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import java.time.LocalDate;
@ -33,15 +32,7 @@ public class DF03ObjectTag extends ObjectTag<SDf03> {
@JacksonXmlProperty(isAttribute = true, localName = "SBANKNAM")
@JsonSerialize(nullsUsing = NullSerializer.class)
private String sbanknam1;
@JsonIgnore
private String sbanknam2;
@JsonIgnore
private String sbanknam3;
@JsonIgnore
private String sbanknam4;
@JsonIgnore
private String sbanknam5;
private String sbanknam;
@JacksonXmlProperty(isAttribute = true, localName = "C_ACC_CRED")
@JsonSerialize(nullsUsing = NullSerializer.class)
@ -49,15 +40,7 @@ public class DF03ObjectTag extends ObjectTag<SDf03> {
@JacksonXmlProperty(isAttribute = true, localName = "RBANKNAM")
@JsonSerialize(nullsUsing = NullSerializer.class)
private String rbanknam1;
@JsonIgnore
private String rbanknam2;
@JsonIgnore
private String rbanknam3;
@JsonIgnore
private String rbanknam4;
@JsonIgnore
private String rbanknam5;
private String rbanknam;
@JacksonXmlProperty(isAttribute = true, localName = "PAY_DATE")
@JsonSerialize(nullsUsing = NullSerializer.class)
@ -93,17 +76,17 @@ public class DF03ObjectTag extends ObjectTag<SDf03> {
this.docnmRef = entity.getDocnm_ref();
this.docnmprev = entity.getDocnmprev();
this.cAccDeb = entity.getC_acc_deb();
this.sbanknam1 = entity.getSbanknam1();
this.sbanknam2 = entity.getSbanknam2();
this.sbanknam3 = entity.getSbanknam3();
this.sbanknam4 = entity.getSbanknam4();
this.sbanknam5 = entity.getSbanknam5();
this.sbanknam = getOrEmptyString(entity.getSbanknam1()) +
getOrEmptyString(entity.getSbanknam2()) +
getOrEmptyString(entity.getSbanknam3()) +
getOrEmptyString(entity.getSbanknam4()) +
getOrEmptyString(entity.getSbanknam5());
this.cAccCred = entity.getC_acc_cred();
this.rbanknam1 = entity.getRbanknam1();
this.rbanknam2 = entity.getRbanknam2();
this.rbanknam3 = entity.getRbanknam3();
this.rbanknam4 = entity.getRbanknam4();
this.rbanknam5 = entity.getRbanknam5();
this.rbanknam = getOrEmptyString(entity.getRbanknam1()) +
getOrEmptyString(entity.getRbanknam2()) +
getOrEmptyString(entity.getRbanknam3()) +
getOrEmptyString(entity.getRbanknam4()) +
getOrEmptyString(entity.getRbanknam5());
this.payDate = entity.getPay_date() != null ? LocalDate.parse(entity.getPay_date(), dtf) : null;
this.payVal = entity.getPay_val();
this.sumDeb = entity.getSum_deb();
@ -156,44 +139,12 @@ public class DF03ObjectTag extends ObjectTag<SDf03> {
this.cAccDeb = cAccDeb;
}
public String getSbanknam1() {
return sbanknam1;
public String getSbanknam() {
return sbanknam;
}
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 void setSbanknam(String sbanknam) {
this.sbanknam = sbanknam;
}
public String getcAccCred() {
@ -204,44 +155,12 @@ public class DF03ObjectTag extends ObjectTag<SDf03> {
this.cAccCred = cAccCred;
}
public String getRbanknam1() {
return rbanknam1;
public String getRbanknam() {
return rbanknam;
}
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 void setRbanknam(String rbanknam) {
this.rbanknam = rbanknam;
}
public LocalDate getPayDate() {
@ -286,15 +205,14 @@ public class DF03ObjectTag extends ObjectTag<SDf03> {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
DF03ObjectTag that = (DF03ObjectTag) o;
return Objects.equals(segType, that.segType) && Objects.equals(docType, that.docType) && Objects.equals(docnmRef, that.docnmRef) && Objects.equals(docnmprev, that.docnmprev) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam1, that.sbanknam1) && Objects.equals(sbanknam2, that.sbanknam2) && Objects.equals(sbanknam3, that.sbanknam3) && Objects.equals(sbanknam4, that.sbanknam4) && Objects.equals(sbanknam5, that.sbanknam5) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam1, that.rbanknam1) && Objects.equals(rbanknam2, that.rbanknam2) && Objects.equals(rbanknam3, that.rbanknam3) && Objects.equals(rbanknam4, that.rbanknam4) && Objects.equals(rbanknam5, that.rbanknam5) && Objects.equals(payDate, that.payDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(specif1, that.specif1) && Objects.equals(impResult, that.impResult);
return Objects.equals(segType, that.segType) && Objects.equals(docType, that.docType) && Objects.equals(docnmRef, that.docnmRef) && Objects.equals(docnmprev, that.docnmprev) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam, that.sbanknam) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam, that.rbanknam) && Objects.equals(payDate, that.payDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(specif1, that.specif1) && Objects.equals(impResult, that.impResult);
}
@Override
public int hashCode() {
return Objects.hash(segType, docType, docnmRef, docnmprev, cAccDeb, sbanknam1, sbanknam2, sbanknam3, sbanknam4, sbanknam5, cAccCred, rbanknam1, rbanknam2, rbanknam3, rbanknam4, rbanknam5, payDate, payVal, sumDeb, specif1, impResult);
return Objects.hash(segType, docType, docnmRef, docnmprev, cAccDeb, sbanknam, cAccCred, rbanknam, payDate, payVal, sumDeb, specif1, impResult);
}
@Override
@ -305,17 +223,9 @@ public class DF03ObjectTag extends ObjectTag<SDf03> {
", docnmRef='" + docnmRef + '\'' +
", docnmprev='" + docnmprev + '\'' +
", cAccDeb='" + cAccDeb + '\'' +
", sbanknam1='" + sbanknam1 + '\'' +
", sbanknam2='" + sbanknam2 + '\'' +
", sbanknam3='" + sbanknam3 + '\'' +
", sbanknam4='" + sbanknam4 + '\'' +
", sbanknam5='" + sbanknam5 + '\'' +
", sbanknam='" + sbanknam + '\'' +
", cAccCred='" + cAccCred + '\'' +
", rbanknam1='" + rbanknam1 + '\'' +
", rbanknam2='" + rbanknam2 + '\'' +
", rbanknam3='" + rbanknam3 + '\'' +
", rbanknam4='" + rbanknam4 + '\'' +
", rbanknam5='" + rbanknam5 + '\'' +
", rbanknam='" + rbanknam + '\'' +
", payDate=" + payDate +
", payVal='" + payVal + '\'' +
", sumDeb='" + sumDeb + '\'' +

244
clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/DF54ObjectTag.java
View file

@ -1,7 +1,6 @@
package ru.spcex.clearing.xml.exporter.logic.data.tags.objects;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import java.time.LocalDate;
@ -37,15 +36,7 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
@JacksonXmlProperty(isAttribute = true, localName = "SBANKNAM")
@JsonSerialize(nullsUsing = NullSerializer.class)
private String sbanknam1;
@JsonIgnore
private String sbanknam2;
@JsonIgnore
private String sbanknam3;
@JsonIgnore
private String sbanknam4;
@JsonIgnore
private String sbanknam5;
private String sbanknam;
@JacksonXmlProperty(isAttribute = true, localName = "RBANKCODE")
@JsonSerialize(nullsUsing = NullSerializer.class)
@ -57,15 +48,7 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
@JacksonXmlProperty(isAttribute = true, localName = "RBANKNAM")
@JsonSerialize(nullsUsing = NullSerializer.class)
private String rbanknam1;
@JsonIgnore
private String rbanknam2;
@JsonIgnore
private String rbanknam3;
@JsonIgnore
private String rbanknam4;
@JsonIgnore
private String rbanknam5;
private String rbanknam;
@JacksonXmlProperty(isAttribute = true, localName = "OP_TYPE")
@JsonSerialize(nullsUsing = NullSerializer.class)
@ -90,13 +73,7 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
@JacksonXmlProperty(isAttribute = true, localName = "SCLIENTN")
@JsonSerialize(nullsUsing = NullSerializer.class)
private String sclientn1;
@JsonIgnore
private String sclientn2;
@JsonIgnore
private String sclientn3;
@JsonIgnore
private String sclientn4;
private String sclientn;
@JacksonXmlProperty(isAttribute = true, localName = "INN_DEB")
@JsonSerialize(nullsUsing = NullSerializer.class)
@ -112,13 +89,7 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
@JacksonXmlProperty(isAttribute = true, localName = "RCLIENTN")
@JsonSerialize(nullsUsing = NullSerializer.class)
private String rclientn1;
@JsonIgnore
private String rclientn2;
@JsonIgnore
private String rclientn3;
@JsonIgnore
private String rclientn4;
private String rclientn;
@JacksonXmlProperty(isAttribute = true, localName = "INN_CRED")
@JsonSerialize(nullsUsing = NullSerializer.class)
@ -179,34 +150,34 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
this.docnmprev = entity.getDocnmprev();
this.sbankcode = entity.getSbankcode();
this.cAccDeb = entity.getC_acc_deb();
this.sbanknam1 = entity.getSbanknam1();
this.sbanknam2 = entity.getSbanknam2();
this.sbanknam3 = entity.getSbanknam3();
this.sbanknam4 = entity.getSbanknam4();
this.sbanknam5 = entity.getSbanknam5();
this.sbanknam = getOrEmptyString(entity.getSbanknam1()) +
getOrEmptyString(entity.getSbanknam2()) +
getOrEmptyString(entity.getSbanknam3()) +
getOrEmptyString(entity.getSbanknam4()) +
getOrEmptyString(entity.getSbanknam5());
this.rbankcode = entity.getRbankcode();
this.cAccCred = entity.getC_acc_cred();
this.rbanknam1 = entity.getRbanknam1();
this.rbanknam2 = entity.getRbanknam2();
this.rbanknam3 = entity.getRbanknam3();
this.rbanknam4 = entity.getRbanknam4();
this.rbanknam5 = entity.getRbanknam5();
this.rbanknam = getOrEmptyString(entity.getRbanknam1()) +
getOrEmptyString(entity.getRbanknam2()) +
getOrEmptyString(entity.getRbanknam3()) +
getOrEmptyString(entity.getRbanknam4()) +
getOrEmptyString(entity.getRbanknam5());
this.opType = entity.getOp_type();
this.opOrder = entity.getOp_order();
this.payDate = entity.getPay_date() != null ? LocalDate.parse(entity.getPay_date(), dtf) : null;
this.payVal = entity.getPay_val();
this.sumDeb = entity.getSum_deb();
this.sclientn1 = entity.getSclientn1();
this.sclientn2 = entity.getSclientn2();
this.sclientn3 = entity.getSclientn3();
this.sclientn4 = entity.getSclientn4();
this.sclientn = getOrEmptyString(entity.getSclientn1()) +
getOrEmptyString(entity.getSclientn2()) +
getOrEmptyString(entity.getSclientn3()) +
getOrEmptyString(entity.getSclientn4());
this.innDeb = entity.getInn_deb();
this.kppDeb = entity.getKpp_deb();
this.accDeb = entity.getAcc_deb();
this.rclientn1 = entity.getRclientn1();
this.rclientn2 = entity.getRclientn2();
this.rclientn3 = entity.getRclientn3();
this.rclientn4 = entity.getRclientn4();
this.rclientn = getOrEmptyString(entity.getRclientn1()) +
getOrEmptyString(entity.getRclientn2()) +
getOrEmptyString(entity.getRclientn3()) +
getOrEmptyString(entity.getRclientn4());
this.innCred = entity.getInn_cred();
this.kppCred = entity.getKpp_cred();
this.accKr1 = entity.getAcc_kr_1();
@ -273,44 +244,12 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
this.cAccDeb = cAccDeb;
}
public String getSbanknam1() {
return sbanknam1;
public String getSbanknam() {
return sbanknam;
}
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 void setSbanknam(String sbanknam) {
this.sbanknam = sbanknam;
}
public String getRbankcode() {
@ -329,44 +268,12 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
this.cAccCred = cAccCred;
}
public String getRbanknam1() {
return rbanknam1;
public String getRbanknam() {
return rbanknam;
}
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 void setRbanknam(String rbanknam) {
this.rbanknam = rbanknam;
}
public String getOpType() {
@ -409,36 +316,12 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
this.sumDeb = sumDeb;
}
public String getSclientn1() {
return sclientn1;
public String getSclientn() {
return sclientn;
}
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 void setSclientn(String sclientn) {
this.sclientn = sclientn;
}
public String getInnDeb() {
@ -465,36 +348,12 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
this.accDeb = accDeb;
}
public String getRclientn1() {
return rclientn1;
public String getRclientn() {
return rclientn;
}
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 void setRclientn(String rclientn) {
this.rclientn = rclientn;
}
public String getInnCred() {
@ -587,15 +446,14 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
DF54ObjectTag that = (DF54ObjectTag) o;
return Objects.equals(segType, that.segType) && Objects.equals(docType, that.docType) && Objects.equals(docnmRef, that.docnmRef) && Objects.equals(docnmprev, that.docnmprev) && Objects.equals(sbankcode, that.sbankcode) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam1, that.sbanknam1) && Objects.equals(sbanknam2, that.sbanknam2) && Objects.equals(sbanknam3, that.sbanknam3) && Objects.equals(sbanknam4, that.sbanknam4) && Objects.equals(sbanknam5, that.sbanknam5) && Objects.equals(rbankcode, that.rbankcode) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam1, that.rbanknam1) && Objects.equals(rbanknam2, that.rbanknam2) && Objects.equals(rbanknam3, that.rbanknam3) && Objects.equals(rbanknam4, that.rbanknam4) && Objects.equals(rbanknam5, that.rbanknam5) && Objects.equals(opType, that.opType) && Objects.equals(opOrder, that.opOrder) && Objects.equals(payDate, that.payDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(sclientn1, that.sclientn1) && Objects.equals(sclientn2, that.sclientn2) && Objects.equals(sclientn3, that.sclientn3) && Objects.equals(sclientn4, that.sclientn4) && Objects.equals(innDeb, that.innDeb) && Objects.equals(kppDeb, that.kppDeb) && Objects.equals(accDeb, that.accDeb) && Objects.equals(rclientn1, that.rclientn1) && Objects.equals(rclientn2, that.rclientn2) && Objects.equals(rclientn3, that.rclientn3) && Objects.equals(rclientn4, that.rclientn4) && Objects.equals(innCred, that.innCred) && Objects.equals(kppCred, that.kppCred) && Objects.equals(accKr1, that.accKr1) && Objects.equals(specif1, that.specif1) && Objects.equals(sendType, that.sendType) && Objects.equals(docResult, that.docResult) && Objects.equals(docNum, that.docNum) && Objects.equals(docDate, that.docDate) && Objects.equals(valueDate, that.valueDate) && Objects.equals(swiftBen, that.swiftBen) && Objects.equals(swiftInt, that.swiftInt);
return Objects.equals(segType, that.segType) && Objects.equals(docType, that.docType) && Objects.equals(docnmRef, that.docnmRef) && Objects.equals(docnmprev, that.docnmprev) && Objects.equals(sbankcode, that.sbankcode) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam, that.sbanknam) && Objects.equals(rbankcode, that.rbankcode) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam, that.rbanknam) && Objects.equals(opType, that.opType) && Objects.equals(opOrder, that.opOrder) && Objects.equals(payDate, that.payDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(sclientn, that.sclientn) && Objects.equals(innDeb, that.innDeb) && Objects.equals(kppDeb, that.kppDeb) && Objects.equals(accDeb, that.accDeb) && Objects.equals(rclientn, that.rclientn) && Objects.equals(innCred, that.innCred) && Objects.equals(kppCred, that.kppCred) && Objects.equals(accKr1, that.accKr1) && Objects.equals(specif1, that.specif1) && Objects.equals(sendType, that.sendType) && Objects.equals(docResult, that.docResult) && Objects.equals(docNum, that.docNum) && Objects.equals(docDate, that.docDate) && Objects.equals(valueDate, that.valueDate) && Objects.equals(swiftBen, that.swiftBen) && Objects.equals(swiftInt, that.swiftInt);
}
@Override
public int hashCode() {
return Objects.hash(segType, docType, docnmRef, docnmprev, sbankcode, cAccDeb, sbanknam1, sbanknam2, sbanknam3, sbanknam4, sbanknam5, rbankcode, cAccCred, rbanknam1, rbanknam2, rbanknam3, rbanknam4, rbanknam5, opType, opOrder, payDate, payVal, sumDeb, sclientn1, sclientn2, sclientn3, sclientn4, innDeb, kppDeb, accDeb, rclientn1, rclientn2, rclientn3, rclientn4, innCred, kppCred, accKr1, specif1, sendType, docResult, docNum, docDate, valueDate, swiftBen, swiftInt);
return Objects.hash(segType, docType, docnmRef, docnmprev, sbankcode, cAccDeb, sbanknam, rbankcode, cAccCred, rbanknam, opType, opOrder, payDate, payVal, sumDeb, sclientn, innDeb, kppDeb, accDeb, rclientn, innCred, kppCred, accKr1, specif1, sendType, docResult, docNum, docDate, valueDate, swiftBen, swiftInt);
}
@Override
@ -607,34 +465,20 @@ public class DF54ObjectTag extends ObjectTag<SDf54> {
", docnmprev='" + docnmprev + '\'' +
", sbankcode='" + sbankcode + '\'' +
", cAccDeb='" + cAccDeb + '\'' +
", sbanknam1='" + sbanknam1 + '\'' +
", sbanknam2='" + sbanknam2 + '\'' +
", sbanknam3='" + sbanknam3 + '\'' +
", sbanknam4='" + sbanknam4 + '\'' +
", sbanknam5='" + sbanknam5 + '\'' +
", sbanknam='" + sbanknam + '\'' +
", rbankcode='" + rbankcode + '\'' +
", cAccCred='" + cAccCred + '\'' +
", rbanknam1='" + rbanknam1 + '\'' +
", rbanknam2='" + rbanknam2 + '\'' +
", rbanknam3='" + rbanknam3 + '\'' +
", rbanknam4='" + rbanknam4 + '\'' +
", rbanknam5='" + rbanknam5 + '\'' +
", rbanknam='" + rbanknam + '\'' +
", opType='" + opType + '\'' +
", opOrder='" + opOrder + '\'' +
", payDate=" + payDate +
", payVal='" + payVal + '\'' +
", sumDeb='" + sumDeb + '\'' +
", sclientn1='" + sclientn1 + '\'' +
", sclientn2='" + sclientn2 + '\'' +
", sclientn3='" + sclientn3 + '\'' +
", sclientn4='" + sclientn4 + '\'' +
", sclientn='" + sclientn + '\'' +
", innDeb='" + innDeb + '\'' +
", kppDeb='" + kppDeb + '\'' +
", accDeb='" + accDeb + '\'' +
", rclientn1='" + rclientn1 + '\'' +
", rclientn2='" + rclientn2 + '\'' +
", rclientn3='" + rclientn3 + '\'' +
", rclientn4='" + rclientn4 + '\'' +
", rclientn='" + rclientn + '\'' +
", innCred='" + innCred + '\'' +
", kppCred='" + kppCred + '\'' +
", accKr1='" + accKr1 + '\'' +

9
clearing-parent/xml-exporter/src/main/java/ru/spcex/clearing/xml/exporter/logic/data/tags/objects/ObjectTag.java
View file

@ -1,10 +1,11 @@
package ru.spcex.clearing.xml.exporter.logic.data.tags.objects;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.Optional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.spcex.platform.classes.base.SpcexObjectBase;
@ -47,4 +48,8 @@ public abstract class ObjectTag<T1 extends SpcexObjectBase> {
}
return cloneObj;
}
public String getOrEmptyString(String str) {
return Optional.ofNullable(str).orElse("");
}
}

16
clearing-parent/xml-exporter/src/test/java/ru/spcex/clearing/xml/exporter/logic/stages/ExportSf03FromHazelcastTest.java
View file

@ -98,9 +98,17 @@ public class ExportSf03FromHazelcastTest {
expectedSDf03.setDocnm_ref("test3");
expectedSDf03.setDocnmprev("test4");
expectedSDf03.setC_acc_deb("test5");
expectedSDf03.setSbanknam1("test6");
expectedSDf03.setSbanknam1("sbanknam1");
expectedSDf03.setSbanknam2("sbanknam2");
expectedSDf03.setSbanknam3("sbanknam3");
expectedSDf03.setSbanknam4("sbanknam4");
expectedSDf03.setSbanknam5(null);
expectedSDf03.setC_acc_cred("test7");
expectedSDf03.setRbanknam1("test8");
expectedSDf03.setRbanknam1("rbanknam1");
expectedSDf03.setRbanknam2("rbanknam2");
expectedSDf03.setRbanknam3("rbanknam3");
expectedSDf03.setRbanknam4("rbanknam4");
expectedSDf03.setRbanknam5(null);
expectedSDf03.setPay_date("14.03.24");
expectedSDf03.setPay_val("test9");
expectedSDf03.setSum_deb("test10");
@ -123,9 +131,9 @@ public class ExportSf03FromHazelcastTest {
Assertions.assertThat(actualObjectTag.getDocnmRef()).isEqualTo(expectedSDf03.getDocnm_ref());
Assertions.assertThat(actualObjectTag.getDocnmprev()).isEqualTo(expectedSDf03.getDocnmprev());
Assertions.assertThat(actualObjectTag.getcAccDeb()).isEqualTo(expectedSDf03.getC_acc_deb());
Assertions.assertThat(actualObjectTag.getSbanknam1()).isEqualTo(expectedSDf03.getSbanknam1());
Assertions.assertThat(actualObjectTag.getSbanknam()).isEqualTo(expectedSDf03.getSbanknam1() + expectedSDf03.getSbanknam2() + expectedSDf03.getSbanknam3() + expectedSDf03.getSbanknam4());
Assertions.assertThat(actualObjectTag.getcAccCred()).isEqualTo(expectedSDf03.getC_acc_cred());
Assertions.assertThat(actualObjectTag.getRbanknam1()).isEqualTo(expectedSDf03.getRbanknam1());
Assertions.assertThat(actualObjectTag.getRbanknam()).isEqualTo(expectedSDf03.getRbanknam1() + expectedSDf03.getRbanknam2() + expectedSDf03.getRbanknam3() + expectedSDf03.getRbanknam4());
Assertions.assertThat(actualObjectTag.getPayDate().format(formatter)).isEqualTo(expectedSDf03.getPay_date());
Assertions.assertThat(actualObjectTag.getPayVal()).isEqualTo(expectedSDf03.getPay_val());
Assertions.assertThat(actualObjectTag.getSumDeb()).isEqualTo(expectedSDf03.getSum_deb());

30
clearing-parent/xml-exporter/src/test/java/ru/spcex/clearing/xml/exporter/logic/stages/ExportSf54FromHazelcastTest.java
View file

@ -99,20 +99,34 @@ public class ExportSf54FromHazelcastTest {
expectedSDf54.setDocnmprev("test4");
expectedSDf54.setSbankcode("test5");
expectedSDf54.setC_acc_deb("test6");
expectedSDf54.setSbanknam1("test7");
expectedSDf54.setSbanknam1("sbanknam1");
expectedSDf54.setSbanknam2("sbanknam2");
expectedSDf54.setSbanknam3("sbanknam3");
expectedSDf54.setSbanknam4("sbanknam4");
expectedSDf54.setSbanknam5(null);
expectedSDf54.setRbankcode("test8");
expectedSDf54.setC_acc_cred("test9");
expectedSDf54.setRbanknam1("test10");
expectedSDf54.setRbanknam1("rbanknam1");
expectedSDf54.setRbanknam2("rbanknam2");
expectedSDf54.setRbanknam3("rbanknam3");
expectedSDf54.setRbanknam4("rbanknam4");
expectedSDf54.setRbanknam5(null);
expectedSDf54.setOp_type("test11");
expectedSDf54.setOp_order("test12");
expectedSDf54.setPay_date("14.03.24");
expectedSDf54.setPay_val("test13");
expectedSDf54.setSum_deb("test14");
expectedSDf54.setSclientn1("test15");
expectedSDf54.setSclientn1("sclientn1");
expectedSDf54.setSclientn2("sclientn2");
expectedSDf54.setSclientn3("sclientn3");
expectedSDf54.setSclientn4(null);
expectedSDf54.setInn_deb("test16");
expectedSDf54.setKpp_deb("test17");
expectedSDf54.setAcc_deb("test18");
expectedSDf54.setRclientn1("test19");
expectedSDf54.setRclientn1("rclientn1");
expectedSDf54.setRclientn2("rclientn2");
expectedSDf54.setRclientn3("rclientn3");
expectedSDf54.setRclientn4(null);
expectedSDf54.setInn_cred("test20");
expectedSDf54.setKpp_cred("test21");
expectedSDf54.setAcc_kr_1("test22");
@ -142,20 +156,20 @@ public class ExportSf54FromHazelcastTest {
Assertions.assertThat(actualObjectTag.getDocnmprev()).isEqualTo(expectedSDf54.getDocnmprev());
Assertions.assertThat(actualObjectTag.getSbankcode()).isEqualTo(expectedSDf54.getSbankcode());
Assertions.assertThat(actualObjectTag.getcAccDeb()).isEqualTo(expectedSDf54.getC_acc_deb());
Assertions.assertThat(actualObjectTag.getSbanknam1()).isEqualTo(expectedSDf54.getSbanknam1());
Assertions.assertThat(actualObjectTag.getSbanknam()).isEqualTo(expectedSDf54.getSbanknam1() + expectedSDf54.getSbanknam2() + expectedSDf54.getSbanknam3() + expectedSDf54.getSbanknam4());
Assertions.assertThat(actualObjectTag.getRbankcode()).isEqualTo(expectedSDf54.getRbankcode());
Assertions.assertThat(actualObjectTag.getcAccCred()).isEqualTo(expectedSDf54.getC_acc_cred());
Assertions.assertThat(actualObjectTag.getRbanknam1()).isEqualTo(expectedSDf54.getRbanknam1());
Assertions.assertThat(actualObjectTag.getRbanknam()).isEqualTo(expectedSDf54.getRbanknam1() + expectedSDf54.getRbanknam2() + expectedSDf54.getRbanknam3() + expectedSDf54.getRbanknam4());
Assertions.assertThat(actualObjectTag.getOpType()).isEqualTo(expectedSDf54.getOp_type());
Assertions.assertThat(actualObjectTag.getOpOrder()).isEqualTo(expectedSDf54.getOp_order());
Assertions.assertThat(actualObjectTag.getPayDate().format(formatter)).isEqualTo(expectedSDf54.getPay_date());
Assertions.assertThat(actualObjectTag.getPayVal()).isEqualTo(expectedSDf54.getPay_val());
Assertions.assertThat(actualObjectTag.getSumDeb()).isEqualTo(expectedSDf54.getSum_deb());
Assertions.assertThat(actualObjectTag.getSclientn1()).isEqualTo(expectedSDf54.getSclientn1());
Assertions.assertThat(actualObjectTag.getSclientn()).isEqualTo(expectedSDf54.getSclientn1() + expectedSDf54.getSclientn2() + expectedSDf54.getSclientn3());
Assertions.assertThat(actualObjectTag.getInnDeb()).isEqualTo(expectedSDf54.getInn_deb());
Assertions.assertThat(actualObjectTag.getKppDeb()).isEqualTo(expectedSDf54.getKpp_deb());
Assertions.assertThat(actualObjectTag.getAccDeb()).isEqualTo(expectedSDf54.getAcc_deb());
Assertions.assertThat(actualObjectTag.getRclientn1()).isEqualTo(expectedSDf54.getRclientn1());
Assertions.assertThat(actualObjectTag.getRclientn()).isEqualTo(expectedSDf54.getRclientn1() + expectedSDf54.getRclientn2() + expectedSDf54.getRclientn3());
Assertions.assertThat(actualObjectTag.getInnCred()).isEqualTo(expectedSDf54.getInn_cred());
Assertions.assertThat(actualObjectTag.getKppCred()).isEqualTo(expectedSDf54.getKpp_cred());
Assertions.assertThat(actualObjectTag.getAccKr1()).isEqualTo(expectedSDf54.getAcc_kr_1());

2
clearing-parent/xml-exporter/src/test/resources/xml-original/DF-03_S_PRC1604240915_1.xml
View file

@ -2,6 +2,6 @@
<DOCUMENT MESSAGETYPE="DF03" MESSAGENAME="Распоряжение по итогам клиринга" MESSAGEDATE="2024-03-14" MESSAGETIME="09:15:31" SENDER="" RECIEVER="">
<PARENTDOC PARENTID=""/>
<OBJECTS>
<OBJECT SEG_TYPE="test1" DOC_TYPE="test2" DOCNM_REF="test3" DOCNMPREV="test4" C_ACC_DEB="test5" SBANKNAM="test6" C_ACC_CRED="test7" RBANKNAM="test8" PAY_DATE="2024-03-14" PAY_VAL="test9" SUM_DEB="test10" SPECIF_1="test11" IMP_RESULT="test12"/>
<OBJECT SEG_TYPE="test1" DOC_TYPE="test2" DOCNM_REF="test3" DOCNMPREV="test4" C_ACC_DEB="test5" SBANKNAM="sbanknam1sbanknam2sbanknam3sbanknam4" C_ACC_CRED="test7" RBANKNAM="rbanknam1rbanknam2rbanknam3rbanknam4" PAY_VAL="test9" SUM_DEB="test10" SPECIF_1="test11" IMP_RESULT="test12"/>
</OBJECTS>
</DOCUMENT>

2
clearing-parent/xml-exporter/src/test/resources/xml-original/DF-54_S_PRC1604240915_1.xml
View file

@ -2,6 +2,6 @@
<DOCUMENT MESSAGETYPE="DF54" MESSAGENAME="Распоряжение на вывод денежных средств" MESSAGEDATE="2024-03-14" MESSAGETIME="09:15:31" SENDER="" RECIEVER="">
<PARENTDOC PARENTID=""/>
<OBJECTS>
<OBJECT SEG_TYPE="test1" DOC_TYPE="test2" DOCNM_REF="test3" DOCNMPREV="test4" SBANKCODE="test5" C_ACC_DEB="test6" SBANKNAM="test7" RBANKCODE="test8" C_ACC_CRED="test9" RBANKNAM="test10" OP_TYPE="test11" OP_ORDER="test12" PAY_DATE="2024-03-14" PAY_VAL="test13" SUM_DEB="test14" SCLIENTN="test15" INN_DEB="test16" KPP_DEB="test17" ACC_DEB="test18" RCLIENTN="test19" INN_CRED="test20" KPP_CRED="test21" ACC_KR_1="test22" SPECIF_1="test23" SEND_TYPE="test24" DOC_RESULT="test25" DOC_NUM="test26" DOC_DATE="2024-03-15" VALUE_DATE="2024-03-16" SWIFT_BEN="test27" SWIFT_INT="test28"/>
<OBJECT SEG_TYPE="test1" DOC_TYPE="test2" DOCNM_REF="test3" DOCNMPREV="test4" SBANKCODE="test5" C_ACC_DEB="test6" SBANKNAM="sbanknam1sbanknam2sbanknam3sbanknam4" RBANKCODE="test8" C_ACC_CRED="test9" RBANKNAM="rbanknam1rbanknam2rbanknam3rbanknam4" OP_TYPE="test11" OP_ORDER="test12" PAY_VAL="test13" SUM_DEB="test14" SCLIENTN="sclientn1sclientn2sclientn3" INN_DEB="test16" KPP_DEB="test17" ACC_DEB="test18" RCLIENTN="rclientn1rclientn2rclientn3" INN_CRED="test20" KPP_CRED="test21" ACC_KR_1="test22" SPECIF_1="test23" SEND_TYPE="test24" DOC_RESULT="test25" DOC_NUM="test26" SWIFT_BEN="test27" SWIFT_INT="test28"/>
</OBJECTS>
</DOCUMENT>

4
clearing-parent/xml-importer/pom.xml
View file

@ -8,12 +8,12 @@
<artifactId>xml-importer</artifactId>
<name>xml-importer</name>
<description>XML loader for XML files</description>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<dependencies>

4
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/sdf/objects/DF01ObjectTag.java
View file

@ -14,7 +14,7 @@ public class DF01ObjectTag extends ObjectTag<SDf01> {
private static final ETable PREFIX = ETable.DF_01;
private static final Class<SDf01> CLAZZ = SDf01.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf01;
private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yy");
public DF01ObjectTag() {
super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
@ -66,7 +66,7 @@ public class DF01ObjectTag extends ObjectTag<SDf01> {
result.setRemainder(this.getRemainder());
result.setDeal(this.getDeal());
result.setAcc_code(this.getAccCode());
result.setDat(this.getDat() == null ? null : this.getDat().format(formatter));
result.setDat(this.getDat() == null ? null : this.getDat().format(FORMATTER));
result.setMarket(this.getMarket());
result.setAcc_name(this.getAccName());
result.setAcc_type(this.getAccType());

137
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/sdf/objects/DF04ObjectTag.java
View file

@ -5,6 +5,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import java.time.Instant;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Objects;
import ru.clearing.classes.statics.data.sdf.SDf04;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
@ -14,7 +15,7 @@ public class DF04ObjectTag extends ObjectTag<SDf04> {
private static final ETable PREFIX = ETable.DF_04;
private static final Class<SDf04> CLAZZ = SDf04.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf04;
private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yy");
public DF04ObjectTag() {
super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
@ -36,21 +37,13 @@ public class DF04ObjectTag extends ObjectTag<SDf04> {
private String cAccDeb;
@JacksonXmlProperty(isAttribute = true, localName = "SBANKNAM")
private String sbanknam1;
private String sbanknam2;
private String sbanknam3;
private String sbanknam4;
private String sbanknam5;
private String sbanknam;
@JacksonXmlProperty(isAttribute = true, localName = "C_ACC_CRED")
private String cAccCred;
@JacksonXmlProperty(isAttribute = true, localName = "RBANKNAM")
private String rbanknam1;
private String rbanknam2;
private String rbanknam3;
private String rbanknam4;
private String rbanknam5;
private String rbanknam;
@JacksonXmlProperty(isAttribute = true, localName = "PAY_DATE")
@JsonFormat(pattern = "yyyy-MM-dd")
@ -72,23 +65,26 @@ public class DF04ObjectTag extends ObjectTag<SDf04> {
public SDf04 getSDfEntity() {
SDf04 result = new SDf04();
List<String> sbanknamList = splitStringByNum(sbanknam, 35, 5);
List<String> rbanknamList = splitStringByNum(rbanknam, 35, 5);
result.setSeg_type(this.getSegType());
result.setDoc_type(this.getDocType());
result.setDocnm_ref(this.getDocnmRef());
result.setDocnmprev(this.getDocnmprev());
result.setC_acc_deb(this.getcAccDeb());
result.setSbanknam1(this.getSbanknam1());
result.setSbanknam2(this.getSbanknam1());
result.setSbanknam3(this.getSbanknam1());
result.setSbanknam4(this.getSbanknam1());
result.setSbanknam5(this.getSbanknam1());
result.setSbanknam1(sbanknamList.get(0));
result.setSbanknam2(sbanknamList.get(1));
result.setSbanknam3(sbanknamList.get(2));
result.setSbanknam4(sbanknamList.get(3));
result.setSbanknam5(sbanknamList.get(4));
result.setC_acc_cred(this.getcAccCred());
result.setRbanknam1(this.getRbanknam1());
result.setRbanknam2(this.getRbanknam1());
result.setRbanknam3(this.getRbanknam1());
result.setRbanknam4(this.getRbanknam1());
result.setRbanknam5(this.getRbanknam1());
result.setPay_date(this.getPayDate() == null ? null : this.getPayDate().format(formatter));
result.setRbanknam1(rbanknamList.get(0));
result.setRbanknam2(rbanknamList.get(1));
result.setRbanknam3(rbanknamList.get(2));
result.setRbanknam4(rbanknamList.get(3));
result.setRbanknam5(rbanknamList.get(4));
result.setPay_date(this.getPayDate() == null ? null : this.getPayDate().format(FORMATTER));
result.setPay_val(this.getPayVal());
result.setSum_deb(this.getSumDeb());
result.setSpecif_1(this.getSpecif1());
@ -140,44 +136,12 @@ public class DF04ObjectTag extends ObjectTag<SDf04> {
this.cAccDeb = cAccDeb;
}
public String getSbanknam1() {
return sbanknam1;
public String getSbanknam() {
return sbanknam;
}
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 void setSbanknam(String sbanknam) {
this.sbanknam = sbanknam;
}
public String getcAccCred() {
@ -188,44 +152,12 @@ public class DF04ObjectTag extends ObjectTag<SDf04> {
this.cAccCred = cAccCred;
}
public String getRbanknam1() {
return rbanknam1;
public String getRbanknam() {
return rbanknam;
}
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 void setRbanknam(String rbanknam) {
this.rbanknam = rbanknam;
}
public LocalDate getPayDate() {
@ -270,15 +202,14 @@ public class DF04ObjectTag extends ObjectTag<SDf04> {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
DF04ObjectTag that = (DF04ObjectTag) o;
return Objects.equals(segType, that.segType) && Objects.equals(docType, that.docType) && Objects.equals(docnmRef, that.docnmRef) && Objects.equals(docnmprev, that.docnmprev) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam1, that.sbanknam1) && Objects.equals(sbanknam2, that.sbanknam2) && Objects.equals(sbanknam3, that.sbanknam3) && Objects.equals(sbanknam4, that.sbanknam4) && Objects.equals(sbanknam5, that.sbanknam5) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam1, that.rbanknam1) && Objects.equals(rbanknam2, that.rbanknam2) && Objects.equals(rbanknam3, that.rbanknam3) && Objects.equals(rbanknam4, that.rbanknam4) && Objects.equals(rbanknam5, that.rbanknam5) && Objects.equals(payDate, that.payDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(specif1, that.specif1) && Objects.equals(impResult, that.impResult);
return Objects.equals(segType, that.segType) && Objects.equals(docType, that.docType) && Objects.equals(docnmRef, that.docnmRef) && Objects.equals(docnmprev, that.docnmprev) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam, that.sbanknam) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam, that.rbanknam) && Objects.equals(payDate, that.payDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(specif1, that.specif1) && Objects.equals(impResult, that.impResult);
}
@Override
public int hashCode() {
return Objects.hash(segType, docType, docnmRef, docnmprev, cAccDeb, sbanknam1, sbanknam2, sbanknam3, sbanknam4, sbanknam5, cAccCred, rbanknam1, rbanknam2, rbanknam3, rbanknam4, rbanknam5, payDate, payVal, sumDeb, specif1, impResult);
return Objects.hash(segType, docType, docnmRef, docnmprev, cAccDeb, sbanknam, cAccCred, rbanknam, payDate, payVal, sumDeb, specif1, impResult);
}
@Override
@ -289,17 +220,9 @@ public class DF04ObjectTag extends ObjectTag<SDf04> {
", docnmRef='" + docnmRef + '\'' +
", docnmprev='" + docnmprev + '\'' +
", cAccDeb='" + cAccDeb + '\'' +
", sbanknam1='" + sbanknam1 + '\'' +
", sbanknam2='" + sbanknam2 + '\'' +
", sbanknam3='" + sbanknam3 + '\'' +
", sbanknam4='" + sbanknam4 + '\'' +
", sbanknam5='" + sbanknam5 + '\'' +
", sbanknam='" + sbanknam + '\'' +
", cAccCred='" + cAccCred + '\'' +
", rbanknam1='" + rbanknam1 + '\'' +
", rbanknam2='" + rbanknam2 + '\'' +
", rbanknam3='" + rbanknam3 + '\'' +
", rbanknam4='" + rbanknam4 + '\'' +
", rbanknam5='" + rbanknam5 + '\'' +
", rbanknam='" + rbanknam + '\'' +
", payDate=" + payDate +
", payVal='" + payVal + '\'' +
", sumDeb='" + sumDeb + '\'' +

4
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/sdf/objects/DF06ObjectTag.java
View file

@ -15,7 +15,7 @@ public class DF06ObjectTag extends ObjectTag<SDf06> {
private static final ETable PREFIX = ETable.DF_06;
private static final Class<SDf06> CLAZZ = SDf06.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf06;
private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yy");
public DF06ObjectTag() {
super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
@ -76,7 +76,7 @@ public class DF06ObjectTag extends ObjectTag<SDf06> {
result.setSpec(this.getSpec());
result.setNumber(this.getNumber());
result.setDoc_num(this.getDocNum());
result.setDoc_date(this.getDocDate() == null ? null : this.getDocDate().format(formatter));
result.setDoc_date(this.getDocDate() == null ? null : this.getDocDate().format(FORMATTER));
result.setPay_val(this.getPayVal());
result.setFileName(this.getFileName());
result.setGenerationTime(Instant.now());

4
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/sdf/objects/DF52ObjectTag.java
View file

@ -14,7 +14,7 @@ public class DF52ObjectTag extends ObjectTag<SDf52> {
private static final ETable PREFIX = ETable.DF_52;
private static final Class<SDf52> CLAZZ = SDf52.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf52;
private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yy");
public DF52ObjectTag() {
super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
@ -46,7 +46,7 @@ public class DF52ObjectTag extends ObjectTag<SDf52> {
result.setAccount(this.getAccount());
result.setAcc_name(this.getAccName());
result.setDeal(this.getDeal());
result.setDate(this.getDate() == null ? null : this.getDate().format(formatter));
result.setDate(this.getDate() == null ? null : this.getDate().format(FORMATTER));
result.setAcc_type(this.getAccType());
result.setStatus(this.getStatus());
result.setFileName(this.getFileName());

243
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/sdf/objects/DF55ObjectTag.java
View file

@ -5,6 +5,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import java.time.Instant;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Objects;
import ru.clearing.classes.statics.data.sdf.SDf55;
import ru.spcex.clearing.imdg.IMDGDistributedNames;
@ -14,7 +15,7 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
private static final ETable PREFIX = ETable.DF_55;
private static final Class<SDf55> CLAZZ = SDf55.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf55;
private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yy");
public DF55ObjectTag() {
super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
@ -39,11 +40,7 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
private String cAccDeb;
@JacksonXmlProperty(isAttribute = true, localName = "SBANKNAM")
private String sbanknam1;
private String sbanknam2;
private String sbanknam3;
private String sbanknam4;
private String sbanknam5;
private String sbanknam;
@JacksonXmlProperty(isAttribute = true, localName = "RBANKCODE")
private String rbankcode;
@ -52,11 +49,7 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
private String cAccCred;
@JacksonXmlProperty(isAttribute = true, localName = "RBANKNAM")
private String rbanknam1;
private String rbanknam2;
private String rbanknam3;
private String rbanknam4;
private String rbanknam5;
private String rbanknam;
@JacksonXmlProperty(isAttribute = true, localName = "OP_TYPE")
private String opType;
@ -75,10 +68,7 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
private String sumDeb;
@JacksonXmlProperty(isAttribute = true, localName = "SCLIENTN")
private String sclientn1;
private String sclientn2;
private String sclientn3;
private String sclientn4;
private String sclientn;
@JacksonXmlProperty(isAttribute = true, localName = "INN_DEB")
private String innDeb;
@ -90,10 +80,7 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
private String accDeb;
@JacksonXmlProperty(isAttribute = true, localName = "RCLIENTN")
private String rclientn1;
private String rclientn2;
private String rclientn3;
private String rclientn4;
private String rclientn;
@JacksonXmlProperty(isAttribute = true, localName = "INN_CRED")
private String innCred;
@ -134,40 +121,45 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
public SDf55 getSDfEntity() {
SDf55 result = new SDf55();
List<String> sbanknamList = splitStringByNum(sbanknam, 35, 5);
List<String> rbanknamList = splitStringByNum(rbanknam, 35, 5);
List<String> sclientnList = splitStringByNum(sclientn, 35, 4);
List<String> rclientnList = splitStringByNum(rclientn, 35, 4);
result.setSeg_type(this.getSegType());
result.setDoc_type(this.getDocType());
result.setDocnm_ref(this.getDocnmRef());
result.setDocnmprev(this.getDocnmprev());
result.setSbankcode(this.getSbankcode());
result.setC_acc_deb(this.getcAccDeb());
result.setSbanknam1(this.getSbanknam1());
result.setSbanknam2(this.getSbanknam1());
result.setSbanknam3(this.getSbanknam1());
result.setSbanknam4(this.getSbanknam1());
result.setSbanknam5(this.getSbanknam1());
result.setSbanknam1(sbanknamList.get(0));
result.setSbanknam2(sbanknamList.get(1));
result.setSbanknam3(sbanknamList.get(2));
result.setSbanknam4(sbanknamList.get(3));
result.setSbanknam5(sbanknamList.get(4));
result.setRbankcode(this.getRbankcode());
result.setC_acc_cred(this.getcAccCred());
result.setRbanknam1(this.getRbanknam1());
result.setRbanknam2(this.getRbanknam1());
result.setRbanknam3(this.getRbanknam1());
result.setRbanknam4(this.getRbanknam1());
result.setRbanknam5(this.getRbanknam1());
result.setRbanknam1(rbanknamList.get(0));
result.setRbanknam2(rbanknamList.get(1));
result.setRbanknam3(rbanknamList.get(2));
result.setRbanknam4(rbanknamList.get(3));
result.setRbanknam5(rbanknamList.get(4));
result.setOp_type(this.getOpType());
result.setOp_order(this.getOpOrder());
result.setPay_date(this.getPayDate() == null ? null : this.getPayDate().format(formatter));
result.setPay_date(this.getPayDate() == null ? null : this.getPayDate().format(FORMATTER));
result.setPay_val(this.getPayVal());
result.setSum_deb(this.getSumDeb());
result.setSclientn1(this.getSclientn1());
result.setSclientn2(this.getSclientn1());
result.setSclientn3(this.getSclientn1());
result.setSclientn4(this.getSclientn1());
result.setSclientn1(sclientnList.get(0));
result.setSclientn2(sclientnList.get(1));
result.setSclientn3(sclientnList.get(2));
result.setSclientn4(sclientnList.get(3));
result.setInn_deb(this.getInnDeb());
result.setKpp_deb(this.getKppDeb());
result.setAcc_deb(this.getAccDeb());
result.setRclientn1(this.getRclientn1());
result.setRclientn2(this.getRclientn1());
result.setRclientn3(this.getRclientn1());
result.setRclientn4(this.getRclientn1());
result.setRclientn1(rclientnList.get(0));
result.setRclientn2(rclientnList.get(1));
result.setRclientn3(rclientnList.get(2));
result.setRclientn4(rclientnList.get(3));
result.setInn_cred(this.getInnCred());
result.setKpp_cred(this.getKppCred());
result.setAcc_kr_1(this.getAccKr1());
@ -175,8 +167,8 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
result.setSend_type(this.getSendType());
result.setDoc_result(this.getDocResult());
result.setDoc_num(this.getDocNum());
result.setDoc_date(this.getDocDate() == null ? null : this.getDocDate().format(formatter));
result.setValue_date(this.getValueDate() == null ? null : this.getValueDate().format(formatter));
result.setDoc_date(this.getDocDate() == null ? null : this.getDocDate().format(FORMATTER));
result.setValue_date(this.getValueDate() == null ? null : this.getValueDate().format(FORMATTER));
result.setSwift_ben(this.getSwiftBen());
result.setSwift_int(this.getSwiftInt());
result.setFileName(this.getFileName());
@ -234,44 +226,12 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
this.cAccDeb = cAccDeb;
}
public String getSbanknam1() {
return sbanknam1;
public String getSbanknam() {
return sbanknam;
}
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 void setSbanknam(String sbanknam) {
this.sbanknam = sbanknam;
}
public String getRbankcode() {
@ -290,44 +250,12 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
this.cAccCred = cAccCred;
}
public String getRbanknam1() {
return rbanknam1;
public String getRbanknam() {
return rbanknam;
}
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 void setRbanknam(String rbanknam) {
this.rbanknam = rbanknam;
}
public String getOpType() {
@ -370,36 +298,12 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
this.sumDeb = sumDeb;
}
public String getSclientn1() {
return sclientn1;
public String getSclientn() {
return sclientn;
}
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 void setSclientn(String sclientn) {
this.sclientn = sclientn;
}
public String getInnDeb() {
@ -426,36 +330,12 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
this.accDeb = accDeb;
}
public String getRclientn1() {
return rclientn1;
public String getRclientn() {
return rclientn;
}
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 void setRclientn(String rclientn) {
this.rclientn = rclientn;
}
public String getInnCred() {
@ -548,15 +428,14 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
DF55ObjectTag that = (DF55ObjectTag) o;
return Objects.equals(segType, that.segType) && Objects.equals(docType, that.docType) && Objects.equals(docnmRef, that.docnmRef) && Objects.equals(docnmprev, that.docnmprev) && Objects.equals(sbankcode, that.sbankcode) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam1, that.sbanknam1) && Objects.equals(sbanknam2, that.sbanknam2) && Objects.equals(sbanknam3, that.sbanknam3) && Objects.equals(sbanknam4, that.sbanknam4) && Objects.equals(sbanknam5, that.sbanknam5) && Objects.equals(rbankcode, that.rbankcode) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam1, that.rbanknam1) && Objects.equals(rbanknam2, that.rbanknam2) && Objects.equals(rbanknam3, that.rbanknam3) && Objects.equals(rbanknam4, that.rbanknam4) && Objects.equals(rbanknam5, that.rbanknam5) && Objects.equals(opType, that.opType) && Objects.equals(opOrder, that.opOrder) && Objects.equals(payDate, that.payDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(sclientn1, that.sclientn1) && Objects.equals(sclientn2, that.sclientn2) && Objects.equals(sclientn3, that.sclientn3) && Objects.equals(sclientn4, that.sclientn4) && Objects.equals(innDeb, that.innDeb) && Objects.equals(kppDeb, that.kppDeb) && Objects.equals(accDeb, that.accDeb) && Objects.equals(rclientn1, that.rclientn1) && Objects.equals(rclientn2, that.rclientn2) && Objects.equals(rclientn3, that.rclientn3) && Objects.equals(rclientn4, that.rclientn4) && Objects.equals(innCred, that.innCred) && Objects.equals(kppCred, that.kppCred) && Objects.equals(accKr1, that.accKr1) && Objects.equals(specif1, that.specif1) && Objects.equals(sendType, that.sendType) && Objects.equals(docResult, that.docResult) && Objects.equals(docNum, that.docNum) && Objects.equals(docDate, that.docDate) && Objects.equals(valueDate, that.valueDate) && Objects.equals(swiftBen, that.swiftBen) && Objects.equals(swiftInt, that.swiftInt);
return Objects.equals(segType, that.segType) && Objects.equals(docType, that.docType) && Objects.equals(docnmRef, that.docnmRef) && Objects.equals(docnmprev, that.docnmprev) && Objects.equals(sbankcode, that.sbankcode) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam, that.sbanknam) && Objects.equals(rbankcode, that.rbankcode) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam, that.rbanknam) && Objects.equals(opType, that.opType) && Objects.equals(opOrder, that.opOrder) && Objects.equals(payDate, that.payDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(sclientn, that.sclientn) && Objects.equals(innDeb, that.innDeb) && Objects.equals(kppDeb, that.kppDeb) && Objects.equals(accDeb, that.accDeb) && Objects.equals(rclientn, that.rclientn) && Objects.equals(innCred, that.innCred) && Objects.equals(kppCred, that.kppCred) && Objects.equals(accKr1, that.accKr1) && Objects.equals(specif1, that.specif1) && Objects.equals(sendType, that.sendType) && Objects.equals(docResult, that.docResult) && Objects.equals(docNum, that.docNum) && Objects.equals(docDate, that.docDate) && Objects.equals(valueDate, that.valueDate) && Objects.equals(swiftBen, that.swiftBen) && Objects.equals(swiftInt, that.swiftInt);
}
@Override
public int hashCode() {
return Objects.hash(segType, docType, docnmRef, docnmprev, sbankcode, cAccDeb, sbanknam1, sbanknam2, sbanknam3, sbanknam4, sbanknam5, rbankcode, cAccCred, rbanknam1, rbanknam2, rbanknam3, rbanknam4, rbanknam5, opType, opOrder, payDate, payVal, sumDeb, sclientn1, sclientn2, sclientn3, sclientn4, innDeb, kppDeb, accDeb, rclientn1, rclientn2, rclientn3, rclientn4, innCred, kppCred, accKr1, specif1, sendType, docResult, docNum, docDate, valueDate, swiftBen, swiftInt);
return Objects.hash(segType, docType, docnmRef, docnmprev, sbankcode, cAccDeb, sbanknam, rbankcode, cAccCred, rbanknam, opType, opOrder, payDate, payVal, sumDeb, sclientn, innDeb, kppDeb, accDeb, rclientn, innCred, kppCred, accKr1, specif1, sendType, docResult, docNum, docDate, valueDate, swiftBen, swiftInt);
}
@Override
@ -568,34 +447,20 @@ public class DF55ObjectTag extends ObjectTag<SDf55> {
", docnmprev='" + docnmprev + '\'' +
", sbankcode='" + sbankcode + '\'' +
", cAccDeb='" + cAccDeb + '\'' +
", sbanknam1='" + sbanknam1 + '\'' +
", sbanknam2='" + sbanknam2 + '\'' +
", sbanknam3='" + sbanknam3 + '\'' +
", sbanknam4='" + sbanknam4 + '\'' +
", sbanknam5='" + sbanknam5 + '\'' +
", sbanknam='" + sbanknam + '\'' +
", rbankcode='" + rbankcode + '\'' +
", cAccCred='" + cAccCred + '\'' +
", rbanknam1='" + rbanknam1 + '\'' +
", rbanknam2='" + rbanknam2 + '\'' +
", rbanknam3='" + rbanknam3 + '\'' +
", rbanknam4='" + rbanknam4 + '\'' +
", rbanknam5='" + rbanknam5 + '\'' +
", rbanknam='" + rbanknam + '\'' +
", opType='" + opType + '\'' +
", opOrder='" + opOrder + '\'' +
", payDate=" + payDate +
", payVal='" + payVal + '\'' +
", sumDeb='" + sumDeb + '\'' +
", sclientn1='" + sclientn1 + '\'' +
", sclientn2='" + sclientn2 + '\'' +
", sclientn3='" + sclientn3 + '\'' +
", sclientn4='" + sclientn4 + '\'' +
", sclientn='" + sclientn + '\'' +
", innDeb='" + innDeb + '\'' +
", kppDeb='" + kppDeb + '\'' +
", accDeb='" + accDeb + '\'' +
", rclientn1='" + rclientn1 + '\'' +
", rclientn2='" + rclientn2 + '\'' +
", rclientn3='" + rclientn3 + '\'' +
", rclientn4='" + rclientn4 + '\'' +
", rclientn='" + rclientn + '\'' +
", innCred='" + innCred + '\'' +
", kppCred='" + kppCred + '\'' +
", accKr1='" + accKr1 + '\'' +

241
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/sdf/objects/DF57ObjectTag.java
View file

@ -6,6 +6,7 @@ import java.time.Instant;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import org.slf4j.Logger;
@ -19,7 +20,7 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
private static final ETable PREFIX = ETable.DF_57;
private static final Class<SDf57> CLAZZ = SDf57.class;
private static final String NAME_OF_HZ_MAP = IMDGDistributedNames.Map_SDf57;
private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd.MM.yy");
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("dd.MM.yy");
public DF57ObjectTag() {
super(PREFIX, CLAZZ, NAME_OF_HZ_MAP);
@ -41,11 +42,7 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
private String cAccDeb;
@JacksonXmlProperty(isAttribute = true, localName = "SBANKNAM")
private String sbanknam1;
private String sbanknam2;
private String sbanknam3;
private String sbanknam4;
private String sbanknam5;
private String sbanknam;
@JacksonXmlProperty(isAttribute = true, localName = "RBANKCODE")
private String rbankcode;
@ -54,11 +51,7 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
private String cAccCred;
@JacksonXmlProperty(isAttribute = true, localName = "RBANKNAM")
private String rbanknam1;
private String rbanknam2;
private String rbanknam3;
private String rbanknam4;
private String rbanknam5;
private String rbanknam;
@JacksonXmlProperty(isAttribute = true, localName = "OP_TYPE")
private String opType;
@ -77,10 +70,7 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
private String sumDeb;
@JacksonXmlProperty(isAttribute = true, localName = "SCLIENTN")
private String sclientn1;
private String sclientn2;
private String sclientn3;
private String sclientn4;
private String sclientn;
@JacksonXmlProperty(isAttribute = true, localName = "INN_DEB")
private String innDeb;
@ -92,10 +82,7 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
private String accDeb;
@JacksonXmlProperty(isAttribute = true, localName = "RCLIENTN")
private String rclientn1;
private String rclientn2;
private String rclientn3;
private String rclientn4;
private String rclientn;
@JacksonXmlProperty(isAttribute = true, localName = "INN_CRED")
private String innCred;
@ -132,45 +119,50 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
public SDf57 getSDfEntity() {
SDf57 result = new SDf57();
List<String> sbanknamList = splitStringByNum(sbanknam, 35, 5);
List<String> rbanknamList = splitStringByNum(rbanknam, 35, 5);
List<String> sclientnList = splitStringByNum(sclientn, 35, 4);
List<String> rclientnList = splitStringByNum(rclientn, 35, 4);
result.setDbfId(this.getId());
result.setDeal_deb(this.getDealDeb());
result.setDeal_cred(this.getDealCred());
result.setSbankcode(this.getSbankcode());
result.setC_acc_deb(this.getcAccDeb());
result.setSbanknam1(this.getSbanknam1());
result.setSbanknam2(this.getSbanknam1());
result.setSbanknam3(this.getSbanknam1());
result.setSbanknam4(this.getSbanknam1());
result.setSbanknam5(this.getSbanknam1());
result.setSbanknam1(sbanknamList.get(0));
result.setSbanknam2(sbanknamList.get(1));
result.setSbanknam3(sbanknamList.get(2));
result.setSbanknam4(sbanknamList.get(3));
result.setSbanknam5(sbanknamList.get(4));
result.setRbankcode(this.getRbankcode());
result.setC_acc_cred(this.getcAccCred());
result.setRbanknam1(this.getRbanknam1());
result.setRbanknam2(this.getRbanknam1());
result.setRbanknam3(this.getRbanknam1());
result.setRbanknam4(this.getRbanknam1());
result.setRbanknam5(this.getRbanknam1());
result.setRbanknam1(rbanknamList.get(0));
result.setRbanknam2(rbanknamList.get(1));
result.setRbanknam3(rbanknamList.get(2));
result.setRbanknam4(rbanknamList.get(3));
result.setRbanknam5(rbanknamList.get(4));
result.setOp_type(this.getOpType());
result.setPay_date(this.getPayDate() == null ? null : this.getPayDate().format(formatter));
result.setPay_date(this.getPayDate() == null ? null : this.getPayDate().format(FORMATTER));
result.setExt_date(this.getExtDate() == null ? null : this.getExtDate().toString());
result.setPay_val(this.getPayVal());
result.setSum_deb(this.getSumDeb());
result.setSclientn1(this.getSclientn1());
result.setSclientn2(this.getSclientn1());
result.setSclientn3(this.getSclientn1());
result.setSclientn4(this.getSclientn1());
result.setSclientn1(sclientnList.get(0));
result.setSclientn2(sclientnList.get(1));
result.setSclientn3(sclientnList.get(2));
result.setSclientn4(sclientnList.get(3));
result.setInn_deb(this.getInnDeb());
result.setKpp_deb(this.getKppDeb());
result.setAcc_deb(this.getAccDeb());
result.setRclientn1(this.getRclientn1());
result.setRclientn2(this.getRclientn1());
result.setRclientn3(this.getRclientn1());
result.setRclientn4(this.getRclientn1());
result.setRclientn1(rclientnList.get(0));
result.setRclientn2(rclientnList.get(1));
result.setRclientn3(rclientnList.get(2));
result.setRclientn4(rclientnList.get(3));
result.setInn_cred(this.getInnCred());
result.setKpp_cred(this.getKppCred());
result.setAcc_kr(this.getAccKr());
result.setSpecif(this.getSpecif());
result.setDoc_num(this.getDocNum());
result.setDoc_date(this.getDocDate() == null ? null : this.getDocDate().format(formatter));
result.setDoc_date(this.getDocDate() == null ? null : this.getDocDate().format(FORMATTER));
result.setDt_in(this.getDtIn());
result.setKt_in(this.getKtIn());
result.setDt_out(this.getDtOut());
@ -234,44 +226,12 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
this.cAccDeb = cAccDeb;
}
public String getSbanknam1() {
return sbanknam1;
public String getSbanknam() {
return sbanknam;
}
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 void setSbanknam(String sbanknam) {
this.sbanknam = sbanknam;
}
public String getRbankcode() {
@ -290,44 +250,12 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
this.cAccCred = cAccCred;
}
public String getRbanknam1() {
return rbanknam1;
public String getRbanknam() {
return rbanknam;
}
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 void setRbanknam(String rbanknam) {
this.rbanknam = rbanknam;
}
public String getOpType() {
@ -370,36 +298,12 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
this.sumDeb = sumDeb;
}
public String getSclientn1() {
return sclientn1;
public String getSclientn() {
return sclientn;
}
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 void setSclientn(String sclientn) {
this.sclientn = sclientn;
}
public String getInnDeb() {
@ -426,36 +330,12 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
this.accDeb = accDeb;
}
public String getRclientn1() {
return rclientn1;
public String getRclientn() {
return rclientn;
}
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 void setRclientn(String rclientn) {
this.rclientn = rclientn;
}
public String getInnCred() {
@ -540,15 +420,14 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
DF57ObjectTag that = (DF57ObjectTag) o;
return Objects.equals(id, that.id) && Objects.equals(dealDeb, that.dealDeb) && Objects.equals(dealCred, that.dealCred) && Objects.equals(sbankcode, that.sbankcode) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam1, that.sbanknam1) && Objects.equals(sbanknam2, that.sbanknam2) && Objects.equals(sbanknam3, that.sbanknam3) && Objects.equals(sbanknam4, that.sbanknam4) && Objects.equals(sbanknam5, that.sbanknam5) && Objects.equals(rbankcode, that.rbankcode) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam1, that.rbanknam1) && Objects.equals(rbanknam2, that.rbanknam2) && Objects.equals(rbanknam3, that.rbanknam3) && Objects.equals(rbanknam4, that.rbanknam4) && Objects.equals(rbanknam5, that.rbanknam5) && Objects.equals(opType, that.opType) && Objects.equals(payDate, that.payDate) && Objects.equals(extDate, that.extDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(sclientn1, that.sclientn1) && Objects.equals(sclientn2, that.sclientn2) && Objects.equals(sclientn3, that.sclientn3) && Objects.equals(sclientn4, that.sclientn4) && Objects.equals(innDeb, that.innDeb) && Objects.equals(kppDeb, that.kppDeb) && Objects.equals(accDeb, that.accDeb) && Objects.equals(rclientn1, that.rclientn1) && Objects.equals(rclientn2, that.rclientn2) && Objects.equals(rclientn3, that.rclientn3) && Objects.equals(rclientn4, that.rclientn4) && Objects.equals(innCred, that.innCred) && Objects.equals(kppCred, that.kppCred) && Objects.equals(accKr, that.accKr) && Objects.equals(specif, that.specif) && Objects.equals(docNum, that.docNum) && Objects.equals(docDate, that.docDate) && Objects.equals(dtIn, that.dtIn) && Objects.equals(ktIn, that.ktIn) && Objects.equals(dtOut, that.dtOut) && Objects.equals(ktOut, that.ktOut);
return Objects.equals(id, that.id) && Objects.equals(dealDeb, that.dealDeb) && Objects.equals(dealCred, that.dealCred) && Objects.equals(sbankcode, that.sbankcode) && Objects.equals(cAccDeb, that.cAccDeb) && Objects.equals(sbanknam, that.sbanknam) && Objects.equals(rbankcode, that.rbankcode) && Objects.equals(cAccCred, that.cAccCred) && Objects.equals(rbanknam, that.rbanknam) && Objects.equals(opType, that.opType) && Objects.equals(payDate, that.payDate) && Objects.equals(extDate, that.extDate) && Objects.equals(payVal, that.payVal) && Objects.equals(sumDeb, that.sumDeb) && Objects.equals(sclientn, that.sclientn) && Objects.equals(innDeb, that.innDeb) && Objects.equals(kppDeb, that.kppDeb) && Objects.equals(accDeb, that.accDeb) && Objects.equals(rclientn, that.rclientn) && Objects.equals(innCred, that.innCred) && Objects.equals(kppCred, that.kppCred) && Objects.equals(accKr, that.accKr) && Objects.equals(specif, that.specif) && Objects.equals(docNum, that.docNum) && Objects.equals(docDate, that.docDate) && Objects.equals(dtIn, that.dtIn) && Objects.equals(ktIn, that.ktIn) && Objects.equals(dtOut, that.dtOut) && Objects.equals(ktOut, that.ktOut);
}
@Override
public int hashCode() {
return Objects.hash(id, dealDeb, dealCred, sbankcode, cAccDeb, sbanknam1, sbanknam2, sbanknam3, sbanknam4, sbanknam5, rbankcode, cAccCred, rbanknam1, rbanknam2, rbanknam3, rbanknam4, rbanknam5, opType, payDate, extDate, payVal, sumDeb, sclientn1, sclientn2, sclientn3, sclientn4, innDeb, kppDeb, accDeb, rclientn1, rclientn2, rclientn3, rclientn4, innCred, kppCred, accKr, specif, docNum, docDate, dtIn, ktIn, dtOut, ktOut);
return Objects.hash(id, dealDeb, dealCred, sbankcode, cAccDeb, sbanknam, rbankcode, cAccCred, rbanknam, opType, payDate, extDate, payVal, sumDeb, sclientn, innDeb, kppDeb, accDeb, rclientn, innCred, kppCred, accKr, specif, docNum, docDate, dtIn, ktIn, dtOut, ktOut);
}
@Override
@ -559,34 +438,20 @@ public class DF57ObjectTag extends ObjectTag<SDf57> {
", dealCred='" + dealCred + '\'' +
", sbankcode='" + sbankcode + '\'' +
", cAccDeb='" + cAccDeb + '\'' +
", sbanknam1='" + sbanknam1 + '\'' +
", sbanknam2='" + sbanknam2 + '\'' +
", sbanknam3='" + sbanknam3 + '\'' +
", sbanknam4='" + sbanknam4 + '\'' +
", sbanknam5='" + sbanknam5 + '\'' +
", sbanknam='" + sbanknam + '\'' +
", rbankcode='" + rbankcode + '\'' +
", cAccCred='" + cAccCred + '\'' +
", rbanknam1='" + rbanknam1 + '\'' +
", rbanknam2='" + rbanknam2 + '\'' +
", rbanknam3='" + rbanknam3 + '\'' +
", rbanknam4='" + rbanknam4 + '\'' +
", rbanknam5='" + rbanknam5 + '\'' +
", rbanknam='" + rbanknam + '\'' +
", opType='" + opType + '\'' +
", payDate=" + payDate +
", extDate=" + extDate +
", payVal='" + payVal + '\'' +
", sumDeb='" + sumDeb + '\'' +
", sclientn1='" + sclientn1 + '\'' +
", sclientn2='" + sclientn2 + '\'' +
", sclientn3='" + sclientn3 + '\'' +
", sclientn4='" + sclientn4 + '\'' +
", sclientn='" + sclientn + '\'' +
", innDeb='" + innDeb + '\'' +
", kppDeb='" + kppDeb + '\'' +
", accDeb='" + accDeb + '\'' +
", rclientn1='" + rclientn1 + '\'' +
", rclientn2='" + rclientn2 + '\'' +
", rclientn3='" + rclientn3 + '\'' +
", rclientn4='" + rclientn4 + '\'' +
", rclientn='" + rclientn + '\'' +
", innCred='" + innCred + '\'' +
", kppCred='" + kppCred + '\'' +
", accKr='" + accKr + '\'' +

20
clearing-parent/xml-importer/src/main/java/ru/spcex/clearing/xml/importer/logic/data/tags/sdf/objects/ObjectTag.java
View file

@ -3,6 +3,9 @@ package ru.spcex.clearing.xml.importer.logic.data.tags.sdf.objects;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.IntStream;
import ru.spcex.clearing.xml.importer.logic.data.enums.ETable;
import ru.spcex.platform.classes.base.SpcexObjectBase;
import ru.spcex.platform.imdg.iml.hazelcast.adapter.ImdgHazelcast;
@ -75,4 +78,21 @@ public abstract class ObjectTag<T extends SpcexObjectBase> {
protected void bootMap() {
map = (ImdgHazelcast<T>) hazelcastService.getImdg(nameOfMap, clazz);
}
public List<String> splitStringByNum(String str, int splitByNum, int totalFields) {
if (str == null || str.isEmpty()) {
return IntStream.range(0, totalFields).mapToObj(i -> "").toList();
}
List<String> result = new ArrayList<>(List.of(str.split("(?<=\\G.{" + splitByNum + "})")));
if (result.size() < totalFields) {
for (int i = result.size(); i < totalFields; i++) {
result.add("");
}
}
return result;
}
}

76
clearing-parent/xml-importer/src/test/java/ru/spcex/clearing/xml/importer/logic/steps/ImportToDBTest.java
View file

@ -138,9 +138,9 @@ class ImportToDBTest {
expectedObjectTag.setDocnmRef("test3");
expectedObjectTag.setDocnmprev("test4");
expectedObjectTag.setcAccDeb("test5");
expectedObjectTag.setSbanknam1("test6");
expectedObjectTag.setSbanknam("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setcAccCred("test7");
expectedObjectTag.setRbanknam1("test8");
expectedObjectTag.setRbanknam("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setPayDate(LocalDate.parse("2024-03-14"));
expectedObjectTag.setPayVal("test9");
expectedObjectTag.setSumDeb("test10");
@ -178,9 +178,17 @@ class ImportToDBTest {
Assertions.assertThat(actualSDf04.getDocnm_ref()).isEqualTo(expectedObjectTag.getDocnmRef());
Assertions.assertThat(actualSDf04.getDocnmprev()).isEqualTo(expectedObjectTag.getDocnmprev());
Assertions.assertThat(actualSDf04.getC_acc_deb()).isEqualTo(expectedObjectTag.getcAccDeb());
Assertions.assertThat(actualSDf04.getSbanknam1()).isEqualTo(expectedObjectTag.getSbanknam1());
Assertions.assertThat(actualSDf04.getSbanknam1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf04.getSbanknam2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf04.getSbanknam3()).isEqualTo("");
Assertions.assertThat(actualSDf04.getSbanknam4()).isEqualTo("");
Assertions.assertThat(actualSDf04.getSbanknam5()).isEqualTo("");
Assertions.assertThat(actualSDf04.getC_acc_cred()).isEqualTo(expectedObjectTag.getcAccCred());
Assertions.assertThat(actualSDf04.getRbanknam1()).isEqualTo(expectedObjectTag.getRbanknam1());
Assertions.assertThat(actualSDf04.getRbanknam1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf04.getRbanknam2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf04.getRbanknam3()).isEqualTo("");
Assertions.assertThat(actualSDf04.getRbanknam4()).isEqualTo("");
Assertions.assertThat(actualSDf04.getRbanknam5()).isEqualTo("");
Assertions.assertThat(actualSDf04.getPay_date()).isEqualTo(expectedObjectTag.getPayDate().format(formatter));
Assertions.assertThat(actualSDf04.getPay_val()).isEqualTo(expectedObjectTag.getPayVal());
Assertions.assertThat(actualSDf04.getSum_deb()).isEqualTo(expectedObjectTag.getSumDeb());
@ -305,20 +313,20 @@ class ImportToDBTest {
expectedObjectTag.setDocnmprev("test4");
expectedObjectTag.setSbankcode("test5");
expectedObjectTag.setcAccDeb("test6");
expectedObjectTag.setSbanknam1("test7");
expectedObjectTag.setSbanknam("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setRbankcode("test8");
expectedObjectTag.setcAccCred("test9");
expectedObjectTag.setRbanknam1("test10");
expectedObjectTag.setRbanknam("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setOpType("test11");
expectedObjectTag.setOpOrder("test12");
expectedObjectTag.setPayDate(LocalDate.parse("2024-03-14"));
expectedObjectTag.setPayVal("test13");
expectedObjectTag.setSumDeb("test14");
expectedObjectTag.setSclientn1("test15");
expectedObjectTag.setSclientn("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setInnDeb("test16");
expectedObjectTag.setKppDeb("test17");
expectedObjectTag.setAccDeb("test18");
expectedObjectTag.setRclientn1("test19");
expectedObjectTag.setRclientn("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setInnCred("test20");
expectedObjectTag.setKppCred("test21");
expectedObjectTag.setAccKr1("test22");
@ -363,20 +371,34 @@ class ImportToDBTest {
Assertions.assertThat(actualSDf55.getDocnmprev()).isEqualTo(expectedObjectTag.getDocnmprev());
Assertions.assertThat(actualSDf55.getSbankcode()).isEqualTo(expectedObjectTag.getSbankcode());
Assertions.assertThat(actualSDf55.getC_acc_deb()).isEqualTo(expectedObjectTag.getcAccDeb());
Assertions.assertThat(actualSDf55.getSbanknam1()).isEqualTo(expectedObjectTag.getSbanknam1());
Assertions.assertThat(actualSDf55.getSbanknam1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf55.getSbanknam2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf55.getSbanknam3()).isEqualTo("");
Assertions.assertThat(actualSDf55.getSbanknam4()).isEqualTo("");
Assertions.assertThat(actualSDf55.getSbanknam5()).isEqualTo("");
Assertions.assertThat(actualSDf55.getRbankcode()).isEqualTo(expectedObjectTag.getRbankcode());
Assertions.assertThat(actualSDf55.getC_acc_cred()).isEqualTo(expectedObjectTag.getcAccCred());
Assertions.assertThat(actualSDf55.getRbanknam1()).isEqualTo(expectedObjectTag.getRbanknam1());
Assertions.assertThat(actualSDf55.getRbanknam1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf55.getRbanknam2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf55.getRbanknam3()).isEqualTo("");
Assertions.assertThat(actualSDf55.getRbanknam4()).isEqualTo("");
Assertions.assertThat(actualSDf55.getRbanknam5()).isEqualTo("");
Assertions.assertThat(actualSDf55.getOp_type()).isEqualTo(expectedObjectTag.getOpType());
Assertions.assertThat(actualSDf55.getOp_order()).isEqualTo(expectedObjectTag.getOpOrder());
Assertions.assertThat(actualSDf55.getPay_date()).isEqualTo(expectedObjectTag.getPayDate().format(formatter));
Assertions.assertThat(actualSDf55.getPay_val()).isEqualTo(expectedObjectTag.getPayVal());
Assertions.assertThat(actualSDf55.getSum_deb()).isEqualTo(expectedObjectTag.getSumDeb());
Assertions.assertThat(actualSDf55.getSclientn1()).isEqualTo(expectedObjectTag.getSclientn1());
Assertions.assertThat(actualSDf55.getSclientn1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf55.getSclientn2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf55.getSclientn3()).isEqualTo("");
Assertions.assertThat(actualSDf55.getSclientn4()).isEqualTo("");
Assertions.assertThat(actualSDf55.getInn_deb()).isEqualTo(expectedObjectTag.getInnDeb());
Assertions.assertThat(actualSDf55.getKpp_deb()).isEqualTo(expectedObjectTag.getKppDeb());
Assertions.assertThat(actualSDf55.getAcc_deb()).isEqualTo(expectedObjectTag.getAccDeb());
Assertions.assertThat(actualSDf55.getRclientn1()).isEqualTo(expectedObjectTag.getRclientn1());
Assertions.assertThat(actualSDf55.getRclientn1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf55.getRclientn2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf55.getRclientn3()).isEqualTo("");
Assertions.assertThat(actualSDf55.getRclientn4()).isEqualTo("");
Assertions.assertThat(actualSDf55.getInn_cred()).isEqualTo(expectedObjectTag.getInnCred());
Assertions.assertThat(actualSDf55.getKpp_cred()).isEqualTo(expectedObjectTag.getKppCred());
Assertions.assertThat(actualSDf55.getAcc_kr_1()).isEqualTo(expectedObjectTag.getAccKr1());
@ -400,20 +422,20 @@ class ImportToDBTest {
expectedObjectTag.setDealCred("test3");
expectedObjectTag.setSbankcode("test4");
expectedObjectTag.setcAccDeb("test5");
expectedObjectTag.setSbanknam1("test6");
expectedObjectTag.setSbanknam("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setRbankcode("test7");
expectedObjectTag.setcAccCred("test8");
expectedObjectTag.setRbanknam1("test9");
expectedObjectTag.setRbanknam("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setOpType("test10");
expectedObjectTag.setPayDate(LocalDate.parse("2024-03-15"));
expectedObjectTag.setExtDate(111L);
expectedObjectTag.setPayVal("test11");
expectedObjectTag.setSumDeb("test12");
expectedObjectTag.setSclientn1("test13");
expectedObjectTag.setSclientn("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setInnDeb("test14");
expectedObjectTag.setKppDeb("test15");
expectedObjectTag.setAccDeb("test16");
expectedObjectTag.setRclientn1("test17");
expectedObjectTag.setRclientn("1111111111111111111111111111111111111111111111111111111111111111111111");
expectedObjectTag.setInnCred("test18");
expectedObjectTag.setKppCred("test19");
expectedObjectTag.setAccKr("test20");
@ -456,20 +478,34 @@ class ImportToDBTest {
Assertions.assertThat(actualSDf57.getDeal_cred()).isEqualTo(expectedObjectTag.getDealCred());
Assertions.assertThat(actualSDf57.getSbankcode()).isEqualTo(expectedObjectTag.getSbankcode());
Assertions.assertThat(actualSDf57.getC_acc_deb()).isEqualTo(expectedObjectTag.getcAccDeb());
Assertions.assertThat(actualSDf57.getSbanknam1()).isEqualTo(expectedObjectTag.getSbanknam1());
Assertions.assertThat(actualSDf57.getSbanknam1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf57.getSbanknam2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf57.getSbanknam3()).isEqualTo("");
Assertions.assertThat(actualSDf57.getSbanknam4()).isEqualTo("");
Assertions.assertThat(actualSDf57.getSbanknam5()).isEqualTo("");
Assertions.assertThat(actualSDf57.getRbankcode()).isEqualTo(expectedObjectTag.getRbankcode());
Assertions.assertThat(actualSDf57.getC_acc_cred()).isEqualTo(expectedObjectTag.getcAccCred());
Assertions.assertThat(actualSDf57.getRbanknam1()).isEqualTo(expectedObjectTag.getRbanknam1());
Assertions.assertThat(actualSDf57.getRbanknam1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf57.getRbanknam2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf57.getRbanknam3()).isEqualTo("");
Assertions.assertThat(actualSDf57.getRbanknam4()).isEqualTo("");
Assertions.assertThat(actualSDf57.getRbanknam5()).isEqualTo("");
Assertions.assertThat(actualSDf57.getOp_type()).isEqualTo(expectedObjectTag.getOpType());
Assertions.assertThat(actualSDf57.getPay_date()).isEqualTo(expectedObjectTag.getPayDate().format(formatter));
Assertions.assertThat(Long.parseLong(actualSDf57.getExt_date())).isEqualTo(expectedObjectTag.getExtDate());
Assertions.assertThat(actualSDf57.getPay_val()).isEqualTo(expectedObjectTag.getPayVal());
Assertions.assertThat(actualSDf57.getSum_deb()).isEqualTo(expectedObjectTag.getSumDeb());
Assertions.assertThat(actualSDf57.getSclientn1()).isEqualTo(expectedObjectTag.getSclientn1());
Assertions.assertThat(actualSDf57.getSclientn1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf57.getSclientn2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf57.getSclientn3()).isEqualTo("");
Assertions.assertThat(actualSDf57.getSclientn4()).isEqualTo("");
Assertions.assertThat(actualSDf57.getInn_deb()).isEqualTo(expectedObjectTag.getInnDeb());
Assertions.assertThat(actualSDf57.getKpp_deb()).isEqualTo(expectedObjectTag.getKppDeb());
Assertions.assertThat(actualSDf57.getAcc_deb()).isEqualTo(expectedObjectTag.getAccDeb());
Assertions.assertThat(actualSDf57.getRclientn1()).isEqualTo(expectedObjectTag.getRclientn1());
Assertions.assertThat(actualSDf57.getRclientn1()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf57.getRclientn2()).isEqualTo("11111111111111111111111111111111111");
Assertions.assertThat(actualSDf57.getRclientn3()).isEqualTo("");
Assertions.assertThat(actualSDf57.getRclientn4()).isEqualTo("");
Assertions.assertThat(actualSDf57.getInn_cred()).isEqualTo(expectedObjectTag.getInnCred());
Assertions.assertThat(actualSDf57.getKpp_cred()).isEqualTo(expectedObjectTag.getKppCred());
Assertions.assertThat(actualSDf57.getAcc_kr()).isEqualTo(expectedObjectTag.getAccKr());

41
clearing-parent/xml-importer/src/test/java/ru/spcex/clearing/xml/importer/logic/steps/ReadXMLFileTest.java
View file

@ -14,7 +14,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
import ru.spcex.clearing.test.config.ImdgTestConfig;
import ru.spcex.clearing.xml.importer.config.ImporterImdgTestConfig;
import ru.spcex.clearing.xml.importer.config.KafkaTestConfig;
import ru.spcex.clearing.xml.importer.config.XMLImporterConfig;
@ -140,9 +139,9 @@ class ReadXMLFileTest {
expectedObjectTag.setDocnmRef("test3");
expectedObjectTag.setDocnmprev("test4");
expectedObjectTag.setcAccDeb("test5");
expectedObjectTag.setSbanknam1("test6");
expectedObjectTag.setSbanknam("test6");
expectedObjectTag.setcAccCred("test7");
expectedObjectTag.setRbanknam1("test8");
expectedObjectTag.setRbanknam("test8");
expectedObjectTag.setPayDate(LocalDate.parse("2024-03-14"));
expectedObjectTag.setPayVal("test9");
expectedObjectTag.setSumDeb("test10");
@ -157,9 +156,9 @@ class ReadXMLFileTest {
Assertions.assertThat(actualObjectTag.getDocnmRef()).isEqualTo(expectedObjectTag.getDocnmRef());
Assertions.assertThat(actualObjectTag.getDocnmprev()).isEqualTo(expectedObjectTag.getDocnmprev());
Assertions.assertThat(actualObjectTag.getcAccDeb()).isEqualTo(expectedObjectTag.getcAccDeb());
Assertions.assertThat(actualObjectTag.getSbanknam1()).isEqualTo(expectedObjectTag.getSbanknam1());
Assertions.assertThat(actualObjectTag.getSbanknam()).isEqualTo(expectedObjectTag.getSbanknam());
Assertions.assertThat(actualObjectTag.getcAccCred()).isEqualTo(expectedObjectTag.getcAccCred());
Assertions.assertThat(actualObjectTag.getRbanknam1()).isEqualTo(expectedObjectTag.getRbanknam1());
Assertions.assertThat(actualObjectTag.getRbanknam()).isEqualTo(expectedObjectTag.getRbanknam());
Assertions.assertThat(actualObjectTag.getPayDate()).isEqualTo(expectedObjectTag.getPayDate());
Assertions.assertThat(actualObjectTag.getPayVal()).isEqualTo(expectedObjectTag.getPayVal());
Assertions.assertThat(actualObjectTag.getSumDeb()).isEqualTo(expectedObjectTag.getSumDeb());
@ -253,20 +252,20 @@ class ReadXMLFileTest {
expectedObjectTag.setDocnmprev("test4");
expectedObjectTag.setSbankcode("test5");
expectedObjectTag.setcAccDeb("test6");
expectedObjectTag.setSbanknam1("test7");
expectedObjectTag.setSbanknam("test7");
expectedObjectTag.setRbankcode("test8");
expectedObjectTag.setcAccCred("test9");
expectedObjectTag.setRbanknam1("test10");
expectedObjectTag.setRbanknam("test10");
expectedObjectTag.setOpType("11");
expectedObjectTag.setOpOrder("2");
expectedObjectTag.setPayDate(LocalDate.parse("2024-03-14"));
expectedObjectTag.setPayVal("test13");
expectedObjectTag.setSumDeb("test14");
expectedObjectTag.setSclientn1("test15");
expectedObjectTag.setSclientn("test15");
expectedObjectTag.setInnDeb("test16");
expectedObjectTag.setKppDeb("test17");
expectedObjectTag.setAccDeb("test18");
expectedObjectTag.setRclientn1("test19");
expectedObjectTag.setRclientn("test19");
expectedObjectTag.setInnCred("test20");
expectedObjectTag.setKppCred("test21");
expectedObjectTag.setAccKr1("test22");
@ -288,20 +287,20 @@ class ReadXMLFileTest {
Assertions.assertThat(actualObjectTag.getDocnmprev()).isEqualTo(expectedObjectTag.getDocnmprev());
Assertions.assertThat(actualObjectTag.getSbankcode()).isEqualTo(expectedObjectTag.getSbankcode());
Assertions.assertThat(actualObjectTag.getcAccDeb()).isEqualTo(expectedObjectTag.getcAccDeb());
Assertions.assertThat(actualObjectTag.getSbanknam1()).isEqualTo(expectedObjectTag.getSbanknam1());
Assertions.assertThat(actualObjectTag.getSbanknam()).isEqualTo(expectedObjectTag.getSbanknam());
Assertions.assertThat(actualObjectTag.getRbankcode()).isEqualTo(expectedObjectTag.getRbankcode());
Assertions.assertThat(actualObjectTag.getcAccCred()).isEqualTo(expectedObjectTag.getcAccCred());
Assertions.assertThat(actualObjectTag.getRbanknam1()).isEqualTo(expectedObjectTag.getRbanknam1());
Assertions.assertThat(actualObjectTag.getRbanknam()).isEqualTo(expectedObjectTag.getRbanknam());
Assertions.assertThat(actualObjectTag.getOpType()).isEqualTo(expectedObjectTag.getOpType());
Assertions.assertThat(actualObjectTag.getOpOrder()).isEqualTo(expectedObjectTag.getOpOrder());
Assertions.assertThat(actualObjectTag.getPayDate()).isEqualTo(expectedObjectTag.getPayDate());
Assertions.assertThat(actualObjectTag.getPayVal()).isEqualTo(expectedObjectTag.getPayVal());
Assertions.assertThat(actualObjectTag.getSumDeb()).isEqualTo(expectedObjectTag.getSumDeb());
Assertions.assertThat(actualObjectTag.getSclientn1()).isEqualTo(expectedObjectTag.getSclientn1());
Assertions.assertThat(actualObjectTag.getSclientn()).isEqualTo(expectedObjectTag.getSclientn());
Assertions.assertThat(actualObjectTag.getInnDeb()).isEqualTo(expectedObjectTag.getInnDeb());
Assertions.assertThat(actualObjectTag.getKppDeb()).isEqualTo(expectedObjectTag.getKppDeb());
Assertions.assertThat(actualObjectTag.getAccDeb()).isEqualTo(expectedObjectTag.getAccDeb());
Assertions.assertThat(actualObjectTag.getRclientn1()).isEqualTo(expectedObjectTag.getRclientn1());
Assertions.assertThat(actualObjectTag.getRclientn()).isEqualTo(expectedObjectTag.getRclientn());
Assertions.assertThat(actualObjectTag.getInnCred()).isEqualTo(expectedObjectTag.getInnCred());
Assertions.assertThat(actualObjectTag.getKppCred()).isEqualTo(expectedObjectTag.getKppCred());
Assertions.assertThat(actualObjectTag.getAccKr1()).isEqualTo(expectedObjectTag.getAccKr1());
@ -330,20 +329,20 @@ class ReadXMLFileTest {
expectedObjectTag.setDealCred("test3");
expectedObjectTag.setSbankcode("test4");
expectedObjectTag.setcAccDeb("test5");
expectedObjectTag.setSbanknam1("test6");
expectedObjectTag.setSbanknam("test6");
expectedObjectTag.setRbankcode("test7");
expectedObjectTag.setcAccCred("test8");
expectedObjectTag.setRbanknam1("test9");
expectedObjectTag.setRbanknam("test9");
expectedObjectTag.setOpType("test10");
expectedObjectTag.setPayDate(LocalDate.parse("2024-03-15"));
expectedObjectTag.setExtDate(111L);
expectedObjectTag.setPayVal("test11");
expectedObjectTag.setSumDeb("test12");
expectedObjectTag.setSclientn1("test13");
expectedObjectTag.setSclientn("test13");
expectedObjectTag.setInnDeb("test14");
expectedObjectTag.setKppDeb("test15");
expectedObjectTag.setAccDeb("test16");
expectedObjectTag.setRclientn1("test17");
expectedObjectTag.setRclientn("test17");
expectedObjectTag.setInnCred("test18");
expectedObjectTag.setKppCred("test19");
expectedObjectTag.setAccKr("test20");
@ -363,20 +362,20 @@ class ReadXMLFileTest {
Assertions.assertThat(actualObjectTag.getDealCred()).isEqualTo(expectedObjectTag.getDealCred());
Assertions.assertThat(actualObjectTag.getSbankcode()).isEqualTo(expectedObjectTag.getSbankcode());
Assertions.assertThat(actualObjectTag.getcAccDeb()).isEqualTo(expectedObjectTag.getcAccDeb());
Assertions.assertThat(actualObjectTag.getSbanknam1()).isEqualTo(expectedObjectTag.getSbanknam1());
Assertions.assertThat(actualObjectTag.getSbanknam()).isEqualTo(expectedObjectTag.getSbanknam());
Assertions.assertThat(actualObjectTag.getRbankcode()).isEqualTo(expectedObjectTag.getRbankcode());
Assertions.assertThat(actualObjectTag.getcAccCred()).isEqualTo(expectedObjectTag.getcAccCred());
Assertions.assertThat(actualObjectTag.getRbanknam1()).isEqualTo(expectedObjectTag.getRbanknam1());
Assertions.assertThat(actualObjectTag.getRbanknam()).isEqualTo(expectedObjectTag.getRbanknam());
Assertions.assertThat(actualObjectTag.getOpType()).isEqualTo(expectedObjectTag.getOpType());
Assertions.assertThat(actualObjectTag.getPayDate()).isEqualTo(expectedObjectTag.getPayDate());
Assertions.assertThat(actualObjectTag.getExtDate()).isEqualTo(expectedObjectTag.getExtDate());
Assertions.assertThat(actualObjectTag.getPayVal()).isEqualTo(expectedObjectTag.getPayVal());
Assertions.assertThat(actualObjectTag.getSumDeb()).isEqualTo(expectedObjectTag.getSumDeb());
Assertions.assertThat(actualObjectTag.getSclientn1()).isEqualTo(expectedObjectTag.getSclientn1());
Assertions.assertThat(actualObjectTag.getSclientn()).isEqualTo(expectedObjectTag.getSclientn());
Assertions.assertThat(actualObjectTag.getInnDeb()).isEqualTo(expectedObjectTag.getInnDeb());
Assertions.assertThat(actualObjectTag.getKppDeb()).isEqualTo(expectedObjectTag.getKppDeb());
Assertions.assertThat(actualObjectTag.getAccDeb()).isEqualTo(expectedObjectTag.getAccDeb());
Assertions.assertThat(actualObjectTag.getRclientn1()).isEqualTo(expectedObjectTag.getRclientn1());
Assertions.assertThat(actualObjectTag.getRclientn()).isEqualTo(expectedObjectTag.getRclientn());
Assertions.assertThat(actualObjectTag.getInnCred()).isEqualTo(expectedObjectTag.getInnCred());
Assertions.assertThat(actualObjectTag.getKppCred()).isEqualTo(expectedObjectTag.getKppCred());
Assertions.assertThat(actualObjectTag.getAccKr()).isEqualTo(expectedObjectTag.getAccKr());

273
clr_test/README.md Normal file
View file

@ -0,0 +1,273 @@
# Описание тестирования клиринговой системы
## Описание проведения тестирования в GitLab CI/CD
Файл .gitlab-ci.yml определяет этапы тестирования, сейчас существуют 3 этапа:
* preflight - загрузка тест-кейсов из репозитория clearing_test
* build - сборка jar-файлов
* test - запуск тестирования
Во время запуска тестирования jar-файлы копируются в папку `./clr_test/clearing-all/bin`,
а sql-файлы в `./clr_test/clearing-all/db`
Основное взаимодействие с Docker'ом происходит посредством python-скрипта
Данный скрипт копирует следующие файлы:
* Тестовые файлы в `./clr_test/clearing-all/clearing_testing_utils/`
* Подготовленную базу данных в `./clr_test/db/data`
Для обновления базы данных скрипт ищет все файлы updateDDL_*.sql в `./clr_test/clearing-all/db` выше чем `DDL_VERSION_FROM` из скрипта и объединяет их в один sql-файл в `./clr_test/db-updater/combined_update_ddl.sql`
Удаляются старые образы:
* `docker rmi -f clr_test-db`
* `docker rmi -f clr_test-db-updater`
* `docker rmi -f clr_test-clearing_system`
Выполняется запуск Docker Compose командой `docker compose up --abort-on-container-exit --exit-code-from clearing_system --build --force-recreate`
В зависимости от кода выхода Docker заполняется файл `clr_test/results.txt`
После выполнения скрипта ищется строка со словом `failed`, если она есть, то тест завершается в ошибкой
## Описание создания подготовленной базы данных для тест-кейса
Репозиторий clearing_test содержит индивидуальные директории для каждого из тест-кейса:
* clearing_testing_utils – содержит входные и ожидаемые файлы клиринговой системы;
* data – сохраненное состояние базы данных для рассматриваемого тест-кейса;
* db – содержит, уникальные для конкретного тест-кейса, sql-файлы.
Для начала очистим папку data и добавим в директорию db следующие файлы с сохранением последовательности:
* DDL.sql
* DICTIONARIES.sql
* MARKET.sql
* export.sql – уникален для тест-кейса, уже присутствует в директории
* test-data.sql – уникален для тест-кейса, уже присутствует в директории
В корневой папке создадим файл docker-compose.yml со следующим содержанием:
```yaml
services:
test_db:
image: postgres:14.1-alpine
restart: always
security_opt:
- seccomp:unconfined
environment:
POSTGRES_USER: clearing
POSTGRES_PASSWORD: Aa111111
POSTGRES_DB: clearing
POSTGRES_HOST_AUTH_METHOD: trust
volumes:
- ./data:/var/lib/postgresql/data
- ./db:/docker-entrypoint-initdb.d/
```
Запустим Docker командой docker compose up, после инициализации базы данных остановим контейнер командой docker compose down, сохраненное состояние базы данных будет находиться в директории data. Важно, для сохранения корректной структуры при загрузке в GitLab необходимо добавить пустые файлы в пустые директории.
Например, посредством данной PowerShell команды:
```
Get-ChildItem -Directory -Recurse | Where-Object {
(Get-ChildItem -Path $_.FullName -File).Count -eq 0 -and (Get-ChildItem -Path $_.FullName -Directory).Count -eq 0
} | ForEach-Object {
$newFilePath = Join-Path $_.FullName ".gitkeep"
New-Item -ItemType file -Path $newFilePath -Force | Out-Null
Write-Host "Created file in: $($_.FullName)"
}
```
Также, если добавить папки db и data в их соответствующие директории по наименованию тест-кейса, можно обновить базы данных для все тест-кейсов одновременно, например, посредством следующего docker-compose.yml файла:
```yaml
services:
1_0_sesn_mkr_curr:
image: postgres:14.1-alpine
restart: always
security_opt:
- seccomp:unconfined
environment:
POSTGRES_USER: clearing
POSTGRES_PASSWORD: Aa111111
POSTGRES_DB: clearing
POSTGRES_HOST_AUTH_METHOD: trust
volumes:
- ./1_0_sesn_mkr_curr/data:/var/lib/postgresql/data
- ./1_0_sesn_mkr_curr/db:/docker-entrypoint-initdb.d/
1_1_sesn_mkr_curr:
image: postgres:14.1-alpine
restart: always
security_opt:
- seccomp:unconfined
environment:
POSTGRES_USER: clearing
POSTGRES_PASSWORD: Aa111111
POSTGRES_DB: clearing
POSTGRES_HOST_AUTH_METHOD: trust
volumes:
- ./1_1_sesn_mkr_curr/data:/var/lib/postgresql/data
- ./1_1_sesn_mkr_curr/db:/docker-entrypoint-initdb.d/
1_2_sesn_mkr_curr_tsoper:
image: postgres:14.1-alpine
restart: always
security_opt:
- seccomp:unconfined
environment:
POSTGRES_USER: clearing
POSTGRES_PASSWORD: Aa111111
POSTGRES_DB: clearing
POSTGRES_HOST_AUTH_METHOD: trust
volumes:
- ./1_2_sesn_mkr_curr_tsoper/data:/var/lib/postgresql/data
- ./1_2_sesn_mkr_curr_tsoper/db:/docker-entrypoint-initdb.d/
2_0_sesn_mkr_medm:
image: postgres:14.1-alpine
restart: always
security_opt:
- seccomp:unconfined
environment:
POSTGRES_USER: clearing
POSTGRES_PASSWORD: Aa111111
POSTGRES_DB: clearing
POSTGRES_HOST_AUTH_METHOD: trust
volumes:
- ./2_0_sesn_mkr_medm/data:/var/lib/postgresql/data
- ./2_0_sesn_mkr_medm/db:/docker-entrypoint-initdb.d/
3_0_sesn_mkr_finl:
image: postgres:14.1-alpine
restart: always
security_opt:
- seccomp:unconfined
environment:
POSTGRES_USER: clearing
POSTGRES_PASSWORD: Aa111111
POSTGRES_DB: clearing
POSTGRES_HOST_AUTH_METHOD: trust
volumes:
- ./3_0_sesn_mkr_finl/data:/var/lib/postgresql/data
- ./3_0_sesn_mkr_finl/db:/docker-entrypoint-initdb.d/
5_0_sesn_fond_trdt:
image: postgres:14.1-alpine
restart: always
security_opt:
- seccomp:unconfined
environment:
POSTGRES_USER: clearing
POSTGRES_PASSWORD: Aa111111
POSTGRES_DB: clearing
POSTGRES_HOST_AUTH_METHOD: trust
volumes:
- ./5_0_sesn_fond_trdt/data:/var/lib/postgresql/data
- ./5_0_sesn_fond_trdt/db:/docker-entrypoint-initdb.d/
5_1_sesn_fond_trdt_nodepo:
image: postgres:14.1-alpine
restart: always
security_opt:
- seccomp:unconfined
environment:
POSTGRES_USER: clearing
POSTGRES_PASSWORD: Aa111111
POSTGRES_DB: clearing
POSTGRES_HOST_AUTH_METHOD: trust
volumes:
- ./5_1_sesn_fond_trdt_nodepo/data:/var/lib/postgresql/data
- ./5_1_sesn_fond_trdt_nodepo/db:/docker-entrypoint-initdb.d/
6_0_sesn_fond_ipob:
image: postgres:14.1-alpine
restart: always
security_opt:
- seccomp:unconfined
environment:
POSTGRES_USER: clearing
POSTGRES_PASSWORD: Aa111111
POSTGRES_DB: clearing
POSTGRES_HOST_AUTH_METHOD: trust
volumes:
- ./6_0_sesn_fond_ipob/data:/var/lib/postgresql/data
- ./6_0_sesn_fond_ipob/db:/docker-entrypoint-initdb.d/
7_0_sesn_fond_ipo0:
image: postgres:14.1-alpine
restart: always
security_opt:
- seccomp:unconfined
environment:
POSTGRES_USER: clearing
POSTGRES_PASSWORD: Aa111111
POSTGRES_DB: clearing
POSTGRES_HOST_AUTH_METHOD: trust
volumes:
- ./7_0_sesn_fond_ipo0/data:/var/lib/postgresql/data
- ./7_0_sesn_fond_ipo0/db:/docker-entrypoint-initdb.d/
8_0_sesn_fond_ipot:
image: postgres:14.1-alpine
restart: always
security_opt:
- seccomp:unconfined
environment:
POSTGRES_USER: clearing
POSTGRES_PASSWORD: Aa111111
POSTGRES_DB: clearing
POSTGRES_HOST_AUTH_METHOD: trust
volumes:
- ./8_0_sesn_fond_ipot/data:/var/lib/postgresql/data
- ./8_0_sesn_fond_ipot/db:/docker-entrypoint-initdb.d/
9_0_sessn_mult_unit:
image: postgres:14.1-alpine
restart: always
security_opt:
- seccomp:unconfined
environment:
POSTGRES_USER: clearing
POSTGRES_PASSWORD: Aa111111
POSTGRES_DB: clearing
POSTGRES_HOST_AUTH_METHOD: trust
volumes:
- ./9_0_sessn_mult_unit/data:/var/lib/postgresql/data
- ./9_0_sessn_mult_unit/db:/docker-entrypoint-initdb.d/
9_1_sessn_mult_unit_tcr:
image: postgres:14.1-alpine
restart: always
security_opt:
- seccomp:unconfined
environment:
POSTGRES_USER: clearing
POSTGRES_PASSWORD: Aa111111
POSTGRES_DB: clearing
POSTGRES_HOST_AUTH_METHOD: trust
volumes:
- ./9_1_sessn_mult_unit_tcr/data:/var/lib/postgresql/data
- ./9_1_sessn_mult_unit_tcr/db:/docker-entrypoint-initdb.d/
9_2_sessn_mult_unit_tkr:
image: postgres:14.1-alpine
restart: always
security_opt:
- seccomp:unconfined
environment:
POSTGRES_USER: clearing
POSTGRES_PASSWORD: Aa111111
POSTGRES_DB: clearing
POSTGRES_HOST_AUTH_METHOD: trust
volumes:
- ./9_2_sessn_mult_unit_tkr/data:/var/lib/postgresql/data
- ./9_2_sessn_mult_unit_tkr/db:/docker-entrypoint-initdb.d/
9_3_sessn_mult_unit_dmav:
image: postgres:14.1-alpine
restart: always
security_opt:
- seccomp:unconfined
environment:
POSTGRES_USER: clearing
POSTGRES_PASSWORD: Aa111111
POSTGRES_DB: clearing
POSTGRES_HOST_AUTH_METHOD: trust
volumes:
- ./9_3_sessn_mult_unit_dmav/data:/var/lib/postgresql/data
- ./9_3_sessn_mult_unit_dmav/db:/docker-entrypoint-initdb.d/
```

9
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/registry/RegistryReturnDepositRequest.java
View file

@ -10,8 +10,6 @@ public class RegistryReturnDepositRequest implements WithId {
private Long id;
@JsonProperty
private BigDecimal balance;
@JsonProperty
public String market;
public Long getId() {
return id;
@ -29,11 +27,4 @@ public class RegistryReturnDepositRequest implements WithId {
this.balance = balance;
}
public String getMarket() {
return market;
}
public void setMarket(String market) {
this.market = market;
}
}

2
platform-parent/pom.xml
View file

@ -14,7 +14,7 @@
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing</artifactId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<modules>

4
pom.xml
View file

@ -9,7 +9,7 @@
<name>__parent_ROOT</name>
<description>Clearing main parent</description>
<packaging>pom</packaging>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
<modules>
<module>clearing-parent</module>
@ -24,7 +24,7 @@
<project.java.version>17</project.java.version>
<built.by>Maven</built.by>
<global.project.version>SPCEX-3.18.244</global.project.version>
<global.project.version>SPCEX-3.19.244</global.project.version>
<spring-boot.version>2.6.3</spring-boot.version>

2
z-distr/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.18.244</version>
<version>SPCEX-3.19.244</version>
</parent>
<modelVersion>4.0.0</modelVersion>