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 c603b99..fc41d4c 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 @@ -88,8 +88,11 @@ public class DynamicEntity extends BaseBean implements Serializable { } public void setDynProperty(Map params) { + LOGGER.info("set Dyn Property params",params); + LOGGER.info("set Dyn Property params",params); if (params != null && params.size() > 0){ params.forEach((k,v)->{{ + LOGGER.info("set Dyn Property Key:{},Value:{}",k,v); setDynProperty(k,v); }}); } @@ -107,6 +110,7 @@ public class DynamicEntity extends BaseBean implements Serializable { String setMethodName = "set" + propName.substring(0,1).toUpperCase() + propName.substring(1); try { val = getValue(propName,val); + LOGGER.error("设置动态对象属性值 attr name:{} -> value:{} ",setMethodName,val); Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()}); setMethod.invoke(this, val); } catch (NoSuchMethodException e) { diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index 9cb8bbc..e1f0536 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 数据对象 @@ -52,6 +53,10 @@ public class BfDataObjectProperty extends BaseBean { @ApiParam(value ="数据对象类型") private Integer objectColumnType; + @Column(name="OBJECT_COLUMN_DEFAULT_WHERE") + @ApiParam(value ="默认查询条件") + private Integer objectColumnDefaultWhere; + // 字段长度 @ApiParam(value = "字段长度") @Column(name="OBJECT_COLUMN_PRECISION") @@ -86,4 +91,12 @@ public class BfDataObjectProperty extends BaseBean { @ApiParam(value ="属性描述") private String propertyDescription; + @Transient + @ApiParam(value ="默认查询条件") + private Integer objectColumnCustomWhere; + + @Transient + @ApiParam(value ="元素值") + private transient Object propertyFormValue; + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java new file mode 100644 index 0000000..9669922 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.model.form; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.form.bean.BfDataObject; +import cn.estsh.i3plus.pojo.form.bean.BfDataObjectProperty; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : Adair Peng + * @CreateDate : 2019-06-06 15:40 + * @Modify: + **/ +@Data +public class CloudFormModel { + + private BfDataObject dataObject; + + // 数据源编码 + private String sourceCode; //任何操作必填 必须真实 + // 数据对象编码 + private String dataObjectCode; // 任何操作必填 必须真实 + + // 单条插入 + private Map insert; + + // 单条修改 + private Map update; + + // 新增数据 + private List> insertList; + + // 修改数据 + private List> updateList; + + // 查询数据 + private List selectList; + + // 查询单条数据 + private Long select; + + // 删除数据 + private List deleteList; + + // 删除数据ID + private Long delete; + + public String orderByParam; + + public Integer ascOrDesc = 1; + + public String orderBy(){ + String result = ""; + if (orderByParam!=null&&orderByParam.trim().length()>0) { + result = " order by " + orderByParam; + if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + result += " asc"; + }else{ + result += " desc"; + } + } + return result; + } + +}