修复二级分段进不去的错误

docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleServiceImpl.java

@@ -130,17 +130,9 @@ public class OcrRuleServiceImpl implements IOcrRuleService {
                                         score = ocrRuleSecondJson.getMatchRatio();
                                         for (int j = 0; j < keyWordList.length; j++) {
                                             keyWord = keyWordList[j];
-                                            if (ocrText.contains(keyWord)) {
+                                            for (String ocrContent : ocrTextList) {
-                                                rate = keyWord.length() / (double) ocrText.length() * 100;
+                                                if (handleOcrText(assortId, assortName, score, keyWord, ocrRuleResult, ocrContent, ocrRule.getId()))
-                                                //判断是否命中
-                                                if (rate >= score) {
-                                                    ocrRuleResult.setRuleId(ocrRule.getId());
-                                                    ocrRuleResult.setAssortId(assortId);
-                                                    ocrRuleResult.setAssortName(assortName);
-                                                    ocrRuleResult.setHitKey(keyWord);
-                                                    ocrRuleResult.setRate(rate);
                                                     return ocrRuleResult;
-                                                }
                                             }
                                         }
                                     }
@@ -156,6 +148,23 @@ public class OcrRuleServiceImpl implements IOcrRuleService {
         return null;
     }
 
+    static boolean handleOcrText(String assortId, String assortName, double score, String keyWord, OcrRuleResult ocrRuleResult, String ocrContent, Long id ) {
+        double rate;
+        if (ocrContent.contains(keyWord)) {
+            rate = keyWord.length() / (double) ocrContent.length() * 100;
+            //判断是否命中
+            if (rate >= score) {
+                ocrRuleResult.setRuleId(id);
+                ocrRuleResult.setAssortId(assortId);
+                ocrRuleResult.setAssortName(assortName);
+                ocrRuleResult.setHitKey(keyWord);
+                ocrRuleResult.setRate(rate);
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * 新增
      *

docus-segmentation/src/main/java/com/docus/server/service/impl/OcrRuleTestServiceImpl.java

@@ -83,17 +83,9 @@ public class OcrRuleTestServiceImpl implements IOcrRuleTestService {
                                         score = ocrRuleSecondJson.getMatchRatio();
                                         for (int j = 0; j < keyWordList.length; j++) {
                                             keyWord = keyWordList[j];
-                                            if (ocrText.contains(keyWord)) {
+                                            for (String ocrContent : ocrTextList) {
-                                                rate = keyWord.length() / (double) ocrText.length() * 100;
+                                                if (OcrRuleServiceImpl.handleOcrText(assortId, assortName, score, keyWord, ocrRuleResult, ocrContent, ocrRuleTest.getId()))
-                                                //判断是否命中
-                                                if (rate >= score) {
-                                                    ocrRuleResult.setRuleId(ocrRuleTest.getId());
-                                                    ocrRuleResult.setAssortId(assortId);
-                                                    ocrRuleResult.setAssortName(assortName);
-                                                    ocrRuleResult.setHitKey(keyWord);
-                                                    ocrRuleResult.setRate(rate);
                                                     return ocrRuleResult;
-                                                }
                                             }
                                         }
                                     }