Merge branch 'test' into test-02huogui
# Conflicts: # deploy/sql/头程数据库统一增量-MySQL8.sql # firstleg/src/main/java/com/baiyue/firstleg/service/FbaPricingService.java # firstleg/src/main/resources/application.yml # firstleg/src/main/resources/openapi/fba-pricing-v1.yaml # firstleg/src/test/java/com/baiyue/firstleg/service/FbaPricingServiceTest.java # order/src/main/java/com/baiyue/order/controller/PlatformFirstLegOrderController.java # order/src/test/java/com/baiyue/order/controller/OrderControllerPermissionTest.java
This commit is contained in:
@@ -1,16 +1,22 @@
|
||||
package com.baiyue.integration.dto.ocr;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 百度 OCR 返回的文字候选及其识别框。
|
||||
*/
|
||||
public record OcrCandidate(
|
||||
String text,
|
||||
Double confidence,
|
||||
BigDecimal confidence,
|
||||
Integer left,
|
||||
Integer top,
|
||||
Integer width,
|
||||
Integer height
|
||||
) {
|
||||
public OcrCandidate {
|
||||
confidence = OcrConfidence.normalize(confidence);
|
||||
}
|
||||
|
||||
public long area() {
|
||||
if (width == null || height == null || width <= 0 || height <= 0) {
|
||||
return 0;
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.baiyue.integration.dto.ocr;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
|
||||
/** Canonical confidence representation shared by OCR response models. */
|
||||
public final class OcrConfidence {
|
||||
private static final int SCALE = 5;
|
||||
private static final BigDecimal ZERO = BigDecimal.ZERO.setScale(SCALE);
|
||||
private static final BigDecimal ONE = BigDecimal.ONE.setScale(SCALE);
|
||||
|
||||
private OcrConfidence() {
|
||||
}
|
||||
|
||||
public static BigDecimal normalize(BigDecimal value) {
|
||||
if (value == null) {
|
||||
return null;
|
||||
}
|
||||
if (value.compareTo(BigDecimal.ZERO) < 0) {
|
||||
return ZERO;
|
||||
}
|
||||
if (value.compareTo(BigDecimal.ONE) > 0) {
|
||||
return ONE;
|
||||
}
|
||||
return value.setScale(SCALE, RoundingMode.HALF_UP);
|
||||
}
|
||||
}
|
||||
+6
-1
@@ -12,10 +12,15 @@ public record WeightOcrImageResult(
|
||||
String rawResponseFile,
|
||||
Status status,
|
||||
BigDecimal weight,
|
||||
Double confidence,
|
||||
BigDecimal confidence,
|
||||
List<OcrCandidate> candidates,
|
||||
String ocrRawText,
|
||||
String error
|
||||
) {
|
||||
public WeightOcrImageResult {
|
||||
confidence = OcrConfidence.normalize(confidence);
|
||||
}
|
||||
|
||||
public enum Status {
|
||||
/** 已成功识别到有效重量。 */
|
||||
RECOGNIZED,
|
||||
|
||||
Reference in New Issue
Block a user