Compare commits
No commits in common. "6dd52fb135cce664903f1381b2ca9238065641d1" and "38668e137c5ef8c40a1b9b6e5b294130acfb300e" have entirely different histories.
6dd52fb135
...
38668e137c
|
|
@ -13,7 +13,6 @@ import jakarta.annotation.Resource;
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import model.DimensionResult;
|
import model.DimensionResult;
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
|
@ -107,12 +106,4 @@ public class QmsInspectionStandardController extends BaseController {
|
||||||
public ApiResult<List<DimensionResult>> pdfExtractRegion(@Valid @RequestBody QmsPdfExtractRegionQO request) throws IOException {
|
public ApiResult<List<DimensionResult>> pdfExtractRegion(@Valid @RequestBody QmsPdfExtractRegionQO request) throws IOException {
|
||||||
return ApiResult.success(inspectionStandardControllerService.pdfExtractRegion(request));
|
return ApiResult.success(inspectionStandardControllerService.pdfExtractRegion(request));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 提取PDF文件的所有区域数据
|
|
||||||
*/
|
|
||||||
@GetMapping("/pdf/dimensions")
|
|
||||||
public ApiResult<List<DimensionResult>> extractDimensions(@RequestParam String url) throws IOException {
|
|
||||||
return ApiResult.success(inspectionStandardControllerService.extractDimensions(url));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -713,8 +713,4 @@ public class QmsInspectionStandardControllerService {
|
||||||
);
|
);
|
||||||
return regionFilterService.mergeRegionResults(filtered);
|
return regionFilterService.mergeRegionResults(filtered);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<DimensionResult> extractDimensions(String url) throws IOException {
|
|
||||||
return pdfExtractionService.extractDimensions(url);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@ import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.StringWriter;
|
import java.io.StringWriter;
|
||||||
import java.net.MalformedURLException;
|
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -81,30 +80,6 @@ public class PdfExtractionService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<DimensionResult> extractDimensions(String pdfUrl) throws IOException {
|
|
||||||
byte[] pdfBytes;
|
|
||||||
try (InputStream in = new URL(pdfUrl).openStream();
|
|
||||||
ByteArrayOutputStream buffer = new ByteArrayOutputStream()) {
|
|
||||||
byte[] chunk = new byte[8192];
|
|
||||||
int len;
|
|
||||||
while ((len = in.read(chunk)) != -1) {
|
|
||||||
buffer.write(chunk, 0, len);
|
|
||||||
}
|
|
||||||
pdfBytes = buffer.toByteArray();
|
|
||||||
}
|
|
||||||
try (PDDocument document = Loader.loadPDF(pdfBytes)) {
|
|
||||||
int totalPages = document.getNumberOfPages();
|
|
||||||
PositionedTextStripper stripper = new PositionedTextStripper();
|
|
||||||
stripper.setSortByPosition(true);
|
|
||||||
StringWriter writer = new StringWriter();
|
|
||||||
stripper.writeText(document, writer);
|
|
||||||
List<TextElement> allElements = stripper.getElements();
|
|
||||||
|
|
||||||
List<TextGroup> groups = textGrouper.groupTextElements(allElements);
|
|
||||||
return dimensionIdentifier.identifyDimensions(groups);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class ExtractionResult {
|
public static class ExtractionResult {
|
||||||
private final List<DimensionResult> dimensions;
|
private final List<DimensionResult> dimensions;
|
||||||
private final int totalPages;
|
private final int totalPages;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue