From 30a0e861a3f84d7a56cc313ff22d28bddccd1004 Mon Sep 17 00:00:00 2001 From: weiweiw <14335254+weiweiw22@user.noreply.gitee.com> Date: Fri, 23 Aug 2024 15:22:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=84=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB=E5=AF=BC=E5=87=BAexcel=E6=97=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E4=B8=80=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/system/api/domain/SysDictData.java | 4 ++++ .../java/com/bonus/system/api/domain/SysDictType.java | 4 ++++ .../java/com/bonus/system/api/domain/SysLogsVo.java | 1 + .../java/com/bonus/system/api/domain/SysRole.java | 4 ++++ .../java/com/bonus/system/api/domain/SysUser.java | 3 +++ .../com/bonus/common/core/utils/poi/ExcelUtil.java | 7 +++++-- .../bonus/common/core/utils/poi/ExcelUtilTests.java | 4 ++-- .../security/interceptor/ParamSecureHandler.java | 11 ----------- 8 files changed, 23 insertions(+), 15 deletions(-) diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDictData.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDictData.java index 471ff20..a57f84f 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDictData.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDictData.java @@ -18,6 +18,10 @@ public class SysDictData extends BaseEntity { private static final long serialVersionUID = 1L; + //用于excel导出的序号一列,不需要业务逻辑处理 + @Excel(name = "序号", isSequence = true, type = Excel.Type.EXPORT) + int sequence; + /** 字典编码 */ @Excel(name = "字典编码", cellType = ColumnType.NUMERIC) private Long dictCode; diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDictType.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDictType.java index 50a2be9..bef84c5 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDictType.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDictType.java @@ -18,6 +18,10 @@ public class SysDictType extends BaseEntity { private static final long serialVersionUID = 1L; + //用于excel导出的序号一列,不需要业务逻辑处理 + @Excel(name = "序号", isSequence = true, type = Excel.Type.EXPORT) + int sequence; + /** 字典主键 */ @Excel(name = "字典主键", cellType = ColumnType.NUMERIC) private Long dictId; diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogsVo.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogsVo.java index 9c9f94c..0111844 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogsVo.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogsVo.java @@ -31,6 +31,7 @@ import java.util.UUID; @Data @Alias("SysLogsVo") public class SysLogsVo { + /** * 日志id */ diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java index 8540519..3792b0e 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java @@ -19,6 +19,10 @@ public class SysRole extends BaseEntity { private static final long serialVersionUID = 1L; + //用于excel导出的序号一列,不需要业务逻辑处理 + @Excel(name = "序号", isSequence = true, type = Excel.Type.EXPORT) + int sequence; + /** 角色ID */ @Excel(name = "角色序号", cellType = ColumnType.NUMERIC) private Long roleId; diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java index 71e2a0f..5d9db5b 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java @@ -21,6 +21,9 @@ import com.bonus.common.core.xss.Xss; public class SysUser extends BaseEntity { private static final long serialVersionUID = 1L; + //用于excel导出的序号一列,不需要业务逻辑处理 + @Excel(name = "序号", isSequence = true, type = Excel.Type.EXPORT) + int sequence; /** * 用户ID */ diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/poi/ExcelUtil.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/poi/ExcelUtil.java index 170a374..7161ede 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/poi/ExcelUtil.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/poi/ExcelUtil.java @@ -1618,9 +1618,12 @@ public class ExcelUtil } private int getColumnIndexByFieldName(String fieldName) { - for (int columnIndex = 0; columnIndex <= sheet.getRow(0).getLastCellNum(); columnIndex++) { - if (fieldName.equals(sheet.getRow(0).getCell(columnIndex).getStringCellValue())) { + Cell cell = sheet.getRow(0).getCell(columnIndex); + if (cell == null) { + continue; + } + else if (fieldName.equals(cell.getStringCellValue())){ return columnIndex; } } diff --git a/bonus-common/bonus-common-core/src/test/java/com/bonus/common/core/utils/poi/ExcelUtilTests.java b/bonus-common/bonus-common-core/src/test/java/com/bonus/common/core/utils/poi/ExcelUtilTests.java index 383225d..44a0e0e 100644 --- a/bonus-common/bonus-common-core/src/test/java/com/bonus/common/core/utils/poi/ExcelUtilTests.java +++ b/bonus-common/bonus-common-core/src/test/java/com/bonus/common/core/utils/poi/ExcelUtilTests.java @@ -44,9 +44,9 @@ public class ExcelUtilTests { String currentPath = System.getProperty("user.dir"); System.out.println("当前执行路径: " + currentPath); ExcelUtil excelUtil = new ExcelUtil(Person.class); - Person p1 = new Person("admin",10,"男"); + Person p1 = new Person("admin",10,"0"); p1.setImportErrorMessage("用户名存在"); - Person p2 = new Person("admin2",20,"女"); + Person p2 = new Person("admin2",20,"1"); p2.setImportErrorMessage("数据格式不正确"); List personList = new ArrayList<>(); personList.add(p1); diff --git a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/interceptor/ParamSecureHandler.java b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/interceptor/ParamSecureHandler.java index b82af31..45b00aa 100644 --- a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/interceptor/ParamSecureHandler.java +++ b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/interceptor/ParamSecureHandler.java @@ -1,23 +1,12 @@ package com.bonus.common.security.interceptor; import com.bonus.common.core.context.SecurityContextHolder; -import com.bonus.common.core.utils.JwtUtils; import com.bonus.common.core.utils.SafeUtil; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; -import com.bonus.common.security.utils.SecurityUtils; -import com.bonus.system.api.RemoteLogService; -import com.bonus.system.api.model.LoginUser; import org.springframework.web.servlet.AsyncHandlerInterceptor; import com.alibaba.fastjson2.JSON; -import com.github.pagehelper.util.StringUtil; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.AntPathMatcher; -import org.springframework.util.PathMatcher; - -import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession;