From fd9318895ee12f6939ecd87296962feb33e9a0ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 12 Nov 2024 10:15:45 +0800
Subject: [PATCH] 'commit'

---
 .../【昭通市】人口总体情况.xlsx    | Bin 9822 -> 0 bytes
 .../人口总体情况.xlsx                   | Bin 0 -> 8564 bytes
 .../人口总体情况【成果】.xlsx       | Bin 0 -> 5231 bytes
 .../市/【8】人口总体情况/说明.txt  |   6 +
 .../dsideal/base/Tools/FillData/City/C8.java  | 103 +++++++++++
 .../base/Tools/FillData/Test/C7_Test.java     | 162 ------------------
 6 files changed, 109 insertions(+), 162 deletions(-)
 delete mode 100644 Doc/待处理/市/【8】人口总体情况/【昭通市】人口总体情况.xlsx
 create mode 100644 Doc/待处理/市/【8】人口总体情况/人口总体情况.xlsx
 create mode 100644 Doc/待处理/市/【8】人口总体情况/人口总体情况【成果】.xlsx
 create mode 100644 src/main/java/com/dsideal/base/Tools/FillData/City/C8.java
 delete mode 100644 src/main/java/com/dsideal/base/Tools/FillData/Test/C7_Test.java

diff --git a/Doc/待处理/市/【8】人口总体情况/【昭通市】人口总体情况.xlsx b/Doc/待处理/市/【8】人口总体情况/【昭通市】人口总体情况.xlsx
deleted file mode 100644
index 1041edc9c86a8e726eeeb942de77caaae1fbc79c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9822
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
HN8JAbiiH8d

diff --git a/Doc/待处理/市/【8】人口总体情况/人口总体情况.xlsx b/Doc/待处理/市/【8】人口总体情况/人口总体情况.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..89438448c56c8ddb05ba2550775fcbd46ab615e7
GIT binary patch
literal 8564
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

literal 0
HcmV?d00001

diff --git a/Doc/待处理/市/【8】人口总体情况/人口总体情况【成果】.xlsx b/Doc/待处理/市/【8】人口总体情况/人口总体情况【成果】.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..b9ebb539c3cef3a04d204ceddcf860d36c7d6f1c
GIT binary patch
literal 5231
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

literal 0
HcmV?d00001

diff --git a/Doc/待处理/市/【8】人口总体情况/说明.txt b/Doc/待处理/市/【8】人口总体情况/说明.txt
index 07727059..067cd1dc 100644
--- a/Doc/待处理/市/【8】人口总体情况/说明.txt
+++ b/Doc/待处理/市/【8】人口总体情况/说明.txt
@@ -2,5 +2,11 @@
 
 城镇化率 = 城镇人口 / 总人口   保留两位小数
 
+总人口:B
+城镇人口:D
+乡村人口:E
+城镇化率:计算，
+
+每项需要除以10000
 
 单位：万人
\ No newline at end of file
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java
new file mode 100644
index 00000000..f3954bfb
--- /dev/null
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java
@@ -0,0 +1,103 @@
+package com.dsideal.base.Tools.FillData.City;
+
+import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
+import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
+import com.dsideal.base.Tools.Util.ReadDocxUtil;
+import com.jfinal.kit.StrKit;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+public class C8 {
+
+    //示例Excel
+    static String sampleExcelPath = "D:\\dsWork\\YunNanDsBase\\Doc\\待处理\\市\\【8】人口总体情况\\人口总体情况.xlsx";
+
+    //源文件
+    static String parentPath = "D:\\dsWork\\YunNanDsBase\\Doc\\全省及州市县区人口与教育报告集20241023\\2023年数据更新表\\16州市数据更新表汇总20241021";
+
+    public static void main(String[] args) throws IOException, InvalidFormatException {
+        //初始化数据库连接
+        LocalMysqlConnectUtil.Init();
+        //实例化
+        ReadDocxUtil ru = new ReadDocxUtil();
+
+        //结果Excel
+        XSSFWorkbook outWorkbook = new XSSFWorkbook();
+        //结果Sheet
+        XSSFSheet outSheet = ExcelKit.CreateSheet(outWorkbook);
+        //样式
+        XSSFCellStyle headerStyle = ExcelKit.getHeaderStyle(outWorkbook);
+        XSSFCellStyle dataStyle = ExcelKit.getDataStyle(outWorkbook);
+        //如果样例文件是xls格式，则转化为xlsx格式
+        sampleExcelPath = ExcelKit.ConvertXlsToXlsx(sampleExcelPath);
+        //拷贝文件头
+        ExcelKit.CopyHead(sampleExcelPath, outSheet, headerStyle);
+
+        //目标Excel,就是把文件名解析出来后，后面添加上【成果】,需要动态计算获取，不能写死
+        String excelPath = sampleExcelPath.replace(".xlsx", "【成果】.xlsx");
+        ExcelKit.delExcel(excelPath);
+
+        //开始填表
+        //找到parentPath下一级目录中所有文件
+        List<File> files = FileUtil.loopFiles(parentPath, file -> true);
+        int rowIndex = 0;
+        //处理这个目录
+        if (files != null) {
+            for (File file : files) {
+                //判断file是不是目录，是目录的需要跳过
+                if (file.isDirectory()) continue;
+                //城市名称
+                String cityName = ru.getCityOrAreaName(file.getName());
+                if (StrKit.isBlank(cityName)) {
+                    System.out.println("发现异常数据，请人工处理：" + file.getName());
+                    System.exit(0);
+                }
+                System.out.println("正在进行" + cityName + "的数据填充~");
+                //如果源文件或者示例文件是xls格式，则转化为xlsx格式
+                String sourceExcel = file.getAbsolutePath();
+                sourceExcel = ExcelKit.ConvertXlsToXlsx(sourceExcel);
+                //它的最后一个有效数据行，就是这个城市的整体数据汇总
+                List<List<String>> sheetList = ExcelKit.readSheet(sourceExcel, 4);//此表格有4行表头
+                //最后一行的数据就是整个市州的数据
+                List<String> rowData = sheetList.getLast();
+
+                try {
+                    Row outRow = outSheet.createRow(++rowIndex);
+                    Double allCount = Double.parseDouble(rowData.get(ExcelKit.transLetter2Num("B"))) / 10000;
+                    Double chengZhenCount = Double.parseDouble(rowData.get(ExcelKit.transLetter2Num("D"))) / 10000;
+                    Double xiangChunCount = Double.parseDouble(rowData.get(ExcelKit.transLetter2Num("E"))) / 10000;
+                    Double lv =
+                            Double.parseDouble(rowData.get(ExcelKit.transLetter2Num("D"))) /
+                                    Integer.parseInt(rowData.get(ExcelKit.transLetter2Num("B")));
+                    //需要保留两位小数
+                    lv = Double.parseDouble(String.format("%.2f", lv));
+                    ExcelKit.putData(outRow, Arrays.asList(cityName, "总人口",Double.parseDouble(String.format("%.2f", allCount))+"" , "万人", "云南省"), dataStyle);
+                    outRow = outSheet.createRow(++rowIndex);
+                    ExcelKit.putData(outRow, Arrays.asList(cityName, "城镇人口",Double.parseDouble(String.format("%.2f", chengZhenCount))+"", "万人", "云南省"), dataStyle);
+                    outRow = outSheet.createRow(++rowIndex);
+                    ExcelKit.putData(outRow, Arrays.asList(cityName, "乡村人口", Double.parseDouble(String.format("%.2f", xiangChunCount))+"", "万人", "云南省"), dataStyle);
+                    outRow = outSheet.createRow(++rowIndex);
+                    ExcelKit.putData(outRow, Arrays.asList(cityName, "城镇化率", lv + "%", "", "云南省"), dataStyle);
+                } catch (Exception err) {
+                    System.out.println("错误数据：");
+                    System.out.println(rowData);
+                    System.exit(0);
+                }
+            }
+        }
+        //保存文件
+        ExcelKit.saveExcel(excelPath, outWorkbook);
+        System.out.println("市州所有文件处理完成！");
+    }
+}
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Test/C7_Test.java b/src/main/java/com/dsideal/base/Tools/FillData/Test/C7_Test.java
deleted file mode 100644
index 02e923bc..00000000
--- a/src/main/java/com/dsideal/base/Tools/FillData/Test/C7_Test.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package com.dsideal.base.Tools.FillData.Test;
-
-import cn.hutool.core.io.FileUtil;
-import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
-import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
-import com.dsideal.base.Tools.Util.ReadDocxUtil;
-import com.jfinal.kit.StrKit;
-import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-
-public class C7_Test {
-
-    //示例Excel
-    static String sampleExcelPath = "D:\\dsWork\\YunNanDsBase\\Doc\\待处理\\市\\【7】概览\\概览.xlsx";
-
-    //源文件
-    static String parentPath = "D:\\dsWork\\YunNanDsBase\\Doc\\全省及州市县区人口与教育报告集20241023\\2023年数据更新表\\16州市数据更新表汇总20241021";
-
-    public static void main(String[] args) throws IOException, InvalidFormatException {
-        //初始化数据库连接
-        LocalMysqlConnectUtil.Init();
-        //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
-
-        //结果Excel
-        XSSFWorkbook outWorkbook = new XSSFWorkbook();
-        //结果Sheet
-        XSSFSheet outSheet = ExcelKit.CreateSheet(outWorkbook);
-        //样式
-        XSSFCellStyle headerStyle = ExcelKit.getHeaderStyle(outWorkbook);
-        XSSFCellStyle dataStyle = ExcelKit.getDataStyle(outWorkbook);
-        //如果样例文件是xls格式，则转化为xlsx格式
-        sampleExcelPath = ExcelKit.ConvertXlsToXlsx(sampleExcelPath);
-        //拷贝文件头
-        ExcelKit.CopyHead(sampleExcelPath, outSheet, headerStyle);
-
-        //目标Excel,就是把文件名解析出来后，后面添加上【成果】,需要动态计算获取，不能写死
-        String excelPath = sampleExcelPath.replace(".xlsx", "【成果】.xlsx");
-        ExcelKit.delExcel(excelPath);
-        /*
-        程序员看EXCEL数据整理出下面的规则，然后提供给AI，让其按Map<String,String>生成代码，其中key使用 学段_指定指标,比如：学前_学校总数
-        学前：
-               学校总数： I
-               招生总数： O
-               在校生总数：P
-               教职工总数：M
-               专任教师数：N
-        小学：
-               学校总数： S
-               招生总数： Z
-               在校生总数：AA
-               教职工总数：X
-               专任教师数：Y
-        初中：
-               学校总数： AD
-               招生总数： AJ
-               在校生总数：AK
-               教职工总数：AH
-               专任教师数：AI
-        高中：
-               学校总数： AN
-               招生总数： AQ
-               在校生总数：AR
-               教职工总数：AO
-               专任教师数：AP
-        中职：
-               学校总数： AU
-               招生总数： AX
-               在校生总数：AY
-               教职工总数：AV
-               专任教师数：AW
-        */
-
-        // 初始化数据
-        String[] a = {"学前", "小学", "初中", "高中", "中职"};
-        String[] b = {"招生总数", "在校生总数", "教职工总数", "专任教师数"};
-
-        String[][] data = {
-                {"学前", "学校总数", "I"},
-                {"学前", "招生总数", "O"},
-                {"学前", "在校生总数", "P"},
-                {"学前", "教职工总数", "M"},
-                {"学前", "专任教师数", "N"},
-                {"小学", "学校总数", "S"},
-                {"小学", "招生总数", "Z"},
-                {"小学", "在校生总数", "AA"},
-                {"小学", "教职工总数", "X"},
-                {"小学", "专任教师数", "Y"},
-                {"初中", "学校总数", "AD"},
-                {"初中", "招生总数", "AJ"},
-                {"初中", "在校生总数", "AK"},
-                {"初中", "教职工总数", "AH"},
-                {"初中", "专任教师数", "AI"},
-                {"高中", "学校总数", "AN"},
-                {"高中", "招生总数", "AQ"},
-                {"高中", "在校生总数", "AR"},
-                {"高中", "教职工总数", "AO"},
-                {"高中", "专任教师数", "AP"},
-                {"中职", "学校总数", "AU"},
-                {"中职", "招生总数", "AX"},
-                {"中职", "在校生总数", "AY"},
-                {"中职", "教职工总数", "AV"},
-                {"中职", "专任教师数", "AW"}
-        };
-        // 创建存储结构+填充数据
-        Map<String, String> schoolData = new LinkedHashMap<>();
-        for (String[] entry : data) {
-            String grade = entry[0];
-            String metric = entry[1];
-            String value = entry[2];
-            schoolData.put(grade + "_" + metric, value);
-        }
-        //开始填表
-        //找到parentPath下一级目录中所有文件
-        List<File> files = FileUtil.loopFiles(parentPath, file -> true);
-        int rowIndex = 0;
-        //处理这个目录
-        if (files != null) {
-            for (File file : files) {
-                //判断file是不是目录，是目录的需要跳过
-                if (file.isDirectory()) continue;
-                //城市名称
-                String cityName = ru.getCityOrAreaName(file.getName());
-                if (StrKit.isBlank(cityName)) {
-                    System.out.println("发现异常数据，请人工处理：" + file.getName());
-                    System.exit(0);
-                }
-                System.out.println("正在进行" + cityName + "的数据填充~");
-                //如果源文件或者示例文件是xls格式，则转化为xlsx格式
-                String sourceExcel = file.getAbsolutePath();
-                sourceExcel = ExcelKit.ConvertXlsToXlsx(sourceExcel);
-                //它的最后一个有效数据行，就是这个城市的整体数据汇总
-                List<List<String>> sheetList = ExcelKit.readSheet(sourceExcel, 4);//此表格有4行表头
-                //最后一行的数据就是整个市州的数据
-                List<String> rowData = sheetList.getLast();
-                for (String s : a) {
-                    for (String t : b) {
-                        Row outRow = outSheet.createRow(++rowIndex);
-                        try {
-                            ExcelKit.putData(outRow, Arrays.asList(cityName, t, "2023", s, rowData.get(ExcelKit.transLetter2Num(schoolData.get(s + "_" + t))), "云南省"), dataStyle);
-                        } catch (Exception err) {
-                            System.out.println("错误数据：");
-                            System.out.println(rowData);
-                            System.out.println(schoolData.get(s + "_" + t) + ":" + ExcelKit.transLetter2Num(schoolData.get(s + "_" + t)) + "找不到这一列！");
-                            System.exit(0);
-                        }
-                    }
-                }
-            }
-        }
-        //保存文件
-        ExcelKit.saveExcel(excelPath, outWorkbook);
-        System.out.println("市州所有文件处理完成！");
-    }
-}