From da7ef2b64129740ba235499266cf2c018cdc2254 Mon Sep 17 00:00:00 2001 From: Turbolisten <188029906@qq.com> Date: Mon, 27 Sep 2021 20:25:14 +0800 Subject: [PATCH] update enum --- .../service/common/enumconst/GenderEnum.java | 30 +++----------- .../enumconst/SystemEnvironmentEnum.java | 34 ++++------------ .../category/constant/CategoryTypeEnum.java | 31 +++------------ .../goods/constant/GoodsTypeEnum.java | 31 +++------------ .../constant/DataTracerBusinessTypeEnum.java | 24 +++--------- .../constant/DataTracerOperateTypeEnum.java | 22 +++-------- .../idgenerator/IdGeneratorService.java | 6 +-- .../idgenerator/constant/IdGeneratorEnum.java | 36 +++++------------ .../constant/IdGeneratorRuleTypeEnum.java | 25 ++++++------ .../datascope/constant/DataScopeTypeEnum.java | 39 ++++--------------- .../constant/DataScopeViewTypeEnum.java | 30 ++++---------- .../constant/DataScopeWhereInTypeEnum.java | 24 +++--------- .../system/menu/constant/MenuTypeEnum.java | 24 +++--------- 13 files changed, 87 insertions(+), 269 deletions(-) diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/GenderEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/GenderEnum.java index 96cbdffa..7ece3654 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/GenderEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/GenderEnum.java @@ -1,11 +1,16 @@ package net.lab1024.smartadmin.service.common.enumconst; +import lombok.AllArgsConstructor; +import lombok.Getter; + /** * 性别枚举类 * * @author listen * @date 2019/09/24 16:50 */ +@AllArgsConstructor +@Getter public enum GenderEnum implements BaseEnum { /** @@ -23,30 +28,7 @@ public enum GenderEnum implements BaseEnum { */ WOMAN(2, "女"); - private final Integer gender; + private final Integer value; private final String desc; - - GenderEnum(Integer gender, String desc) { - this.gender = gender; - this.desc = desc; - } - /** - * 获取枚举类的值 - * - * @return Integer - */ - @Override - public Integer getValue() { - return gender; - } - /** - * 获取枚举类的说明 - * - * @return String - */ - @Override - public String getDesc() { - return desc; - } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/SystemEnvironmentEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/SystemEnvironmentEnum.java index af21758a..0d497534 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/SystemEnvironmentEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/SystemEnvironmentEnum.java @@ -1,11 +1,16 @@ package net.lab1024.smartadmin.service.common.enumconst; +import lombok.AllArgsConstructor; +import lombok.Getter; + /** * 系统环境枚举类 * * @author zhuoda */ +@AllArgsConstructor +@Getter public enum SystemEnvironmentEnum implements BaseEnum { /** * dev @@ -27,34 +32,9 @@ public enum SystemEnvironmentEnum implements BaseEnum { */ PROD(SystemEnvironmentNameConst.PROD, "生产环境"); - private String value; + private final String value; - private String desc; - - SystemEnvironmentEnum(String value, String desc) { - this.value = value; - this.desc = desc; - } - - /** - * 获取定义枚举value值 - * - * @return Integer - */ - @Override - public String getValue() { - return value; - } - - /** - * 获取枚举类的说明 - * - * @return String - */ - @Override - public String getDesc() { - return desc; - } + private final String desc; public static final class SystemEnvironmentNameConst { public static final String DEV = "dev"; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryTypeEnum.java index 6bbfc7a1..aec0e2b4 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryTypeEnum.java @@ -1,6 +1,8 @@ package net.lab1024.smartadmin.service.module.business.category.constant; +import lombok.AllArgsConstructor; +import lombok.Getter; import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; /** @@ -9,6 +11,8 @@ import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; * @author listen * @date 2021/08/05 15:26 */ +@AllArgsConstructor +@Getter public enum CategoryTypeEnum implements BaseEnum { /** @@ -23,32 +27,7 @@ public enum CategoryTypeEnum implements BaseEnum { ; - private final Integer type; + private final Integer value; private final String desc; - - CategoryTypeEnum(Integer type, String desc) { - this.type = type; - this.desc = desc; - } - - /** - * 获取枚举类的值 - * - * @return Integer - */ - @Override - public Integer getValue() { - return type; - } - - /** - * 获取枚举类的说明 - * - * @return String - */ - @Override - public String getDesc() { - return desc; - } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/constant/GoodsTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/constant/GoodsTypeEnum.java index dacd59b6..0b804a12 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/constant/GoodsTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/constant/GoodsTypeEnum.java @@ -1,6 +1,8 @@ package net.lab1024.smartadmin.service.module.business.goods.constant; +import lombok.AllArgsConstructor; +import lombok.Getter; import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; /** @@ -9,6 +11,8 @@ import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; * @author listen * @date 2021/08/05 15:26 */ +@AllArgsConstructor +@Getter public enum GoodsTypeEnum implements BaseEnum { /** @@ -23,32 +27,7 @@ public enum GoodsTypeEnum implements BaseEnum { ; - private final Integer type; + private final Integer value; private final String desc; - - GoodsTypeEnum(Integer type, String desc) { - this.type = type; - this.desc = desc; - } - - /** - * 获取枚举类的值 - * - * @return Integer - */ - @Override - public Integer getValue() { - return type; - } - - /** - * 获取枚举类的说明 - * - * @return String - */ - @Override - public String getDesc() { - return desc; - } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerBusinessTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerBusinessTypeEnum.java index 56a61244..22ce584a 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerBusinessTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerBusinessTypeEnum.java @@ -1,6 +1,8 @@ package net.lab1024.smartadmin.service.module.support.datatracer.constant; +import lombok.AllArgsConstructor; +import lombok.Getter; import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; /** @@ -9,29 +11,15 @@ import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; * @author 罗伊 * @date 2020/8/11 15:56 */ +@AllArgsConstructor +@Getter public enum DataTracerBusinessTypeEnum implements BaseEnum { NOTICE(1, "系统通知"), ; - private Integer value; - - private String desc; - - DataTracerBusinessTypeEnum(Integer value, String desc) { - this.value = value; - this.desc = desc; - } - - @Override - public Integer getValue() { - return value; - } - - @Override - public String getDesc() { - return desc; - } + private final Integer value; + private final String desc; } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerOperateTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerOperateTypeEnum.java index b028421e..c06369ab 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerOperateTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerOperateTypeEnum.java @@ -1,6 +1,8 @@ package net.lab1024.smartadmin.service.module.support.datatracer.constant; +import lombok.AllArgsConstructor; +import lombok.Getter; import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; /** @@ -13,6 +15,8 @@ public interface DataTracerOperateTypeEnum extends BaseEnum { Integer INIT_CODE = 4; + @AllArgsConstructor + @Getter enum Common implements BaseEnum { SAVE(0, "保存"), SAVE_SUBMIT(1, "保存并提交"), @@ -20,23 +24,9 @@ public interface DataTracerOperateTypeEnum extends BaseEnum { UPDATE_SUBMIT(3, "更新并提交"), DELETE(4, "删除"); - private Integer value; - private String desc; + private final Integer value; - Common(Integer value, String desc) { - this.value = value; - this.desc = desc; - } - - @Override - public Integer getValue() { - return value; - } - - @Override - public String getDesc() { - return desc; - } + private final String desc; } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorService.java index a987f49a..ca49cac2 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorService.java @@ -58,7 +58,7 @@ public class IdGeneratorService { * @return */ public ResponseDTO generate(IdGeneratorEnum idGeneratorEnum) { - int generatorId = idGeneratorEnum.getId(); + int generatorId = idGeneratorEnum.getValue(); IdGeneratorEntity idGeneratorEntity = this.idGeneratorMap.get(generatorId); if (null == idGeneratorEntity) { return ResponseDTO.wrapMsg(ResponseCodeConst.ERROR_PARAM, "IdGenerator， 生成器 不存在" + generatorId); @@ -69,7 +69,7 @@ public class IdGeneratorService { int monthValue = now.getMonthValue(); int dayOfMonth = now.getDayOfMonth(); - String lockKey = RedisKeyConst.Base.ID_GENERATOR + idGeneratorEnum.getKeyName(); + String lockKey = RedisKeyConst.Base.ID_GENERATOR + idGeneratorEnum.getDesc(); try { boolean lock = false; @@ -107,7 +107,7 @@ public class IdGeneratorService { Long lastNumber = generatorRecordDTO.getLastNumber(); IdGeneratorRuleTypeEnum ruleTypeEnum = this.getIdGeneratorRuleTypeEnum(idGeneratorEntity.getRuleType()); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern(ruleTypeEnum.getExt()); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern(ruleTypeEnum.getValue()); String nowFormat = now.format(formatter); if (IdGeneratorRuleTypeEnum.YEAR_CYCLE == ruleTypeEnum || IdGeneratorRuleTypeEnum.MONTH_CYCLE == ruleTypeEnum || IdGeneratorRuleTypeEnum.DAY_CYCLE == ruleTypeEnum) { if (!Objects.equals(generatorRecordDTO.getUpdateTime().format(formatter), nowFormat)) { diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorEnum.java index d905b01f..bd11dd90 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorEnum.java @@ -1,45 +1,27 @@ package net.lab1024.smartadmin.service.module.support.idgenerator.constant; +import lombok.AllArgsConstructor; +import lombok.Getter; import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; /** + * id生成枚举类 + * * @author Administrator */ - +@AllArgsConstructor +@Getter public enum IdGeneratorEnum implements BaseEnum { ; - private Integer id; + private final Integer value; - private String keyName; - - IdGeneratorEnum(int id, String keyName) { - this.id = id; - this.keyName = keyName; - } + private final String desc; @Override public String toString() { - return "IdGeneratorEnum{" + "id=" + id + ", keyName='" + keyName + '\'' + '}'; - } - - public int getId() { - return id; - } - - public String getKeyName() { - return keyName; - } - - @Override - public Integer getValue() { - return id; - } - - @Override - public String getDesc() { - return null; + return "IdGeneratorEnum{" + "id=" + value + ", keyName='" + desc + '\'' + '}'; } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorRuleTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorRuleTypeEnum.java index 7e6217e9..36f1ae75 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorRuleTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorRuleTypeEnum.java @@ -1,35 +1,36 @@ package net.lab1024.smartadmin.service.module.support.idgenerator.constant; +import lombok.AllArgsConstructor; +import lombok.Getter; +import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; + /** * [ ] * * @author 罗伊 */ -public enum IdGeneratorRuleTypeEnum { +@AllArgsConstructor +@Getter +public enum IdGeneratorRuleTypeEnum implements BaseEnum { /** * 没有周期 */ - NO_CYCLE(""), + NO_CYCLE("", "没有周期"), /** * 年周期 */ - YEAR_CYCLE("yyyy"), + YEAR_CYCLE("yyyy", "年"), /** * 月周期 */ - MONTH_CYCLE("yyyyMM"), + MONTH_CYCLE("yyyyMM", "年月"), /** * 日周期 */ - DAY_CYCLE("yyyyMMdd"); + DAY_CYCLE("yyyyMMdd", "年月日"); - private String ext; + private final String value; - IdGeneratorRuleTypeEnum(String ext) { - this.ext = ext; - } + private final String desc; - public String getExt() { - return ext; - } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeTypeEnum.java index 9451098b..cc3c6487 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeTypeEnum.java @@ -1,6 +1,8 @@ package net.lab1024.smartadmin.service.module.system.datascope.constant; +import lombok.AllArgsConstructor; +import lombok.Getter; import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; /** @@ -8,43 +10,18 @@ import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; * * @author 罗伊 */ +@AllArgsConstructor +@Getter public enum DataScopeTypeEnum implements BaseEnum { NOTICE(7, 7, "系统通知", "系统通知数据范围"), ; - private Integer value; + private final Integer value; - private Integer sort; - - private String name; - - private String desc; - - DataScopeTypeEnum(Integer value, Integer sort, String name, String desc) { - this.value = value; - this.sort = sort; - this.name = name; - this.desc = desc; - } - - @Override - public Integer getValue() { - return value; - } - - public Integer getSort() { - return sort; - } - - @Override - public String getDesc() { - return desc; - } - - public String getName() { - return name; - } + private final Integer sort; + private final String name; + private final String desc; } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeViewTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeViewTypeEnum.java index 10aa4573..3cb298dd 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeViewTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeViewTypeEnum.java @@ -1,6 +1,8 @@ package net.lab1024.smartadmin.service.module.system.datascope.constant; +import lombok.AllArgsConstructor; +import lombok.Getter; import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; /** @@ -8,6 +10,8 @@ import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; * * @author 罗伊 */ +@AllArgsConstructor +@Getter public enum DataScopeViewTypeEnum implements BaseEnum { ME(0, 0, "本人"), @@ -18,29 +22,9 @@ public enum DataScopeViewTypeEnum implements BaseEnum { ALL(3, 15, "全部"); - private Integer value; - private Integer level; - private String desc; - - DataScopeViewTypeEnum(Integer value, Integer level, String desc) { - this.value = value; - this.level = level; - this.desc = desc; - } - - @Override - public Integer getValue() { - return value; - } - - public Integer getLevel() { - return level; - } - - @Override - public String getDesc() { - return desc; - } + private final Integer value; + private final Integer level; + private final String desc; } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeWhereInTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeWhereInTypeEnum.java index b454caa8..90cf3b1b 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeWhereInTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeWhereInTypeEnum.java @@ -1,6 +1,8 @@ package net.lab1024.smartadmin.service.module.system.datascope.constant; +import lombok.AllArgsConstructor; +import lombok.Getter; import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; /** @@ -8,6 +10,8 @@ import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; * * @author 罗伊 */ +@AllArgsConstructor +@Getter public enum DataScopeWhereInTypeEnum implements BaseEnum { EMPLOYEE(0, "以员工IN"), @@ -16,23 +20,7 @@ public enum DataScopeWhereInTypeEnum implements BaseEnum { CUSTOM_STRATEGY(2, "自定义策略"); - private Integer value; - private String desc; - - DataScopeWhereInTypeEnum(Integer value, String desc) { - this.value = value; - this.desc = desc; - } - - @Override - public Integer getValue() { - return value; - } - - @Override - public String getDesc() { - return desc; - } - + private final Integer value; + private final String desc; } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/constant/MenuTypeEnum.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/constant/MenuTypeEnum.java index 3cb01f39..0ac74d29 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/constant/MenuTypeEnum.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/constant/MenuTypeEnum.java @@ -1,6 +1,8 @@ package net.lab1024.smartadmin.service.module.system.menu.constant; +import lombok.AllArgsConstructor; +import lombok.Getter; import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; /** @@ -9,6 +11,8 @@ import net.lab1024.smartadmin.service.common.enumconst.BaseEnum; * @author 卓大 * @date 2021/7/29 15:30 */ +@AllArgsConstructor +@Getter public enum MenuTypeEnum implements BaseEnum { /** * 目录 @@ -23,23 +27,7 @@ public enum MenuTypeEnum implements BaseEnum { */ POINTS(3, "功能点"); - private Integer value; + private final Integer value; - private String desc; - - - MenuTypeEnum(Integer value, String desc) { - this.value = value; - this.desc = desc; - } - - @Override - public Integer getValue() { - return value; - } - - @Override - public String getDesc() { - return desc; - } + private final String desc; }