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

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

Browse source 
Поправил ошибки.
This commit is contained in:
psemenkov 2023-06-08 12:39:52 +03:00
parent d3fc4ae105
commit 04b5498542
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/notifications/NCMPNotificationBuilder.java
View file

@ -9,6 +9,7 @@ import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.statics.data.company.CompanySymbols; import ru.clearing.classes.statics.data.company.CompanySymbols;
import ru.clearing.classes.statics.data.profile.ProfileDocument; import ru.clearing.classes.statics.data.profile.ProfileDocument;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.platform.enumeration.CompanySymbol;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
@ -58,9 +59,9 @@ public class NCMPNotificationBuilder extends NotificationBuilder {
return null; return null;
} }
String companySymbolsValueINN = getCompanySymbolValue("companyId = %d AND companySymbol = INN".formatted(consumerId), companySymbolsImdg); String companySymbolsValueINN = getCompanySymbolValue("companyId = %d AND companySymbol = %s".formatted(consumerId, CompanySymbol.INN.getKey()), companySymbolsImdg);
String companySymbolValueCLRC = getCompanySymbolValue("companyId = %d AND companySymbol = CLRC".formatted(consumerId), companySymbolsImdg); String companySymbolValueCLRC = getCompanySymbolValue("companyId = %d AND companySymbol = %s".formatted(consumerId, CompanySymbol.CLRC.getKey()), companySymbolsImdg);
String companySymbolValueRGRC = getCompanySymbolValue("companyId = %d AND companySymbol = RGRC".formatted(consumerId), companySymbolsImdg); String companySymbolValueRGRC = getCompanySymbolValue("companyId = %d AND companySymbol = %s".formatted(consumerId, CompanySymbol.RGRC.getKey()), companySymbolsImdg);
String accountSql = "companyId = %d AND accountType = INFO".formatted(consumerId); String accountSql = "companyId = %d AND accountType = INFO".formatted(consumerId);
Account account = null; Account account = null;

3
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/notifications/NTCRNotificationBuilder.java
View file

@ -8,6 +8,7 @@ import ru.clearing.classes.statics.data.company.Company;
import ru.clearing.classes.statics.data.company.CompanySymbols; import ru.clearing.classes.statics.data.company.CompanySymbols;
import ru.clearing.classes.statics.data.registry.TradingClearingRegistry; import ru.clearing.classes.statics.data.registry.TradingClearingRegistry;
import ru.spcex.clearing.imdg.IMDGDistributedNames; import ru.spcex.clearing.imdg.IMDGDistributedNames;
import ru.spcex.platform.enumeration.CompanySymbol;
import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.Imdg;
import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgProvider;
@ -59,7 +60,7 @@ public class NTCRNotificationBuilder extends NotificationBuilder {
return null; return null;
} }
String companySymbolValueCLRC = getCompanySymbolValue("companyId = %d AND companySymbol = CLRC".formatted(consumerId), companySymbolsImdg); String companySymbolValueCLRC = getCompanySymbolValue("companyId = %d AND companySymbol = %s".formatted(consumerId, CompanySymbol.INN.getKey()), companySymbolsImdg);
Map<String, String> valuesForTemplate = new HashMap<>(); Map<String, String> valuesForTemplate = new HashMap<>();

6
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/NotificationService.java
View file

@ -13,6 +13,7 @@ import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate; import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
import ru.spcex.clearing.reports.config.element.ReportsServiceSettings; import ru.spcex.clearing.reports.config.element.ReportsServiceSettings;
import ru.spcex.clearing.reports.notifications.NCMPNotificationBuilder; import ru.spcex.clearing.reports.notifications.NCMPNotificationBuilder;
import ru.spcex.clearing.reports.notifications.NTCRNotificationBuilder;
import ru.spcex.clearing.util.security.UserRoleVerification; import ru.spcex.clearing.util.security.UserRoleVerification;
import java.io.File; import java.io.File;
@ -23,6 +24,7 @@ public class NotificationService extends QueueConsumer implements InitializingBe
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
private final UserRoleVerification userRoleVerification; private final UserRoleVerification userRoleVerification;
private final NCMPNotificationBuilder ncmpNotificationBuilder; private final NCMPNotificationBuilder ncmpNotificationBuilder;
private final NTCRNotificationBuilder ntcrNotificationBuilder;
private final File outFolder; private final File outFolder;
@ -30,10 +32,12 @@ public class NotificationService extends QueueConsumer implements InitializingBe
Producer<String, Object> kafkaResponseQueue, Producer<String, Object> kafkaResponseQueue,
UserRoleVerification userRoleVerification, UserRoleVerification userRoleVerification,
NCMPNotificationBuilder ncmpNotificationBuilder, NCMPNotificationBuilder ncmpNotificationBuilder,
NTCRNotificationBuilder ntcrNotificationBuilder,
ReportsServiceSettings reportsServiceSettings) { ReportsServiceSettings reportsServiceSettings) {
super(kafkaQueue, kafkaResponseQueue); super(kafkaQueue, kafkaResponseQueue);
this.userRoleVerification = userRoleVerification; this.userRoleVerification = userRoleVerification;
this.ncmpNotificationBuilder = ncmpNotificationBuilder; this.ncmpNotificationBuilder = ncmpNotificationBuilder;
this.ntcrNotificationBuilder = ntcrNotificationBuilder;
this.outFolder = new File(reportsServiceSettings.getNotificationModuleOut()); this.outFolder = new File(reportsServiceSettings.getNotificationModuleOut());
assert outFolder.isDirectory(); assert outFolder.isDirectory();
} }
@ -76,7 +80,7 @@ public class NotificationService extends QueueConsumer implements InitializingBe
logUnknownProperties(userRequest); logUnknownProperties(userRequest);
File outFile = ncmpNotificationBuilder.buildNotification(req.getConsumerId(), outFolder); File outFile = ntcrNotificationBuilder.buildNotification(req.getConsumerId(), outFolder);
if (outFile == null) { if (outFile == null) {
log.error("Create notification NTCR for id={} failed, see log", req.getConsumerId()); log.error("Create notification NTCR for id={} failed, see log", req.getConsumerId());
} else { } else {

2
clearing-parent/reports-service/src/test/java/ru/spcex/clearing/reports/services/DOCXServiceTest.java
View file

@ -32,7 +32,7 @@ class DOCXServiceTest {
file.delete(); file.delete();
} }
// @Test//для отладки алгоритма объединения ключей // @Test//для отладки алгоритма объединения ключей в методе DOCXService.collectKeysFromParagraph(XWPFParagraph paragraph)
void normalize() { void normalize() {
List<String> data = Arrays.asList(new String[]{"test ", "someText${", "some", "Key}/${ano", "ther", "Key}someText", "test"}); List<String> data = Arrays.asList(new String[]{"test ", "someText${", "some", "Key}/${ano", "ther", "Key}someText", "test"});