From 97e992f05fbe3942a6fdbf678191df786ae89ea0 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Sun, 21 Apr 2019 19:58:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8=E5=BC=80=E5=8F=911.1=E5=AE=8C?= =?UTF-8?q?=E6=88=90=20=20=20=20=20=20=20=20=20=20=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/dynamic/DynamicEntity.java | 65 +++++++++++++++------- .../pojo/base/enumutil/BlockFormEnumUtil.java | 1 + .../i3plus/pojo/form/bean/BfElementProperty.java | 7 +-- .../estsh/i3plus/pojo/form/bean/BfElementTree.java | 4 ++ .../cn/estsh/i3plus/pojo/model/form/FormModel.java | 7 +-- 5 files changed, 56 insertions(+), 28 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 99771c9..5665951 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 @@ -1,9 +1,11 @@ package cn.estsh.i3plus.pojo.base.dynamic; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.persistence.Transient; import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -28,6 +30,8 @@ public class DynamicEntity extends BaseBean implements Serializable { public String tableName; public List propertyList; + @ApiParam(value ="子集列表") + private List childList = new ArrayList<>(); public DynamicEntity(){ try { @@ -42,13 +46,6 @@ public class DynamicEntity extends BaseBean implements Serializable { this.tableName = tableName; } - public String getTableName() { - return tableName; - } - - public void setTableName(String tableName) { - this.tableName = tableName; - } /** * 初始化属性，以便动态加载 @@ -60,8 +57,7 @@ public class DynamicEntity extends BaseBean implements Serializable { Field[] fields = this.getClass().getDeclaredFields(); for(Field f : fields) { String propName = f.getName().replace(ATTR_PREFIX, ""); - if(!"LOGGER".equals(propName) && !"ATTR_PREFIX".equals(propName) - && !"propertyList".equals(propName) && !"dynProperty".equals(propName) ) { + if (!isDefaultField(propName)) { // 添加到属性list中 this.getPropertyList().add(propName); // 属性初始化 @@ -77,8 +73,7 @@ public class DynamicEntity extends BaseBean implements Serializable { Field[] fields = this.getClass().getDeclaredFields(); for(Field f : fields) { String fieldName = f.getName().replace(ATTR_PREFIX, ""); - if (!"LOGGER".equals(fieldName) && !"ATTR_PREFIX".equals(fieldName) - && !"propertyList".equals(fieldName) && !"dynProperty".equals(fieldName)) { + if (!isDefaultField(fieldName)) { result += "\"" + fieldName + "\":\"" + getDynProperty(fieldName) + "\","; } @@ -92,7 +87,6 @@ public class DynamicEntity extends BaseBean implements Serializable { return result; } - public void setDynProperty(Map params) { if (params != null && params.size() > 0){ params.forEach((k,v)->{{ @@ -140,14 +134,6 @@ public class DynamicEntity extends BaseBean implements Serializable { return getValue(propName,result); } - public List getPropertyList() { - return propertyList; - } - - public void setPropertyList(List propertyList) { - this.propertyList = propertyList; - } - /** * 获取默认值 * @param propName @@ -188,4 +174,43 @@ public class DynamicEntity extends BaseBean implements Serializable { return val; } + /** + * 是否是本类属性 + * @param fieldName + * @return + */ + public boolean isDefaultField(String fieldName){ + if (!ATTR_PREFIX.equals(fieldName)) { + if("propertyList".equals(fieldName) || "dynProperty".equals(fieldName) || "childList".equals(fieldName) + || "LOGGER".equals(fieldName)){ + return true; + } + } + return false; + } + + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public List getPropertyList() { + return propertyList; + } + + public void setPropertyList(List propertyList) { + this.propertyList = propertyList; + } + + public List getChildList() { + return childList; + } + + public void setChildList(List childList) { + this.childList = childList; + } } 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 1b302cd..895a4a9 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 @@ -832,6 +832,7 @@ public class BlockFormEnumUtil { PASSWORD(230, "PASSWORD", "密码"), 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", "文件"), 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 3a2b46f..f4a6151 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 @@ -115,10 +115,9 @@ public class BfElementProperty extends BaseBean { @ApiParam(value = "控件显示格式") private String propertyControlFormat; - @Column(name = "PROPERTY_CONTROL_REF_ID") - @ApiParam(value = "控件引用RefId") - @JsonSerialize(using = ToStringSerializer.class) - private Long propertyControlRefId; + @Column(name = "PROPERTY_CONTROL_REF_KEY") + @ApiParam(value = "控件引用RefKey") + private String propertyControlRefKey; @Column(name = "PROPERTY_DESCRIPTION") @ApiParam(value = "属性描述") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java index 8883376..aefdef9 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementTree.java @@ -52,6 +52,10 @@ public class BfElementTree extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long treeAttrValueId; + @Column(name="TREE_IS_OPEN_ALL") + @ApiParam(value ="是否全部展开") + private Integer treeIsOpenAll; + @Column(name="TREE_DEFAULT_DIRECTION") @ApiParam(value ="树默认方向") private Integer treeDefaultDirection; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java index 08b4fd5..e8cc46b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.pojo.model.form; -import cn.estsh.i3plus.pojo.form.bean.BfButton; -import cn.estsh.i3plus.pojo.form.bean.BfLayout; -import cn.estsh.i3plus.pojo.form.bean.BfMethod; -import cn.estsh.i3plus.pojo.form.bean.BfMethodDetail; +import cn.estsh.i3plus.pojo.form.bean.*; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -54,4 +51,6 @@ public class FormModel { @ApiParam(value = "元素Model") private List elementModelList; + @ApiParam(value = "表单功能明细关联属性") + private List methodDetailPropertyRefList; }