diff --git a/plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/constant/EntityStatus.java b/plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/constant/EntityStatus.java index 752e31e..d3e887e 100644 --- a/plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/constant/EntityStatus.java +++ b/plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/constant/EntityStatus.java @@ -24,12 +24,10 @@ public final class EntityStatus extends Enumeration { private static final ValueSet VALUE_SET = new ValueSet<>( AVAILABLE, DISABLED); - @Nonnull public static EntityStatus of(int id) { return VALUE_SET.get(id); } - @Nonnull public static Collection constants() { return VALUE_SET.getValues(); } diff --git a/plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/query/AccountQueries.java b/plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/query/AccountQueries.java index e1019e4..fa67800 100644 --- a/plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/query/AccountQueries.java +++ b/plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/query/AccountQueries.java @@ -2,6 +2,8 @@ package xyz.zhouxy.plusone.system.application.query; import java.util.List; +import javax.annotation.Nonnull; + import org.apache.ibatis.annotations.Mapper; import xyz.zhouxy.plusone.commons.util.PageDTO; @@ -23,6 +25,7 @@ public interface AccountQueries { return PageDTO.of(content, total); } + @Nonnull List queryAccountOverview(AccountQueryParams queryParams); long count(AccountQueryParams queryParams); diff --git a/plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/AccountStatus.java b/plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/AccountStatus.java index b5e9ba7..540ceab 100644 --- a/plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/AccountStatus.java +++ b/plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/AccountStatus.java @@ -31,7 +31,6 @@ public final class AccountStatus extends Enumeration implements I return VALUE_SET.get(id); } - @Nonnull public static Collection constants() { return VALUE_SET.getValues(); } diff --git a/plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/Sex.java b/plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/Sex.java index 2f66038..7a0d646 100644 --- a/plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/Sex.java +++ b/plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/Sex.java @@ -26,12 +26,10 @@ public final class Sex extends Enumeration implements IValueObject { private static final ValueSet VALUE_SET = new ValueSet<>(UNSET, MALE, FEMALE); - @Nonnull public static Sex of(int value) { return VALUE_SET.get(value); } - @Nonnull public static Collection constants() { return VALUE_SET.getValues(); }