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

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

Browse source 
Небольшие изменения.
This commit is contained in:
psemenkov 2023-05-02 16:44:22 +03:00
parent b5592ad393
commit bb396b71d5
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/config/DbConnectionConfig.java
View file

@ -5,7 +5,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.SingleConnectionDataSource; import org.springframework.jdbc.datasource.DriverManagerDataSource;
import ru.spcex.clearing.trade.importer.config.settings.DatabaseSettings; import ru.spcex.clearing.trade.importer.config.settings.DatabaseSettings;
import ru.spcex.clearing.trade.importer.config.settings.ImportTradeServiceSettings; import ru.spcex.clearing.trade.importer.config.settings.ImportTradeServiceSettings;
import ru.spcex.clearing.trade.importer.error.ModuleInitializeException; import ru.spcex.clearing.trade.importer.error.ModuleInitializeException;
@ -26,14 +26,14 @@ public class DbConnectionConfig {
this.settings = settings.getDatabase(); this.settings = settings.getDatabase();
} }
@Bean(destroyMethod = "destroy") @Bean
public SingleConnectionDataSource dataSource() { public DataSource dataSource() {
String login = settings.getLogin(); String login = settings.getLogin();
String password = settings.getPassword(); String password = settings.getPassword();
String dbUrl = settings.getUrl(); String dbUrl = settings.getUrl();
String driver = settings.getDriver(); String driver = settings.getDriver();
SingleConnectionDataSource ds = new SingleConnectionDataSource(); DriverManagerDataSource ds = new DriverManagerDataSource();
try { try {
ds.setDriverClassName(driver); ds.setDriverClassName(driver);
} catch (Exception ue) { } catch (Exception ue) {

4
clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/error/ValidationError.java → clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/error/TradeImporterError.java
View file

@ -2,13 +2,13 @@ package ru.spcex.clearing.trade.importer.error;
import ru.spcex.platform.utils.enumeration.IErrorEnumId; import ru.spcex.platform.utils.enumeration.IErrorEnumId;
public enum ValidationError implements IErrorEnumId { public enum TradeImporterError implements IErrorEnumId {
sTradesNotValid(10001L), sTradesNotValid(10001L),
; ;
private final Long id; private final Long id;
ValidationError(Long id) { TradeImporterError(Long id) {
this.id = id; this.id = id;
} }

1
clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/LauncherCommandReceiver.java
View file

@ -27,6 +27,7 @@ public class LauncherCommandReceiver extends QueueConsumer implements Initializi
callback(LauncherCommandRequest.class) callback(LauncherCommandRequest.class)
.setConsumer(action -> importer.process(true)) .setConsumer(action -> importer.process(true))
.forDestination(Task.getOfTrades.topic(), callbacks::put); // GTRD .forDestination(Task.getOfTrades.topic(), callbacks::put); // GTRD
importer.process(true);
init(); init();
} }
} }

3
clearing-parent/trade-importer/src/main/java/ru/spcex/clearing/trade/importer/services/TradeImporterService.java
View file

@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.Map; import java.util.Map;
import static ru.spcex.clearing.platform.messaging.domain.Consts.S_TRADES_IMPORTED; import static ru.spcex.clearing.platform.messaging.domain.Consts.S_TRADES_IMPORTED;
import static ru.spcex.clearing.trade.importer.error.ValidationError.sTradesNotValid; import static ru.spcex.clearing.trade.importer.error.TradeImporterError.sTradesNotValid;
@Service @Service
@EnableScheduling @EnableScheduling
@ -64,6 +64,7 @@ public class TradeImporterService {
if (byCommand) { if (byCommand) {
STradesImportedRequest sTradesImportedRequest = new STradesImportedRequest(); STradesImportedRequest sTradesImportedRequest = new STradesImportedRequest();
producer.send(new ProducerRecord<>(S_TRADES_IMPORTED, sTradesImportedRequest)); producer.send(new ProducerRecord<>(S_TRADES_IMPORTED, sTradesImportedRequest));
log.debug("successfully import STrades from DB by command");
} }
} }