From c3a6c177f4c016dcf962f01f81de3d1506598da0 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Thu, 1 Aug 2024 10:45:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=96=B0=E6=97=A7=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E5=8D=95=E5=AF=B9=E6=AF=94):=20=E5=AF=B9=E6=AF=94=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarFileCompareItemCommentServiceImpl.java | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
index 13b48810..b6341c2f 100644
--- a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.LanguageEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.util.MessageUtils;
-import com.jero.common.util.MinioUtil;
+import com.jero.common.util.obs.ObsBootUtil;
 import com.jero.modules.compare.entity.*;
 import com.jero.modules.compare.enums.AssessConsistencyEnum;
 import com.jero.modules.compare.mapper.SarFileCompareItemCommentMapper;
@@ -409,12 +409,18 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
                     }
                 }
 
+                // 左、右条款内容
+                String leftContent  = String.valueOf(row.getCell(3));
+                String rightContent  = String.valueOf(row.getCell(7));
+                // 左、右条款名称
+                String leftName  = String.valueOf(row.getCell(2));
+                String rightName  = String.valueOf(row.getCell(6));
                 // 左右条款内容对比
-                if (StringUtils.isNotBlank(itemIdLeft) && StringUtils.isNotBlank(itemIdRight)) {
+                if (StringUtils.isNotBlank(leftContent) && StringUtils.isNotBlank(rightContent)) {
                     // 获取对比结果
                     DiffUtils dmp = new DiffUtils();
-                    List<String> htmlDiffStrContent = dmp.getHtmlDiffStr(rowDataAndPathLeft, rowDataAndPathRight);
-                    List<String> htmlDiffStrName = dmp.getHtmlDiffStr(itemLeft.getItemsName(), itemRight.getItemsName());
+                    List<String> htmlDiffStrContent = dmp.getHtmlDiffStr(leftContent, rightContent);
+                    List<String> htmlDiffStrName = dmp.getHtmlDiffStr(leftName, rightName);
 
                     Font redFont = workbook.createFont();
                     redFont.setColor(HSSFColor.HSSFColorPredefined.RED.getIndex());
@@ -459,19 +465,19 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
                         // 设置单独字体样式
                         String[] split = tagIndex.split(",");
                         leftNameRich.applyFont(Integer.parseInt(split[0]), Integer.parseInt(split[1]), redFont);
-                        row.createCell(2).setCellValue(leftRich);
+                        row.createCell(2).setCellValue(leftNameRich);
                     }
 
-                    List<String> rightNameRedTagIndex = getTagIndex(htmlDiffStrName.get(1), greenTag);
+                    List<String> rightNameGreenTagIndex = getTagIndex(htmlDiffStrName.get(1), greenTag);
                     HSSFRichTextString rightNameRich = new HSSFRichTextString(
-                            htmlDiffStrName.get(0)
-                                    .replace(redTag, "")
+                            htmlDiffStrName.get(1)
+                                    .replace(greenTag, "")
                                     .replace("</span>", ""));
-                    for (String tagIndex : rightNameRedTagIndex) {
+                    for (String tagIndex : rightNameGreenTagIndex) {
                         // 设置单独字体样式
                         String[] split = tagIndex.split(",");
                         rightNameRich.applyFont(Integer.parseInt(split[0]), Integer.parseInt(split[1]), greenFont);
-                        row.createCell(6).setCellValue(leftRich);
+                        row.createCell(6).setCellValue(rightNameRich);
                     }
                 }
 
@@ -599,8 +605,8 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
             //先将图片下载到本地
             log.info("-------------------------将图片下载到本地文件夹中----------------------------");
             String fileLastName = text.substring(text.lastIndexOf("/") + 1);
-            if (MinioUtil.doesObjectExist(text)) {
-                try (InputStream in = MinioUtil.download(text)) {
+            if (StringUtils.isNotBlank(text)) {
+                try (InputStream in = ObsBootUtil.getOssFile(text)) {
                     copyFile2(in, dir + File.separator + fileLastName);
                 } catch (IOException e) {
                     e.printStackTrace();