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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2024-10-17 11:50:46 +03:00
commit 8abd74f42c
45 changed files with 124 additions and 337 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.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>

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

@ -1,6 +1,6 @@
{
"version": "3.15.206.111",
"version": "3.15.208.113",
"enums": {
@ -4988,66 +4988,6 @@
{"code": "intermediarySwiftCode",
"type": 2,"length": 255,"name": "Код SWIFT посредника","shortname": "SWIFT посредника","searchable": true,"sortable": true,"visible": true
}
,
{"code": "name",
"type": 2,"length": 255,"name": "Наименование владельца счета","shortname": "Владелец счета","searchable": true,"sortable": true,"visible": true
}
,
{"code": "address",
"type": 2,"length": 255,"name": "Адрес владельца счета","shortname": "Адрес владельца","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankAddress",
"type": 2,"length": 255,"name": "Место нахождения банка получателя средств","shortname": "Место нахождение банка","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankSwiftCode",
"type": 2,"length": 12,"name": "SWIFT банка получателя средств","shortname": "SWIFT банка","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankAccount",
"type": 2,"length": 35,"name": "Номер счета банка получателя средств","shortname": "Номер счёта получателя","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankName1",
"type": 2,"length": 255,"name": "Наименование банка-посредника 1","shortname": "Банк посредник 1","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankAddress1",
"type": 2,"length": 255,"name": "Место нахождения банка-посредника 1","shortname": "Место нахождения банка-посредника 1","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankAccount1",
"type": 2,"length": 35,"name": "Номер счета банка-посредника 1","shortname": "Счет банка-посредника 1","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankName2",
"type": 2,"length": 255,"name": "Наименование банка-посредника 2","shortname": "Банк посредник 2","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankAddress2",
"type": 2,"length": 255,"name": "Место нахождения банка-посредника 2","shortname": "Место нахождения банка-посредника 2","searchable": true,"sortable": true,"visible": true
}
,
{"code": "intermediarySwiftCode2",
"type": 2,"length": 12,"name": "SWIFT банка-посредника 2","shortname": "Счет банка-посредника 2","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankAccount2",
"type": 2,"length": 35,"name": "Номер счета банка-посредника 2","shortname": "Счет банка-посредника 2","searchable": true,"sortable": true,"visible": true
}
,
{"code": "personalAccount",
"type": 2,"length": 20,"name": "Лицевой счет получателя","shortname": "Счет получателя","searchable": true,"sortable": true,"visible": true
}
,
{"code": "budgetClassificationCode",
"type": 2,"length": 20,"name": "КБК","shortname": "КБК","searchable": true,"sortable": true,"visible": true
}
,
{"code": "oktmo",
"type": 2,"length": 20,"name": "ОКТМО получателя средств","shortname": "ОКТМО","searchable": true,"sortable": true,"visible": true
}
]
,"actions":[
{"method":"post",
@ -5106,66 +5046,6 @@
{"code": "intermediarySwiftCode",
"type": 2,"length": 255,"name": "Код SWIFT посредника","shortname": "SWIFT посредника","searchable": true,"sortable": true,"visible": true
}
,
{"code": "name",
"type": 2,"length": 255,"name": "Наименование владельца счета","shortname": "Владелец счета","searchable": true,"sortable": true,"visible": true,"required": true
}
,
{"code": "address",
"type": 2,"length": 255,"name": "Адрес владельца счета","shortname": "Адрес владельца","searchable": true,"sortable": true,"visible": true,"required": true
}
,
{"code": "bankAddress",
"type": 2,"length": 255,"name": "Место нахождения банка получателя средств","shortname": "Место нахождение банка","searchable": true,"sortable": true,"visible": true,"required": true
}
,
{"code": "bankSwiftCode",
"type": 2,"length": 12,"name": "SWIFT банка получателя средств","shortname": "SWIFT банка","searchable": true,"sortable": true,"visible": true,"required": true
}
,
{"code": "bankAccount",
"type": 2,"length": 35,"name": "Номер счета банка получателя средств","shortname": "Номер счёта получателя","searchable": true,"sortable": true,"visible": true,"required": true
}
,
{"code": "bankName1",
"type": 2,"length": 255,"name": "Наименование банка-посредника 1","shortname": "Банк посредник 1","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankAddress1",
"type": 2,"length": 255,"name": "Место нахождения банка-посредника 1","shortname": "Место нахождения банка-посредника 1","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankAccount1",
"type": 2,"length": 35,"name": "Номер счета банка-посредника 1","shortname": "Счет банка-посредника 1","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankName2",
"type": 2,"length": 255,"name": "Наименование банка-посредника 2","shortname": "Банк посредник 2","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankAddress2",
"type": 2,"length": 255,"name": "Место нахождения банка-посредника 2","shortname": "Место нахождения банка-посредника 2","searchable": true,"sortable": true,"visible": true
}
,
{"code": "intermediarySwiftCode2",
"type": 2,"length": 12,"name": "SWIFT банка-посредника 2","shortname": "Счет банка-посредника 2","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankAccount2",
"type": 2,"length": 35,"name": "Номер счета банка-посредника 2","shortname": "Счет банка-посредника 2","searchable": true,"sortable": true,"visible": true
}
,
{"code": "personalAccount",
"type": 2,"length": 20,"name": "Лицевой счет получателя","shortname": "Счет получателя","searchable": true,"sortable": true,"visible": true
}
,
{"code": "budgetClassificationCode",
"type": 2,"length": 20,"name": "КБК","shortname": "КБК","searchable": true,"sortable": true,"visible": true
}
,
{"code": "oktmo",
"type": 2,"length": 20,"name": "ОКТМО получателя средств","shortname": "ОКТМО","searchable": true,"sortable": true,"visible": true
}
]
}
,
@ -5225,66 +5105,6 @@
{"code": "intermediarySwiftCode",
"type": 2,"length": 255,"name": "Код SWIFT посредника","shortname": "SWIFT посредника","searchable": true,"sortable": true,"visible": true
}
,
{"code": "name",
"type": 2,"length": 255,"name": "Наименование владельца счета","shortname": "Владелец счета","searchable": true,"sortable": true,"visible": true,"required": true
}
,
{"code": "address",
"type": 2,"length": 255,"name": "Адрес владельца счета","shortname": "Адрес владельца","searchable": true,"sortable": true,"visible": true,"required": true
}
,
{"code": "bankAddress",
"type": 2,"length": 255,"name": "Место нахождения банка получателя средств","shortname": "Место нахождение банка","searchable": true,"sortable": true,"visible": true,"required": true
}
,
{"code": "bankSwiftCode",
"type": 2,"length": 12,"name": "SWIFT банка получателя средств","shortname": "SWIFT банка","searchable": true,"sortable": true,"visible": true,"required": true
}
,
{"code": "bankAccount",
"type": 2,"length": 35,"name": "Номер счета банка получателя средств","shortname": "Номер счёта получателя","searchable": true,"sortable": true,"visible": true,"required": true
}
,
{"code": "bankName1",
"type": 2,"length": 255,"name": "Наименование банка-посредника 1","shortname": "Банк посредник 1","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankAddress1",
"type": 2,"length": 255,"name": "Место нахождения банка-посредника 1","shortname": "Место нахождения банка-посредника 1","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankAccount1",
"type": 2,"length": 35,"name": "Номер счета банка-посредника 1","shortname": "Счет банка-посредника 1","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankName2",
"type": 2,"length": 255,"name": "Наименование банка-посредника 2","shortname": "Банк посредник 2","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankAddress2",
"type": 2,"length": 255,"name": "Место нахождения банка-посредника 2","shortname": "Место нахождения банка-посредника 2","searchable": true,"sortable": true,"visible": true
}
,
{"code": "intermediarySwiftCode2",
"type": 2,"length": 12,"name": "SWIFT банка-посредника 2","shortname": "Счет банка-посредника 2","searchable": true,"sortable": true,"visible": true
}
,
{"code": "bankAccount2",
"type": 2,"length": 35,"name": "Номер счета банка-посредника 2","shortname": "Счет банка-посредника 2","searchable": true,"sortable": true,"visible": true
}
,
{"code": "personalAccount",
"type": 2,"length": 20,"name": "Лицевой счет получателя","shortname": "Счет получателя","searchable": true,"sortable": true,"visible": true
}
,
{"code": "budgetClassificationCode",
"type": 2,"length": 20,"name": "КБК","shortname": "КБК","searchable": true,"sortable": true,"visible": true
}
,
{"code": "oktmo",
"type": 2,"length": 20,"name": "ОКТМО получателя средств","shortname": "ОКТМО","searchable": true,"sortable": true,"visible": true
}
]
}
,

47
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.15.206.111">
<meta version="3.15.208.113">
<!-- _xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" _xsi:noNamespaceSchemaLocation="file:///E:/d/projects/meta/from/meta.xsd" -->
<!--Здесь словари-->
<enums>
@ -1159,21 +1159,6 @@
<status field="accountId" type="12" dbname="Код статуса" name="Наименование статуса" shortname="Статус" searchable="true" sortable="true" visible="true" linkKeyCode="id" linkCode="status" link="account" extends="account"/>
<id type="1" name="Идентификатор записи" shortname="ID" searchable="true" sortable="true"/>
<intermediarySwiftCode type="2" length="255" name="Код SWIFT посредника" shortname="SWIFT посредника" searchable="true" sortable="true" visible="true"/>
<name type="2" length="255" name="Наименование владельца счета" shortname="Владелец счета" searchable="true" sortable="true" visible="true"/>
<address type="2" length="255" name="Адрес владельца счета" shortname="Адрес владельца" searchable="true" sortable="true" visible="true"/>
<bankAddress type="2" length="255" name="Место нахождения банка получателя средств" shortname="Место нахождение банка" searchable="true" sortable="true" visible="true"/>
<bankSwiftCode type="2" length="12" name="SWIFT банка получателя средств" shortname="SWIFT банка" searchable="true" sortable="true" visible="true"/>
<bankAccount type="2" length="35" name="Номер счета банка получателя средств" shortname="Номер счёта получателя" searchable="true" sortable="true" visible="true"/>
<bankName1 type="2" length="255" name="Наименование банка-посредника 1" shortname="Банк посредник 1" searchable="true" sortable="true" visible="true"/>
<bankAddress1 type="2" length="255" name="Место нахождения банка-посредника 1" shortname="Место нахождения банка-посредника 1" searchable="true" sortable="true" visible="true"/>
<bankAccount1 type="2" length="35" name="Номер счета банка-посредника 1" shortname="Счет банка-посредника 1" searchable="true" sortable="true" visible="true"/>
<bankName2 type="2" length="255" name="Наименование банка-посредника 2" shortname="Банк посредник 2" searchable="true" sortable="true" visible="true"/>
<bankAddress2 type="2" length="255" name="Место нахождения банка-посредника 2" shortname="Место нахождения банка-посредника 2" searchable="true" sortable="true" visible="true"/>
<intermediarySwiftCode2 type="2" length="12" name="SWIFT банка-посредника 2" shortname="Счет банка-посредника 2" searchable="true" sortable="true" visible="true"/>
<bankAccount2 type="2" length="35" name="Номер счета банка-посредника 2" shortname="Счет банка-посредника 2" searchable="true" sortable="true" visible="true"/>
<personalAccount type="2" length="20" name="Лицевой счет получателя" shortname="Счет получателя" searchable="true" sortable="true" visible="true"/>
<budgetClassificationCode type="2" length="20" name="КБК" shortname="КБК" searchable="true" sortable="true" visible="true"/>
<oktmo type="2" length="20" name="ОКТМО получателя средств" shortname="ОКТМО" searchable="true" sortable="true" visible="true"/>
<actions>
<post name="Добавление счета вывода средств" confirmation="currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account" class="ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountNewAction">
<currency type="12" name="Код валюты" shortname="Валюта" required="true" link="currencyCode" linkCode="code"/>
@ -1188,21 +1173,6 @@
<companyId type="1" name="Компания" shortname="Компания" link="company" linkCode="shortName" visible="false"/>
<destination type="2" length="255" name="Назначение платежа" shortname="Назначение платежа" visible="true"/>
<intermediarySwiftCode type="2" length="255" name="Код SWIFT посредника" shortname="SWIFT посредника" searchable="true" sortable="true" visible="true"/>
<name type="2" length="255" name="Наименование владельца счета" shortname="Владелец счета" searchable="true" sortable="true" visible="true" required="true"/>
<address type="2" length="255" name="Адрес владельца счета" shortname="Адрес владельца" searchable="true" sortable="true" visible="true" required="true"/>
<bankAddress type="2" length="255" name="Место нахождения банка получателя средств" shortname="Место нахождение банка" searchable="true" sortable="true" visible="true" required="true"/>
<bankSwiftCode type="2" length="12" name="SWIFT банка получателя средств" shortname="SWIFT банка" searchable="true" sortable="true" visible="true" required="true"/>
<bankAccount type="2" length="35" name="Номер счета банка получателя средств" shortname="Номер счёта получателя" searchable="true" sortable="true" visible="true" required="true"/>
<bankName1 type="2" length="255" name="Наименование банка-посредника 1" shortname="Банк посредник 1" searchable="true" sortable="true" visible="true"/>
<bankAddress1 type="2" length="255" name="Место нахождения банка-посредника 1" shortname="Место нахождения банка-посредника 1" searchable="true" sortable="true" visible="true"/>
<bankAccount1 type="2" length="35" name="Номер счета банка-посредника 1" shortname="Счет банка-посредника 1" searchable="true" sortable="true" visible="true"/>
<bankName2 type="2" length="255" name="Наименование банка-посредника 2" shortname="Банк посредник 2" searchable="true" sortable="true" visible="true"/>
<bankAddress2 type="2" length="255" name="Место нахождения банка-посредника 2" shortname="Место нахождения банка-посредника 2" searchable="true" sortable="true" visible="true"/>
<intermediarySwiftCode2 type="2" length="12" name="SWIFT банка-посредника 2" shortname="Счет банка-посредника 2" searchable="true" sortable="true" visible="true"/>
<bankAccount2 type="2" length="35" name="Номер счета банка-посредника 2" shortname="Счет банка-посредника 2" searchable="true" sortable="true" visible="true"/>
<personalAccount type="2" length="20" name="Лицевой счет получателя" shortname="Счет получателя" searchable="true" sortable="true" visible="true"/>
<budgetClassificationCode type="2" length="20" name="КБК" shortname="КБК" searchable="true" sortable="true" visible="true"/>
<oktmo type="2" length="20" name="ОКТМО получателя средств" shortname="ОКТМО" searchable="true" sortable="true" visible="true"/>
</post>
<put name="Изменение счета вывода средств" confirmation="currency,bankIdentificationCode,bankName,correspondentAccount,correspondentAccountName,taxpayerIdentificationNumber,taxRegistrationReasonCode,account" class="ru.spcex.clearing.backendapi.controller.request.cud.account.BankAccountUpdateAction">
<id type="1" name="Идентификатор записи" shortname="ID" link="bankAccount" linkCode="id" required="true"/>
@ -1217,21 +1187,6 @@
<account type="2" length="50" name="Номер счета" shortname="Счет"/>
<destination type="2" length="255" name="Назначение платежа" shortname="Назначение платежа" visible="true"/>
<intermediarySwiftCode type="2" length="255" name="Код SWIFT посредника" shortname="SWIFT посредника" searchable="true" sortable="true" visible="true"/>
<name type="2" length="255" name="Наименование владельца счета" shortname="Владелец счета" searchable="true" sortable="true" visible="true" required="true"/>
<address type="2" length="255" name="Адрес владельца счета" shortname="Адрес владельца" searchable="true" sortable="true" visible="true" required="true"/>
<bankAddress type="2" length="255" name="Место нахождения банка получателя средств" shortname="Место нахождение банка" searchable="true" sortable="true" visible="true" required="true"/>
<bankSwiftCode type="2" length="12" name="SWIFT банка получателя средств" shortname="SWIFT банка" searchable="true" sortable="true" visible="true" required="true"/>
<bankAccount type="2" length="35" name="Номер счета банка получателя средств" shortname="Номер счёта получателя" searchable="true" sortable="true" visible="true" required="true"/>
<bankName1 type="2" length="255" name="Наименование банка-посредника 1" shortname="Банк посредник 1" searchable="true" sortable="true" visible="true"/>
<bankAddress1 type="2" length="255" name="Место нахождения банка-посредника 1" shortname="Место нахождения банка-посредника 1" searchable="true" sortable="true" visible="true"/>
<bankAccount1 type="2" length="35" name="Номер счета банка-посредника 1" shortname="Счет банка-посредника 1" searchable="true" sortable="true" visible="true"/>
<bankName2 type="2" length="255" name="Наименование банка-посредника 2" shortname="Банк посредник 2" searchable="true" sortable="true" visible="true"/>
<bankAddress2 type="2" length="255" name="Место нахождения банка-посредника 2" shortname="Место нахождения банка-посредника 2" searchable="true" sortable="true" visible="true"/>
<intermediarySwiftCode2 type="2" length="12" name="SWIFT банка-посредника 2" shortname="Счет банка-посредника 2" searchable="true" sortable="true" visible="true"/>
<bankAccount2 type="2" length="35" name="Номер счета банка-посредника 2" shortname="Счет банка-посредника 2" searchable="true" sortable="true" visible="true"/>
<personalAccount type="2" length="20" name="Лицевой счет получателя" shortname="Счет получателя" searchable="true" sortable="true" visible="true"/>
<budgetClassificationCode type="2" length="20" name="КБК" shortname="КБК" searchable="true" sortable="true" visible="true"/>
<oktmo type="2" length="20" name="ОКТМО получателя средств" shortname="ОКТМО" searchable="true" sortable="true" visible="true"/>
</put>
<delete name="Блокировка счета вывода средств" confirmation="currency,bankIdentificationCode,correspondentAccount,taxpayerIdentificationNumber,taxRegistrationReasonCode,account" class="ru.spcex.clearing.backendapi.controller.request.cud.common.CommonDeleteAction">
<id type="1" name="Идентификатор записи" shortname="ID" link="bankAccount" 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.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<artifactId>cleaning-builders</artifactId>
<name>cleaning-builders</name>
<description>Cleaning builders module</description>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
<packaging>jar</packaging>
@ -26,7 +26,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<modelVersion>4.0.0</modelVersion>

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.15.207</version>
<version>SPCEX-3.15.208</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<properties>
@ -35,13 +35,13 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>dictionary</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<build>

6
clearing-parent/db-scripts/src/main/resources/db/DICTIONARIES.sql
View file

@ -1,7 +1,3 @@
-- DB version: 3.13
-- DATA version: 3.13.0.95
/* Dictionaries */
INSERT INTO ALLOWED_DICTIONARY(ID, CODE, NAME) values (1, 'ALWD', 'Разрешено') ON CONFLICT (ID) DO UPDATE SET CODE = EXCLUDED.CODE, NAME = EXCLUDED.NAME;
@ -1035,4 +1031,4 @@ INSERT INTO ERROR_CODE_DICTIONARY(ID, CODE, NAME) values (10001, 'TRDI', 'Сде
/* Business objects */
INSERT INTO DB_VERSION(ID, DICTIONARY_VERSION) values (1, '3.13.0.95') ON CONFLICT (ID) DO UPDATE SET DICTIONARY_VERSION = EXCLUDED.DICTIONARY_VERSION
INSERT INTO DB_VERSION(ID, DICTIONARY_VERSION) values (1, '3.15.0.96') ON CONFLICT (ID) DO UPDATE SET DICTIONARY_VERSION = EXCLUDED.DICTIONARY_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.15.207</version>
<version>SPCEX-3.15.208</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<dependencies>

13
clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/ResultContainer.java
View file

@ -1,11 +1,10 @@
package ru.spcex.clearing.dbf.exporter.logic.data;
import ru.spcex.clearing.dbf.exporter.logic.data.enums.StageResult;
import ru.spcex.clearing.dbf.exporter.logic.data.enums.Table;
import java.io.File;
import java.time.LocalDateTime;
import java.util.UUID;
import ru.spcex.clearing.dbf.exporter.logic.data.enums.StageResult;
import ru.spcex.clearing.dbf.exporter.logic.data.enums.Table;
/**
* Контейнер для передачи результата между стадиями
@ -19,13 +18,15 @@ public class ResultContainer {
private StageResult lastStageResult;
private LocalDateTime registrationDateTime;
private String memberCode;
private String section;
protected ResultContainer() {}
public static ResultContainer createNewTask(Table tableForExport) {
public static ResultContainer createNewTask(Table tableForExport, String section) {
ResultContainer container = new ResultContainer();
container.tableForExport = tableForExport;
container.uuid = UUID.randomUUID();
container.section = section;
return container;
}
@ -92,4 +93,8 @@ public class ResultContainer {
public void setMemberCode(String memberCode) {
this.memberCode = memberCode;
}
public String getSection() {
return section;
}
}

17
clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplate.java
View file

@ -1,19 +1,14 @@
package ru.spcex.clearing.dbf.exporter.logic.data.enums;
import java.io.File;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Locale;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.integration.sftp.session.SftpFileInfo;
import ru.spcex.clearing.dbf.exporter.logic.data.ResultContainer;
import java.io.File;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import static ru.spcex.clearing.dbf.exporter.logic.stages.PrepareDBFFile.SECTION;
import static ru.spcex.clearing.dbf.exporter.logic.stages.PrepareDBFFile.outDir;
public enum FilenameTemplate {
@ -66,7 +61,7 @@ public enum FilenameTemplate {
result.append(File.separator);
result.append(resultContainer.getTableForExport().getFilePrefix().toUpperCase(Locale.ROOT));
result.append('_');
result.append(SECTION);
result.append(resultContainer.getSection());
return result;
}

1
clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/logic/stages/PrepareDBFFile.java
View file

@ -26,7 +26,6 @@ import ru.spcex.clearing.dbf.exporter.logic.data.enums.Table;
*/
@Component
public class PrepareDBFFile extends Stage implements InitializingBean {
public static final String SECTION = "S";
private final ExportDBFServiceSettings settings;
public static String outDir;
private final SFTPConfig.DbfGateway gateway;

17
clearing-parent/dbf-exporter/src/main/java/ru/spcex/clearing/dbf/exporter/services/CommandService.java
View file

@ -1,9 +1,12 @@
package ru.spcex.clearing.dbf.exporter.services;
import java.util.Arrays;
import java.util.Optional;
import org.apache.kafka.clients.consumer.Consumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import ru.spcex.clearing.dbf.exporter.logic.Processor;
import ru.spcex.clearing.dbf.exporter.logic.data.ResultContainer;
@ -17,22 +20,22 @@ import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
import ru.spcex.platform.enumeration.Task;
import ru.spcex.platform.imdg.api.ImdgProvider;
import java.util.Arrays;
import java.util.Optional;
@Service
public class CommandService extends QueueConsumer implements InitializingBean {
private final Logger log = LoggerFactory.getLogger(getClass());
private final ImdgProvider imdgProvider;
private final Processor processor;
private final String section;
public CommandService(Consumer<String, Object> kafkaQueue,
ImdgProvider imdgProvider,
Processor processor) {
Processor processor,
@Value("${export-dbf-service.section:S}") String section) {
super(kafkaQueue);
this.imdgProvider = imdgProvider;
this.processor = processor;
this.section = section;
}
@Override
@ -79,7 +82,7 @@ public class CommandService extends QueueConsumer implements InitializingBean {
if (tableForExport.isEmpty()) {
throw new IllegalStateException(String.format("Unsupported table prefix: %s", request.getNameOfTable()));
}
ResultContainer resultContainer = ResultContainer.createNewTask(tableForExport.get());
ResultContainer resultContainer = ResultContainer.createNewTask(tableForExport.get(), section);
resultContainer.setGroupId(request.getSdfGroupId());
resultContainer.setSourceName(request.getFileName());
processor.process(resultContainer);
@ -87,7 +90,7 @@ public class CommandService extends QueueConsumer implements InitializingBean {
private void processSpecial(Table table, BaseRequest<SdfClearingRequest> systemRequest) {
SdfClearingRequest request = systemRequest.getRequestPayload();
ResultContainer resultContainer = ResultContainer.createNewTask(table);
ResultContainer resultContainer = ResultContainer.createNewTask(table, section);
resultContainer.setGroupId(request.getGroupId());
resultContainer.setSourceName(null);
processor.process(resultContainer);
@ -96,7 +99,7 @@ public class CommandService extends QueueConsumer implements InitializingBean {
private void processByLauncher(Table table, BaseRequest<LauncherCommandRequest> systemRequest) {
LauncherCommandRequest request = systemRequest.getRequestPayload();
log.info("RequestId={}, LauncherCommandRequest task={}. Table {}", systemRequest.getId(), request.getTaskName(), table);
ResultContainer resultContainer = ResultContainer.createNewTask(table);
ResultContainer resultContainer = ResultContainer.createNewTask(table, section);
resultContainer.setGroupId(null);
resultContainer.setSourceName(null);
processor.process(resultContainer);

2
clearing-parent/dbf-exporter/src/main/resources/application.properties
View file

@ -30,3 +30,5 @@ export-dbf-service.kafka-producer.retries=0
export-dbf-service.kafka-producer.batch-size=16384
export-dbf-service.kafka-producer.linger-ms=1
export-dbf-service.kafka-producer.buffer-memory=33554432
export-dbf-service.section=S

14
clearing-parent/dbf-exporter/src/test/java/ru/spcex/clearing/dbf/exporter/logic/data/enums/FilenameTemplateTest.java
View file

@ -1,18 +1,16 @@
package ru.spcex.clearing.dbf.exporter.logic.data.enums;
import com.jcraft.jsch.ChannelSftp.LsEntry;
import org.junit.jupiter.api.Test;
import org.springframework.integration.sftp.session.SftpFileInfo;
import ru.spcex.clearing.dbf.exporter.logic.data.ResultContainer;
import ru.spcex.clearing.dbf.exporter.logic.stages.PrepareDBFFile;
import java.io.File;
import java.time.LocalDateTime;
import java.util.List;
import com.jcraft.jsch.ChannelSftp.LsEntry;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Test;
import static org.mockito.Mockito.*;
import org.springframework.integration.sftp.session.SftpFileInfo;
import ru.spcex.clearing.dbf.exporter.logic.data.ResultContainer;
import static ru.spcex.clearing.dbf.exporter.logic.data.enums.FilenameTemplate.df_section_sameName;
import ru.spcex.clearing.dbf.exporter.logic.stages.PrepareDBFFile;
class FilenameTemplateTest {
@ -38,7 +36,7 @@ class FilenameTemplateTest {
SftpFileInfo sftpFileInfo = spy(new SftpFileInfo(lsEntry));
doReturn(false).when(sftpFileInfo).isDirectory();
List<SftpFileInfo> files = List.of(sftpFileInfo);
ResultContainer resultContainer = ResultContainer.createNewTask(Table.S_DF02);
ResultContainer resultContainer = ResultContainer.createNewTask(Table.S_DF02, "S");
resultContainer.setGroupId(10L);
resultContainer.setSourceName("DF-01_S_PRC1807230915_1.dbf");
PrepareDBFFile.outDir="TEST_DIR";

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.15.207</version>
<version>SPCEX-3.15.208</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<artifactId>extdb-importer</artifactId>
<name>extdb-importer</name>
<description>Extdb importer module. Аналог trade-importer.</description>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<modelVersion>4.0.0</modelVersion>

16
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java
View file

@ -63,11 +63,11 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
private final RestTemplate restTemplate;
private final InboundServerSettings inboundServerSettings;
private final InboundExternalServerSettings inboundExternalServerSettings;
private final GatewayApiSettings gatewayApiSettings;
private final Map<Long, List<SentAsset>> sentAssets;
private final Map<UUID, OutboundRequest> outboundRequestByUuid;
protected final Imdg<GatewayResult> gatewayResultImdg;
private final static Pattern REPORT_FILE_NAME_PATTERN = Pattern.compile("(\\S*)_(\\d{15}).csv");
private final String clearingSystemValue;
public GatewayService(Consumer<String, Object> kafkaQueue,
Producer<String, Object> kafkaProducer,
@ -80,7 +80,8 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
super(kafkaQueue, kafkaProducer);
this.restTemplate = restTemplate;
this.userRoleVerification = userRoleVerification;
this.gatewayApiSettings = gatewayApiSettings;
this.clearingSystemValue = StringUtils.isNotEmpty(gatewayApiSettings.getClearingSystem()) ?
gatewayApiSettings.getClearingSystem() : "SPVB";
this.inboundServerSettings = gatewayApiSettings.getInboundServer();
this.inboundExternalServerSettings = gatewayApiSettings.getInboundExternalServer();
this.sentAssets = sentAssets;
@ -120,6 +121,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
logUnknownProperties(userRequest);
OutboundRequest outboundFondRequest = OutboundRequestBuilder.builder()
.type(OutboundRequestType.MEMBER_ON_DEMAND.getKey())
.clearingSystem(clearingSystemValue)
.build();
outboundRequestByUuid.put(outboundFondRequest.getId(), outboundFondRequest);
@ -133,6 +135,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
OutboundRequest outboundFondRequest = OutboundRequestBuilder.builder()
.section(exportedRequest.getSection())
.type(OutboundRequestType.FILL_LIMITS.getKey())
.clearingSystem(clearingSystemValue)
.content(content)
.build();
@ -152,16 +155,19 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
OutboundRequest outboundFondRequest = OutboundRequestBuilder.builder()
.section(Section.FOND.getKey())
.type(OutboundRequestType.ON_DEMAND.getKey())
.clearingSystem(clearingSystemValue)
.build();
OutboundRequest outboundMkrRequest = OutboundRequestBuilder.builder()
.section(Section.MKR.getKey())
.type(OutboundRequestType.ON_DEMAND.getKey())
.clearingSystem(clearingSystemValue)
.build();
OutboundRequest outboundCurrRequest = OutboundRequestBuilder.builder()
.section(Section.CURR.getKey())
.type(OutboundRequestType.ON_DEMAND.getKey())
.clearingSystem(clearingSystemValue)
.build();
outboundRequestByUuid.put(outboundFondRequest.getId(), outboundFondRequest);
@ -198,6 +204,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
OutboundRequest outboundRequest = OutboundRequestBuilder.builder()
.section(assetOperation.getAmount() != null ? Section.MKR.getKey() : Section.FOND.getKey())
.type(OutboundRequestType.ASSET_OPERATION.getKey())
.clearingSystem(clearingSystemValue)
.content(content).build();
gatewayBuilder.outboundRequest(outboundRequest);
@ -231,6 +238,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
OutboundRequest outboundRequest = OutboundRequestBuilder.builder()
.section(Section.FOND.getKey())
.type(reportType.getKey())
.clearingSystem(clearingSystemValue)
.content(content).build();
sendRequest(outboundRequest);
@ -243,6 +251,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
OutboundRequest outboundRequest = OutboundRequestBuilder.builder()
.type(OutboundRequestType.MEMBER_RESPONSE_TKR.getKey())
.content(content)
.clearingSystem(clearingSystemValue)
.build();
if (reportRequest.getRequestId() != null) {
outboundRequest.setId(reportRequest.getRequestId());
@ -286,9 +295,6 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
}
private void sendRequest(OutboundRequest request) {
String clearingSystem = StringUtils.isNotEmpty(gatewayApiSettings.getClearingSystem()) ?
gatewayApiSettings.getClearingSystem() : "SPVB";
request.setClearingSystem(clearingSystem);
if (inboundServerSettings != null &&
(inboundServerSettings.getAllowedTypes().isEmpty() ||
inboundServerSettings.getAllowedTypes().contains(request.getType()))) {

3
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/TkrService.java
View file

@ -26,6 +26,9 @@ public class TkrService {
if (tkrRequest.getErrors() != null && !tkrRequest.getErrors().isEmpty()) {
return;
}
if (tkrRequest.getInfoAccount() == null || tkrRequest.getInfoAccount().isEmpty()) {
return;
}
List<TkrAccount> tkrAccountsForCheck = tkrRequest.getInfoAccount()
.stream().filter(infoAccount -> TypeOperations.CHECK.equalsByKey(infoAccount.getTypeOperationClient()))
.map(tkrAdapter::toTkrResponse)

9
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/builders/OutboundRequestBuilder.java
View file

@ -1,15 +1,15 @@
package ru.spcex.clearing.gatewayapi.service.builders;
import ru.spcex.clearing.gatewayapi.controller.outbound.request.OutboundRequest;
import java.time.Instant;
import java.util.Map;
import java.util.UUID;
import ru.spcex.clearing.gatewayapi.controller.outbound.request.OutboundRequest;
public class OutboundRequestBuilder {
private String section;
private String requestType;
private String clearingSystem;
private Map<String, Object> content;
private OutboundRequestBuilder() {
@ -34,11 +34,16 @@ public class OutboundRequestBuilder {
this.content = content;
return this;
}
public OutboundRequestBuilder clearingSystem(String val) {
this.clearingSystem = val;
return this;
}
public OutboundRequest build() {
OutboundRequest outboundRequest = new OutboundRequest();
outboundRequest.setId(UUID.randomUUID());
outboundRequest.setDatetime(Instant.now());
outboundRequest.setClearingSystem(clearingSystem);
if (section != null) {
outboundRequest.setSection(section);
}

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.15.207</version>
<version>SPCEX-3.15.208</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
@ -36,13 +36,13 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>dictionary</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
<scope>compile</scope>
</dependency>
@ -82,7 +82,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>cleaning-builders</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<properties>
@ -32,13 +32,13 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>dictionary</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
<scope>compile</scope>
</dependency>
@ -89,7 +89,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>cleaning-builders</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
<packaging>jar</packaging>
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<properties>
@ -35,7 +35,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
<parent>
<artifactId>clearing</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -51,7 +51,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>cleaning-builders</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<properties>
@ -35,13 +35,13 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>dictionary</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
<packaging>jar</packaging>
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing-parent</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<properties>
@ -35,7 +35,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<artifactId>test-clearing</artifactId>
<name>Test-clearing</name>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<artifactId>trade-importer</artifactId>
<name>trade-importer</name>
<description>Trade importer module</description>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
<packaging>jar</packaging>
<properties>
@ -51,7 +51,7 @@
<dependency>
<groupId>ru.spcex.clearing</groupId>
<artifactId>classes</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<dependencies>

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.15.207</version>
<version>SPCEX-3.15.208</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<dependencies>

2
platform-parent/pom.xml
View file

@ -14,7 +14,7 @@
<parent>
<groupId>ru.spcex.clearing</groupId>
<artifactId>clearing</artifactId>
<version>SPCEX-3.15.207</version>
<version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</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.15.207</global.project.version>
<global.project.version>SPCEX-3.15.208</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.15.207</version>
<version>SPCEX-3.15.208</version>
</parent>
<modelVersion>4.0.0</modelVersion>