From 18a5f57f62dd7c79b8177d23da9ce5b0f4e1dc8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Mon, 18 Nov 2024 16:14:06 +0800 Subject: [PATCH] 'commit' --- .../总人口变化及预测-双.xlsx | Bin 8977 -> 8977 bytes ...人口变化及预测-双【成果】.xlsx | Bin 10402 -> 10400 bytes .../dsideal/base/Tools/FillData/City/C9.java | 4 +++- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双.xlsx b/Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双.xlsx index d62a0fc122ba280680256ef667a3bb2a6ab5a29e..7e76aba4c6fd62aca71f7766f7b0e62f8a162d2b 100644 GIT binary patch delta 156 zcmbQ}Hqnhcz?+#xgn@&DgJJ1L?#YadOE=GF)CN(fnNmQM0ZTrJTELnHqS)D+KvWmU z4lW?&ES$g!q?Sl9G6AV&Qeb_Tq)S*Bmriz9Z~&4W3Kl@}pn@%s{I6gKB<&PI;`NG- ZAaO-2Ao&L@Vyk2WWLGJ<1Ia^5{s6)DGjsp| delta 156 zcmbQ}Hqnhcz?+#xgn@&DgMoh|_hd#!{>}3lwL#QrrW6omz>*K57OknN4nVR)!2(DgRImk-{}t?jq@5y2yk5}} ZB(7)$B>#X#Y?W+)>?$R9AbCj19{?{SCXfIC diff --git a/Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双【成果】.xlsx b/Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双【成果】.xlsx index 4a6f04ce6bd25da6e203e11b4e10c36b76cac7dc..4972d9b9c07752457cd82be3b059f310523e96e4 100644 GIT binary patch delta 1794 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 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 03f6c611..9be9ae3c 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 @@ -65,7 +65,7 @@ public class C9 { System.out.println("文件名无法解析为城市:" + fileName); System.exit(0); } - System.out.println("正在处理" + cityName + "市州文件..."); + System.out.println("正在处理" + cityName + "..."); //数据在图表1 int chartNumber = 1; //chartNumber:第几个图表 @@ -73,8 +73,10 @@ public class C9 { //expectLimit:期望的数据行数,首先用POI进行解析,如果获取的行数大于预期行数,就是正确的,否则就需要二次调用python进行读取 List> source = ExcelKit.getChartData(file.getAbsolutePath(), chartNumber - 1, 6); + System.out.println("当前城市数据条目数量=" + source.size()); //遍历source for (List r : source) { + Row outRow = outSheet.createRow(++rowIndex); // 导出数据 //上级行政区划,行政区划,年份,总人口变化,总人口预测