From 570f08b135fd85c7f61a84fd676264d10cd85a00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Mon, 11 Nov 2024 15:53:30 +0800 Subject: [PATCH] 'commit' --- ...¦å‰æ•™è‚²å…¥å›­æ€»é‡å˜åŒ–åŠé¢„测.xlsx | Bin 12429 -> 12429 bytes ...¥å›­æ€»é‡å˜åŒ–åŠé¢„测ã€æˆæžœã€‘.xlsx | Bin 50961 -> 50961 bytes .../dsideal/base/Tools/FillData/City/C1.java | 37 ++++++------------ .../Tools/FillData/ExcelKit/ExcelKit.java | 36 ++++++++++++----- 4 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Doc/待处ç†/市/ã€1】学å‰æ•™è‚²å…¥å›­æ€»é‡å˜åŒ–åŠé¢„测/å­¦å‰æ•™è‚²å…¥å›­æ€»é‡å˜åŒ–åŠé¢„测.xlsx b/Doc/待处ç†/市/ã€1】学å‰æ•™è‚²å…¥å›­æ€»é‡å˜åŒ–åŠé¢„测/å­¦å‰æ•™è‚²å…¥å›­æ€»é‡å˜åŒ–åŠé¢„测.xlsx index 3d5b7f387e3f23606cba5fdcd094087900c300ed..738ce546fbba10a6efcfdfc29b222d093cd3e2e7 100644 GIT binary patch delta 177 zcmeB8>`mke@MdNaVc_84U|3$ak!K%jCj zjt5*I^)rOyS%LK8pAt+U?r$kAu(Z0&Y(XG@@)2Eo5XGuz4x;SzY(P|vo-K<p}F- dqvrsY)3*dsmHJ@8UHaA_-gkXB5M^)R2LSGzKZ^hW delta 177 zcmeB8>`mke@MdNaVc_84VE9(Kk!K%jCj zjt5*I^)rOyS%LK8pAt+U?r$kAu(Z0&Y(XG@@)2Eo5XGuz4x;SzY(P|vo-K<p}F- dqvrsY)3*dsmHJ@8UHaA_-gkXB5M^)R2LSl$Mdttj diff --git a/Doc/待处ç†/市/ã€1】学å‰æ•™è‚²å…¥å›­æ€»é‡å˜åŒ–åŠé¢„测/å­¦å‰æ•™è‚²å…¥å›­æ€»é‡å˜åŒ–åŠé¢„测ã€æˆæžœã€‘.xlsx b/Doc/待处ç†/市/ã€1】学å‰æ•™è‚²å…¥å›­æ€»é‡å˜åŒ–åŠé¢„测/å­¦å‰æ•™è‚²å…¥å›­æ€»é‡å˜åŒ–åŠé¢„测ã€æˆæžœã€‘.xlsx index 84ed797312c1f1354ccf3633d1d53c0d1a6997db..24dc2b9f3c5bb66a051468a07f7214b9064cade0 100644 GIT binary patch delta 285 zcmbQ($2_r*nJ2)TnMH(wgM))%W!*-eDn_Q2b(=dFr9kxLB~0f*R4KC|W9;PR%uDOF z#P$4K9=`nctWMHS_RF8r#w9EJveaZgH5hd=iP`1cIZ^&8A}(&L^(B$Yjh>pl%g>&_ z;d%1Kvz<-xe>Z=4oflIqD1Iq<)BfG_c5aP1IN#KKet$zL*)`db z3`jr($liRKMUWHZz^Yj+J%U iksymEcR<7r9(4doF(0!8QFh0yK~(iIHxPCBm>&T1{%>vo delta 285 zcmbQ($2_r*nJ2)TnMH(wgM)+NN99JIDn_Osm76;lr9kxLB~0f*R4KC|WAxBP+GICS~#*}q0LRxf_OX7UV{z3OA}gfUf!Rj200j*0J|6c$%rediJU#C2wnl>hAc zhE<17ecIU+|9A6;*Lg9;g5sBwH|^g&Z|BySgY!+z=LdMRbJ$7$=VE1KVAue}$gatb zWIzHUK=$U-EP|XM2j1iT0e0vOelalpK>+OF%{)STHi2Ax>WDpv;y!8)qFj#JaQvvu ijs#gWxdS40@Tdbwiusr&h_X9o4Wg=#xq+y|$NT`NTy$gr 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 bdf791fa..0dbf1193 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 @@ -16,6 +16,7 @@ import org.apache.poi.xwpf.usermodel.XWPFDocument; import java.io.*; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class C1 { @@ -45,7 +46,8 @@ public class C1 { //åº”ç”¨æ ·å¼ XSSFCellStyle headerStyle = ExcelKit.getHeaderStyle(outWorkbook); XSSFCellStyle dataStyle = ExcelKit.getDataStyle(outWorkbook); - //æ‹·è´æ–‡ä»¶å¤´ï¼Œç¬¬ä¸€è¡Œ + + //æ‹·è´æ–‡ä»¶å¤´ ExcelKit.CopyHead(sampleExcelPath, outSheet, headerStyle); //找到parentPath下一级目录中所有文件 @@ -81,25 +83,16 @@ public class C1 { //é历source1 for (int i = 0; i < source1.size(); i++) { List r = source1.get(i); - rowIndex++; - Row outRow = outSheet.createRow(rowIndex); + Row outRow = outSheet.createRow(++rowIndex); // 需è¦å†™æ­»åˆ—的对应关系 - outRow.createCell(0).setCellValue(r.getFirst());//年份 - outRow.createCell(1).setCellValue("总入园数");//总é‡åˆ†ç±» - outRow.createCell(2).setCellValue("");//区域分类 - outRow.createCell(3).setCellValue(r.get(4));//总é‡æ•°å€¼ - outRow.createCell(4).setCellValue("");//区域数值 - outRow.createCell(5).setCellValue(cityName);//行政区划 - outRow.createCell(6).setCellValue("云å—çœ");//上级行政区划 - //åº”ç”¨ä¸€ä¸‹æ ·å¼ - ExcelKit.applyStyle(outRow, 0, 6, dataStyle); + ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(r.getFirst(), "总入园数", "", r.get(4), "", cityName, "云å—çœ")), dataStyle); + //年份,总é‡åˆ†ç±»,区域分类,总é‡æ•°å€¼,区域数值,行政区划,上级行政区划 } //é历source2 for (int i = 0; i < source2.size(); i++) { if (i == 0) continue;//跳过2022年，这个年份é‡å¤äº† List r = source2.get(i); - rowIndex++; - Row outRow = outSheet.createRow(rowIndex); + Row outRow = outSheet.createRow(++rowIndex); // 需è¦å†™æ­»åˆ—的对应关系 outRow.createCell(0).setCellValue(r.getFirst());//年份 outRow.createCell(1).setCellValue("总入园数");//总é‡åˆ†ç±» @@ -115,8 +108,7 @@ public class C1 { //2022年基数:é历source2 for (int i = 0; i < source2.size(); i++) { List r = source2.get(i); - rowIndex++; - Row outRow = outSheet.createRow(rowIndex); + Row outRow = outSheet.createRow(++rowIndex); // 需è¦å†™æ­»åˆ—的对应关系 outRow.createCell(0).setCellValue(r.getFirst());//年份 outRow.createCell(1).setCellValue("2022年基数");//基数 @@ -140,8 +132,7 @@ public class C1 { for (int i = 0; i < source1.size(); i++) { List r = source1.get(i); - rowIndex++; - Row outRow = outSheet.createRow(rowIndex); + Row outRow = outSheet.createRow(++rowIndex); // 需è¦å†™æ­»åˆ—的对应关系 outRow.createCell(0).setCellValue(r.getFirst());//年份 outRow.createCell(1).setCellValue("");//总é‡åˆ†ç±» @@ -156,18 +147,13 @@ public class C1 { for (int i = 0; i < source2.size(); i++) { if (i == 0) continue; List r = source2.get(i); - rowIndex++; - Row outRow = outSheet.createRow(rowIndex); + Row outRow = outSheet.createRow(++rowIndex); // 需è¦å†™æ­»åˆ—的对应关系 outRow.createCell(0).setCellValue(r.getFirst());//年份 outRow.createCell(1).setCellValue("");//基数 outRow.createCell(2).setCellValue(areaName);//区域分类 outRow.createCell(3).setCellValue("");//总é‡æ•°å€¼ - if (k + 1 < r.size()) { - outRow.createCell(4).setCellValue(r.get(k + 1));//区域数值 - } else { - outRow.createCell(4).setCellValue("");//区域数值 - } + outRow.createCell(4).setCellValue(r.get(k + 1));//区域数值 outRow.createCell(5).setCellValue(cityName);//行政区划 outRow.createCell(6).setCellValue("云å—çœ");//上级行政区划 @@ -176,6 +162,7 @@ public class C1 { } } } + System.out.println("正在处ç†" + cityName + "市州文件..."); } } 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 c0142b06..8c838f9e 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 @@ -117,14 +117,14 @@ public class ExcelKit { //é历输出sheet的内容 int rowIndex = 0; // é历工作表中的所有行 - if(sheet==null) return array; + if (sheet == null) return array; for (Row row : sheet) { rowIndex++; if (rowIndex == 1) continue;//第一行为表头 if (row == null) break; if (row.getCell(0) == null) break; - if (StrKit.isBlank(readCell(row.getCell(0)))){ + if (StrKit.isBlank(readCell(row.getCell(0)))) { break; } // é历行中的所有å•å…ƒæ ¼ @@ -140,6 +140,7 @@ public class ExcelKit { /** * 读å–å•å…ƒæ ¼ + * * @param cell */ public static String readCell(Cell cell) { @@ -188,6 +189,7 @@ public class ExcelKit { return cell.toString(); } } + /** * 将数æ®æ ·å¼åº”用到指定的å•å…ƒæ ¼ * @@ -202,44 +204,58 @@ public class ExcelKit { } } + /** + * å¡«å……æ•°æ® + * + * @param outRow + * @param stringList + */ + public static void putData(Row outRow, List stringList, XSSFCellStyle dataStyle) { + for (int i = 0; i < stringList.size(); i++) { + outRow.createCell(i).setCellValue(stringList.get(i)); + } + //åº”ç”¨ä¸€ä¸‹æ ·å¼ + applyStyle(outRow, 0, stringList.size()-1, dataStyle); + } /** * 对图表Listé‡æ–°æŽ’åº - * @param affCharts doc.getCharts() + * + * @param affCharts doc.getCharts() * @return */ public static List getSortListForXWPFChart(List affCharts) { List charts = new ArrayList<>(); int itNumber = 0; //计数器 int oldNumber = 0; //å…¥å‚计数器 - while (itNumber < affCharts.size()){ + while (itNumber < affCharts.size()) { // 从oldCharts.get(0)开始检索,获å–排åºç”¨å›¾è¡¨å String name = affCharts.get(oldNumber).getPackagePart().getPartName().toString(); // 获å–æ­¤å›¾è¡¨æŽ’åº String chartsNum = "";// 图表åºå· boolean flag = false; // 上一个是å¦ä¸ºæ•°å­— for (int i = 0; i < name.length(); i++) { - if (chartsNum.equals("") && name.charAt(i)>=48 && name.charAt(i)<=57 ){ + if (chartsNum.equals("") && name.charAt(i) >= 48 && name.charAt(i) <= 57) { chartsNum += name.charAt(i); flag = true; - }else if ( flag && name.charAt(i)>=48 && name.charAt(i)<=57){ + } else if (flag && name.charAt(i) >= 48 && name.charAt(i) <= 57) { chartsNum += name.charAt(i); flag = true; - }else { + } else { flag = false; } } //对比图表åºå·æ•°å­— int thisChartNum = Integer.parseInt(chartsNum); - if (thisChartNum == itNumber+1){ //如果相等则加入返回list,且itNumber++ + if (thisChartNum == itNumber + 1) { //如果相等则加入返回list,且itNumber++ charts.add(affCharts.get(oldNumber)); itNumber++; } //å…¥å‚计数器+1 如果达到最大值则é‡ç½®ä¸º0 - if (oldNumber == affCharts.size()-1){ + if (oldNumber == affCharts.size() - 1) { oldNumber = 0; - }else{ + } else { oldNumber++; } }