diff --git a/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_0_0_7.xml b/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_0_0_7.xml deleted file mode 100644 index e800a9a7e..000000000 --- a/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_0_0_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_common_0_0_7.xml b/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_common_0_0_7.xml deleted file mode 100644 index 994b8ba72..000000000 --- a/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_common_0_0_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_onnx_linux_x86_64_1_2_2.xml b/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_onnx_linux_x86_64_1_2_2.xml deleted file mode 100644 index 63249893f..000000000 --- a/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_onnx_linux_x86_64_1_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_onnx_macosx_x86_64_1_2_2.xml b/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_onnx_macosx_x86_64_1_2_2.xml deleted file mode 100644 index 173c5c528..000000000 --- a/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_onnx_macosx_x86_64_1_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_onnx_models_1_2_2.xml b/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_onnx_models_1_2_2.xml deleted file mode 100644 index f0eb29c91..000000000 --- a/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_onnx_models_1_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_onnx_platform_0_0_7.xml b/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_onnx_platform_0_0_7.xml deleted file mode 100644 index aeabf32ae..000000000 --- a/.idea/libraries/Maven__io_github_mymonstercat_rapidocr_onnx_platform_0_0_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/emis-ai-web/emis-ai-web.iml b/emis-ai-web/emis-ai-web.iml index 3a0359cf1..05c8fd340 100644 --- a/emis-ai-web/emis-ai-web.iml +++ b/emis-ai-web/emis-ai-web.iml @@ -57,7 +57,6 @@ - @@ -272,11 +271,5 @@ - - - - - - \ No newline at end of file diff --git a/emis-ai-web/src/main/java/com/xdadan/erp/web/ai/AICommonController.java b/emis-ai-web/src/main/java/com/xdadan/erp/web/ai/AICommonController.java index e8a27874f..43597d2b5 100644 --- a/emis-ai-web/src/main/java/com/xdadan/erp/web/ai/AICommonController.java +++ b/emis-ai-web/src/main/java/com/xdadan/erp/web/ai/AICommonController.java @@ -1,7 +1,6 @@ package com.xdadan.erp.web.ai; -import com.benjaminwan.ocrlibrary.OcrResult; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.xdadan.erp.ai.service.OCRService; @@ -135,8 +134,8 @@ public class AICommonController extends BaseController String filePath = PayConfig.getUploadPath(); // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file); - OcrResult rst=ocrService.recognize(fileName); - return AjaxResult.success("成功",rst); + AjaxResult rst=ocrService.recognize(fileName); + return rst; } catch (Exception e) { @@ -164,8 +163,8 @@ public class AICommonController extends BaseController // base64写入文件 String filePath=""; - OcrResult rst=ocrService.recognize(filePath); - return AjaxResult.success("成功",rst); + AjaxResult rst=ocrService.recognize(filePath); + return rst; } diff --git a/emis-ai/emis-ai.iml b/emis-ai/emis-ai.iml index 498ea4c3d..9c01e055a 100644 --- a/emis-ai/emis-ai.iml +++ b/emis-ai/emis-ai.iml @@ -57,7 +57,6 @@ - @@ -272,11 +271,5 @@ - - - - - - \ No newline at end of file diff --git a/emis-ai/pom.xml b/emis-ai/pom.xml index 9da70aeec..ed9c8e645 100644 --- a/emis-ai/pom.xml +++ b/emis-ai/pom.xml @@ -163,33 +163,6 @@ aspectjweaver - - - io.github.mymonstercat - rapidocr - 0.0.7 - - - slf4j-api - org.slf4j - - - - - - - - io.github.mymonstercat - rapidocr-onnx-platform - 0.0.7 - - - - io.github.mymonstercat - rapidocr-onnx-linux-x86_64 - 1.2.2 - - diff --git a/emis-ai/src/main/java/com/xdadan/erp/ai/service/OCRService.java b/emis-ai/src/main/java/com/xdadan/erp/ai/service/OCRService.java index 7dccae708..e93bb1d83 100644 --- a/emis-ai/src/main/java/com/xdadan/erp/ai/service/OCRService.java +++ b/emis-ai/src/main/java/com/xdadan/erp/ai/service/OCRService.java @@ -1,9 +1,6 @@ package com.xdadan.erp.ai.service; -import com.benjaminwan.ocrlibrary.OcrResult; -import io.github.mymonstercat.Model; -import io.github.mymonstercat.ocr.InferenceEngine; -import io.github.mymonstercat.ocr.config.ParamConfig; +import com.xdadan.erp.common.core.domain.AjaxResult; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -11,24 +8,24 @@ import org.springframework.stereotype.Service; @Slf4j public class OCRService { - public OcrResult recognize(String filePath){ - ParamConfig paramConfig = ParamConfig.getDefaultConfig(); - paramConfig.setDoAngle(true); - paramConfig.setMostAngle(true); - InferenceEngine engine = InferenceEngine.getInstance(Model.ONNX_PPOCR_V4); - // 开始识别 - OcrResult ocrResult = engine.runOcr(filePath, paramConfig); - return ocrResult; + public AjaxResult recognize(String filePath){ +// ParamConfig paramConfig = ParamConfig.getDefaultConfig(); +// paramConfig.setDoAngle(true); +// paramConfig.setMostAngle(true); +// InferenceEngine engine = InferenceEngine.getInstance(Model.ONNX_PPOCR_V4); +// // 开始识别 +// OcrResult ocrResult = engine.runOcr(filePath, paramConfig); + return AjaxResult.success("成功"); } public static void main(String[] args) { - String temPath = "/Users/alan/Downloads/工作台1.png"; - ParamConfig paramConfig = ParamConfig.getDefaultConfig(); - paramConfig.setDoAngle(true); - paramConfig.setMostAngle(true); - InferenceEngine engine = InferenceEngine.getInstance(Model.ONNX_PPOCR_V4); - // 开始识别 - OcrResult ocrResult = engine.runOcr(temPath, paramConfig); - System.out.println("识别内容"+ocrResult.getStrRes().replace("\n", " ")); +// String temPath = "/Users/alan/Downloads/工作台1.png"; +// ParamConfig paramConfig = ParamConfig.getDefaultConfig(); +// paramConfig.setDoAngle(true); +// paramConfig.setMostAngle(true); +// InferenceEngine engine = InferenceEngine.getInstance(Model.ONNX_PPOCR_V4); +// // 开始识别 +// OcrResult ocrResult = engine.runOcr(temPath, paramConfig); +// System.out.println("识别内容"+ocrResult.getStrRes().replace("\n", " ")); } }