diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 64e12e9..464bf8f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -827,34 +827,34 @@ public class ImppEnumUtil { } } /** - * 系统参数值类型 + * 系统值类型 * 1. String * 2. Number * 3. Date */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SYS_CONFIG_VALUE_TYPE { + public enum SYS_VALUE_TYPE { - STRING("1","text","文本值"), - NUMBER("2","number","数字值"), - DATE("3","date","时间值"), - BOOLEAN("4","switch","布尔值"), - SELECT("5","select","多选值"); + STRING(1,"text","文本"), + NUMBER(2,"number","数字"), + DATE(3,"date","时间"), + SWITCH(4,"switch","布尔"), + SELECT(5,"select","选择"); - private String value; + private int value; private String name; private String description; - SYS_CONFIG_VALUE_TYPE() { + SYS_VALUE_TYPE() { } - SYS_CONFIG_VALUE_TYPE(String value, String name, String description) { + SYS_VALUE_TYPE(int value, String name, String description) { this.value = value; this.name = name; this.description = description; } - public String getValue() { + public int getValue() { return value; } @@ -869,7 +869,7 @@ public class ImppEnumUtil { public static String valueOfCode(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(val)) { + if (values()[i].value == val) { tmp = values()[i].name; } } @@ -879,7 +879,7 @@ public class ImppEnumUtil { public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(val)) { + if (values()[i].value == val) { tmp = values()[i].description; } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index 1276a63..ad87b86 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -41,7 +41,7 @@ public class SysConfig extends BaseBean { @ApiParam(value ="配置代码") private String configCode; - // 枚举 ImppEnumUtil.SYS_CONFIG_VALUE_TYPE + // 枚举 ImppEnumUtil.SYS_VALUE_TYPE @Column(name="CONFIG_VALUE_TYPE") @ApiParam(value ="配置值类型") private String configValueType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index 5829675..faa65b3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -52,6 +52,11 @@ public class SysDictionary extends BaseBean { @ApiParam(value ="父级节点代码") private String parentCodeRdd; + // 枚举 ImppEnumUtil.SYS_VALUE_TYPE + @Column(name="DICTIONARY_VALUE_TYPE") + @ApiParam(value ="字典值类型") + private Integer dictionaryValueType; + @Column(name="DICTIONARY_VALUE") @ApiParam(value ="字典值") private String dictionaryValue;