zayac/zayac-admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: 优化部分代码

Browse Source
This commit is contained in:
Charles7c 2023-09-08 21:17:30 +08:00
parent d5138e1e43
commit 883dbecb1b
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConsts.java
View File

@ -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";
}

15
continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java
View File

@ -74,8 +74,9 @@ public class LogServiceImpl implements LogService {
// 限定查询信息
List<String> fieldNameList = ReflectUtils.getNonStaticFieldsName(OperationLogVO.class);
List<String> columnNameList = fieldNameList.stream().map(StrUtil::toUnderlineCase)
.filter(n -> !n.endsWith("string")).collect(Collectors.toList());
List<String> 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<String> fieldNameList = ReflectUtils.getNonStaticFieldsName(LoginLogVO.class);
List<String> columnNameList = fieldNameList.stream().map(StrUtil::toUnderlineCase)
.filter(n -> !n.endsWith("string")).collect(Collectors.toList());
List<String> 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<String> fieldNameList = ReflectUtils.getNonStaticFieldsName(SystemLogVO.class);
List<String> columnNameList = fieldNameList.stream().map(StrUtil::toUnderlineCase)
.filter(n -> !n.endsWith("string")).collect(Collectors.toList());
List<String> columnNameList =
fieldNameList.stream().filter(n -> !n.endsWith(SysConsts.VO_DESCRIPTION_FIELD_SUFFIX))
.map(StrUtil::toUnderlineCase).collect(Collectors.toList());
queryWrapper.select(columnNameList);
// 分页查询

1
continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/vo/UserInfoVO.java
View File

@ -101,7 +101,6 @@ public class UserInfoVO implements Serializable {
/**
* 创建时间
*/
@Schema(description = "创建时间", example = "2023-08-08 08:08:08", type = "string")
@JsonIgnore
private LocalDateTime createTime;

14
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/vo/AnnouncementVO.java
View File

@ -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;
}