From ac6345e7ffd367960225985bc7c46a9348c985a0 Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Tue, 8 Apr 2025 14:26:40 +0800 Subject: [PATCH] 'commit' --- .../Bean/{School2019.java => BeanSchool2019.java} | 2 +- .../Tools/Excel/{ExcelReader.java => School2019.java} | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) rename src/main/java/com/dsideal/base/Tools/Excel/Bean/{School2019.java => BeanSchool2019.java} (93%) rename src/main/java/com/dsideal/base/Tools/Excel/{ExcelReader.java => School2019.java} (87%) diff --git a/src/main/java/com/dsideal/base/Tools/Excel/Bean/School2019.java b/src/main/java/com/dsideal/base/Tools/Excel/Bean/BeanSchool2019.java similarity index 93% rename from src/main/java/com/dsideal/base/Tools/Excel/Bean/School2019.java rename to src/main/java/com/dsideal/base/Tools/Excel/Bean/BeanSchool2019.java index 2e561b6c..59e16bfb 100644 --- a/src/main/java/com/dsideal/base/Tools/Excel/Bean/School2019.java +++ b/src/main/java/com/dsideal/base/Tools/Excel/Bean/BeanSchool2019.java @@ -6,7 +6,7 @@ import com.dsideal.base.Tools.Excel.Util.ExcelUtil; import lombok.Data; @Data -public class School2019 { +public class BeanSchool2019 { @ExcelProperty(index = 1) // B列 private String schoolName; diff --git a/src/main/java/com/dsideal/base/Tools/Excel/ExcelReader.java b/src/main/java/com/dsideal/base/Tools/Excel/School2019.java similarity index 87% rename from src/main/java/com/dsideal/base/Tools/Excel/ExcelReader.java rename to src/main/java/com/dsideal/base/Tools/Excel/School2019.java index 5488bc94..b4660734 100644 --- a/src/main/java/com/dsideal/base/Tools/Excel/ExcelReader.java +++ b/src/main/java/com/dsideal/base/Tools/Excel/School2019.java @@ -3,14 +3,14 @@ package com.dsideal.base.Tools.Excel; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import cn.idev.excel.*; -import com.dsideal.base.Tools.Excel.Bean.School2019; +import com.dsideal.base.Tools.Excel.Bean.BeanSchool2019; import org.slf4j.LoggerFactory; import java.util.HashMap; import java.util.List; import java.util.Map; -public class ExcelReader { +public class School2019 { public static void main(String[] args) { // 设置 com.alibaba.excel 的日志级别为 INFO Logger excelLogger = (Logger) LoggerFactory.getLogger("cn.idev.excel"); @@ -22,8 +22,8 @@ public class ExcelReader { // 从第8行开始读取(跳过前7行) - List dataList = FastExcel.read(filePath) - .head(School2019.class) + List dataList = FastExcel.read(filePath) + .head(BeanSchool2019.class) .sheet(sheetName) .headRowNumber(skipRows) // 跳过前skipRows行 .doReadSync(); @@ -31,7 +31,7 @@ public class ExcelReader { // 使用 Map 进行分组统计 Map> cityDistrictMap = new HashMap<>(); - for (School2019 data : dataList) { + for (BeanSchool2019 data : dataList) { if (data.getSchoolCount() > 0) { String city = data.getCity(); String district = data.getDistrict();