diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
index 650d294..3af434a 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
@@ -823,114 +823,6 @@ public class BlockFormEnumUtil {
}
}
- /**
- * 元素控件类型信息
- */
- @JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum PROPERTY_CONTROL_TYPE {
- RADIO(100, "RADIO", "单选"),
- CHECKBOX(110, "CHECKBOX", "复选"),
- TEXT(200, "TEXT", "文本"),
- NUMBER(210, "NUMBER", "数字"),
- PASSWORD(230, "PASSWORD", "密码"),
- DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN),
-// DATE(300, "DATE", "日期(yyyy-MM-dd)"),
-// DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
- // ELEMENT(700, "DICT_SELECT", "元素"),
- DICTIONARY(800, "DICT_SELECT", "字典"),
- CASCADE(900, "CASCADE", "级联");
- //FILE(400, "file", "文件"),
- //IMAGE(410, "image", "image"),
- //OFF(500, "color", "颜色"),
-
- private int value;
- private String code;
- private String description;
-
- /**
- * 默认查询关系
- */
- private SQL_WHERE defaultWhere;
-
- PROPERTY_CONTROL_TYPE(int value, String code, String description) {
- this.value = value;
- this.code = code;
- this.description = description;
- }
-
- PROPERTY_CONTROL_TYPE(int value, String code, String description, SQL_WHERE defaultWhere) {
- this.value = value;
- this.code = code;
- this.description = description;
- this.defaultWhere = defaultWhere;
- }
-
- public int getValue() {
- return value;
- }
-
- public String getCode() {
- return code;
- }
-
- public String getDescription() {
- return description;
- }
-
- public SQL_WHERE getDefaultWhere() {
- return defaultWhere;
- }
-
- public static String valueOfCode(int val) {
- String tmp = null;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].value == val) {
- tmp = values()[i].code;
- }
- }
- return tmp;
- }
-
- public static int codeOfValue(String code) {
- int tmp = 1;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].code.equals(code)) {
- tmp = values()[i].value;
- }
- }
- return tmp;
- }
-
- public static String valueOfDescription(int val) {
- String tmp = null;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].value == val) {
- tmp = values()[i].description;
- }
- }
- return tmp;
- }
-
- public static PROPERTY_CONTROL_TYPE valueOf(int val) {
- String tmp = null;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].value == val) {
- return values()[i];
- }
- }
- return null;
- }
-
- public static String codeOfDescription(String code) {
- String tmp = null;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].code.equals(code)) {
- tmp = values()[i].description;
- }
- }
- return tmp;
- }
- }
/**
* 属性字段排序规则
@@ -1172,102 +1064,26 @@ public class BlockFormEnumUtil {
}
}
+
+
/**
- * 属性类型信息(属性转换器)
- *
- *
Form 核心转换器
- *
数据库字段类型转换Java 属性类型
- *
Java 属性 转换为控件类型
- *
+ * 执行类型信息
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum PROPERTY_TYPE {
- STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,""),
- CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,""),
- INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
- LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
- DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
- FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
- BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
- BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null),
- BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null),
- DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,SQL_WHERE.BETWEEN,null,"yyyy-MM-dd hh:mm:ss");
+ public enum EXECUTION_TYPE {
+ SQL(10, "SQL", "SQL脚本"),
+ CLASS_METHOD(20, "ClassMethod", "类方法"),
+ SYSTEM_JAVA(30, "SystemClassMethod", "系统类方法"),
+ SCRIPT(40, "Script", "脚本");
- /**
- * 属性类型值
- */
private int value;
- /**
- * 属性类型代码
- */
private String code;
- /**
- * 属性类型描述
- */
private String description;
- /**
- * 属性类型ClassPath
- */
- private String classPath;
- /**
- * 属性类型 Class
- */
- private Class clzFullName;
- /**
- * 属性类型 对应的 控件类型
- */
- private PROPERTY_CONTROL_TYPE controlType;
-
- /**
- * 默认查询关系
- */
- private SQL_WHERE defaultWhere;
-
- /**
- * 默认 格式化 方式
- */
- private String defaultFormat;
-
- /**
- * 默认查询关系
- */
- private String defaultValue;
-
- private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
- PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) {
- this.value = value;
- this.code = code;
- this.description = description;
- this.classPath = classPath;
- this.clzFullName = clzFullName;
- this.controlType = controlType;
- this.defaultWhere = defaultWhere;
- }
-
- private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
- PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) {
- this.value = value;
- this.code = code;
- this.description = description;
- this.classPath = classPath;
- this.clzFullName = clzFullName;
- this.controlType = controlType;
- this.defaultWhere = defaultWhere;
- this.defaultValue = defaultValue;
- this.defaultFormat = defaultFormat;
- }
- private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
- PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) {
+ private EXECUTION_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
- this.classPath = classPath;
- this.clzFullName = clzFullName;
- this.controlType = controlType;
- this.defaultWhere = defaultWhere;
- this.defaultValue = defaultValue;
- this.defaultFormat = defaultFormat;
}
public int getValue() {
@@ -1282,30 +1098,6 @@ public class BlockFormEnumUtil {
return description;
}
- public String getClassPath() {
- return classPath;
- }
-
- public Class getClzFullName() {
- return clzFullName;
- }
-
- public PROPERTY_CONTROL_TYPE getControlType() {
- return controlType;
- }
-
- public SQL_WHERE getDefaultWhere() {
- return defaultWhere;
- }
-
- public String getDefaultFormat() {
- return defaultFormat;
- }
-
- public String getDefaultValue() {
- return defaultValue;
- }
-
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@@ -1316,182 +1108,38 @@ public class BlockFormEnumUtil {
return tmp;
}
- public static PROPERTY_TYPE valueOfClzFullName(int val) {
- PROPERTY_TYPE tmp = null;
+ public static int codeOfValue(String code) {
+ int tmp = 1;
for (int i = 0; i < values().length; i++) {
- if (values()[i].value == val) {
- tmp = values()[i];
+ if (values()[i].code.equals(code)) {
+ tmp = values()[i].value;
}
}
return tmp;
}
-
- public static PROPERTY_CONTROL_TYPE valueOfControlType(int val) {
- PROPERTY_CONTROL_TYPE tmp = null;
+ public static String valueOfDescription(int val) {
+ String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
- tmp = values()[i].controlType;
+ tmp = values()[i].description;
}
}
return tmp;
}
- public static int codeOfValue(String code) {
- int tmp = 1;
+ public static EXECUTION_TYPE valueOf(int val) {
+ String tmp = null;
for (int i = 0; i < values().length; i++) {
- if (values()[i].code.equals(code)) {
- tmp = values()[i].value;
+ if (values()[i].value == val) {
+ return values()[i];
}
}
- return tmp;
+ return null;
}
- public static int codeOfClzFullName(Class clzFullName) {
- int tmp = 1;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].clzFullName.equals(clzFullName)) {
- tmp = values()[i].value;
- }
- }
- return tmp;
- }
-
- public static int codeOfClassPath(String classPath) {
- int tmp = 1;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].classPath.equals(classPath)) {
- tmp = values()[i].value;
- }
- }
- return tmp;
- }
-
- public static String valueOfDescription(int val) {
- String tmp = null;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].value == val) {
- tmp = values()[i].description;
- }
- }
- return tmp;
- }
-
- public static PROPERTY_TYPE valueOfClassPath(String classPath) {
- PROPERTY_TYPE tmp = null;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].classPath.equals(classPath)) {
- tmp = values()[i];
- }
- }
- return tmp;
- }
-
- public static PROPERTY_TYPE valueOf(int val) {
- String tmp = null;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].value == val) {
- return values()[i];
- }
- }
- return null;
- }
-
- public static PROPERTY_TYPE indexOf(String val) {
- String tmp = null;
- for (int i = 0; i < values().length; i++) {
- if (val.indexOf(values()[i].value) >= 0) {
- return values()[i];
- }
- }
- return null;
- }
-
- public static String codeOfDescription(String code) {
- String tmp = null;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].code.equals(code)) {
- tmp = values()[i].description;
- }
- }
- return tmp;
- }
- }
-
- /**
- * 执行类型信息
- */
- @JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum EXECUTION_TYPE {
- SQL(10, "SQL", "SQL脚本"),
- CLASS_METHOD(20, "ClassMethod", "类方法"),
- SYSTEM_JAVA(30, "SystemClassMethod", "系统类方法"),
- SCRIPT(40, "Script", "脚本");
-
- private int value;
- private String code;
- private String description;
-
- private EXECUTION_TYPE(int value, String code, String description) {
- this.value = value;
- this.code = code;
- this.description = description;
- }
-
- public int getValue() {
- return value;
- }
-
- public String getCode() {
- return code;
- }
-
- public String getDescription() {
- return description;
- }
-
- public static String valueOfCode(int val) {
- String tmp = null;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].value == val) {
- tmp = values()[i].code;
- }
- }
- return tmp;
- }
-
- public static int codeOfValue(String code) {
- int tmp = 1;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].code.equals(code)) {
- tmp = values()[i].value;
- }
- }
- return tmp;
- }
-
- public static String valueOfDescription(int val) {
- String tmp = null;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].value == val) {
- tmp = values()[i].description;
- }
- }
- return tmp;
- }
-
- public static EXECUTION_TYPE valueOf(int val) {
- String tmp = null;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].value == val) {
- return values()[i];
- }
- }
- return null;
- }
-
- public static String codeOfDescription(String code) {
- String tmp = null;
+ public static String codeOfDescription(String code) {
+ String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
@@ -2423,6 +2071,115 @@ public class BlockFormEnumUtil {
}
/**
+ * 元素控件类型信息
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum PROPERTY_CONTROL_TYPE {
+ RADIO(100, "RADIO", "单选"),
+ CHECKBOX(110, "CHECKBOX", "复选"),
+ TEXT(200, "TEXT", "文本"),
+ NUMBER(210, "NUMBER", "数字"),
+ PASSWORD(230, "PASSWORD", "密码"),
+ DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN),
+ // DATE(300, "DATE", "日期(yyyy-MM-dd)"),
+// DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
+ // ELEMENT(700, "DICT_SELECT", "元素"),
+ DICTIONARY(800, "DICT_SELECT", "字典"),
+ CASCADE(900, "CASCADE", "级联");
+ //FILE(400, "file", "文件"),
+ //IMAGE(410, "image", "image"),
+ //OFF(500, "color", "颜色"),
+
+ private int value;
+ private String code;
+ private String description;
+
+ /**
+ * 默认查询关系
+ */
+ private SQL_WHERE defaultWhere;
+
+ PROPERTY_CONTROL_TYPE(int value, String code, String description) {
+ this.value = value;
+ this.code = code;
+ this.description = description;
+ }
+
+ PROPERTY_CONTROL_TYPE(int value, String code, String description, SQL_WHERE defaultWhere) {
+ this.value = value;
+ this.code = code;
+ this.description = description;
+ this.defaultWhere = defaultWhere;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public SQL_WHERE getDefaultWhere() {
+ return defaultWhere;
+ }
+
+ public static String valueOfCode(int val) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ tmp = values()[i].code;
+ }
+ }
+ return tmp;
+ }
+
+ public static int codeOfValue(String code) {
+ int tmp = 1;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].code.equals(code)) {
+ tmp = values()[i].value;
+ }
+ }
+ return tmp;
+ }
+
+ public static String valueOfDescription(int val) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ tmp = values()[i].description;
+ }
+ }
+ return tmp;
+ }
+
+ public static PROPERTY_CONTROL_TYPE valueOf(int val) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ return values()[i];
+ }
+ }
+ return null;
+ }
+
+ public static String codeOfDescription(String code) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].code.equals(code)) {
+ tmp = values()[i].description;
+ }
+ }
+ return tmp;
+ }
+ }
+
+ /**
* 条件运算符
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -2510,4 +2267,250 @@ public class BlockFormEnumUtil {
return tmp;
}
}
+
+ /**
+ * 属性类型信息(属性转换器)
+ *
+ *
Form 核心转换器
+ *
数据库字段类型转换Java 属性类型
+ *
Java 属性 转换为控件类型
+ *
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum PROPERTY_TYPE {
+ STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,""),
+ CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,""),
+ INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
+ LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
+ DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
+ FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
+ BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
+ BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null),
+ BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null),
+ DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,SQL_WHERE.BETWEEN,null,"yyyy-MM-dd hh:mm:ss");
+
+ /**
+ * 属性类型值
+ */
+ private int value;
+ /**
+ * 属性类型代码
+ */
+ private String code;
+ /**
+ * 属性类型描述
+ */
+ private String description;
+ /**
+ * 属性类型ClassPath
+ */
+ private String classPath;
+ /**
+ * 属性类型 Class
+ */
+ private Class clzFullName;
+ /**
+ * 属性类型 对应的 控件类型
+ */
+ private PROPERTY_CONTROL_TYPE controlType;
+
+ /**
+ * 默认查询关系
+ */
+ private SQL_WHERE defaultWhere;
+
+ /**
+ * 默认 格式化 方式
+ */
+ private String defaultFormat;
+
+ /**
+ * 默认查询关系
+ */
+ private String defaultValue;
+
+ private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
+ PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) {
+ this.value = value;
+ this.code = code;
+ this.description = description;
+ this.classPath = classPath;
+ this.clzFullName = clzFullName;
+ this.controlType = controlType;
+ this.defaultWhere = defaultWhere;
+ }
+
+ private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
+ PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) {
+ this.value = value;
+ this.code = code;
+ this.description = description;
+ this.classPath = classPath;
+ this.clzFullName = clzFullName;
+ this.controlType = controlType;
+ this.defaultWhere = defaultWhere;
+ this.defaultValue = defaultValue;
+ this.defaultFormat = defaultFormat;
+ }
+
+ private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
+ PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) {
+ this.value = value;
+ this.code = code;
+ this.description = description;
+ this.classPath = classPath;
+ this.clzFullName = clzFullName;
+ this.controlType = controlType;
+ this.defaultWhere = defaultWhere;
+ this.defaultValue = defaultValue;
+ this.defaultFormat = defaultFormat;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public String getClassPath() {
+ return classPath;
+ }
+
+ public Class getClzFullName() {
+ return clzFullName;
+ }
+
+ public PROPERTY_CONTROL_TYPE getControlType() {
+ return controlType;
+ }
+
+ public SQL_WHERE getDefaultWhere() {
+ return defaultWhere;
+ }
+
+ public String getDefaultFormat() {
+ return defaultFormat;
+ }
+
+ public String getDefaultValue() {
+ return defaultValue;
+ }
+
+ public static String valueOfCode(int val) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ tmp = values()[i].code;
+ }
+ }
+ return tmp;
+ }
+
+ public static PROPERTY_TYPE valueOfClzFullName(int val) {
+ PROPERTY_TYPE tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ tmp = values()[i];
+ }
+ }
+ return tmp;
+ }
+
+
+ public static PROPERTY_CONTROL_TYPE valueOfControlType(int val) {
+ PROPERTY_CONTROL_TYPE tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ tmp = values()[i].controlType;
+ }
+ }
+ return tmp;
+ }
+
+ public static int codeOfValue(String code) {
+ int tmp = 1;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].code.equals(code)) {
+ tmp = values()[i].value;
+ }
+ }
+ return tmp;
+ }
+
+ public static int codeOfClzFullName(Class clzFullName) {
+ int tmp = 1;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].clzFullName.equals(clzFullName)) {
+ tmp = values()[i].value;
+ }
+ }
+ return tmp;
+ }
+
+ public static int codeOfClassPath(String classPath) {
+ int tmp = 1;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].classPath.equals(classPath)) {
+ tmp = values()[i].value;
+ }
+ }
+ return tmp;
+ }
+
+ public static String valueOfDescription(int val) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ tmp = values()[i].description;
+ }
+ }
+ return tmp;
+ }
+
+ public static PROPERTY_TYPE valueOfClassPath(String classPath) {
+ PROPERTY_TYPE tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].classPath.equals(classPath)) {
+ tmp = values()[i];
+ }
+ }
+ return tmp;
+ }
+
+ public static PROPERTY_TYPE valueOf(int val) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ return values()[i];
+ }
+ }
+ return null;
+ }
+
+ public static PROPERTY_TYPE indexOf(String val) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (val.indexOf(values()[i].value) >= 0) {
+ return values()[i];
+ }
+ }
+ return null;
+ }
+
+ public static String codeOfDescription(String code) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].code.equals(code)) {
+ tmp = values()[i].description;
+ }
+ }
+ return tmp;
+ }
+ }
}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
index 7f1caa6..bc2e58a 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
@@ -521,6 +521,15 @@ public class BlockSoftSwitchEnumUtil {
}
return result;
}
+
+ public static PARAM_VALUE_TYPE valueOf(int value){
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == value) {
+ return values()[i];
+ }
+ }
+ return null;
+ }
}
/**
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java
index 19b19eb..3a2a57c 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java
@@ -17,14 +17,18 @@ public class SuitParamModel {
/* 标签名称 */
private String tagName;
- /* 标签 id 属性值 */
+ /* 标签 Class Path */
+ private String classPath;
+ /* 标签 调用的方法名称 */
+ private String methodName;
+ /* 标签 id 属性值 */
private String id;
/* 标签 name 属性值 */
private String name;
/* 标签唯一标识 */
private String pathKey;
/* 标签内容 */
- private String value;
+ private String vaule;
/* 标签类型 Default:PARAM_VALUE_TYPE.STRING */
private Integer type; // BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE