ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-11 16:57:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 优化公告状态判断

Browse Source
This commit is contained in:
Charles7c
2024-05-28 21:05:20 +08:00
parent 45396f2dc2
commit a07aedbf35
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java
View File

@@ -21,6 +21,8 @@ import lombok.RequiredArgsConstructor;
import top.continew.admin.common.constant.UiConstants;
import top.continew.starter.data.mybatis.plus.base.IBaseEnum;
import java.time.LocalDateTime;
/**
* 公告状态枚举
*
@@ -49,4 +51,22 @@ public enum NoticeStatusEnum implements IBaseEnum<Integer> {
private final Integer value;
private final String description;
private final String color;
/**
* 获取公告状态
*
* @param effectiveTime 生效时间
* @param terminateTime 终止时间
* @return 公告状态
*/
public static NoticeStatusEnum getStatus(LocalDateTime effectiveTime, LocalDateTime terminateTime) {
LocalDateTime now = LocalDateTime.now();
if (effectiveTime != null && effectiveTime.isAfter(now)) {
return PENDING_RELEASE;
}
if (terminateTime != null && terminateTime.isBefore(now)) {
return EXPIRED;
}
return PUBLISHED;
}
}

8
continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java
View File

@@ -68,12 +68,6 @@ public class NoticeResp extends BaseResp {
*/
@Schema(description = "状态（1：待发布；2：已发布；3：已过期）", type = "Integer", allowableValues = {"1", "2", "3"}, example = "1")
public NoticeStatusEnum getStatus() {
if (null != this.effectiveTime && this.effectiveTime.isAfter(LocalDateTime.now())) {
return NoticeStatusEnum.PENDING_RELEASE;
}
if (null != this.terminateTime && this.terminateTime.isBefore(LocalDateTime.now())) {
return NoticeStatusEnum.EXPIRED;
}
return NoticeStatusEnum.PUBLISHED;
return NoticeStatusEnum.getStatus(effectiveTime, terminateTime);
}
}