From 086fd8c1e344595e301659c80921f0bb6501de4b Mon Sep 17 00:00:00 2001 From: houwei Date: Tue, 25 Jun 2024 16:31:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=8A=E8=AD=A6=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/exceptions/EasyExcelException.java | 5 +++- .../das/common/exceptions/OssException.java | 30 +++++++++---------- .../exceptions/RateLimiterException.java | 2 +- .../exceptions/RepeatSubmitException.java | 2 +- .../common/exceptions/ServiceException.java | 5 +++- .../main/java/com/das/common/result/R.java | 2 ++ .../das/common/utils/AdminRedisTemplate.java | 4 +-- .../com/das/common/utils/PageDataInfo.java | 2 ++ .../java/com/das/common/utils/PageQuery.java | 2 ++ .../das/modules/auth/entity/SysAuthority.java | 3 ++ .../com/das/modules/auth/entity/SysRole.java | 3 ++ .../modules/auth/entity/SysRoleAuthority.java | 2 ++ .../service/impl/SysAuthorityServiceImpl.java | 2 -- 13 files changed, 41 insertions(+), 23 deletions(-) diff --git a/das/src/main/java/com/das/common/exceptions/EasyExcelException.java b/das/src/main/java/com/das/common/exceptions/EasyExcelException.java index 652b7606..362dc943 100644 --- a/das/src/main/java/com/das/common/exceptions/EasyExcelException.java +++ b/das/src/main/java/com/das/common/exceptions/EasyExcelException.java @@ -3,13 +3,16 @@ package com.das.common.exceptions; import com.das.common.result.IResultCode; import com.das.common.result.ResultCode; +import java.io.Serial; + /** * @author chenhaojie * @Description */ public class EasyExcelException extends RuntimeException { - private final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; private int code = ResultCode.FAILURE.getCode(); diff --git a/das/src/main/java/com/das/common/exceptions/OssException.java b/das/src/main/java/com/das/common/exceptions/OssException.java index 824159ba..b25126eb 100644 --- a/das/src/main/java/com/das/common/exceptions/OssException.java +++ b/das/src/main/java/com/das/common/exceptions/OssException.java @@ -10,7 +10,7 @@ import com.das.common.result.ResultCode; */ public class OssException extends RuntimeException { - private final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; private int code = ResultCode.FAILURE.getCode(); @@ -22,43 +22,43 @@ public class OssException extends RuntimeException { public OssException(String msg) { super(msg); - this.msg = msg; + this.setMsg(msg); } public OssException(IResultCode resultCode, String msg) { super(msg); - this.code = resultCode.getCode(); - this.msg = msg; + this.setCode(resultCode.getCode()); + this.setMsg(msg); } public OssException(String msg, Throwable cause) { super(msg, cause); - this.msg = msg; + this.setMsg(msg); } public OssException(IResultCode resultCode, String msg, Throwable cause) { super(msg, cause); - this.code = resultCode.getCode(); - this.msg = msg; + this.setCode(resultCode.getCode()); + this.setMsg(msg); } public OssException(Throwable cause) { super(cause); } - public int getCode() { - return code; - } - public void setCode(int code) { this.code = code; } - public String getMsg() { - return msg; - } - public void setMsg(String msg) { this.msg = msg; } + + public int getCode() { + return code; + } + + public String getMsg() { + return msg; + } } diff --git a/das/src/main/java/com/das/common/exceptions/RateLimiterException.java b/das/src/main/java/com/das/common/exceptions/RateLimiterException.java index 3ff042ef..34a979b8 100644 --- a/das/src/main/java/com/das/common/exceptions/RateLimiterException.java +++ b/das/src/main/java/com/das/common/exceptions/RateLimiterException.java @@ -10,7 +10,7 @@ import com.das.common.result.ResultCode; */ public class RateLimiterException extends RuntimeException { - private final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; private int code = ResultCode.FAILURE.getCode(); diff --git a/das/src/main/java/com/das/common/exceptions/RepeatSubmitException.java b/das/src/main/java/com/das/common/exceptions/RepeatSubmitException.java index 8c9e366f..c7fcc11b 100644 --- a/das/src/main/java/com/das/common/exceptions/RepeatSubmitException.java +++ b/das/src/main/java/com/das/common/exceptions/RepeatSubmitException.java @@ -10,7 +10,7 @@ import com.das.common.result.ResultCode; */ public class RepeatSubmitException extends RuntimeException { - private final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; private int code = ResultCode.FAILURE.getCode(); diff --git a/das/src/main/java/com/das/common/exceptions/ServiceException.java b/das/src/main/java/com/das/common/exceptions/ServiceException.java index 75b7e136..185172cb 100644 --- a/das/src/main/java/com/das/common/exceptions/ServiceException.java +++ b/das/src/main/java/com/das/common/exceptions/ServiceException.java @@ -4,13 +4,16 @@ package com.das.common.exceptions; import com.das.common.result.IResultCode; import com.das.common.result.ResultCode; +import java.io.Serial; + /** * @author chenhaojie * @Description 自定义服务异常 */ public class ServiceException extends RuntimeException { - private final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; private int code = ResultCode.FAILURE.getCode(); diff --git a/das/src/main/java/com/das/common/result/R.java b/das/src/main/java/com/das/common/result/R.java index ca4f1b43..8df742e8 100644 --- a/das/src/main/java/com/das/common/result/R.java +++ b/das/src/main/java/com/das/common/result/R.java @@ -2,6 +2,7 @@ package com.das.common.result; import org.springframework.lang.Nullable; +import java.io.Serial; import java.io.Serializable; import java.util.Optional; @@ -11,6 +12,7 @@ import java.util.Optional; */ public class R implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/das/src/main/java/com/das/common/utils/AdminRedisTemplate.java b/das/src/main/java/com/das/common/utils/AdminRedisTemplate.java index 9b3b641f..140e8c2e 100644 --- a/das/src/main/java/com/das/common/utils/AdminRedisTemplate.java +++ b/das/src/main/java/com/das/common/utils/AdminRedisTemplate.java @@ -189,7 +189,7 @@ public class AdminRedisTemplate { * @return value存储类型 */ public String type(String key) { - return redisTemplate.type(key).code(); + return Objects.requireNonNull(redisTemplate.type(key)).code(); } /** @@ -682,7 +682,7 @@ public class AdminRedisTemplate { * @return 判断 member 元素是否是集合 key 的成员 */ public boolean sIsMember(String key, Object member) { - return setOps.isMember(key, member); + return Boolean.TRUE.equals(setOps.isMember(key, member)); } /** diff --git a/das/src/main/java/com/das/common/utils/PageDataInfo.java b/das/src/main/java/com/das/common/utils/PageDataInfo.java index 3a178169..86d76267 100644 --- a/das/src/main/java/com/das/common/utils/PageDataInfo.java +++ b/das/src/main/java/com/das/common/utils/PageDataInfo.java @@ -4,6 +4,7 @@ import cn.hutool.http.HttpStatus; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; import java.io.Serializable; import java.util.List; @@ -15,6 +16,7 @@ import java.util.List; @NoArgsConstructor public class PageDataInfo implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/das/src/main/java/com/das/common/utils/PageQuery.java b/das/src/main/java/com/das/common/utils/PageQuery.java index 8baac386..6e0b22d1 100644 --- a/das/src/main/java/com/das/common/utils/PageQuery.java +++ b/das/src/main/java/com/das/common/utils/PageQuery.java @@ -9,6 +9,7 @@ import com.das.common.utils.SqlUtil; import com.das.common.utils.StringUtils; import lombok.Data; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -20,6 +21,7 @@ import java.util.List; @Data public class PageQuery implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/das/src/main/java/com/das/modules/auth/entity/SysAuthority.java b/das/src/main/java/com/das/modules/auth/entity/SysAuthority.java index d1ed7d6e..07582e95 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysAuthority.java +++ b/das/src/main/java/com/das/modules/auth/entity/SysAuthority.java @@ -9,6 +9,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import java.io.Serial; + /** *

* 权限信息 @@ -23,6 +25,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class SysAuthority extends BaseEntity { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/das/src/main/java/com/das/modules/auth/entity/SysRole.java b/das/src/main/java/com/das/modules/auth/entity/SysRole.java index ce02e515..02b1a592 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysRole.java +++ b/das/src/main/java/com/das/modules/auth/entity/SysRole.java @@ -9,6 +9,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import java.io.Serial; + /** *

* 角色信息 @@ -23,6 +25,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class SysRole extends BaseEntity { + @Serial private static final long serialVersionUID = 1L; /** diff --git a/das/src/main/java/com/das/modules/auth/entity/SysRoleAuthority.java b/das/src/main/java/com/das/modules/auth/entity/SysRoleAuthority.java index 4ebc6ef1..9612b32c 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysRoleAuthority.java +++ b/das/src/main/java/com/das/modules/auth/entity/SysRoleAuthority.java @@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import java.io.Serializable; @@ -20,6 +21,7 @@ import java.io.Serializable; * @author chenhaojie * @since 2024-06-25 */ +@EqualsAndHashCode(callSuper = true) @Data @NoArgsConstructor @AllArgsConstructor diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysAuthorityServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysAuthorityServiceImpl.java index b3a582ac..b7b1f2e2 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/SysAuthorityServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/SysAuthorityServiceImpl.java @@ -23,8 +23,6 @@ import java.util.List; public class SysAuthorityServiceImpl implements SysAuthorityService { @Autowired SysAuthorityMapper sysAuthorityMapper; - // 在类中声明一个日志对象 - /** * 初始化系统权限