From 11290149f23a294f57cf13b6a4b79f1b86e9a09d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Mon, 24 Apr 2023 19:02:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/UnitTest/MergeTableSameCotent.java     |  1 -
 .../java/com/dsideal/FengHuang/Util/ExcelToHtml.java | 12 ++++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/UnitTest/MergeTableSameCotent.java b/src/main/java/UnitTest/MergeTableSameCotent.java
index 1bb5a32..fb914ca 100644
--- a/src/main/java/UnitTest/MergeTableSameCotent.java
+++ b/src/main/java/UnitTest/MergeTableSameCotent.java
@@ -34,7 +34,6 @@ public class MergeTableSameCotent {
         //删除空白单元格所在的行
         for (int i = 0; i < rows.getCount(); i++) {
             Cell start = table.getRows().get(i).getCells().get(col);
-            //System.out.println(start.getText().charAt(0)-0);
             if (start.getText().length() == 1) table.getRows().removeAt(i);
         }
         //保存
diff --git a/src/main/java/com/dsideal/FengHuang/Util/ExcelToHtml.java b/src/main/java/com/dsideal/FengHuang/Util/ExcelToHtml.java
index 529ac0b..b17a99e 100644
--- a/src/main/java/com/dsideal/FengHuang/Util/ExcelToHtml.java
+++ b/src/main/java/com/dsideal/FengHuang/Util/ExcelToHtml.java
@@ -6,6 +6,7 @@ import com.aspose.cells.Worksheet;
 import com.aspose.cells.WorksheetCollection;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jfinal.kit.StrKit;
+import cn.hutool.core.io.FileUtil;
 
 import java.io.File;
 import java.util.HashMap;
@@ -31,14 +32,17 @@ public class ExcelToHtml {
             // 获取所有的单元格
             Cells cells = worksheet.getCells();
             String value = cells.get(0, 0).getStringValue();
-            value=value.replace("\\t","").replace("\\n","");
+            value = value.replace("\\t", "").replace("\\n", "");
             if (StrKit.isBlank(value)) continue;
             _map.put(cnt, value);
             workbook.save("c:/out/" + cnt + ".html");
             workbook.dispose();
         }
-        String filePath = "c:/out/map.json";
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.writeValue(new File(filePath), _map);
+        String content="";
+        for (Integer key : _map.keySet()) {
+            String value = _map.get(key);
+            content += "<a href='" + key + ".html'>" + value + "</a><br>\r\n";
+        }
+        FileUtil.writeString(content,"c:/Out/index.html", "UTF-8");
     }
 }