diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java index d2534d31..6d487ba2 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java @@ -45,12 +45,12 @@ public class A1 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); //如果样例文件是xls格式,则转化为xlsx格式 - sampleExcelPath = DsKit.ConvertXlsToXlsx(sampleExcelPath); + sampleExcelPath = DsKit.convertXlsToXlsx(sampleExcelPath); //拷贝文件头 DsKit.copyHead(sampleExcelPath, outSheet, headerStyle); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java index 3e65d8f9..7e26e1f6 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java @@ -37,12 +37,12 @@ public class A10 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); //如果样例文件是xls格式,则转化为xlsx格式 - sampleExcelPath = DsKit.ConvertXlsToXlsx(sampleExcelPath); + sampleExcelPath = DsKit.convertXlsToXlsx(sampleExcelPath); //拷贝文件头 DsKit.copyHead(sampleExcelPath, outSheet, headerStyle); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A11.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A11.java index 73c3ea86..dd3f0b7b 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A11.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A11.java @@ -30,12 +30,12 @@ public class A11 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); //如果样例文件是xls格式,则转化为xlsx格式 - sampleExcelPath = DsKit.ConvertXlsToXlsx(sampleExcelPath); + sampleExcelPath = DsKit.convertXlsToXlsx(sampleExcelPath); //拷贝文件头 DsKit.copyHead(sampleExcelPath, outSheet, headerStyle); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java index f9df1428..fb196273 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java @@ -42,12 +42,12 @@ public class A12 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); //如果样例文件是xls格式,则转化为xlsx格式 - sampleExcelPath = DsKit.ConvertXlsToXlsx(sampleExcelPath); + sampleExcelPath = DsKit.convertXlsToXlsx(sampleExcelPath); //拷贝文件头 DsKit.copyHead(sampleExcelPath, outSheet, headerStyle); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java index e74488c1..f4281af9 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java @@ -46,12 +46,12 @@ public class A2 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); //如果样例文件是xls格式,则转化为xlsx格式 - sampleExcelPath = DsKit.ConvertXlsToXlsx(sampleExcelPath); + sampleExcelPath = DsKit.convertXlsToXlsx(sampleExcelPath); //拷贝文件头 DsKit.copyHead(sampleExcelPath, outSheet, headerStyle); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java index 05248691..0c9b25d0 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java @@ -46,12 +46,12 @@ public class A3 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); //如果样例文件是xls格式,则转化为xlsx格式 - sampleExcelPath = DsKit.ConvertXlsToXlsx(sampleExcelPath); + sampleExcelPath = DsKit.convertXlsToXlsx(sampleExcelPath); //拷贝文件头 DsKit.copyHead(sampleExcelPath, outSheet, headerStyle); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java index 56d2ac32..9e491b33 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java @@ -46,12 +46,12 @@ public class A4 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); //如果样例文件是xls格式,则转化为xlsx格式 - sampleExcelPath = DsKit.ConvertXlsToXlsx(sampleExcelPath); + sampleExcelPath = DsKit.convertXlsToXlsx(sampleExcelPath); //拷贝文件头 DsKit.copyHead(sampleExcelPath, outSheet, headerStyle); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java index 53ae50ca..846db01d 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java @@ -46,12 +46,12 @@ public class A5 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); //如果样例文件是xls格式,则转化为xlsx格式 - sampleExcelPath = DsKit.ConvertXlsToXlsx(sampleExcelPath); + sampleExcelPath = DsKit.convertXlsToXlsx(sampleExcelPath); //拷贝文件头 DsKit.copyHead(sampleExcelPath, outSheet, headerStyle); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java index e6fc5a9b..4dc74d6c 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java @@ -46,12 +46,12 @@ public class A6 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); //如果样例文件是xls格式,则转化为xlsx格式 - sampleExcelPath = DsKit.ConvertXlsToXlsx(sampleExcelPath); + sampleExcelPath = DsKit.convertXlsToXlsx(sampleExcelPath); //拷贝文件头 DsKit.copyHead(sampleExcelPath, outSheet, headerStyle); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java index f940a81b..edec045b 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java @@ -46,12 +46,12 @@ public class A7 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); //如果样例文件是xls格式,则转化为xlsx格式 - sampleExcelPath = DsKit.ConvertXlsToXlsx(sampleExcelPath); + sampleExcelPath = DsKit.convertXlsToXlsx(sampleExcelPath); //拷贝文件头 DsKit.copyHead(sampleExcelPath, outSheet, headerStyle); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java index c442cf25..d8bb08ec 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java @@ -41,12 +41,12 @@ public class A8 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); //如果样例文件是xls格式,则转化为xlsx格式 - sampleExcelPath = DsKit.ConvertXlsToXlsx(sampleExcelPath); + sampleExcelPath = DsKit.convertXlsToXlsx(sampleExcelPath); //拷贝文件头 DsKit.copyHead(sampleExcelPath, outSheet, headerStyle); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java index bf8daa94..8927e57c 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java @@ -39,12 +39,12 @@ public class A9 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); //如果样例文件是xls格式,则转化为xlsx格式 - sampleExcelPath = DsKit.ConvertXlsToXlsx(sampleExcelPath); + sampleExcelPath = DsKit.convertXlsToXlsx(sampleExcelPath); //拷贝文件头 DsKit.copyHead(sampleExcelPath, outSheet, headerStyle); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java index eec4dc48..b4b24b26 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java @@ -37,7 +37,7 @@ public class C1 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java index acb0424c..5466dbc5 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java @@ -38,7 +38,7 @@ public class C10 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C11.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C11.java index d62965b0..396cf4e1 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C11.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C11.java @@ -37,7 +37,7 @@ public class C11 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java index 9b8229b2..8c744673 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java @@ -38,7 +38,7 @@ public class C2 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java index 19b500a1..398e4f31 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java @@ -47,7 +47,7 @@ public class C3 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java index 49f619dc..e0bbb6ef 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java @@ -47,7 +47,7 @@ public class C4 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java index 188fe435..56f7a6db 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java @@ -37,7 +37,7 @@ public class C5 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java index 03612a22..c047f24b 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java @@ -37,7 +37,7 @@ public class C6 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java index 47fd6077..93363c1c 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java @@ -32,12 +32,12 @@ public class C7 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); //如果样例文件是xls格式,则转化为xlsx格式 - sampleExcelPath = DsKit.ConvertXlsToXlsx(sampleExcelPath); + sampleExcelPath = DsKit.convertXlsToXlsx(sampleExcelPath); //拷贝文件头 DsKit.copyHead(sampleExcelPath, outSheet, headerStyle); @@ -136,7 +136,7 @@ public class C7 { System.out.println("正在进行" + cityName + "的数据填充~"); //如果源文件或者示例文件是xls格式,则转化为xlsx格式 String sourceExcel = file.getAbsolutePath(); - sourceExcel = DsKit.ConvertXlsToXlsx(sourceExcel); + sourceExcel = DsKit.convertXlsToXlsx(sourceExcel); //它的最后一个有效数据行,就是这个城市的整体数据汇总 List> sheetList = DsKit.readSheet(sourceExcel, 4);//此表格有4行表头 //第一行的数据就是整个市州的数据 diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java index 008faa47..fb1ceef8 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java @@ -33,12 +33,12 @@ public class C8 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); //如果样例文件是xls格式,则转化为xlsx格式 - sampleExcelPath = DsKit.ConvertXlsToXlsx(sampleExcelPath); + sampleExcelPath = DsKit.convertXlsToXlsx(sampleExcelPath); //拷贝文件头 DsKit.copyHead(sampleExcelPath, outSheet, headerStyle); @@ -65,7 +65,7 @@ public class C8 { System.out.println("正在进行" + cityName + "的数据填充~"); //如果源文件或者示例文件是xls格式,则转化为xlsx格式 String sourceExcel = file.getAbsolutePath(); - sourceExcel = DsKit.ConvertXlsToXlsx(sourceExcel); + sourceExcel = DsKit.convertXlsToXlsx(sourceExcel); //它的最后一个有效数据行,就是这个城市的整体数据汇总 List> sheetList = DsKit.readSheet(sourceExcel, 4);//此表格有4行表头 //第一行的数据就是整个市州的数据 diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C9.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C9.java index 6d64da70..ef655b54 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/City/C9.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C9.java @@ -39,7 +39,7 @@ public class C9 { //结果Excel XSSFWorkbook outWorkbook = new XSSFWorkbook(); //结果Sheet - XSSFSheet outSheet = DsKit.CreateSheet(outWorkbook); + XSSFSheet outSheet = DsKit.createSheet(outWorkbook); //样式 XSSFCellStyle headerStyle = DsKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = DsKit.getDataStyle(outWorkbook); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/DsKit.java b/src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/DsKit.java index d2926406..58443792 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/DsKit.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/DsKit.java @@ -31,7 +31,7 @@ public class DsKit { * @param sourceExcel * @throws IOException */ - public static String ConvertXlsToXlsx(String sourceExcel) throws IOException { + public static String convertXlsToXlsx(String sourceExcel) throws IOException { if (sourceExcel.endsWith(".xls")) { ExcelUtil.xlsChangeXlsx(sourceExcel, sourceExcel + "x"); //删除旧的文件 @@ -124,7 +124,7 @@ public class DsKit { * @param outWorkbook * @return */ - public static XSSFSheet CreateSheet(XSSFWorkbook outWorkbook) { + public static XSSFSheet createSheet(XSSFWorkbook outWorkbook) { XSSFSheet outSheet = outWorkbook.createSheet("Sheet1"); //保存Excel outSheet.setDefaultColumnWidth(20); @@ -355,7 +355,7 @@ public class DsKit { * @throws IOException */ public static List> getChartData(String docPath, int chartNumber, int skipRowCount) throws IOException, DocumentException, InterruptedException, InvalidFormatException { - DsKit.UnCompress(docPath); + DsKit.unCompress(docPath); List> data = readChartByXml(docPath, chartNumber); //需要跳过前skipRowCount行,先要判断一下是不是够跳的,不够跳的直接输出错误 if (data.size() < skipRowCount) { @@ -397,7 +397,7 @@ public class DsKit { */ public static List> readSecondTable(String filePath, int sheetIndex, String keyword, int headRows, int tableWidth) throws IOException { - filePath = ConvertXlsToXlsx(filePath); + filePath = convertXlsToXlsx(filePath); List> dataList = new ArrayList<>(); FileInputStream fis = new FileInputStream(filePath); Workbook workbook = new XSSFWorkbook(fis); @@ -483,7 +483,7 @@ public class DsKit { * * @throws IOException */ - public static void UnCompress(String wordPath) throws IOException { + public static void unCompress(String wordPath) throws IOException { if (new File(DocxUnzipDirectory).exists()) { FileUtils.deleteDirectory(new File(DocxUnzipDirectory)); } @@ -524,7 +524,7 @@ public class DsKit { */ public static List> readChartByXml(String sourceDoc, int chartNumber) throws DocumentException, IOException { //将word文件解压缩 - UnCompress(sourceDoc); + unCompress(sourceDoc); List> matrix = new ArrayList<>(); String xml = DocxUnzipDirectory + "word\\charts\\chart" + chartNumber + ".xml"; if (!(new File(xml).exists())) { diff --git a/src/main/java/com/dsideal/base/Tools/Test/CountDocxTuBiao.java b/src/main/java/com/dsideal/base/Tools/Test/CountDocxTuBiao.java index 24b577a9..d09b0a3e 100644 --- a/src/main/java/com/dsideal/base/Tools/Test/CountDocxTuBiao.java +++ b/src/main/java/com/dsideal/base/Tools/Test/CountDocxTuBiao.java @@ -32,7 +32,7 @@ public class CountDocxTuBiao { if (!file.getName().endsWith(".docx") || file.getName().startsWith("~")) continue; - DsKit.UnCompress(file.getAbsolutePath()); + DsKit.unCompress(file.getAbsolutePath()); int chartNumber; for (chartNumber = 1; ; chartNumber++) { String xml = DocxUnzipDirectory + "word\\charts\\chart" + chartNumber + ".xml"; diff --git a/src/main/java/com/dsideal/base/Tools/Test/TestDanWei.java b/src/main/java/com/dsideal/base/Tools/Test/TestDanWei.java index 00fc726f..144da26c 100644 --- a/src/main/java/com/dsideal/base/Tools/Test/TestDanWei.java +++ b/src/main/java/com/dsideal/base/Tools/Test/TestDanWei.java @@ -12,7 +12,7 @@ import java.io.IOException; public class TestDanWei { public static void main(String[] args) throws IOException, InvalidFormatException, InterruptedException, ParserConfigurationException, SAXException, XPathExpressionException, DocumentException { String sourceDoc = "c:/个旧市人口变化及其对教育的影响(定稿).docx"; - DsKit.UnCompress(sourceDoc); + DsKit.unCompress(sourceDoc); String xmlPath = DsKit.DocxUnzipDirectory + "word\\charts\\chart" + 2 + ".xml"; int mul = DsKit.getMul(xmlPath); System.out.println(mul);