xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-08 13:16:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update enum

Browse Source
This commit is contained in:
Turbolisten 2021-09-27 20:25:14 +08:00
parent 11ba797bd5
commit da7ef2b641
13 changed files with 87 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/GenderEnum.java
View File

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

34
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/enumconst/SystemEnvironmentEnum.java
View File

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

31
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/category/constant/CategoryTypeEnum.java
View File

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

31
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/business/goods/constant/GoodsTypeEnum.java
View File

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

24
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerBusinessTypeEnum.java
View File

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

22
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/datatracer/constant/DataTracerOperateTypeEnum.java
View File

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

6
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/IdGeneratorService.java
View File

@ -58,7 +58,7 @@ public class IdGeneratorService {
* @return
*/
public ResponseDTO<String> 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)) {

36
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorEnum.java
View File

@ -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 + '\'' + '}';
}
}

25
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/support/idgenerator/constant/IdGeneratorRuleTypeEnum.java
View File

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

39
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeTypeEnum.java
View File

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

30
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeViewTypeEnum.java
View File

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

24
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/datascope/constant/DataScopeWhereInTypeEnum.java
View File

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

24
admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/constant/MenuTypeEnum.java
View File

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