From ee81400249314f13bb67ff7aa87ef91b8372260d Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Wed, 9 Aug 2023 01:29:51 +0800
Subject: [PATCH] updates

---
 .../service/impl/OcrIdentifyServiceImpl.java  | 53 +++++++++----------
 1 file changed, 26 insertions(+), 27 deletions(-)

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 e95dd41..070a7fd 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
@@ -275,7 +275,7 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
                 //TODO 后续考虑需要修正复杂程度. 支持 & + || 一起
 
                 String errorMsg = errorResults.stream().map(e -> e.getFailureReason()).collect(Collectors.joining(";"));
-                if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckSplitChar)) {
+//                if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckSplitChar)) {
                     if (errorResults.size() > 0) {
                         //匹配失败.
                         updateWrapper.set(OcrIdentify::getErrorMsg, errorMsg);
@@ -284,11 +284,10 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
                         //匹配成功.
                         updateWrapper.set(OcrIdentify::getTaskResult, 1);
                     }
-                }else if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckOrChar)){
+                /*}else if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckOrChar)){
                     Map<String, String> fieldMap = configRuleTypeMap.get(OcrConstant.ruleCheckSplitChar);
                     //获取成功的字段.
                     List<String> successFields = ocrResults.stream().filter(o -> o.getRuleValidation()).map(c->c.getTag()).collect(Collectors.toList());
-
                     updateWrapper.set(OcrIdentify::getErrorMsg, errorMsg);
                     updateWrapper.set(OcrIdentify::getTaskResult, 0);
                     fieldMapFor: for (String s : fieldMap.keySet()) {
@@ -297,8 +296,7 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
                             break fieldMapFor;
                         }
                     }
-
-                }
+                }*/
                 String taskResultInfo = JSONArray.toJSONString(ocrResults);
                 updateWrapper.set(OcrIdentify::getStatus,"1");
                 updateWrapper.set(OcrIdentify::getEndTime,new Date());
@@ -446,32 +444,33 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
                 //TODO 后续考虑需要修正复杂程度. 支持 & + || 一起
 
                 String errorMsg = errorResults.stream().map(e -> e.getFailureReason()).collect(Collectors.joining(";"));
-                if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckSplitChar)) {
-                    if (errorResults.size() > 0) {
-                        //匹配失败.
-                        updateWrapper.set(OcrIdentify::getErrorMsg, errorMsg);
-                        updateWrapper.set(OcrIdentify::getTaskResult, 0);
-                    } else {
-                        //匹配成功.
-                        updateWrapper.set(OcrIdentify::getTaskResult, 1);
-                    }
-                }else if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckOrChar)){
-                    Map<String, String> fieldMap = configRuleTypeMap.get(OcrConstant.ruleCheckSplitChar);
-                    //获取成功的字段.
-                    List<String> successFields = ocrResults.stream().filter(o -> o.getRuleValidation()).map(c->c.getTag()).collect(Collectors.toList());
-
+//                if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckSplitChar)) {
+                if (errorResults.size() > 0) {
+                    //匹配失败.
                     updateWrapper.set(OcrIdentify::getErrorMsg, errorMsg);
                     updateWrapper.set(OcrIdentify::getTaskResult, 0);
-
-                    fieldMapFor: for (String s : fieldMap.keySet()) {
-                        if (successFields.contains(s)) {
-                            updateWrapper.set(OcrIdentify::getTaskResult, 1);
-                            break fieldMapFor;
-                        }
-                    }
-
+                } else {
+                    //匹配成功.
+                    updateWrapper.set(OcrIdentify::getTaskResult, 1);
                 }
+//                }else if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckOrChar)){
+//                    Map<String, String> fieldMap = configRuleTypeMap.get(OcrConstant.ruleCheckSplitChar);
+//                    //获取成功的字段.
+//                    List<String> successFields = ocrResults.stream().filter(o -> o.getRuleValidation()).map(c->c.getTag()).collect(Collectors.toList());
+//
+//                    updateWrapper.set(OcrIdentify::getErrorMsg, errorMsg);
+//                    updateWrapper.set(OcrIdentify::getTaskResult, 0);
+//
+//                    fieldMapFor: for (String s : fieldMap.keySet()) {
+//                        if (successFields.contains(s)) {
+//                            updateWrapper.set(OcrIdentify::getTaskResult, 1);
+//                            break fieldMapFor;
+//                        }
+//                    }
+//                }
                 String taskResultInfo = JSONArray.toJSONString(ocrResults);
+                updateWrapper.set(OcrIdentify::getStatus,"1");
+                updateWrapper.set(OcrIdentify::getEndTime,new Date());
                 updateWrapper.set(OcrIdentify::getTaskResultInfo,taskResultInfo);
             }
         }