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

RED-9139-pageOrderHotfix

Browse Source
This commit is contained in:
Kilian Schuettler 2024-11-15 16:28:13 +01:00
parent 947cbe4cd2
commit f1f2d02266
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redaction-service-v1/document/src/main/java/com/iqser/red/service/redaction/v1/server/mapper/DocumentDataMapper.java
View File

@ -2,6 +2,7 @@ package com.iqser.red.service.redaction.v1.server.mapper;
import java.awt.geom.Rectangle2D; import java.awt.geom.Rectangle2D;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -60,6 +61,7 @@ public class DocumentDataMapper {
List<DocumentPage> documentPageData = document.getPages() List<DocumentPage> documentPageData = document.getPages()
.stream() .stream()
.sorted(Comparator.comparingInt(Page::getNumber))
.map(DocumentDataMapper::toPageData) .map(DocumentDataMapper::toPageData)
.toList(); .toList();

10
redaction-service-v1/document/src/main/java/com/iqser/red/service/redaction/v1/server/mapper/DocumentGraphMapper.java
View File

@ -44,11 +44,6 @@ public class DocumentGraphMapper {
DocumentTree documentTree = new DocumentTree(document); DocumentTree documentTree = new DocumentTree(document);
Context context = new Context(documentData, documentTree); Context context = new Context(documentData, documentTree);
context.pageData.addAll(documentData.getDocumentPages().getDocumentPagesList()
.stream()
.map(DocumentGraphMapper::buildPage)
.toList());
context.documentTree.getRoot().getChildren().addAll(buildEntries(documentData.getDocumentStructure().getRoot().getChildrenList(), context)); context.documentTree.getRoot().getChildren().addAll(buildEntries(documentData.getDocumentStructure().getRoot().getChildrenList(), context));
document.setDocumentTree(context.documentTree); document.setDocumentTree(context.documentTree);
@ -227,7 +222,10 @@ public class DocumentGraphMapper {
Context(DocumentData documentData, DocumentTree documentTree) { Context(DocumentData documentData, DocumentTree documentTree) {
this.documentTree = documentTree; this.documentTree = documentTree;
this.pageData = new ArrayList<>(); this.pageData = documentData.getDocumentPages().getDocumentPagesList()
.stream()
.map(DocumentGraphMapper::buildPage)
.toList();
this.documentTextData = documentData.getDocumentTextData(); this.documentTextData = documentData.getDocumentTextData();
this.documentPositionData = documentData.getDocumentPositionData(); this.documentPositionData = documentData.getDocumentPositionData();