From 1e382a6ea40347c8a144de17153448745a299dcc Mon Sep 17 00:00:00 2001
From: zhang chengzhi <3144712872@qq.com>
Date: Sun, 11 Aug 2024 10:51:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=8E=A8=E9=80=81=E5=BE=AE?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../muyu/resource/domain/ResourceInfo.java    | 24 +++++++++----------
 .../com/muyu/resource/utils/ExcelUtil.java    |  7 +++---
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/cloud-resource-common/src/main/java/com/muyu/resource/domain/ResourceInfo.java b/cloud-resource-common/src/main/java/com/muyu/resource/domain/ResourceInfo.java
index 4ef696c..5a3728e 100644
--- a/cloud-resource-common/src/main/java/com/muyu/resource/domain/ResourceInfo.java
+++ b/cloud-resource-common/src/main/java/com/muyu/resource/domain/ResourceInfo.java
@@ -24,13 +24,13 @@ private String    id;
 private String   recommendId;
 @Excel(name = "*题名")
 private String   title;
-@Excel(name = "只用来查重，格式化题名")
+//@Excel(name = "只用来查重，格式化题名")
 private String   titleFormat;
 @Excel(name = "题名译名")
 private String   otherTitle;
-@Excel(name = "分辑号 - 预留")
+//@Excel(name = "分辑号 - 预留")
 private String   seriesNumber;
-@Excel(name = "分辑名")
+//@Excel(name = "分辑名")
 private String   seriesTitle;
 @Excel(name = "PISSN")
 private String   pissn;
@@ -42,25 +42,25 @@ private String   pisbn;
 private String   eisbn;
 @Excel(name = "订购号")
 private String   orderNumber;
-@Excel(name = "学科")
+//@Excel(name = "学科")
 private String   subject;
-@Excel(name = "出版社")
+//@Excel(name = "出版社")
 private String   publisher;
-@Excel(name = "国别")
+@Excel(name = "国家/地区")
 private String   country;
-@Excel(name = "出版年")
+//@Excel(name = "出版年")
 private String   pubYear;
-@Excel(name = "创刊年")
+//@Excel(name = "创刊年")
 private String   foundedYear;
 @Excel(name = "语种")
 private String   language;
-@Excel(name = "出版频率")
+//@Excel(name = "出版频率")
 private String   pubFeq;
-@Excel(name = "内容简介")
+//@Excel(name = "内容简介")
 private String   Intro;
-@Excel(name = "分类号")
+//@Excel(name = "分类号")
 private String   classiNumber;
-@Excel(name = "期刊URL地址")
+//@Excel(name = "期刊URL地址")
 private String   url;
 private String   carrier;
 private String   type;
diff --git a/cloud-resource-common/src/main/java/com/muyu/resource/utils/ExcelUtil.java b/cloud-resource-common/src/main/java/com/muyu/resource/utils/ExcelUtil.java
index 8686f14..ba0a7b0 100644
--- a/cloud-resource-common/src/main/java/com/muyu/resource/utils/ExcelUtil.java
+++ b/cloud-resource-common/src/main/java/com/muyu/resource/utils/ExcelUtil.java
@@ -154,7 +154,7 @@ public class ExcelUtil<T>
             // 定义一个map用于存放excel列的序号和field.
             Map<String, Integer> cellMap = new HashMap<String, Integer>();
             // 获取表头
-            Row heard = sheet.getRow(0);
+            Row heard = sheet.getRow(2);
             for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) {
                 Cell cell = heard.getCell(i);
                 if (cell != null) {
@@ -176,7 +176,8 @@ public class ExcelUtil<T>
                     // 设置类的私有字段属性可访问.
                     field.setAccessible(true);
                     Integer column = cellMap.get(attr.name());
-                    if(column == null){
+                    Integer column2 = cellMap.get("*"+attr.name());
+                    if(column == null && column2 == null){
                         System.out.println("模板错误:Excel表头和项目里面设置的表头["+attr.name()+"]不一致,请检查!");
                         return new ArrayList<>();
                     }
@@ -185,7 +186,7 @@ public class ExcelUtil<T>
                 }
             }
 
-            for (int i = 1; i < rows; i++) {
+            for (int i = 3; i < rows; i++) {
                 // 从第2行开始取数据,默认第一行是表头.
                 Row row = sheet.getRow(i);
                 T entity = null;