From 62a87236aa42063812ba59665489a08f5db4690f Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Mon, 10 Oct 2022 10:21:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=90=8D=E7=A7=B0=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
index a635115b7..d54fc7199 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
@@ -288,9 +288,9 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
                                         if (ObjectUtils.isEmpty(row2)) {
                                             row2 = sheet.createRow(j + i);
                                         }
-                                        imgToExcel(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, leftSplit[j], 3);
+                                        handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, leftSplit[j], 3);
                                     } else {
-                                        imgToExcel(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, leftSplit[j], 3);
+                                        handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, leftSplit[j], 3);
                                     }
                                 }
                             }
@@ -322,9 +322,9 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
                                         if (ObjectUtils.isEmpty(row2)) {
                                             row2 = sheet.createRow(j + i);
                                         }
-                                        imgToExcel(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, rightSplit[j], 7);
+                                        handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, rightSplit[j], 7);
                                     } else {
-                                        imgToExcel(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, rightSplit[j], 7);
+                                        handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, rightSplit[j], 7);
                                     }
                                 }
                             }
@@ -401,7 +401,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
     }
 
     /**
-     * 将图片添加到excel指定单元格中
+     * 处理图片跟表格类型的数据
      * @param workbook
      * @param dir
      * @param patriarch
@@ -414,7 +414,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
      * @param cellNum
      * @throws IOException
      */
-    private void imgToExcel(Workbook workbook, String dir, HSSFPatriarch patriarch, CellStyle cellStyleLink, ByteArrayOutputStream byteArrayOut, Row row, int i, int j, String text, int cellNum) throws IOException {
+    private void handleSpecificData(Workbook workbook, String dir, HSSFPatriarch patriarch, CellStyle cellStyleLink, ByteArrayOutputStream byteArrayOut, Row row, int i, int j, String text, int cellNum) throws IOException {
         if (text.contains("/upFiles")) {
             row.setHeight((short) 3000); //设置行高
             //先将图片下载到本地
@@ -439,7 +439,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
         } else {
             Cell cell = row.createCell(cellNum);
             if (text.contains("<table")) {
-                tableAssociations(workbook, cellStyleLink, cell, text);
+                tableAssociate(workbook, cellStyleLink, cell, text);
             } else {
                 cell.setCellValue(text);
             }
@@ -453,7 +453,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
      * @param cell
      * @param tableHtml
      */
-    private void tableAssociations(Workbook workbook, CellStyle cellStyleLink, Cell cell, String tableHtml) {
+    private void tableAssociate(Workbook workbook, CellStyle cellStyleLink, Cell cell, String tableHtml) {
         cell.setCellValue("点击查看详情");
         //新开sheet生成表格
         if (org.apache.commons.lang.StringUtils.isNotEmpty(tableHtml) && tableHtml.indexOf("<tbody>") < 0) {
@@ -487,7 +487,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
     private String getSplitContent(HttpServletRequest request, String text) {
         text = text.replace("<p>", "").replace("</p>", "\r\n");
         //分割图片
-        addImgdata(text, request.getSession());
+        splitImg(text, request.getSession());
         //分割表格
         String txtAndImg = (String) request.getSession().getAttribute("txtAndImg");
         txtAndImg = txtAndImg.replaceAll("table", "replaceTable");
@@ -514,18 +514,19 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
     }
 
     /**
-     * 提取字符串中<img>标签内容中的图片路径，并重新按顺序拼接
+     * 分割图片
      * @param text
+     * @param session
      * @return
      */
-    private void addImgdata(String text,HttpSession session) {
+    private void splitImg(String text,HttpSession session) {
         if (text.contains("<img")) {
             String txtLeft = text.substring(0, text.indexOf("<img"));
             String txtRight = text.substring(text.indexOf("g\">") + 3);
             String img = text.substring(text.indexOf("<img"), text.indexOf("g\">"));
             String path = img.substring(img.lastIndexOf("=") + 1)+"g";
             text = txtLeft + "---" + path + "---" + txtRight;
-            addImgdata(text, session);
+            splitImg(text, session);
         } else {
             session.setAttribute("txtAndImg", text);
         }