'commit'

src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelCoreUtil.java

@@ -11,7 +11,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-public class ExcelUtil {
+public class ExcelCoreUtil {
     /**
      * 将xls的转换为xlsx，数据样式和格式一同转换，并输出为文件流
      *
@@ -33,7 +33,7 @@ public class ExcelUtil {
                 // 复制sheet，合并栏和冻结窗格之类
                 Sheet sheet1 = copySheet(wb, swb, i);
                 // 写入xls模板
-                ExcelUtil builder = new ExcelUtil(wb);
+                ExcelCoreUtil builder = new ExcelCoreUtil(wb);
                 int rowNum = sheet.getLastRowNum();
                 // 复制单元格值与样式
                 builder.copyRows(swb, sheet, sheet1, 0, rowNum + 1, 0);
@@ -53,7 +53,7 @@ public class ExcelUtil {
     private final Map<Integer, Font> fonts = new HashMap<>();
     private final Map<Integer, CellStyle> styles = new HashMap<>();
 
-    public ExcelUtil(Workbook template) {
+    public ExcelCoreUtil(Workbook template) {
         this.template = template;
     }
 

src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java

@@ -10,7 +10,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.poi.xwpf.usermodel.XWPFChart;
 
 import java.io.*;
-import java.sql.SQLOutput;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,7 +23,7 @@ public class ExcelKit {
      */
     public static String ConvertXlsToXlsx(String sourceExcel) throws IOException {
         if (sourceExcel.endsWith(".xls")) {
-            ExcelUtil.xlsChangeXlsx(sourceExcel, sourceExcel + "x");
+            ExcelCoreUtil.xlsChangeXlsx(sourceExcel, sourceExcel + "x");
             //删除旧的文件
             ExcelKit.delExcel(sourceExcel);
             sourceExcel = sourceExcel + "x";

src/main/java/com/dsideal/base/Tools/FillData/Test/C9_Test.java

@@ -1,44 +0,0 @@
-package com.dsideal.base.Tools.FillData.Test;
-
-import cn.hutool.core.io.FileUtil;
-import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
-import com.dsideal.base.Tools.Util.ReadDocxUtil;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.openxml4j.util.ZipSecureFile;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.xwpf.usermodel.XWPFChart;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-public class C9_Test {
-
-    public static void main(String[] args) throws IOException, InvalidFormatException {
-        //初始化数据库连接
-        LocalMysqlConnectUtil.Init();
-        //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
-        //判断是否为docx文件
-        //读取文件
-        String inputUrl = "D:\\dsWork\\YunNanDsBase\\Doc\\全省及州市县区人口与教育报告集20241023\\16个州市报告2022\\分析报告20240510\\西双版纳州人口变化及其对教育的影响20240420.docx";
-        InputStream is = new FileInputStream(inputUrl);
-        ZipSecureFile.setMinInflateRatio(-1.0d);
-        XWPFDocument doc = new XWPFDocument(is);
-        //排序后的图表
-        List<XWPFChart> charts = ExcelKit.getSortListForXWPFChart(doc.getCharts());
-
-        for (int i = 0; i < charts.size(); i++) {
-            XSSFWorkbook workbook = charts.get(i).getWorkbook();
-            List<List<String>> source1 = ExcelKit.readSheet(workbook, 1);
-            System.out.println(source1);
-        }
-
-    }
-}