From 3630f0c2f1324b2f384b1be433ca86ef0bc4f7e8 Mon Sep 17 00:00:00 2001
From: "wei.peng" <pengwei940613@163.com>
Date: Fri, 7 Jun 2019 03:24:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2Cloud=20?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD=E5=B7=B2?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/dynamic/DynamicEntity.java    |  4 ++
 .../pojo/form/bean/BfDataObjectProperty.java       | 13 ++++
 .../i3plus/pojo/model/form/CloudFormModel.java     | 71 ++++++++++++++++++++++
 3 files changed, 88 insertions(+)
 create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java

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<String,Object> 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<String,Object> insert;
+
+    // 单条修改
+    private Map<String,Object> update;
+
+    // 新增数据
+    private List<Map<String,Object>> insertList;
+
+    // 修改数据
+    private List<Map<String,Object>> updateList;
+
+    // 查询数据
+    private List<BfDataObjectProperty> selectList;
+
+    // 查询单条数据
+    private Long select;
+
+    // 删除数据
+    private List<Long> 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;
+    }
+
+}