From 883dbecb1b1b9001f94ee5ce71c4c513c443fce4 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Fri, 8 Sep 2023 21:17:30 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cnadmin/common/constant/SysConsts.java | 5 +++++ .../monitor/service/impl/LogServiceImpl.java | 15 +++++++++------ .../cnadmin/auth/model/vo/UserInfoVO.java | 1 - .../cnadmin/system/model/vo/AnnouncementVO.java | 14 +++++--------- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java index 64735bb9..22b255f9 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java @@ -57,4 +57,9 @@ public class SysConsts { * 退出登录 URI */ public static final String LOGOUT_URI = "/auth/logout"; + + /** + * VO 描述类字段后缀 + */ + public static final String VO_DESCRIPTION_FIELD_SUFFIX = "String"; } diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java index 2fec39de..4e084f0d 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java @@ -74,8 +74,9 @@ public class LogServiceImpl implements LogService { // 限定查询信息 List fieldNameList = ReflectUtils.getNonStaticFieldsName(OperationLogVO.class); - List columnNameList = fieldNameList.stream().map(StrUtil::toUnderlineCase) - .filter(n -> !n.endsWith("string")).collect(Collectors.toList()); + List columnNameList = + fieldNameList.stream().filter(n -> !n.endsWith(SysConsts.VO_DESCRIPTION_FIELD_SUFFIX)) + .map(StrUtil::toUnderlineCase).collect(Collectors.toList()); queryWrapper.select(columnNameList); // 分页查询 @@ -100,8 +101,9 @@ public class LogServiceImpl implements LogService { // 限定查询信息 List fieldNameList = ReflectUtils.getNonStaticFieldsName(LoginLogVO.class); - List columnNameList = fieldNameList.stream().map(StrUtil::toUnderlineCase) - .filter(n -> !n.endsWith("string")).collect(Collectors.toList()); + List columnNameList = + fieldNameList.stream().filter(n -> !n.endsWith(SysConsts.VO_DESCRIPTION_FIELD_SUFFIX)) + .map(StrUtil::toUnderlineCase).collect(Collectors.toList()); queryWrapper.select(columnNameList); // 分页查询 @@ -119,8 +121,9 @@ public class LogServiceImpl implements LogService { // 限定查询信息 List fieldNameList = ReflectUtils.getNonStaticFieldsName(SystemLogVO.class); - List columnNameList = fieldNameList.stream().map(StrUtil::toUnderlineCase) - .filter(n -> !n.endsWith("string")).collect(Collectors.toList()); + List columnNameList = + fieldNameList.stream().filter(n -> !n.endsWith(SysConsts.VO_DESCRIPTION_FIELD_SUFFIX)) + .map(StrUtil::toUnderlineCase).collect(Collectors.toList()); queryWrapper.select(columnNameList); // 分页查询 diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java index 2d821cd0..b2c0f21e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java @@ -101,7 +101,6 @@ public class UserInfoVO implements Serializable { /** * 创建时间 */ - @Schema(description = "创建时间", example = "2023-08-08 08:08:08", type = "string") @JsonIgnore private LocalDateTime createTime; diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java index 99a9d33c..6c465b33 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java @@ -62,22 +62,18 @@ public class AnnouncementVO extends BaseVO { private LocalDateTime terminateTime; /** - * 状态 + * 状态（1：待发布，2：已发布，3：已过期） * * @return 公告状态 */ @Schema(description = "状态（1：待发布，2：已发布，3：已过期）", example = "1") public Integer getStatus() { int status = 2; - if (null != this.effectiveTime) { - if (this.effectiveTime.isAfter(LocalDateTime.now())) { - status = 1; - } + if (null != this.effectiveTime && this.effectiveTime.isAfter(LocalDateTime.now())) { + status = 1; } - if (null != this.terminateTime) { - if (this.terminateTime.isBefore(LocalDateTime.now())) { - status = 3; - } + if (null != this.terminateTime && this.terminateTime.isBefore(LocalDateTime.now())) { + status = 3; } return status; }