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

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

Browse source 
http://jira.mfd.msk:8088/browse/CLS-41
This commit is contained in:
ialbert 2022-09-06 18:14:33 +03:00
parent 714c561424
commit 7aad3f4100
13 changed files with 582 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
clearing-parent/balance-service/pom.xml Normal file
View file

@ -0,0 +1,68 @@
<?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>balance-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>

12
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/BalanceServiceApplication.java Normal file
View file

@ -0,0 +1,12 @@
package ru.spcex.clearing.balance;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class BalanceServiceApplication {
public static void main(String[] args) {
SpringApplication app = new SpringApplication(BalanceServiceApplication.class);
app.run(args);
}
}

47
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/config/BalanceImdgConfig.java Normal file
View file

@ -0,0 +1,47 @@
package ru.spcex.clearing.balance.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.balance.config.element.BalanceServiceSettings;
import ru.spcex.platform.imdg.api.ImdgProvider;
import ru.spcex.platform.imdg.iml.hazelcast.service.HazelcastService;
@Configuration
public class BalanceImdgConfig {
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,
BalanceServiceSettings settings
) {
return new HazelcastService(taskExecutorHazelcastClientInitializer,
taskExecutorIdGeneratorAwaiter,
settings.getHazelcast());
}
}

20
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/config/KafkaConfig.java Normal file
View file

@ -0,0 +1,20 @@
package ru.spcex.clearing.balance.config;
import org.apache.kafka.clients.consumer.Consumer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope;
import ru.spcex.clearing.balance.config.element.BalanceServiceSettings;
import ru.spcex.clearing.platform.messaging.config.KafkaConsumerFactory;
@Configuration
public class KafkaConfig {
@Autowired
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
@Bean
public Consumer<String, Object> createProducer(BalanceServiceSettings settings) {
return KafkaConsumerFactory.consumer(settings.getKafka());
}
}

31
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/config/element/BalanceServiceSettings.java Normal file
View file

@ -0,0 +1,31 @@
package ru.spcex.clearing.balance.config.element;
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("balance-service")
public class BalanceServiceSettings {
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;
}
}

59
clearing-parent/balance-service/src/main/java/ru/spcex/clearing/balance/service/Sdf02Service.java Normal file
View file

@ -0,0 +1,59 @@
package ru.spcex.clearing.balance.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.stereotype.Service;
import ru.clearing.classes.statics.data.sdf.SDf02;
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.balance.SDf02NewRequest;
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 Sdf02Service extends QueueConsumer implements InitializingBean {
private final Logger log = LoggerFactory.getLogger(getClass());
private final Imdg<SDf02> sdf8Map;
public Sdf02Service(Consumer<String, Object> kafkaQueue, ImdgProvider imdgProvider) {
super(kafkaQueue);
this.sdf8Map = imdgProvider.getImdg(IMDGDistributedNames.Map_SDf02, SDf02.class);
}
@Override
public void afterPropertiesSet() {
callback(SDf02NewRequest.class)
.setConsumer(this::newSDf02)
.forDestination(Consts.DESTINATION_SDF02_NEW, callbacks::put);
init();
}
private void newSDf02(BaseRequest<SDf02NewRequest> userRequest) {
SDf02NewRequest req = userRequest.getRequestPayload();
log.debug("SDf02NewRequest received");
SDf02 sDf02 = new SDf02();
sDf02.setCurr_code(req.getCurr_code());
sDf02.setAccount(req.getAccount());
sDf02.setRemainder(req.getRemainder());
sDf02.setDeal(req.getDeal());
sDf02.setAcc_code(req.getAcc_code());
sDf02.setDat(req.getDat());
sDf02.setMarket(req.getMarket());
sDf02.setAcc_name(req.getAcc_name());
sDf02.setAcc_type(req.getAcc_type());
sDf02.setSumengage(req.getSumengage());
sDf02.setSumunblock(req.getSumunblock());
sDf02.setFile_type(req.getFile_type());
sDf02.setResult(req.getResult());
sDf02.setFileName(req.getFileName());
sDf02.setGenerationTime(req.getGenerationTime());
sDf02.setGenerationId(req.getGenerationId());
sdf8Map.insert(sDf02);
log.debug("successfully processed, new id {}", sDf02.getId());
}
}

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

@ -0,0 +1,48 @@
package ru.spcex.clearing.balance.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.stereotype.Service;
import ru.clearing.classes.statics.data.sdf.SDf08;
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.balance.SDf08NewRequest;
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 Sdf08Service extends QueueConsumer implements InitializingBean {
private final Logger log = LoggerFactory.getLogger(getClass());
private final Imdg<SDf08> sdf8Map;
public Sdf08Service(Consumer<String, Object> kafkaQueue, ImdgProvider imdgProvider) {
super(kafkaQueue);
this.sdf8Map = imdgProvider.getImdg(IMDGDistributedNames.Map_SDf08, SDf08.class);
}
@Override
public void afterPropertiesSet() {
callback(SDf08NewRequest.class)
.setConsumer(this::newSDf08)
.forDestination(Consts.DESTINATION_SDF08_NEW, callbacks::put);
init();
}
private void newSDf08(BaseRequest<SDf08NewRequest> userRequest) {
SDf08NewRequest req = userRequest.getRequestPayload();
log.debug("SDf08NewRequest received");
SDf08 sDf08 = new SDf08();
sDf08.setNumber(req.getNumber());
sDf08.setDatetime(req.getDatetime());
sDf08.setFileName(req.getFileName());
sDf08.setGenerationTime(req.getGenerationTime());
sDf08.setGenerationId(req.getGenerationId());
sdf8Map.insert(sDf08);
log.debug("successfully processed, new id {}", sDf08.getId());
}
}

12
clearing-parent/balance-service/src/main/resources/application.properties Normal file
View file

@ -0,0 +1,12 @@
spring.main.web-application-type=none
balance-service.hazelcast.cluster-members=127.0.0.1
balance-service.hazelcast.login=dev
balance-service.hazelcast.password=dev-pass
balance-service.kafka.bootstrap-servers=localhost:9092
balance-service.kafka.group-id=dev-group
balance-service.kafka.enable-auto-commit=false
balance-service.kafka.session-timeout-ms=30000
balance-service.kafka.auto-offset-reset=latest
balance-service.kafka.linger-ms=1
balance-service.kafka.buffer-memory=33554432

38
clearing-parent/balance-service/src/main/resources/logback.xml Normal file
View file

@ -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/balance-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/balance-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>

1
clearing-parent/pom.xml
View file

@ -28,6 +28,7 @@
<module>company-service</module>
<module>reports-service</module>
<module>account-service</module>
<module>balance-service</module>
</modules>
<properties>

6
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
View file

@ -14,8 +14,12 @@ public interface Consts {
String DESTINATION_COMPANY_SYMBOL_UPDATE = "company-symbol-update";
String DESTINATION_CONTACT_UPDATE = "contact-update";
String DESTINATION_CLEARING_MEMBER_CATEGORY_UPDATE = "clearing-member-category-update";
String DESTINATION_CLEARING_MEMBER_CATEGORY_DELETE = "clearing-member-category-delete";
String DESTINATION_BANK_ACCOUNT_DELETE = "bank-account-delete";
String DESTINATION_BANK_ACCOUNT_UPDATE = "bank-account-update";
String DESTINATION_BANK_ACCOUNT_NEW = "bank-account-new";
String DESTINATION_CLEARING_MEMBER_CATEGORY_DELETE = "clearing-member-category-delete";
String DESTINATION_SDF08_NEW = "s-df-08-new";
String DESTINATION_SDF02_NEW = "s-df-02-new";
}

174
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/balance/SDf02NewRequest.java Normal file
View file

@ -0,0 +1,174 @@
package ru.spcex.clearing.platform.messaging.domain.cud.balance;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer;
import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer;
import java.time.Instant;
public class SDf02NewRequest {
@JsonProperty
private String curr_code;
@JsonProperty
private String account;
@JsonProperty
private String remainder;
@JsonProperty
private String deal;
@JsonProperty
private String acc_code;
@JsonProperty
private String dat;
@JsonProperty
private String market;
@JsonProperty
private String acc_name;
@JsonProperty
private String acc_type;
@JsonProperty
private String sumengage;
@JsonProperty
private String sumunblock;
@JsonProperty
private String file_type;
@JsonProperty
private String result;
@JsonProperty
private String fileName;
@JsonSerialize(using = InstantSerializer.class)
@JsonDeserialize(using = InstantDeserializer.class)
@JsonProperty
private Instant generationTime;
@JsonProperty
private Long generationId;
public String getCurr_code() {
return curr_code;
}
public void setCurr_code(String curr_code) {
this.curr_code = curr_code;
}
public String getAccount() {
return account;
}
public void setAccount(String account) {
this.account = account;
}
public String getRemainder() {
return remainder;
}
public void setRemainder(String remainder) {
this.remainder = remainder;
}
public String getDeal() {
return deal;
}
public void setDeal(String deal) {
this.deal = deal;
}
public String getAcc_code() {
return acc_code;
}
public void setAcc_code(String acc_code) {
this.acc_code = acc_code;
}
public String getDat() {
return dat;
}
public void setDat(String dat) {
this.dat = dat;
}
public String getMarket() {
return market;
}
public void setMarket(String market) {
this.market = market;
}
public String getAcc_name() {
return acc_name;
}
public void setAcc_name(String acc_name) {
this.acc_name = acc_name;
}
public String getAcc_type() {
return acc_type;
}
public void setAcc_type(String acc_type) {
this.acc_type = acc_type;
}
public String getSumengage() {
return sumengage;
}
public void setSumengage(String sumengage) {
this.sumengage = sumengage;
}
public String getSumunblock() {
return sumunblock;
}
public void setSumunblock(String sumunblock) {
this.sumunblock = sumunblock;
}
public String getFile_type() {
return file_type;
}
public void setFile_type(String file_type) {
this.file_type = file_type;
}
public String getResult() {
return result;
}
public void setResult(String result) {
this.result = result;
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public Instant getGenerationTime() {
return generationTime;
}
public void setGenerationTime(Instant generationTime) {
this.generationTime = generationTime;
}
public Long getGenerationId() {
return generationId;
}
public void setGenerationId(Long generationId) {
this.generationId = generationId;
}
}

67
platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/balance/SDf08NewRequest.java Normal file
View file

@ -0,0 +1,67 @@
package ru.spcex.clearing.platform.messaging.domain.cud.balance;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import ru.spcex.clearing.platform.messaging.domain.json.deserialize.InstantDeserializer;
import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSerializer;
import java.math.BigDecimal;
import java.time.Instant;
public class SDf08NewRequest {
@JsonProperty
private BigDecimal number;
@JsonSerialize(using = InstantSerializer.class)
@JsonDeserialize(using = InstantDeserializer.class)
@JsonProperty
private Instant datetime;
@JsonProperty
private String fileName;
@JsonSerialize(using = InstantSerializer.class)
@JsonDeserialize(using = InstantDeserializer.class)
@JsonProperty
private Instant generationTime;
@JsonProperty
private Long generationId;
public BigDecimal getNumber() {
return number;
}
public void setNumber(BigDecimal number) {
this.number = number;
}
public Instant getDatetime() {
return datetime;
}
public void setDatetime(Instant datetime) {
this.datetime = datetime;
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public Instant getGenerationTime() {
return generationTime;
}
public void setGenerationTime(Instant generationTime) {
this.generationTime = generationTime;
}
public Long getGenerationId() {
return generationId;
}
public void setGenerationId(Long generationId) {
this.generationId = generationId;
}
}