From 4a37e3ca1225e635bdf1263ad0d6f01d737189e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Wed, 20 Nov 2024 10:51:00 +0800 Subject: [PATCH] 'commit' --- .../人口总体情况【成果】.xlsx | Bin 0 -> 5383 bytes .../总人口变化及预测-双.xlsx | Bin 8977 -> 8977 bytes ...人口变化及预测-双【成果】.xlsx | Bin 10669 -> 10215 bytes .../dsideal/base/Tools/FillData/City/C10.java | 5 +++-- .../dsideal/base/Tools/FillData/City/C9.java | 8 ++------ 5 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 Doc/待处理/市/【8】人口总体情况/人口总体情况【成果】.xlsx diff --git a/Doc/待处理/市/【8】人口总体情况/人口总体情况【成果】.xlsx b/Doc/待处理/市/【8】人口总体情况/人口总体情况【成果】.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..3a7ec67e6433463cdd14712f0ba1820b2d91c136 GIT binary patch literal 5383 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 J6;R`T{SOOt6YT&1 literal 0 HcmV?d00001 diff --git a/Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双.xlsx b/Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双.xlsx index 16c5f39d81b6be515992a51c60ccc47b035efb04..5a87ed004661727e07c39b45127c4f5c07b6947f 100644 GIT binary patch delta 200 zcmbQ}HqnhYz?+#xgn@&DgTXVbWFzlHMrI(rc_E`FgmIQB3BoX9$%QZ$v8F&6oa_w{ zMi0j}F0d|F;W$<>W0}N%h|~%xs5w`pi&#KXlRXvez;u^_8JIq-U=5}j6>Y$@gCaz} cQPCbEuV?|L|3Ss=m8`)08YNdSeMHF@0PO!g6aWAK delta 200 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 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 017da9b9..12266b13 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 @@ -67,7 +67,7 @@ public class C10 { List> source1 = ExcelKit.getChartData(file.getAbsolutePath(), firstChartNumber , 6);//从2017年开始 - List> source3 = ExcelKit.getChartData(file.getAbsolutePath(), secondChartNumber , 2); + List> source2 = ExcelKit.getChartData(file.getAbsolutePath(), secondChartNumber , 2); ;//从2023年开始 //遍历source1 @@ -76,6 +76,7 @@ public class C10 { // 导出数据 //上级行政区划,行政区划,年份,城镇人口变化,城镇人口预测,乡村人口变化,乡村人口预测 + if(r.getFirst().equals("0"))continue; int year = Integer.parseInt(r.getFirst().substring(0, 4)); //城镇 double cvalue = Double.parseDouble(r.get(1)); @@ -88,7 +89,7 @@ public class C10 { } //遍历source3 - for (List r : source3) { + for (List r : source2) { if(r.isEmpty()) break; // 导出数据 //上级行政区划,行政区划,年份,城镇人口变化,城镇人口预测,乡村人口变化,乡村人口预测 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 39d694a6..84400e8f 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 @@ -72,17 +72,13 @@ public class C9 { //chartNumber:第几个图表 //skipRowCount:跳过的行数,2017年开始,第一行是表头,第二行开始是2022,所以填写了跳过6行 //expectLimit:期望的数据行数,首先用POI进行解析,如果获取的行数大于预期行数,就是正确的,否则就需要二次调用python进行读取 - List> source = ExcelKit.getChartData(file.getAbsolutePath(), chartNumber - 1, 6); - - - System.out.println("当前城市数据条目数量=" + source.size()); - ExcelKit.printTable(source); + List> source = ExcelKit.getChartData(file.getAbsolutePath(), chartNumber , 6); //遍历source for (List r : source) { - Row outRow = outSheet.createRow(++rowIndex); // 导出数据 //上级行政区划,行政区划,年份,总人口变化,总人口预测 + if(r.getFirst().equals("0")) continue; int year = Integer.parseInt(r.getFirst().substring(0, 4)); double value = Double.parseDouble(r.get(1));