Marmelator/redaction-report-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 129 Wiki Activity

RED-4036: Revert parallel processing

Browse Source
This commit is contained in:
deiflaender 2022-05-13 16:34:18 +02:00
parent f46ee71e34
commit f1ebfef248
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
View File

@ -41,6 +41,7 @@ import java.util.concurrent.TimeUnit;
@Slf4j
@Service
@RequiredArgsConstructor
@SuppressWarnings("PMD")
public class ReportGenerationService {
private final ReportStorageService reportStorageService;
@ -111,30 +112,30 @@ public class ReportGenerationService {
List<ReportRedactionEntry> reportEntries = getReportEntries(reportMessage.getDossierId(), reportMessage.getFileIds()
.get(j), fileStatus.isExcluded());
ExecutorService executor = Executors.newFixedThreadPool(numberOfReportGenerationThreads);
// ExecutorService executor = Executors.newFixedThreadPool(numberOfReportGenerationThreads);
var isLastFile = j == reportMessage.getFileIds()
.size() - 1;
for (MultiFileWorkbook multiFileWorkbook : multiFileWorkbooks)
executor.submit(() -> excelTemplateReportGenerationService.generateReport(reportEntries,
excelTemplateReportGenerationService.generateReport(reportEntries,
placeholderModel, multiFileWorkbook.getTemplateName(),
multiFileWorkbook.getWorkbook(), fileStatus, dossier, isLastFile));
multiFileWorkbook.getWorkbook(), fileStatus, dossier, isLastFile);
for (MultiFileDocument multiFileDocument : multiFileDocuments) {
executor.submit(() ->
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) {
executor.submit(() ->
storedFileInformation.add(createReportFromTemplate(dossier, fileStatus, placeholderModel, reportTemplate.getFileName(), reportMessage.getDownloadId(), reportEntries, reportTemplate))
);
storedFileInformation.add(createReportFromTemplate(dossier, fileStatus, placeholderModel, reportTemplate.getFileName(), reportMessage.getDownloadId(), reportEntries, reportTemplate));
}
executor.shutdown();
executor.awaitTermination(1, TimeUnit.DAYS);
// executor.shutdown();
// executor.awaitTermination(1, TimeUnit.DAYS);
long end = System.currentTimeMillis();
log.info("Successfully processed {}/{} fileIds for downloadId {}, took {}", i, reportMessage.getFileIds()