From 2123dcd347011e57d195d3420e890a323da7649b Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 16 Oct 2025 14:55:58 +0800 Subject: [PATCH] =?UTF-8?q?OCR=E7=B3=BB=E7=BB=9F=E9=9B=86=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/CommonUploadFileController.java | 12 ++++++ .../web/controller/ocr/OcrController.java | 39 +++++++++++++++++++ .../src/main/resources/application-ocr.yml | 2 +- .../common/domain/ocr/dto/OcrRequest.java | 8 ++-- .../bonus/common/domain/ocr/vo/OcrData.java | 31 ++++++++++----- .../common/domain/ocr/vo/OcrResponse.java | 9 +++-- .../bonus/common/domain/ocr/vo/WordInfo.java | 24 ------------ .../com/bonus/ocr/service/OcrService.java | 23 ++++++----- 8 files changed, 96 insertions(+), 52 deletions(-) create mode 100644 bonus-admin/src/main/java/com/bonus/web/controller/common/CommonUploadFileController.java create mode 100644 bonus-admin/src/main/java/com/bonus/web/controller/ocr/OcrController.java delete mode 100644 bonus-common/src/main/java/com/bonus/common/domain/ocr/vo/WordInfo.java diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/common/CommonUploadFileController.java b/bonus-admin/src/main/java/com/bonus/web/controller/common/CommonUploadFileController.java new file mode 100644 index 0000000..b8ed576 --- /dev/null +++ b/bonus-admin/src/main/java/com/bonus/web/controller/common/CommonUploadFileController.java @@ -0,0 +1,12 @@ +package com.bonus.web.controller.common; + +/** + * @className:UploadFileController + * @author:cwchen + * @date:2025-10-16-13:43 + * @version:1.0 + * @description:文件上传 + */ + +public class CommonUploadFileController { +} diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/ocr/OcrController.java b/bonus-admin/src/main/java/com/bonus/web/controller/ocr/OcrController.java new file mode 100644 index 0000000..9d6a110 --- /dev/null +++ b/bonus-admin/src/main/java/com/bonus/web/controller/ocr/OcrController.java @@ -0,0 +1,39 @@ +package com.bonus.web.controller.ocr; + +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.common.domain.ocr.dto.OcrRequest; +import com.bonus.common.domain.ocr.vo.OcrResponse; +import com.bonus.ocr.service.OcrService; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.io.File; +import java.io.IOException; + +/** + * @className:OcrController + * @author:cwchen + * @date:2025-10-16-13:55 + * @version:1.0 + * @description:ocr识别 + */ +@RestController +@RequestMapping("/ocr") +public class OcrController { + + @Resource(name = "OcrService") + private OcrService ocrService; + + @PostMapping(value = "ocrHandler") + private AjaxResult ocrHandler() throws IOException { + OcrRequest ocrRequest = new OcrRequest(); + File file = new File("C:\\Users\\10488\\Desktop\\新建文件夹\\1955905740907290625.png"); + ocrRequest.setFile(file); + ocrRequest.setType("image/png"); + ocrRequest.setFields_json("[\"姓名\", \"公民身份号码\"]"); + OcrResponse ocrResponse = ocrService.callOcrService(ocrRequest); + return AjaxResult.success(ocrResponse); + } +} diff --git a/bonus-admin/src/main/resources/application-ocr.yml b/bonus-admin/src/main/resources/application-ocr.yml index cb6c44c..d60be1d 100644 --- a/bonus-admin/src/main/resources/application-ocr.yml +++ b/bonus-admin/src/main/resources/application-ocr.yml @@ -1,6 +1,6 @@ ocr: service: - url: http://192.168.0.37:8000/ocr/ # ocr 请求地址 + url: http://192.168.0.37:8000/extract/ # ocr 请求地址 healthUrl: http://192.168.0.37:8000/ # ocr 服务健康检查 timeout: 30000 # ocr 请求超时时间 max-connections: 100 \ No newline at end of file diff --git a/bonus-common/src/main/java/com/bonus/common/domain/ocr/dto/OcrRequest.java b/bonus-common/src/main/java/com/bonus/common/domain/ocr/dto/OcrRequest.java index 332f566..7132f81 100644 --- a/bonus-common/src/main/java/com/bonus/common/domain/ocr/dto/OcrRequest.java +++ b/bonus-common/src/main/java/com/bonus/common/domain/ocr/dto/OcrRequest.java @@ -21,13 +21,13 @@ public class OcrRequest { @JsonProperty("type") private String type; // 文件类型 - @JsonProperty("analysisContent") - private String analysisContent; + @JsonProperty("fields_json") + private String fields_json; - public OcrRequest(File file, String type, String analysisContent) { + public OcrRequest(File file, String type, String fields_json) { this.file = file; this.type = type; - this.analysisContent = analysisContent; + this.fields_json = fields_json; } public OcrRequest() { diff --git a/bonus-common/src/main/java/com/bonus/common/domain/ocr/vo/OcrData.java b/bonus-common/src/main/java/com/bonus/common/domain/ocr/vo/OcrData.java index b234b47..45fe724 100644 --- a/bonus-common/src/main/java/com/bonus/common/domain/ocr/vo/OcrData.java +++ b/bonus-common/src/main/java/com/bonus/common/domain/ocr/vo/OcrData.java @@ -3,7 +3,9 @@ package com.bonus.common.domain.ocr.vo; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; -import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; /** * @className:OcrData @@ -15,15 +17,24 @@ import java.util.List; @Data public class OcrData { - @JsonProperty("text") - private String text; // 识别出的文本 + @JsonProperty("chat_res") + private Map chatRes; - @JsonProperty("confidence") - private Double confidence; // 置信度 + /** + * 获取识别文本 + */ + public String getText() { + if (chatRes == null) return null; + // 将所有字段值拼接成文本 + return chatRes.values().stream() + .filter(Objects::nonNull) + .collect(Collectors.joining(" ")); + } - @JsonProperty("words") - private List words; // 单词列表 - - @JsonProperty("processing_time") - private Double processingTime; // 处理时间 + /** + * 获取特定字段值 + */ + public String getFieldValue(String fieldName) { + return chatRes != null ? chatRes.get(fieldName) : null; + } } diff --git a/bonus-common/src/main/java/com/bonus/common/domain/ocr/vo/OcrResponse.java b/bonus-common/src/main/java/com/bonus/common/domain/ocr/vo/OcrResponse.java index 50df0bf..2098b97 100644 --- a/bonus-common/src/main/java/com/bonus/common/domain/ocr/vo/OcrResponse.java +++ b/bonus-common/src/main/java/com/bonus/common/domain/ocr/vo/OcrResponse.java @@ -13,8 +13,8 @@ import lombok.Data; @Data public class OcrResponse { - @JsonProperty("code") - private Integer code; // 状态码 + @JsonProperty("status_code") + private Integer statusCode; // 状态码 @JsonProperty("message") private String message; // 消息 @@ -22,6 +22,7 @@ public class OcrResponse { @JsonProperty("data") private OcrData data; // 识别数据 - @JsonProperty("request_id") - private String requestId; // 请求ID + public boolean isSuccess() { + return statusCode != null && statusCode == 200; + } } diff --git a/bonus-common/src/main/java/com/bonus/common/domain/ocr/vo/WordInfo.java b/bonus-common/src/main/java/com/bonus/common/domain/ocr/vo/WordInfo.java deleted file mode 100644 index dadbb02..0000000 --- a/bonus-common/src/main/java/com/bonus/common/domain/ocr/vo/WordInfo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.bonus.common.domain.ocr.vo; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.util.List; - -/** - * @className:WordInfo - * @author:cwchen - * @date:2025-10-16-10:43 - * @version:1.0 - * @description: 单词信息DTO - */ -public class WordInfo { - - @JsonProperty("text") - private String text; // 单词文本 - - @JsonProperty("confidence") - private Double confidence; // 单词置信度 - - @JsonProperty("bbox") - private List bbox; // 边界框 [x1, y1, x2, y2, x3, y3, x4, y4] -} diff --git a/bonus-ocr/src/main/java/com/bonus/ocr/service/OcrService.java b/bonus-ocr/src/main/java/com/bonus/ocr/service/OcrService.java index d2e541a..122fa2e 100644 --- a/bonus-ocr/src/main/java/com/bonus/ocr/service/OcrService.java +++ b/bonus-ocr/src/main/java/com/bonus/ocr/service/OcrService.java @@ -19,6 +19,7 @@ import org.apache.http.entity.mime.content.FileBody; import org.apache.http.entity.ContentType; import java.nio.charset.StandardCharsets; import java.io.IOException; +import java.util.Map; /** * @className:OcrService @@ -62,7 +63,7 @@ public class OcrService { /** * 调用OCR服务 */ - private OcrResponse callOcrService(OcrRequest ocrRequest) throws IOException { + public OcrResponse callOcrService(OcrRequest ocrRequest) throws IOException { HttpPost httpPost = new HttpPost(ocrServiceUrl); try { @@ -78,29 +79,33 @@ public class OcrService { builder.addTextBody("type", ocrRequest.getType(), ContentType.TEXT_PLAIN.withCharset("UTF-8")); // 添加解析内容字段 - builder.addTextBody("analysisContent", ocrRequest.getAnalysisContent(), + builder.addTextBody("fields_json", ocrRequest.getFields_json(), ContentType.TEXT_PLAIN.withCharset("UTF-8")); // 设置请求实体 - 注意：这里会自动设置正确的 Content-Type 和 boundary httpPost.setEntity(builder.build()); // 设置 Accept 头 httpPost.setHeader("Accept", "application/json"); - log.debug("发送OCR请求到: {}", ocrServiceUrl); // 执行请求 try (CloseableHttpResponse response = httpClient.execute(httpPost)) { HttpEntity entity = response.getEntity(); String responseBody = EntityUtils.toString(entity, "UTF-8"); - log.debug("OCR服务响应状态: {}", response.getStatusLine().getStatusCode()); - log.debug("OCR服务响应内容: {}", responseBody); + log.info("OCR服务响应状态: {}", response.getStatusLine().getStatusCode()); + log.info("OCR服务响应内容: {}", responseBody); // 解析响应 OcrResponse ocrResponse = objectMapper.readValue(responseBody, OcrResponse.class); - if (ocrResponse.getCode() != null && ocrResponse.getCode() == 200) { - /*log.info("OCR识别成功，识别字符数: {}", - ocrResponse.getData() != null && ocrResponse.getData().getText() != null ? - ocrResponse.getData().getText().length() : 0);*/ + if (ocrResponse.isSuccess()) { + log.info("OCR识别成功"); + // 获取识别结果 + if (ocrResponse.getData() != null && ocrResponse.getData().getChatRes() != null) { + Map chatRes = ocrResponse.getData().getChatRes(); + chatRes.forEach((k, v) -> { + log.info("识别结果 - key: {}, value: {}", k, v); + }); + } } else { log.warn("OCR识别失败: {}", ocrResponse.getMessage()); }