huanghai
/
YunNanDsBase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'commit'

Browse Source
main
黄海 8 months ago
parent fdbbfd0326
commit 8d975a2415
27 changed files with 75 additions and 53 deletions
Show Stats Download Patch File Download Diff File

BIN
Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双.xlsx
View File

Binary file not shown.

BIN
Doc/待处理/市/【9】总人口变化及预测-双/总人口变化及预测-双【成果】.xlsx
View File

Binary file not shown.

6
src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java
Unescape View File

@ -81,14 +81,14 @@ public class A1 {
//只关心发展规模数据的表格
if (!file.getName().contains(fileNameKey)) continue;
//县区名称
String areaName = ru.getCityOrAreaName(file.getName());
String areaName = ru.getAreaName(file.getName());
//市州名称
//此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
String parentPathName = file.getParentFile().getName();
String cityName = ru.getCityOrAreaName(parentPathName);
String cityName = ru.getCityName(parentPathName);
if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
parentPathName = file.getParentFile().getParentFile().getName();
cityName = ru.getCityOrAreaName(parentPathName);
cityName = ru.getCityName(parentPathName);
}
if (StrKit.isBlank(cityName)||StrKit.isBlank(areaName)) {

2
src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java
Unescape View File

@ -70,7 +70,7 @@ public class A10 {
}
if (flag) continue;
//县区名称
String cityName = ru.getCityOrAreaName(file.getName());
String cityName = ru.getAreaName(file.getName());
if (StrKit.isBlank(cityName)) {
System.out.println("发现异常数据，请人工处理：" + file.getName());

6
src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java
Unescape View File

@ -73,14 +73,14 @@ public class A12 {
//只关心发展规模数据的表格
if (!file.getName().contains(fileNameKey)) continue;
//县区名称
String areaName = ru.getCityOrAreaName(file.getName());
String areaName = ru.getCityName(file.getName());
//市州名称
//此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
String parentPathName = file.getParentFile().getName();
String cityName = ru.getCityOrAreaName(parentPathName);
String cityName = ru.getAreaName(parentPathName);
if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
parentPathName = file.getParentFile().getParentFile().getName();
cityName = ru.getCityOrAreaName(parentPathName);
cityName = ru.getAreaName(parentPathName);
}
if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {

6
src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java
Unescape View File

@ -81,14 +81,14 @@ public class A2 {
//只关心发展规模数据的表格
if (!file.getName().contains(fileNameKey)) continue;
//县区名称
String areaName = ru.getCityOrAreaName(file.getName());
String areaName = ru.getAreaName(file.getName());
//市州名称
//此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
String parentPathName = file.getParentFile().getName();
String cityName = ru.getCityOrAreaName(parentPathName);
String cityName = ru.getCityName(parentPathName);
if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
parentPathName = file.getParentFile().getParentFile().getName();
cityName = ru.getCityOrAreaName(parentPathName);
cityName = ru.getCityName(parentPathName);
}
if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {

6
src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java
Unescape View File

@ -81,14 +81,14 @@ public class A3 {
//只关心发展规模数据的表格
if (!file.getName().contains(fileNameKey)) continue;
//县区名称
String areaName = ru.getCityOrAreaName(file.getName());
String areaName = ru.getAreaName(file.getName());
//市州名称
//此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
String parentPathName = file.getParentFile().getName();
String cityName = ru.getCityOrAreaName(parentPathName);
String cityName = ru.getCityName(parentPathName);
if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
parentPathName = file.getParentFile().getParentFile().getName();
cityName = ru.getCityOrAreaName(parentPathName);
cityName = ru.getCityName(parentPathName);
}
if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {

6
src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java
Unescape View File

@ -81,14 +81,14 @@ public class A4 {
//只关心发展规模数据的表格
if (!file.getName().contains(fileNameKey)) continue;
//县区名称
String areaName = ru.getCityOrAreaName(file.getName());
String areaName = ru.getAreaName(file.getName());
//市州名称
//此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
String parentPathName = file.getParentFile().getName();
String cityName = ru.getCityOrAreaName(parentPathName);
String cityName = ru.getCityName(parentPathName);
if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
parentPathName = file.getParentFile().getParentFile().getName();
cityName = ru.getCityOrAreaName(parentPathName);
cityName = ru.getCityName(parentPathName);
}
if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {

6
src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java
Unescape View File

@ -81,14 +81,14 @@ public class A5 {
//只关心发展规模数据的表格
if (!file.getName().contains(fileNameKey)) continue;
//县区名称
String areaName = ru.getCityOrAreaName(file.getName());
String areaName = ru.getAreaName(file.getName());
//市州名称
//此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
String parentPathName = file.getParentFile().getName();
String cityName = ru.getCityOrAreaName(parentPathName);
String cityName = ru.getCityName(parentPathName);
if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
parentPathName = file.getParentFile().getParentFile().getName();
cityName = ru.getCityOrAreaName(parentPathName);
cityName = ru.getCityName(parentPathName);
}
if (StrKit.isBlank(cityName)||StrKit.isBlank(areaName)) {

6
src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java
Unescape View File

@ -81,14 +81,14 @@ public class A6 {
//只关心发展规模数据的表格
if (!file.getName().contains(fileNameKey)) continue;
//县区名称
String areaName = ru.getCityOrAreaName(file.getName());
String areaName = ru.getAreaName(file.getName());
//市州名称
//此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
String parentPathName = file.getParentFile().getName();
String cityName = ru.getCityOrAreaName(parentPathName);
String cityName = ru.getCityName(parentPathName);
if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
parentPathName = file.getParentFile().getParentFile().getName();
cityName = ru.getCityOrAreaName(parentPathName);
cityName = ru.getCityName(parentPathName);
}
if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {

6
src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java
Unescape View File

@ -81,14 +81,14 @@ public class A7 {
//只关心发展规模数据的表格
if (!file.getName().contains(fileNameKey)) continue;
//县区名称
String areaName = ru.getCityOrAreaName(file.getName());
String areaName = ru.getAreaName(file.getName());
//市州名称
//此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
String parentPathName = file.getParentFile().getName();
String cityName = ru.getCityOrAreaName(parentPathName);
String cityName = ru.getCityName(parentPathName);
if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
parentPathName = file.getParentFile().getParentFile().getName();
cityName = ru.getCityOrAreaName(parentPathName);
cityName = ru.getCityName(parentPathName);
}
if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {

6
src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java
Unescape View File

@ -75,14 +75,14 @@ public class A8 {
//只关心发展规模数据的表格
if (!file.getName().contains(fileNameKey)) continue;
//县区名称
String areaName = ru.getCityOrAreaName(file.getName());
String areaName = ru.getAreaName(file.getName());
//市州名称
//此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
String parentPathName = file.getParentFile().getName();
String cityName = ru.getCityOrAreaName(parentPathName);
String cityName = ru.getCityName(parentPathName);
if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
parentPathName = file.getParentFile().getParentFile().getName();
cityName = ru.getCityOrAreaName(parentPathName);
cityName = ru.getCityName(parentPathName);
}
if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {

6
src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java
Unescape View File

@ -73,14 +73,14 @@ public class A9 {
//只关心发展规模数据的表格
if (!file.getName().contains(fileNameKey)) continue;
//县区名称
String areaName = ru.getCityOrAreaName(file.getName());
String areaName = ru.getAreaName(file.getName());
//市州名称
//此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
String parentPathName = file.getParentFile().getName();
String cityName = ru.getCityOrAreaName(parentPathName);
String cityName = ru.getCityName(parentPathName);
if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
parentPathName = file.getParentFile().getParentFile().getName();
cityName = ru.getCityOrAreaName(parentPathName);
cityName = ru.getCityName(parentPathName);
}
if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {

2
src/main/java/com/dsideal/base/Tools/FillData/City/C1.java
Unescape View File

@ -53,7 +53,7 @@ public class C1 {
//判断file是不是目录，是目录的需要跳过
if (file.isDirectory()) continue;
//城市名称
String cityName = ru.getCityOrAreaName(file.getName());
String cityName = ru.getCityName(file.getName());
String fileName = file.getName();
//判断是否为docx文件

2
src/main/java/com/dsideal/base/Tools/FillData/City/C10.java
Unescape View File

@ -59,7 +59,7 @@ public class C10 {
//判断file是不是目录，是目录的需要跳过
if (file.isDirectory()) continue;
//城市名称
String cityName = ru.getCityOrAreaName(file.getName());
String cityName = ru.getCityName(file.getName());
String fileName = file.getName();
//判断是否为docx文件

2
src/main/java/com/dsideal/base/Tools/FillData/City/C11.java
Unescape View File

@ -58,7 +58,7 @@ public class C11 {
//判断file是不是目录，是目录的需要跳过
if (file.isDirectory()) continue;
//城市名称
String cityName = ru.getCityOrAreaName(file.getName());
String cityName = ru.getCityName(file.getName());
String fileName = file.getName();
//判断是否为docx文件

2
src/main/java/com/dsideal/base/Tools/FillData/City/C2.java
Unescape View File

@ -59,7 +59,7 @@ public class C2 {
//判断file是不是目录，是目录的需要跳过
if (file.isDirectory()) continue;
//城市名称
String cityName = ru.getCityOrAreaName(file.getName());
String cityName = ru.getCityName(file.getName());
String fileName = file.getName();
//判断是否为docx文件

2
src/main/java/com/dsideal/base/Tools/FillData/City/C3.java
Unescape View File

@ -63,7 +63,7 @@ public class C3 {
//判断file是不是目录，是目录的需要跳过
if (file.isDirectory()) continue;
//城市名称
String cityName = ru.getCityOrAreaName(file.getName());
String cityName = ru.getCityName(file.getName());
String fileName = file.getName();
//判断是否为docx文件

2
src/main/java/com/dsideal/base/Tools/FillData/City/C4.java
Unescape View File

@ -68,7 +68,7 @@ public class C4 {
//判断file是不是目录，是目录的需要跳过
if (file.isDirectory()) continue;
//城市名称
String cityName = ru.getCityOrAreaName(file.getName());
String cityName = ru.getCityName(file.getName());
String fileName = file.getName();
//判断是否为docx文件

2
src/main/java/com/dsideal/base/Tools/FillData/City/C5.java
Unescape View File

@ -58,7 +58,7 @@ public class C5 {
//判断file是不是目录，是目录的需要跳过
if (file.isDirectory()) continue;
//城市名称
String cityName = ru.getCityOrAreaName(file.getName());
String cityName = ru.getCityName(file.getName());
String fileName = file.getName();
//判断是否为docx文件

2
src/main/java/com/dsideal/base/Tools/FillData/City/C6.java
Unescape View File

@ -58,7 +58,7 @@ public class C6 {
//判断file是不是目录，是目录的需要跳过
if (file.isDirectory()) continue;
//城市名称
String cityName = ru.getCityOrAreaName(file.getName());
String cityName = ru.getCityName(file.getName());
String fileName = file.getName();
//判断是否为docx文件

2
src/main/java/com/dsideal/base/Tools/FillData/City/C7.java
Unescape View File

@ -127,7 +127,7 @@ public class C7 {
//判断file是不是目录，是目录的需要跳过
if (file.isDirectory()) continue;
//城市名称
String cityName = ru.getCityOrAreaName(file.getName());
String cityName = ru.getCityName(file.getName());
if (StrKit.isBlank(cityName)) {
System.out.println("发现异常数据，请人工处理：" + file.getName());
System.exit(0);

2
src/main/java/com/dsideal/base/Tools/FillData/City/C8.java
Unescape View File

@ -58,7 +58,7 @@ public class C8 {
//判断file是不是目录，是目录的需要跳过
if (file.isDirectory()) continue;
//城市名称
String cityName = ru.getCityOrAreaName(file.getName());
String cityName = ru.getCityName(file.getName());
if (StrKit.isBlank(cityName)) {
System.out.println("发现异常数据，请人工处理：" + file.getName());
System.exit(0);

2
src/main/java/com/dsideal/base/Tools/FillData/City/C9.java
Unescape View File

@ -60,7 +60,7 @@ public class C9 {
//判断是否为docx文件
if (fileName.endsWith(".docx") && !fileName.startsWith("~")) {
//城市名称
String cityName = ru.getCityOrAreaName(file.getName());
String cityName = ru.getCityName(file.getName());
if (StrKit.isBlank(cityName)) {
System.out.println("文件名无法解析为城市：" + fileName);
System.exit(0);

2
src/main/java/com/dsideal/base/Tools/FillData/Test/TestBadExcel.java
Unescape View File

@ -44,7 +44,7 @@ public class TestBadExcel {
//判断file是不是目录，是目录的需要跳过
if (file.isDirectory()) continue;
//城市名称
String cityName = ru.getCityOrAreaName(file.getName());
String cityName = ru.getCityName(file.getName());
String fileName = file.getName();
//判断是否为docx文件

2
src/main/java/com/dsideal/base/Tools/Step4_ReaderWord.java
Unescape View File

@ -33,7 +33,7 @@ public class Step4_ReaderWord {
String extension = file.getName().substring(file.getName().lastIndexOf(".") + 1);
if (!extension.equals("docx")) continue;
//城市名称
String cityName = ru.getCityOrAreaName(file.getName());
String cityName = ru.getCityName(file.getName());
if(cityName!=null && cityName.equals("迪庆藏族自治州")){
ru.doOne(file, cityName, excelDir);
}

40
src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java
Unescape View File

@ -42,17 +42,9 @@ public class ReadDocxUtil {
* @param fileName
* @return
*/
public String getCityOrAreaName(String fileName) {
public String getCityName(String fileName) {
//云南省下所有城市
List<String> listCity = getCityNameList();
List<Record> listAreaRecord = dm.getProvinceArea(privinceName);
List<String> listArea = new ArrayList<>();
for (Record record : listAreaRecord) {
listArea.add(record.getStr("area_name"));
}
//合并下listArea,listCity
listCity.addAll(listArea);
//城市名称的前两位一样就视为一样
String top2= fileName.substring(0,2);
@ -72,6 +64,36 @@ public class ReadDocxUtil {
return cityName;
}
/**
* 根据文件名获取县区名称
* @param fileName
* @return
*/
public String getAreaName(String fileName) {
List<Record> listAreaRecord = dm.getProvinceArea(privinceName);
List<String> listCity = new ArrayList<>();
for (Record record : listAreaRecord) {
listCity.add(record.getStr("area_name"));
}
//城市名称的前两位一样就视为一样
String top2= fileName.substring(0,2);
//判断是哪个城市
boolean found = false;
String areaName = "";
for (String s : listCity) {
if (s.startsWith(top2)) {
found = true;
areaName = s;
}
}
if (!found) {
System.out.println(fileName + "未找到匹配的县区");
return null;
}
return areaName;
}
/**
* 解析word文档，提取其中的图表表格，并保存为excel文件
*

Write Preview
Loading…
Cancel
Save