From c119c061302cb63668b9cea29d1f28f623cf0a74 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 24 Apr 2019 17:47:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=20=E4=BD=BF=E7=94=A8Redis=201.0=20=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/dynamic/DynamicEntity.java | 2 +- .../cn/estsh/i3plus/pojo/form/bean/BfCascade.java | 2 +- .../estsh/i3plus/pojo/form/bean/BfDataObject.java | 5 ++++ .../cn/estsh/i3plus/pojo/form/bean/BfElement.java | 34 +++++++++++++++++++--- .../estsh/i3plus/pojo/form/bean/BfElementGrid.java | 12 -------- .../estsh/i3plus/pojo/model/form/ElementModel.java | 5 +++- 6 files changed, 41 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java index 5665951..c603b99 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -182,7 +182,7 @@ public class DynamicEntity extends BaseBean implements Serializable { public boolean isDefaultField(String fieldName){ if (!ATTR_PREFIX.equals(fieldName)) { if("propertyList".equals(fieldName) || "dynProperty".equals(fieldName) || "childList".equals(fieldName) - || "LOGGER".equals(fieldName)){ + || "LOGGER".equals(fieldName) || "ATTR_PREFIX".equals(fieldName)){ return true; } } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java index 7317e1b..44bd93e 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascade.java @@ -53,5 +53,5 @@ public class BfCascade extends BaseBean { @Transient @ApiParam(value = "元素详细") @AnnoOutputColumn(hidden = true) - private List detailList; + private List childList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java index 6648ee4..7208908 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java @@ -68,4 +68,9 @@ public class BfDataObject extends BaseBean { @AnnoOutputColumn(hidden = true) private List propertyList; + @Transient + @ApiParam(value = "元素对象虚拟属性") + @AnnoOutputColumn(hidden = true) + List virtualList; + } 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 507a3a2..7f8fbae 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 @@ -45,6 +45,16 @@ public class BfElement extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long dataObjectId; + //外键关联数据对象主键 + @Column(name = "ELEMENT_PROPERTY_PRIMARY_KEY") + @ApiParam(value = "元素主键Key ", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long elementPropertyPrimaryKey; + + @Column(name="ELEMENT_PROPERTY_PRIMARY_KEY_NAME_RDD") + @ApiParam(value ="元素主键Key名称") + private String elementPropertyPrimaryKeyNameRdd; + @Column(name="ELEMENT_TYPE") @ApiParam(value ="元素类型") private Integer elementType; @@ -57,14 +67,30 @@ public class BfElement extends BaseBean { @ApiParam(value ="元素编码") private String elementCode; - @Column(name="ELEMENT_ATTR_ID") + @Column(name = "IS_OBJECT_ADD") + @ApiParam(value = "是否新增") + private Integer isObjectAdd; + + @Column(name = "IS_OBJECT_EDIT") + @ApiParam(value = "是否编辑") + private Integer isObjectEdit; + + @Column(name = "IS_OBJECT_DEL") + @ApiParam(value = "是否删除") + private Integer isObjectDel; + + @Column(name="ELEMENT_SORT_ATTR_ID") @ApiParam(value ="默认排序属性") @JsonSerialize(using = ToStringSerializer.class) - private Long elementAttrId; + private Long elementSortAttrId; + + @Column(name="ELEMENT_SORT_ATTR_CODE_RDD") + @ApiParam(value ="默认排序属性名称") + private String elementSortAttrCodeRdd; - @Column(name="ELEMENT_SORT_TYPE") + @Column(name="ELEMENT_SORT_ATTR_TYPE") @ApiParam(value ="默认排序规则") - private Integer elementSortType; + private Integer elementSortAttrType; @Column(name="ELEMENT_CSS_STYLE") @ApiParam(value ="元素样式") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java index d0eb771..86a7c19 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java @@ -44,18 +44,6 @@ public class BfElementGrid extends BaseBean { @ApiParam(value = "是否单选") private Integer isLineMultiple; - @Column(name = "IS_OBJECT_ADD") - @ApiParam(value = "是否新增") - private Integer isObjectAdd; - - @Column(name = "IS_OBJECT_EDIT") - @ApiParam(value = "是否编辑") - private Integer isObjectEdit; - - @Column(name = "IS_OBJECT_DEL") - @ApiParam(value = "是否删除") - private Integer isObjectDel; - @Column(name = "IS_OBJECT_FIND") @ApiParam(value = "是否查询") private Integer isObjectFind; 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 0e41729..82e59d5 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 @@ -39,8 +39,11 @@ public class ElementModel{ @ApiParam(value = "元素基础虚拟属性信息") private List virtualList; + @ApiParam(value = "级联信息集合") + private List cascadeList; + @ApiParam(value = "动态对象Class") - private Class dynClass; + private transient Class dynClass; @ApiParam(value = "数据对象信息") private BfDataObject dataObject;