From aaa61ded1ea3dcaeea4ed9a9a9be1eb9af3bfbc4 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:10:08 +0800 Subject: [PATCH] 'commit' --- .../总人口变化及预测-双.xlsx | Bin 8977 -> 8977 bytes ...人口变化及预测-双【成果】.xlsx | Bin 9784 -> 10402 bytes .../dsideal/base/Tools/FillData/City/C9.java | 10 +++++----- .../dsideal/base/Tools/Util/ReadDocxUtil.java | 5 ++++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双.xlsx b/Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双.xlsx index cb07a8896096955df667a60a5ca1a64e8f05ce58..d62a0fc122ba280680256ef667a3bb2a6ab5a29e 100644 GIT binary patch delta 200 zcmbQ}HqnhYz?+#xgn@&DgMq)XXd~}LMrI(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@0AOM}o&W#< delta 200 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 delta 7429 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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 b5622664..03f6c611 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 @@ -55,12 +55,12 @@ public class C9 { for (File file : files) { //判断file是不是目录,是目录的需要跳过 if (file.isDirectory()) continue; - //城市名称 - String cityName = ru.getCityOrAreaName(file.getName()); String fileName = file.getName(); //判断是否为docx文件 if (fileName.endsWith(".docx") && !fileName.startsWith("~")) { + //城市名称 + String cityName = ru.getCityOrAreaName(file.getName()); if (StrKit.isBlank(cityName)) { System.out.println("文件名无法解析为城市:" + fileName); System.exit(0); @@ -82,13 +82,13 @@ public class C9 { double value = Double.parseDouble(r.get(1)); if (year < 2023) { - ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList( "云南省",cityName, r.getFirst().substring(0, 4), String.format("%.2f", value), "")), dataStyle); + ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList("云南省", cityName, r.getFirst().substring(0, 4), String.format("%.2f", value), "")), dataStyle); } if (year > 2023) { - ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList("云南省",cityName, r.getFirst().substring(0, 4), "", String.format("%.2f", value))), dataStyle); + ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList("云南省", cityName, r.getFirst().substring(0, 4), "", String.format("%.2f", value))), dataStyle); } if (year == 2023) { - ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList("云南省",cityName, r.getFirst().substring(0, 4), String.format("%.2f", value), String.format("%.2f", value))), dataStyle); + ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList("云南省", cityName, r.getFirst().substring(0, 4), String.format("%.2f", value), String.format("%.2f", value))), dataStyle); } } } diff --git a/src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java b/src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java index 34fc0538..b99ee94c 100644 --- a/src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java +++ b/src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java @@ -53,11 +53,14 @@ public class ReadDocxUtil { //合并下listArea,listCity listCity.addAll(listArea); + //城市名称的前两位一样就视为一样 + String top2= fileName.substring(0,2); + //判断是哪个城市 boolean found = false; String cityName = ""; for (String s : listCity) { - if (fileName.contains(s)) { + if (s.startsWith(top2)) { found = true; cityName = s; }