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 4ab2c92..1b302cd 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 @@ -1216,6 +1216,18 @@ public class BlockFormEnumUtil { return description; } + public String getClassPath() { + return classPath; + } + + public Class getClzFullName() { + return clzFullName; + } + + public PROPERTY_CONTROL_TYPE getControlType() { + return controlType; + } + public static String valueOfCode(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -1286,6 +1298,16 @@ public class BlockFormEnumUtil { 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 == classPath) { + tmp = values()[i]; + } + } + return tmp; + } + public static PROPERTY_TYPE valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java index c5e200c..d6d796b 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java @@ -50,23 +50,36 @@ public class BfCascadeDetail extends BaseBean { @Column(name="DETAIL_GRADE") @ApiParam(value ="当前级联层级") - private Integer detail_grade; + private Integer detailGrade; @Column(name = "PARENT_ID") @ApiParam(value = "父级ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long parentId; + @Column(name = "PARENT_NAME_RDD") + @ApiParam(value = "父级名称") + private String parentNameRdd; + @Column(name = "ELEMENT_PROPERTY_VALUE_ID") @ApiParam(value = "对象属性-元素属性ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long elementPropertyValueId; + @Column(name = "ELEMENT_PROPERTY_VALUE_Rdd") + @ApiParam(value = "对象属性-元素属性") + private String elementPropertyValueRdd; + @Column(name = "ELEMENT_PROPERTY_TEXT_ID") @ApiParam(value = "显示属性-元素属性ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long elementPropertyTextId; + @Column(name = "ELEMENT_PROPERTY_TEXT_RDD") + @ApiParam(value = "显示属性") + private String elementPropertyTextRdd; + + @Column(name="CASCADE_DETAIL_DESCRIPTION") @ApiParam(value ="级联描述") private String cascadeDetailDescription; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index f787cff..507a3a2 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -59,11 +59,12 @@ public class BfElement extends BaseBean { @Column(name="ELEMENT_ATTR_ID") @ApiParam(value ="默认排序属性") - private String elementAttrId; + @JsonSerialize(using = ToStringSerializer.class) + private Long elementAttrId; @Column(name="ELEMENT_SORT_TYPE") @ApiParam(value ="默认排序规则") - private String elementSortType; + private Integer elementSortType; @Column(name="ELEMENT_CSS_STYLE") @ApiParam(value ="元素样式") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index 1ec1af9..3a2b46f 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -129,7 +129,15 @@ public class BfElementProperty extends BaseBean { private String propertyCssStyle; @Transient + @ApiParam(value ="元素值") + private transient Object propertyFormValue; + + @Transient @ApiParam(value = "对象属性信息") @AnnoOutputColumn(hidden = true) private BfDataObjectProperty objectProperty; + + public Object getFormValue() { + return propertyFormValue == null ? propertyDefaultValue: propertyFormValue; + } } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java index f52cb1b..9f58432 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java @@ -38,6 +38,12 @@ public class BfElementPropertyVirtual extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long elementId; + //外键关联数据对象主键 + @Column(name = "DATA_OBJECT_ID") + @ApiParam(value = "数据对象ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long dataObjectId; + @Column(name="PROPERTY_CODE") @ApiParam(value ="类属性名称") private String propertyCode; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java index 8714cb2..c4a9495 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java @@ -70,10 +70,6 @@ public class BfInterceptDetail extends BaseBean { @ApiParam(value ="拦截器业务结果处理") private Integer interceptProcessResult; - @Transient - @ApiParam(value = "拦截器") - private BfIntercept intercept; - public int getInterceptProcessResultVal(){ if(interceptProcessResult == null ){ return 0; @@ -92,4 +88,8 @@ public class BfInterceptDetail extends BaseBean { return interceptExecuteSort.intValue(); } + @Transient + @ApiParam(value = "拦截器") + private BfIntercept intercept; + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java index ec48bf9..0e41729 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/ElementModel.java @@ -1,9 +1,12 @@ package cn.estsh.i3plus.pojo.model.form; import cn.estsh.i3plus.pojo.form.bean.*; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import java.util.List; /** @@ -16,6 +19,11 @@ import java.util.List; @Data public class ElementModel{ + //外键关联数据对象主键 + @ApiParam(value = "对象元素ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementId; + @ApiParam(value = "元素基础信息") private BfElement element; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java index e1cca37..7c628f7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlColumnModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.form; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -57,5 +58,12 @@ public class SqlColumnModel { @ApiParam(value = "属性默认值") private Object defaultValue; + public SqlColumnModel() { + } + public SqlColumnModel(String columnName, BlockFormEnumUtil.PROPERTY_TYPE type) { + this.columnName = columnName; + this.columnClassType = type.getValue(); + this.columnTypeName = type.getDescription(); + } }