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

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

Browse source
This commit is contained in:
etreschenkov 2023-07-07 12:49:29 +03:00
parent e59b718eab
commit 93a3df9bfb
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
super(kafkaQueue, kafkaProducer); super(kafkaQueue, kafkaProducer);
this.restTemplate = restTemplate; this.restTemplate = restTemplate;
this.userRoleVerification = userRoleVerification; this.userRoleVerification = userRoleVerification;
this.inboundServerSettings = gatewayApiSettings.getInboundServer(); this.inboundServerSettings = null;
this.sentAssets = sentAssets; this.sentAssets = sentAssets;
this.outboundRequestByUuid = outboundRequestByUuid; this.outboundRequestByUuid = outboundRequestByUuid;
} }
@ -236,7 +236,7 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
protected Map<String, Object> makeContentByReportRequest(ReportPart reportPart) { protected Map<String, Object> makeContentByReportRequest(ReportPart reportPart) {
Map<String, Object> content = new HashMap<>(); Map<String, Object> content = new HashMap<>();
Matcher matcher = REPORT_FILE_NAME_PATTERN.matcher(reportPart.getFileName()); Matcher matcher = REPORT_FILE_NAME_PATTERN.matcher(reportPart.getFileName());
ReportKeys reportKeys = IEnumKey.getUndefined(ReportKeys.class); ReportKeys reportKeys = null;
if (matcher.matches()) { if (matcher.matches()) {
String rowKey = matcher.group(1); String rowKey = matcher.group(1);
reportKeys = IEnumKey.getEnumByKeyOrUndefined(ReportKeys.class, rowKey); reportKeys = IEnumKey.getEnumByKeyOrUndefined(ReportKeys.class, rowKey);

1
platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/ReportKeys.java
View file

@ -15,7 +15,6 @@ public enum ReportKeys implements IEnumKey {
KS_REP_TRADES("KS_REP_TRADES"), KS_REP_TRADES("KS_REP_TRADES"),
KS_REP_CASH_NETTO("KS_REP_CASH_NETTO"), KS_REP_CASH_NETTO("KS_REP_CASH_NETTO"),
KS_REP_DEPO_NETTO("KS_REP_DEPO_NETTO"), KS_REP_DEPO_NETTO("KS_REP_DEPO_NETTO"),
; ;
private final String key; private final String key;