QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(标准对比): 对比问题

Browse Source
This commit is contained in:
yjz
2024-08-19 16:49:47 +08:00
parent c1f2741a96
commit 3880afeb1c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
+5 -5
View File
@@ -198,7 +198,7 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
String rightTxt = rightItemList.get(j).getItemsText();
// String rightAllTxt = rightItemList.get(j).getItemsNum() + rightItemList.get(j).getItemsName() + rightItemList.get(j).getItemsText();
StringBuilder sb2 = new StringBuilder();
sb.append(rightItemList.get(j).getItemsNum())
sb2.append(rightItemList.get(j).getItemsNum())
.append(rightItemList.get(j).getItemsName())
.append(rightItemList.get(j).getItemsText());
String rightAllTxt = sb2.toString();
@@ -207,12 +207,12 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
// 使用正则表达式判断是否是纯<img>标签，不以</p>结尾，也不以</table>结尾
String leftTxtTrim = StringUtils.isBlank(leftTxt) ? "" : leftTxt.trim();
String rightTxtTrim = StringUtils.isBlank(rightTxt) ? "" : rightTxt.trim();
boolean leftTxtMatches = leftTxtTrim.matches("<img[^>]+>(?<!</p>)(?<!</table>)");
boolean rightTxtMatches = rightTxtTrim.matches("<img[^>]+>(?<!</p>)(?<!</table>)");
// boolean leftTxtMatches = leftTxtTrim.matches("<img[^>]+>(?<!</p>)(?<!</table>)");
// boolean rightTxtMatches = rightTxtTrim.matches("<img[^>]+>(?<!</p>)(?<!</table>)");
// boolean leftTxtMatches = Pattern.matches("<img[^>]+>(?<!</p>)(?<!</table>)", leftTxtTrim);
// boolean rightTxtMatches = Pattern.matches("<img[^>]+>(?<!</p>)(?<!</table>)", rightTxtTrim);
// boolean leftTxtMatches = imgPattern.matcher(leftTxtTrim).find();
// boolean rightTxtMatches = imgPattern.matcher(rightTxtTrim).find();
boolean leftTxtMatches = imgPattern.matcher(leftTxtTrim).find();
boolean rightTxtMatches = imgPattern.matcher(rightTxtTrim).find();
if (leftTxtMatches && rightTxtMatches){
// 如果是纯img标签直接对比内容
if (leftTxtTrim.equals(rightTxtTrim)