http://jira.mfd.msk:8088/browse/CLS-21

--- company_services: ввел удаление компании company; изменение общей информации о компании companyInfo, ее реквизитов companySymbols
2022-08-31 19:02:15 +03:00 · 2022-08-31 19:02:15 +03:00 · 6773871d26
commit 6773871d26
parent 3fb0524cc8
11 changed files with 376 additions and 0 deletions
--- a/clearing-parent/company-service/pom.xml
+++ b/clearing-parent/company-service/pom.xml
@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>clearing-parent</artifactId>
+        <groupId>ru.spcex.clearing</groupId>
+        <version>SPCEX-1.0.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>company-service</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>ru.spcex.platform</groupId>
+            <artifactId>platform-messaging</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ru.spcex.platform</groupId>
+            <artifactId>platform-imdg-api-hazelcast-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ru.spcex.clearing</groupId>
+            <artifactId>classes</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>application.properties</exclude>
+                </excludes>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <finalName>${project.artifactId}</finalName>
+                </configuration>
+            </plugin>
+        </plugins>
+
+    </build>
+
+</project>
--- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/CompanyServiceApplication.java
+++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/CompanyServiceApplication.java
@ -0,0 +1,12 @@
+package ru.spcex.clearing.company;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class CompanyServiceApplication {
+    public static void main(String[] args) {
+        SpringApplication app = new SpringApplication(CompanyServiceApplication.class);
+        app.run(args);
+    }
+}
--- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/KafkaConfig.java
+++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/KafkaConfig.java
@ -0,0 +1,17 @@
+package ru.spcex.clearing.company.config;
+
+import org.apache.kafka.clients.consumer.Consumer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import ru.spcex.clearing.company.config.settings.CompanyServiceSettings;
+import ru.spcex.clearing.platform.messaging.config.KafkaConsumerFactory;
+
+@Configuration
+public class KafkaConfig {
+    @Autowired
+    @Bean
+    public Consumer<String, Object> createProducer(CompanyServiceSettings settings) {
+        return KafkaConsumerFactory.consumer(settings.getKafka());
+    }
+}
--- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/UtilityServiceImdgConfig.java
+++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/UtilityServiceImdgConfig.java
@ -0,0 +1,47 @@
+package ru.spcex.clearing.company.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import ru.spcex.clearing.company.config.settings.CompanyServiceSettings;
+import ru.spcex.platform.imdg.api.ImdgProvider;
+import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
+
+@Configuration
+public class UtilityServiceImdgConfig {
+    private static ThreadPoolTaskExecutor createThreadPoolTaskExecutor(int maxPoolSz, boolean waitForCompletion) {
+        ThreadPoolTaskExecutor pool = new ThreadPoolTaskExecutor();
+        if (maxPoolSz > 2) {
+            pool.setKeepAliveSeconds(60);
+            pool.setAllowCoreThreadTimeOut(true);
+        }
+        pool.setCorePoolSize(maxPoolSz);
+        pool.setWaitForTasksToCompleteOnShutdown(waitForCompletion);
+        return pool;
+    }
+
+    @Bean(name = "taskExecutorHazelcastClientInitializer")
+    public ThreadPoolTaskExecutor taskExecutorHazelcastClientInitializer() {
+        return createThreadPoolTaskExecutor(1, true);
+    }
+
+    @Bean(name = "taskExecutorIdGeneratorAwaiter")
+    public ThreadPoolTaskExecutor taskExecutorIdGeneratorAwaiter() {
+        return createThreadPoolTaskExecutor(1, false);
+    }
+
+    @Autowired
+    @Bean
+    public ImdgProvider imdgProvider(
+            @Qualifier("taskExecutorHazelcastClientInitializer") ThreadPoolTaskExecutor taskExecutorHazelcastClientInitializer,
+            @Qualifier("taskExecutorIdGeneratorAwaiter") ThreadPoolTaskExecutor taskExecutorIdGeneratorAwaiter,
+            CompanyServiceSettings settings
+    ) {
+        return new HazelcastService(taskExecutorHazelcastClientInitializer,
+                taskExecutorIdGeneratorAwaiter,
+                settings.getHazelcast());
+    }
+
+}
--- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/service/CompanyInfoService.java
+++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/service/CompanyInfoService.java
@ -0,0 +1,56 @@
+package ru.spcex.clearing.company.config.service;
+
+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.Autowired;
+import org.springframework.stereotype.Service;
+import ru.clearing.classes.statics.data.profile.CompanyInfo;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
+import ru.spcex.clearing.platform.messaging.domain.Consts;
+import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanyInfoUpdateRequest;
+import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
+import ru.spcex.platform.imdg.api.Imdg;
+import ru.spcex.platform.imdg.api.ImdgProvider;
+
+@Service
+public class CompanyInfoService extends QueueConsumer implements InitializingBean {
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    private final Imdg<CompanyInfo> companyInfoMap;
+
+    @Autowired
+    public CompanyInfoService(Consumer<String, Object> kafkaQueue, ImdgProvider imdgProvider) {
+        super(kafkaQueue);
+        this.companyInfoMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, CompanyInfo.class);
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        callback(CompanyInfoUpdateRequest.class)
+                .setConsumer(this::companyInfoUpdate)
+                .forDestination(Consts.DESTINATION_COMPANY_INFO_UPDATE, callbacks::put);
+        init();
+    }
+
+    public void companyInfoUpdate(BaseRequest<CompanyInfoUpdateRequest> userRequest) {
+        CompanyInfoUpdateRequest req = userRequest.getRequestPayload();
+        log.debug("CompanyInfoUpdateRequest received");
+        CompanyInfo companyInfo = companyInfoMap.getSingleObjectByID(req.getId());
+
+        companyInfo.setCorporationSoleType(req.getCorporationSoleType());
+        companyInfo.setCountryCode(req.getCountryCode());
+        companyInfo.setDescription(req.getDescription());
+        companyInfo.setProfessionalSign(req.getProfessionalSign());
+        companyInfo.setLegalKind(req.getLegalKind());
+        companyInfo.setOrganizationType(req.getOrganizationType());
+        companyInfo.setResidence(req.getResidence());
+        companyInfo.setShortNameEng(req.getShortNameEng());
+        companyInfo.setFullNameEng(req.getFullNameEng());
+        companyInfo.setShortName(req.getShortName());
+        companyInfo.setFullName(req.getFullName());
+        companyInfoMap.update(companyInfo);
+        log.debug("successfully processed, id {}", companyInfo.getId());
+    }
+}
--- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/service/CompanyService.java
+++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/service/CompanyService.java
@ -0,0 +1,43 @@
+package ru.spcex.clearing.company.config.service;
+
+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.Autowired;
+import org.springframework.stereotype.Service;
+import ru.clearing.classes.statics.data.company.Company;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
+import ru.spcex.clearing.platform.messaging.domain.Consts;
+import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
+import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
+import ru.spcex.platform.imdg.api.Imdg;
+import ru.spcex.platform.imdg.api.ImdgProvider;
+
+@Service
+public class CompanyService extends QueueConsumer implements InitializingBean {
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    private final Imdg<Company> companyMap;
+
+    @Autowired
+    public CompanyService(Consumer<String, Object> kafkaQueue, ImdgProvider imdgProvider) {
+        super(kafkaQueue);
+        this.companyMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        callback(CommonDeleteRequest.class)
+                .setConsumer(this::deleteCompany)
+                .forDestination(Consts.DESTINATION_COMPANY_DELETE, callbacks::put);
+        init();
+    }
+
+    private void deleteCompany(BaseRequest<CommonDeleteRequest> userRequest) {
+        CommonDeleteRequest req = userRequest.getRequestPayload();
+        log.debug("CommonDeleteRequest received id = {}", req.getId());
+        Company company = companyMap.getSingleObjectByID(req.getId());
+        companyMap.delete(company);
+    }
+}
--- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/service/CompanySymbolService.java
+++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/service/CompanySymbolService.java
@ -0,0 +1,48 @@
+package ru.spcex.clearing.company.config.service;
+
+
+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.Autowired;
+import org.springframework.stereotype.Service;
+import ru.clearing.classes.statics.data.company.CompanySymbols;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
+import ru.spcex.clearing.platform.messaging.domain.Consts;
+import ru.spcex.clearing.platform.messaging.domain.cud.company.CompanySymbolUpdateRequest;
+import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
+import ru.spcex.platform.imdg.api.Imdg;
+import ru.spcex.platform.imdg.api.ImdgProvider;
+
+@Service
+public class CompanySymbolService extends QueueConsumer implements InitializingBean {
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    private final Imdg<CompanySymbols> companySymbolsMap;
+
+    @Autowired
+    public CompanySymbolService(Consumer<String, Object> kafkaQueue, ImdgProvider imdgProvider) {
+        super(kafkaQueue);
+        this.companySymbolsMap = imdgProvider.getImdg(IMDGDistributedNames.Map_CompanySymbols, CompanySymbols.class);
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        callback(CompanySymbolUpdateRequest.class)
+                .setConsumer(this::companySymbolUpdate)
+                .forDestination(Consts.DESTINATION_COMPANY_SYMBOL_UPDATE, callbacks::put);
+        init();
+    }
+
+    public void companySymbolUpdate(BaseRequest<CompanySymbolUpdateRequest> userRequest) {
+        CompanySymbolUpdateRequest req = userRequest.getRequestPayload();
+        log.debug("CompanySymbolUpdateRequest received");
+        CompanySymbols companySymbols = companySymbolsMap.getSingleObjectByID(req.getId());
+        companySymbols.setCompanySymbol(req.getCompanySymbol());
+        companySymbols.setCompanySymbolValue(req.getCompanySymbolValue());
+
+        companySymbolsMap.update(companySymbols);
+        log.debug("successfully processed, id {}", companySymbols.getId());
+    }
+}
--- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/settings/CompanyServiceSettings.java
+++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/config/settings/CompanyServiceSettings.java
@ -0,0 +1,31 @@
+package ru.spcex.clearing.company.config.settings;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+import ru.spcex.clearing.platform.messaging.config.element.KafkaConsumerSettings;
+import ru.spcex.platform.imdg.iml.hazelcast.config.HazelcastClientParams;
+
+@Component
+@PropertySource("file:${spring.config.location}/application.properties")
+@ConfigurationProperties("utility-service")
+public class CompanyServiceSettings {
+    private HazelcastClientParams hazelcast;
+    private KafkaConsumerSettings kafka;
+
+    public HazelcastClientParams getHazelcast() {
+        return hazelcast;
+    }
+
+    public void setHazelcast(HazelcastClientParams hazelcast) {
+        this.hazelcast = hazelcast;
+    }
+
+    public KafkaConsumerSettings getKafka() {
+        return kafka;
+    }
+
+    public void setKafka(KafkaConsumerSettings kafka) {
+        this.kafka = kafka;
+    }
+}
--- a/clearing-parent/company-service/src/main/resources/application.properties
+++ b/clearing-parent/company-service/src/main/resources/application.properties
@ -0,0 +1,13 @@
+spring.main.web-application-type=none
+
+utility-service.hazelcast.cluster-members=127.0.0.1
+utility-service.hazelcast.login=dev
+utility-service.hazelcast.password=dev-pass
+
+utility-service.kafka.bootstrap-servers=localhost:9092
+utility-service.kafka.group-id=dev-group
+utility-service.kafka.enable-auto-commit=false
+utility-service.kafka.session-timeout-ms=30000
+utility-service.kafka.auto-offset-reset=latest
+utility-service.kafka.linger-ms=1
+utility-service.kafka.buffer-memory=33554432
--- a/clearing-parent/company-service/src/main/resources/logback.xml
+++ b/clearing-parent/company-service/src/main/resources/logback.xml
@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+<!--            |%X{ru.nbch.scoring.web.logging.mdc_key}-->
+			<Pattern>%date{HH:mm:ss.SSS} [%thread] %-5level %class{0}:%line - %message%n</Pattern>
+			<charset>utf-8</charset>
+		</encoder>
+	</appender>
+	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>./logs/company-service.log</file>
+        <encoder>
+<!--            |%X{ru.nbch.scoring.web.logging.mdc_key}-->
+            <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %class{0}:%msg%n</Pattern>
+            <charset>utf8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+            <fileNamePattern>
+                ./logs/company-service.%i.log
+            </fileNamePattern>
+            <minIndex>1</minIndex>
+            <maxIndex>10</maxIndex>
+        </rollingPolicy>
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <maxFileSize>500MB</maxFileSize>
+        </triggeringPolicy>
+    </appender>
+
+	<root level="warn">
+		<appender-ref ref="CONSOLE"/>
+		<appender-ref ref="FILE"/>
+	</root>
+
+    <logger name="ru.spcex" level="debug" additivity="false">
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="CONSOLE"/>
+    </logger>
+</configuration>
--- a/clearing-parent/pom.xml
+++ b/clearing-parent/pom.xml
@ -25,6 +25,7 @@
        <module>dbf-exporter</module>
        <module>securities-service</module>
        <module>utility-service</module>
+        <module>company-service</module>
    </modules>

    <properties>