From e4e9f1a74c0ff4433853cb9ae7ef883e72e5aaf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 12 Nov 2024 16:34:42 +0800 Subject: [PATCH] 'commit' --- .../教育资源配置发展预测(人).xlsx | Bin 11708 -> 11708 bytes ...配置发展预测(人)【成果】.xlsx | Bin 37020 -> 37020 bytes .../{ExcelUtil.java => ExcelCoreUtil.java} | 6 +-- .../Tools/FillData/ExcelKit/ExcelKit.java | 3 +- .../base/Tools/FillData/Test/C9_Test.java | 44 ------------------ 5 files changed, 4 insertions(+), 49 deletions(-) rename src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/{ExcelUtil.java => ExcelCoreUtil.java} (96%) delete mode 100644 src/main/java/com/dsideal/base/Tools/FillData/Test/C9_Test.java diff --git a/Doc/待处理/市/【11】教育资源配置发展预测/教育资源配置发展预测(人).xlsx b/Doc/待处理/市/【11】教育资源配置发展预测/教育资源配置发展预测(人).xlsx index 951d15a15acc0b8fe435e3e1ae84c2cfb87eb0bb..58266e80c763f285c1e82d07c1bbd6d4c90d2b61 100644 GIT binary patch delta 177 zcmdlJy(gL{z?+#xgn@&DgCU@0BhN%erht~s^BFb3^hu^T z>Qp(mbAjl4!tty?da=DESlCfo3#=?xriBkEJo&ShJ%}>VHV09;+BP6+wYDvYdZi7P e)7EhS%jsBxs1-V3!IwJLAfB488;Hu&^#cIGEJYds diff --git a/Doc/待处理/市/【11】教育资源配置发展预测/教育资源配置发展预测(人)【成果】.xlsx b/Doc/待处理/市/【11】教育资源配置发展预测/教育资源配置发展预测(人)【成果】.xlsx index 8cb16750cd55588707c3aca7222a0389f1b6816f..3d8b74938f01815f28bf9d65f4433e145b8ae3e4 100644 GIT binary patch delta 428 zcmbQUkZI0BCY}IqW)=|!4h{~6pq7n1Rg6qQEt@+Sr9kxLB~0f*R4KDjeF|r;c%T@| zQC97)az)A8NuQmC-v0WwtaR;zs_9Rxi)YkaeYfJ+6Xv<{J?l8n7EM|p=Ek>c^~vPj z{@YbPHfEo6U%XN6)`Zw#&eJW06$Qr@aWnr?$=Z^B=-LwggGLPcRUvoMCtfhDG4=Z> zuznr$>7&x`1-fkZGqg5(%UPT`bY)$=TTzhLMy{C2NHhjoTR<=JGTv>Ye zooDcqqiRb{mb%W)kKCD<`Z4I>{GX9OYR%T|>}mZnL*`w6T3+qC2Wy@^;|}m<=ZL?} z@l}MCk%3_Y5F-cI=AA6vqM-0{lllP;HwPIpFdZQa4!_MMa`*E=0T|k652B{^nS-eF peKs6HEjf`Ob0-V;gT;LM9Y9ij{gxo=WWP0tVw>OwqWmWK0RZw)vxNWv delta 428 zcmbQUkZI0BCY}IqW)=|!4h{~6zs(zYsu-F6HgE1=lmgL{moS|NQKigA^{Je>;(=l; zM_IMI$`vJVCw+Dndi(3!veLB+?y3GfC!-d>)q0g-rTcUC#o11q=cue`o!I;?>(hmI zmvudB9z=b*n6akQEaiI0A)`bYxj7qO9BQ!ZlzKaJgXv4>4Lk?Bw^xi(hm;CT=qE*%m3_W z_TDtf-G0p#6W^O5dNFr84qbkG_V1<|s~10CGkFHjz2al>gfUf!Rj200jT7acBI4q< zR$mgS+~}$4n|bkBbXZW?w#s!6uK&^bV|34`2Cp=!{q<~ diff --git a/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelUtil.java b/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelCoreUtil.java similarity index 96% rename from src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelUtil.java rename to src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelCoreUtil.java index 16149a63..a23701ba 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelUtil.java +++ b/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 fonts = new HashMap<>(); private final Map styles = new HashMap<>(); - public ExcelUtil(Workbook template) { + public ExcelCoreUtil(Workbook template) { this.template = template; } diff --git a/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java b/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java index 65c6dc8e..11de3969 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java +++ b/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"; diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Test/C9_Test.java b/src/main/java/com/dsideal/base/Tools/FillData/Test/C9_Test.java deleted file mode 100644 index 8485019e..00000000 --- a/src/main/java/com/dsideal/base/Tools/FillData/Test/C9_Test.java +++ /dev/null @@ -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 charts = ExcelKit.getSortListForXWPFChart(doc.getCharts()); - - for (int i = 0; i < charts.size(); i++) { - XSSFWorkbook workbook = charts.get(i).getWorkbook(); - List> source1 = ExcelKit.readSheet(workbook, 1); - System.out.println(source1); - } - - } -}