From c73234d29936bb4615788f91d96adca31b7bc74f Mon Sep 17 00:00:00 2001 From: deiflaender Date: Mon, 16 May 2022 09:24:54 +0200 Subject: [PATCH] RED-4036: Added more logs --- .../ExcelTemplateReportGenerationService.java | 4 +++ .../service/ReportGenerationService.java | 27 +++++++++---------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelTemplateReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelTemplateReportGenerationService.java index 290fd59..f5f1b54 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelTemplateReportGenerationService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ExcelTemplateReportGenerationService.java @@ -126,6 +126,7 @@ public class ExcelTemplateReportGenerationService { if (excelModel == null) { + long start = System.currentTimeMillis(); Map> placeholderCellPos = new HashMap<>(); int placeholderRow = -1; for (int j = 0; j < sheet.getLastRowNum() + 1; j++) { @@ -141,6 +142,7 @@ public class ExcelTemplateReportGenerationService { } } excelModel = new ExcelModel(placeholderCellPos, placeholderRow); + log.info("Calculate Placeholder Cells took: {}", System.currentTimeMillis() -start); } AtomicInteger rowIndex = new AtomicInteger(excelModel.getPlaceholderRow()); @@ -163,6 +165,7 @@ public class ExcelTemplateReportGenerationService { } } else { + long start = System.currentTimeMillis(); Map> placeholderCellPos = excelModel.getPlaceholderCellPos(); reportEntries.forEach(entry -> { sheet.createRow(rowIndex.get()); @@ -171,6 +174,7 @@ public class ExcelTemplateReportGenerationService { } rowIndex.getAndIncrement(); }); + log.info("Adding rows took: {}", System.currentTimeMillis() - start); } } excelModel.setPlaceholderRow(rowIndex.getAndIncrement()); diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java index 90ca422..6028dca 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java @@ -21,9 +21,11 @@ import com.iqser.red.service.redaction.v1.model.ManualChange; import com.iqser.red.service.redaction.v1.model.RedactionLog; import com.iqser.red.service.redaction.v1.model.RedactionLogEntry; import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist; + import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; + import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.springframework.beans.factory.annotation.Value; @@ -58,6 +60,7 @@ public class ReportGenerationService { @Value("${redaction-report-service.numberOfReportGenerationThreads:4}") private int numberOfReportGenerationThreads; + @SneakyThrows public List generateReport(ReportRequestMessage reportMessage) { @@ -99,7 +102,6 @@ public class ReportGenerationService { } } - var placeholderModel = generatePlaceholderService.buildPlaceholders(dossier); ExcelModel excelModel = null; @@ -116,23 +118,21 @@ public class ReportGenerationService { // ExecutorService executor = Executors.newFixedThreadPool(numberOfReportGenerationThreads); - var isLastFile = j == reportMessage.getFileIds() - .size() - 1; + var isLastFile = j == reportMessage.getFileIds().size() - 1; - for (MultiFileWorkbook multiFileWorkbook : multiFileWorkbooks) - excelModel = excelTemplateReportGenerationService.generateReport(reportEntries, - placeholderModel, multiFileWorkbook.getTemplateName(), - multiFileWorkbook.getWorkbook(), fileStatus, dossier, isLastFile, excelModel); + for (MultiFileWorkbook multiFileWorkbook : multiFileWorkbooks) { + excelModel = excelTemplateReportGenerationService.generateReport(reportEntries, placeholderModel, multiFileWorkbook.getTemplateName(), multiFileWorkbook.getWorkbook(), fileStatus, dossier, isLastFile, excelModel); + } for (MultiFileDocument multiFileDocument : multiFileDocuments) { - wordReportGenerationService.generateReport(reportEntries, placeholderModel, multiFileDocument.getTemplateName(), multiFileDocument.getDocument(), fileStatus, dossier, isLastFile); + wordReportGenerationService.generateReport(reportEntries, placeholderModel, multiFileDocument.getTemplateName(), multiFileDocument.getDocument(), fileStatus, dossier, isLastFile); } for (ReportTemplate reportTemplate : singleFilesTemplates) { - storedFileInformation.add(createReportFromTemplate(dossier, fileStatus, placeholderModel, reportTemplate.getFileName(), reportMessage.getDownloadId(), reportEntries, reportTemplate)); + storedFileInformation.add(createReportFromTemplate(dossier, fileStatus, placeholderModel, reportTemplate.getFileName(), reportMessage.getDownloadId(), reportEntries, reportTemplate)); } @@ -162,10 +162,10 @@ public class ReportGenerationService { private StoredFileInformation createReportFromTemplate(Dossier dossier, FileModel fileStatus, - PlaceholderModel placeholderModel, - String templateName, - String downloadId, - List reportEntries, ReportTemplate reportTemplate) { + PlaceholderModel placeholderModel, String templateName, + String downloadId, List reportEntries, + ReportTemplate reportTemplate) { + if (reportTemplate.getFileName().endsWith(".xlsx")) { byte[] excelTemplate = reportStorageService.getReportTemplate(reportTemplate.getStorageId()); try (ByteArrayInputStream is = new ByteArrayInputStream(excelTemplate)) { @@ -220,5 +220,4 @@ public class ReportGenerationService { return redactionLogConverterService.convertAndSort(redactionLog, legalBasisMappings); } - }