Merge branch 'master' into dev

# Conflicts:
#	clearing-parent/account-service/pom.xml
#	clearing-parent/backend-api/pom.xml
#	clearing-parent/balance-service/pom.xml
#	clearing-parent/classes/pom.xml
#	clearing-parent/cleaning-builders/pom.xml
#	clearing-parent/clearing-service/pom.xml
#	clearing-parent/clearing-validation/pom.xml
#	clearing-parent/company-service/pom.xml
#	clearing-parent/db-scripts/pom.xml
#	clearing-parent/dbf-exporter/pom.xml
#	clearing-parent/dbf-importer/pom.xml
#	clearing-parent/dictionary/pom.xml
#	clearing-parent/extdb-importer/pom.xml
#	clearing-parent/gateway-api/pom.xml
#	clearing-parent/imdg-hist/pom.xml
#	clearing-parent/imdg/pom.xml
#	clearing-parent/lim-exporter/pom.xml
#	clearing-parent/pom.xml
#	clearing-parent/registry-service/pom.xml
#	clearing-parent/reports-service/pom.xml
#	clearing-parent/scheduler-service/pom.xml
#	clearing-parent/securities-service/pom.xml
#	clearing-parent/security-util/pom.xml
#	clearing-parent/swt-exporter/pom.xml
#	clearing-parent/swt-importer/pom.xml
#	clearing-parent/test-clearing/pom.xml
#	clearing-parent/trade-importer/pom.xml
#	clearing-parent/utility-service/pom.xml
#	platform-parent/pom.xml
#	pom.xml
#	z-distr/pom.xml
This commit is contained in:
akulikov 2024-09-09 12:38:40 +03:00
commit 9701877672
32 changed files with 69 additions and 142 deletions

View file

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

View file

@ -11,7 +11,7 @@
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version>
<version>SPCEX-3.12.12</version>
</parent>
@ -233,19 +233,6 @@
</fileMapper>
</fileMappers>
</transformationSet>
<!-- <transformationSet>
<dir>src/main/resources/meta</dir>
<includes>
<include>data_register_code.xml</include>
</includes>
<stylesheet>src/main/resources/meta/xsl/data.xsl</stylesheet>
<fileMappers>
<fileMapper
implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
<targetExtension>data_register_code.sql</targetExtension>
</fileMapper>
</fileMappers>
</transformationSet> -->
</transformationSets>
</configuration>
</execution>

View file

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

View file

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

View file

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

View file

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

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -7,12 +7,12 @@
<name>_parent_clearing</name>
<description>Clearing parent module</description>
<packaging>pom</packaging>
<version>SPCEX-3.14.106</version>
<version>SPCEX-3.12.12</version>
<parent>
<artifactId>clearing</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version>
<version>SPCEX-3.12.12</version>
</parent>
<modules>
@ -43,8 +43,6 @@
<module>swt-importer</module>
<module>gateway-api</module>
<module>imdg-hist</module>
<module>xml-importer</module>
<module>xml-exporter</module>
</modules>
<properties>

View file

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

View file

@ -8,12 +8,12 @@
<artifactId>reports-service</artifactId>
<name>reports-service</name>
<description>Service for creating reports</description>
<version>SPCEX-3.14.106</version>
<version>SPCEX-3.12.12</version>
<parent>
<artifactId>clearing-parent</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version>
<version>SPCEX-3.12.12</version>
</parent>
<dependencies>
<!-- Spring boot -->
@ -51,12 +51,6 @@
<version>1.4.19</version>
</dependency>
<!-- JDBC -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<!-- DOC -->
<dependency>
<groupId>org.apache.poi</groupId>
@ -132,15 +126,6 @@
<artifactId>spring-boot-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.7.3</version>
</dependency>
</dependencies>
<build>

View file

@ -93,7 +93,12 @@ public class KSCommissionTradesReportBuilder extends CSVReportBuilder<EmptyParam
registryPredicate,
pb.greatEqual("refundDate", nowDate),
pb.lessEqual("valueDate", nowDate),
pb.in("sessionType", SessionType.XDEP.getKey(), SessionType.FINL.getKey(), SessionType.MEDM.getKey())
pb.or(
pb.in("sessionType", SessionType.XDEP.getKey(), SessionType.FINL.getKey(), SessionType.MEDM.getKey()),
pb.and(
pb.equals("sessionType", SessionType.UNIT.getKey()),
pb.equals("section", Section.MKR.getKey()))
)
);
Collection<Registry> registries = registryImdg.getCollectionObjectsByPredicate(finalPredicate);
log.debug("Found {} Registry by query: {}", registries.size(), finalPredicate);

View file

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

View file

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

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -9,7 +9,7 @@
<name>__parent_ROOT</name>
<description>Clearing main parent</description>
<packaging>pom</packaging>
<version>SPCEX-3.14.106</version>
<version>SPCEX-3.12.12</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.14.106</global.project.version>
<global.project.version>SPCEX-3.12.12</global.project.version>
<spring-boot.version>2.6.3</spring-boot.version>
@ -53,8 +53,6 @@
<folder_root_registry-service>${folder_root_clearing}/clearing-parent/registry-service</folder_root_registry-service>
<folder_root_scheduler-service>${folder_root_clearing}/clearing-parent/scheduler-service</folder_root_scheduler-service>
<folder_root_gateway-api>${folder_root_clearing}/clearing-parent/gateway-api</folder_root_gateway-api>
<folder_root_xml-exporter>${folder_root_clearing}/clearing-parent/xml-exporter</folder_root_xml-exporter>
<folder_root_xml-importer>${folder_root_clearing}/clearing-parent/xml-importer</folder_root_xml-importer>
<!-- IMDG -->
<external_libraries.hazelcast.version>3.12.4</external_libraries.hazelcast.version>
<external_libraries.slf4j.version>1.7.33</external_libraries.slf4j.version>

View file

@ -5,7 +5,7 @@
<parent>
<artifactId>clearing</artifactId>
<groupId>ru.spcex.clearing</groupId>
<version>SPCEX-3.14.106</version>
<version>SPCEX-3.12.12</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -568,52 +568,6 @@
</fileSets>
</configuration>
</execution>
<execution>
<id>copy-xml-exporter-bin</id>
<phase>prepare-package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<fileSets>
<fileSet>
<sourceFile>${folder_root_xml-exporter}/target/xml-exporter.jar</sourceFile>
<destinationFile>${folder.clearing.distr.bin}/xml-exporter.jar</destinationFile>
</fileSet>
<fileSet>
<sourceFile>${folder_root_xml-exporter}/target/xml-exporter.jar</sourceFile>
<destinationFile>${folder.clearing.distr.services}/xml-exporter/xml-exporter.jar</destinationFile>
</fileSet>
<fileSet>
<sourceFile>${folder_root_xml-exporter}/src/main/resources/application.properties</sourceFile>
<destinationFile>${folder.clearing.distr.settings}/xml-exporter/application.properties</destinationFile>
</fileSet>
</fileSets>
</configuration>
</execution>
<execution>
<id>copy-xml-importer-bin</id>
<phase>prepare-package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<fileSets>
<fileSet>
<sourceFile>${folder_root_xml-importer}/target/xml-importer.jar</sourceFile>
<destinationFile>${folder.clearing.distr.bin}/xml-importer.jar</destinationFile>
</fileSet>
<fileSet>
<sourceFile>${folder_root_xml-importer}/target/xml-importer.jar</sourceFile>
<destinationFile>${folder.clearing.distr.services}/xml-importer/xml-importer.jar</destinationFile>
</fileSet>
<fileSet>
<sourceFile>${folder_root_xml-importer}/src/main/resources/application.properties</sourceFile>
<destinationFile>${folder.clearing.distr.settings}/xml-importer/application.properties</destinationFile>
</fileSet>
</fileSets>
</configuration>
</execution>
</executions>
</plugin>
<plugin>