From 35d3d117c3a8260ecdd0ed07e5d60d6afcfe9023 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Mon, 7 Aug 2023 15:28:34 +0800
Subject: [PATCH] updates

---
 .../modules/ocr/controller/OcrIdentifyController.java      | 4 ++--
 .../modules/ocr/service/impl/OcrIdentifyServiceImpl.java   | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java
index 4e5a81d..ed2374d 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyController.java
@@ -265,7 +265,7 @@ public class OcrIdentifyController extends JeecgController<OcrIdentify, IOcrIden
         ocrIdentifyDetailList = ocrIdentifyDetailService.list(new LambdaQueryWrapper<OcrIdentifyDetail>().eq(OcrIdentifyDetail::getIdentifyId, id));
         List<OcrIdentifyDetail> identifyDetailList = new ArrayList<>();
 
-        if ("1".equals(ocrIdentify.getStatus()) &&ocrIdentifyDetailList!=null&&ocrIdentifyDetailList.size()>0) {
+/*        if ("1".equals(ocrIdentify.getStatus()) &&ocrIdentifyDetailList!=null&&ocrIdentifyDetailList.size()>0) {
             //判断明细是否识别成功
             identifyDetailList = ocrIdentifyDetailList.stream().filter(o -> o.getIdentifyId().equals(ocrIdentify.getId())).collect(Collectors.toList());
             if (identifyDetailList.size()>0) {
@@ -276,7 +276,7 @@ public class OcrIdentifyController extends JeecgController<OcrIdentify, IOcrIden
                 //失败
                 ocrIdentify.setTaskResult("0");
             }
-        }
+        }*/
 
         if (StringUtils.isNotBlank(ocrIdentify.getTaskResultInfo())) {
             List<OcrResult2> ocrResult2s = JSONObject.parseArray(ocrIdentify.getTaskResultInfo()).toJavaList(OcrResult2.class);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
index 83b9e4d..87a8c4e 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
@@ -98,7 +98,8 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
             ocrIdentifyDetail.setIdentifyId(identifyId);
             ocrIdentifyDetail.setImageName(imgName);
             ocrIdentifyDetail.setImageUrl(imgPath);
-            ocrIdentifyDetail.setStatus(taskStatus);
+            //ocrIdentifyDetail.setStatus(taskStatus);
+            ocrIdentifyDetail.setStatus("0");
             ocrIdentifyDetail.setMessage(message);
             ocrIdentifyDetail.setExecutionTime(executionTime);
             ocrIdentifyDetail.setSemanticResult(semanticResult.toJSONString());
@@ -182,9 +183,9 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
 
             //其中有一个字段 全部都是 失败，则该图片失败.
             if (fieldRightMap != null && fieldRightMap.values().size() > 0 && !fieldRightMap.containsValue(false)) {
-                ocrIdentifyDetail.setStatus("0");//全部通过
+                ocrIdentifyDetail.setStatus("1");//全部通过
             } else {
-                ocrIdentifyDetail.setStatus("1");//有失败的
+                ocrIdentifyDetail.setStatus("0");//有失败的
                 ocrIdentifyDetail.setMessage(rMessage.toString());
             }
             ocrIdentifyDetail.setDataStructured(JSONArray.toJSONString(ocrResultList));//数据结构化