From bdc69a995af4ae00f4ed27a4f89e321024e0dc86 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 20 Oct 2023 17:14:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=96=87=E6=A1=A3=E5=AF=B9=E6=AF=94):=20?=
 =?UTF-8?q?=E7=9B=B8=E5=90=8C=E7=BA=AFimg=E6=A0=87=E7=AD=BE=E5=AF=B9?=
 =?UTF-8?q?=E6=AF=94=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarFileCompareInfoServiceImpl.java      | 16 +++++++++++++++-
 .../modules/compare/utils/CompHanLPUtils.java    |  1 -
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
index b768b22b..23cde341 100644
--- a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -161,7 +162,20 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
                         }
                         String rightTxt = rightItemList.get(j).getItemsText();
                         if (null != rightTxt && !rightTxt.isEmpty()) {
-                            double similarity = CompHanLPUtils.findSimilarity(leftTxt.trim(), rightTxt.trim());
+                            double similarity = 0;
+                                    // 使用正则表达式判断是否是纯<img>标签，不以</p>结尾，也不以</table>结尾
+                            String leftTxtTrim = leftTxt.trim();
+                            String rightTxtTrim = rightTxt.trim();
+                            boolean leftTxtMatches = Pattern.matches("<img[^>]+>(?<!</p>)(?<!</table>)", leftTxtTrim);
+                            boolean rightTxtMatches = Pattern.matches("<img[^>]+>(?<!</p>)(?<!</table>)", rightTxtTrim);
+                            if (leftTxtMatches && rightTxtMatches){
+                                // 如果是纯img标签直接对比内容
+                                if (leftTxtTrim.equals(rightTxtTrim)){
+                                    similarity = 1;
+                                }
+                            }else {
+                                similarity = CompHanLPUtils.findSimilarity(leftTxt.trim(), rightTxt.trim());
+                            }
                             //如果相似度超过0.6 并且该相似度比之前的相似度还高，那么该条款目前相似度最高
                             if (similarity >= 0.6 && compareSimilarity < similarity) {
                                 compareSimilarity = similarity;
diff --git a/laws-modules/src/main/java/com/jero/modules/compare/utils/CompHanLPUtils.java b/laws-modules/src/main/java/com/jero/modules/compare/utils/CompHanLPUtils.java
index a6c87611..0ee53251 100644
--- a/laws-modules/src/main/java/com/jero/modules/compare/utils/CompHanLPUtils.java
+++ b/laws-modules/src/main/java/com/jero/modules/compare/utils/CompHanLPUtils.java
@@ -15,7 +15,6 @@ import org.wltea.analyzer.core.Lexeme;
 
 import java.io.IOException;
 import java.io.StringReader;
-import java.text.NumberFormat;
 import java.util.*;
 import java.util.stream.Collectors;