From 568b57684b1548f8eadc2e212ce56fbacd5fdd4a Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Wed, 19 Jul 2023 11:39:24 +0800
Subject: [PATCH] updates

---
 .../ocr/controller/OcrApiController.java      | 57 +++++++++++++++++++
 .../service/impl/OcrTaskTypeServiceImpl.java  | 12 ++--
 2 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiController.java

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiController.java
new file mode 100644
index 0000000..874929f
--- /dev/null
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiController.java
@@ -0,0 +1,57 @@
+package org.jeecg.modules.ocr.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description
+ * @Author ZhouWenTao
+ * @Date 2023/7/19 11:03
+ */
+@RequestMapping(value = "/ocrApi")
+@RestController
+@Slf4j
+public class OcrApiController {
+/**
+ * 1. 收到 任务  入参 任务id，图片路径[]
+ * 2. 调用java接口，入参
+ *     任务id，
+ *     图片路径，
+ *     语义化结果（
+ *                 {
+ *                     "医院名称":[
+ *                         {
+ *                             "ocrText":"从北京到广东医科大学附属医院",
+ *                             "text": "广东医科大学附属医院",
+ *                             "area": []
+ *                         },{},{}
+ *                     ],
+ *                     "科室": [{}],
+ *                     "时间": [{}]
+ *                     "姓名": [{}]
+ *                 }
+ *     )
+ *     message: "成功"
+ *     任务是否完成 0 未完成，1 完成
+ */
+
+/**
+ * task_id: "11",
+ *     img_path: "/usr/ssss/img.jpg"，
+ *     semantic_result:
+*      {
+*          "医院名称":[
+*              {
+*                  "ocrText":"从北京到广东医科大学附属医院",
+*                  "text": "广东医科大学附属医院",
+*                  "area": []
+*              },
+*          ],
+*          "科室": [{}],
+*          "时间": [{}]
+*          "姓名": [{}]
+*      }
+ *     message: "成功"
+ */
+}
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrTaskTypeServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrTaskTypeServiceImpl.java
index 4fb92f4..b7579e4 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrTaskTypeServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrTaskTypeServiceImpl.java
@@ -40,11 +40,13 @@ public class OcrTaskTypeServiceImpl extends ServiceImpl<OcrTaskTypeMapper, OcrTa
             AssertUtils.notTrue(super.count(countQueryWrapper)>0,String.format("[%s]-已存在",ocrTaskType.getTypeName()));
         }
         //判断重复类型名
-        Map<String, Long> countMap = ocrTaskTypes.stream().map(o->o.getTypeName()).collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));
-        if (countMap.keySet().size()>0) {
-            //有重复的类型名
-            String typeName = countMap.keySet().stream().filter(key -> countMap.get(key) > 1).distinct().collect(Collectors.joining(","));
-            AssertUtils.isEmpty(typeName,String.format("[%s]-重复了",typeName));
+        if (ocrTaskTypes.size()>0) {
+            Map<String, Long> countMap = ocrTaskTypes.stream().map(o->o.getTypeName()).collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));
+            if (countMap.keySet().size()>0) {
+                //有重复的类型名
+                String typeName = countMap.keySet().stream().filter(key -> countMap.get(key) > 1).distinct().collect(Collectors.joining(","));
+                AssertUtils.isEmpty(typeName,String.format("[%s]-重复了",typeName));
+            }
         }
         return true;
     }