merge dev 还原pom

modules/i3plus-pojo-andon/pom.xml

@@ -32,7 +32,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-aps/pom.xml

@@ -36,7 +36,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-base/pom.xml

@@ -49,7 +49,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -2159,6 +2159,16 @@ public class CommonEnumUtil {
             return tmp;
         }
 
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ScreenEnumUtil.java

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.base.enumutil;
 import java.math.BigDecimal;
 import java.net.URL;
 import java.sql.*;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author Wynne.Lu
@@ -68,15 +70,15 @@ public class ScreenEnumUtil {
         }
     }
 
-    public enum SCREEN_TYPE {
+    public enum DEVICE_TYPE {
         PC(10, "PC", "PC端"),
-        PDA(20, "PDA", "PDA手持端");
+        APP(20, "APP", "移动端");
 
         private Integer value;
         private String code;
         private String description;
 
-        SCREEN_TYPE(Integer value, String code, String description) {
+        DEVICE_TYPE(Integer value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -268,46 +270,10 @@ public class ScreenEnumUtil {
 
     }
 
-    public enum LAYOUT_TYPE {
-        SCREEN(10, "SCREEN", "Screen布局"),
-        PANEL(20, "PANEL", "Panel布局");
-
-        private Integer value;
-        private String code;
-        private String description;
-
-        LAYOUT_TYPE(Integer value, String code, String description) {
-            this.value = value;
-            this.code = code;
-            this.description = description;
-        }
-
-        public Integer getValue() {
-            return value;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String codeOfDescription(String code) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].code.equals(code)) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
-
     public enum DATASOURCE_CONNECTION_STATUS {
-        SUCCESS(10, "success", "连接成功"),
-        FAILED(20, "failed", "连接失败");
+        TEST(10, "test", "待连接测试"),
+        SUCCESS(20, "success", "连接成功"),
+        FAILED(30, "failed", "连接失败");
 
         private Integer value;
         private String code;
@@ -450,7 +416,7 @@ public class ScreenEnumUtil {
     }
 
     public enum DATA_RESOURCE_TYPE {
-        ENUM(10, "enum", "枚举"),
+        ENUM(10, "ENUM", "枚举"),
         WEBSOCKET(20, "WEBSOCKET", "WebSocket");
 
         private Integer value;
@@ -489,7 +455,7 @@ public class ScreenEnumUtil {
     public enum MODEL_TYPE {
         DATA_OBJECT(10, "DATA_OBJECT", "数据库对应类型"),
         INNER_MODEL(20, "INNER_MODEL", "程序内部对应类型"),
-        CUSTOMIZE(30, "CUSTOMIZE", "程序内部对应类型");
+        CUSTOMIZE(30, "CUSTOMIZE", "用户自定义类型");
 
         private Integer value;
         private String code;
@@ -741,11 +707,14 @@ public class ScreenEnumUtil {
         DOUBLE(70, "Double", Double.class),
         FLOAT(80, "Float", Float.class),
         BIG_DECIMAL(90, "BigDecimal", BigDecimal.class),
-        STRING(100, "String", BigDecimal.class),
+        STRING(100, "String", String.class),
         DATE(110, "Date", Date.class),
         TIME(120, "Time", Time.class),
         TIMESTAMP(130, "Timestamp", Timestamp.class),
-        ARRAY(140, "Array", Array.class);
+        ARRAY(140, "Array", Array.class),
+        LIST(150, "List", List.class),
+        MAP(160, "Map", Map.class),
+        OBJECT(170, "Object", Object.class);
 
         private Integer value;
         private String code;
@@ -788,6 +757,19 @@ public class ScreenEnumUtil {
             }
             return tmp;
         }
+
+        public static JAVA_TYPES clazzOfEnum(Class clazz) {
+            JAVA_TYPES tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].clazz.equals(clazz)) {
+                    tmp = values()[i];
+                }
+            }
+            if (tmp == null) {
+                return OBJECT;
+            }
+            return tmp;
+        }
     }
 
     public enum AUTH_ACCESS_TYPE {
@@ -864,4 +846,194 @@ public class ScreenEnumUtil {
         }
     }
 
+    public enum INNER_MESSAGE_TYPE {
+        DATASOURCE_BEAN_REFRESH(10, "DATASOURCE_BEAN_REFRESH", "刷新Spring容器中的数据源Bean");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        INNER_MESSAGE_TYPE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    public enum OPERATION_TYPE {
+        CREATE(10, "create", "新增"),
+        UPDATE(20, "update", "修改"),
+        DELETE(30, "delete", "删除"),
+        WEAKLY_DELETE(40, "invalid", "弱删"),
+        VALID(50, "valid", "启用"),
+        INVALID(60, "invalid", "禁用");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        OPERATION_TYPE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static OPERATION_TYPE valueOfEnum(Integer value) {
+            OPERATION_TYPE tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    public enum TEMPLATE_TYPE {
+        EMPTY(10, "empty", "空白模板"),
+        SPA(20, "spa", "单页应用模板");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        TEMPLATE_TYPE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static TEMPLATE_TYPE valueOfEnum(Integer value) {
+            TEMPLATE_TYPE tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    public enum LAYOUT_REF_TYPE {
+        PANEL(10, "Panel", "容器"),
+        SCREEN(20, "Screen", "页面");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        LAYOUT_REF_TYPE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static LAYOUT_REF_TYPE valueOfEnum(Integer value) {
+            LAYOUT_REF_TYPE tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-bsp/pom.xml

@@ -35,7 +35,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-form/pom.xml

@@ -34,7 +34,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-hardswitch/pom.xml

@@ -26,7 +26,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-jobflow/pom.xml

@@ -26,7 +26,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-lac/pom.xml

@@ -32,7 +32,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -32,7 +32,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-mes/pom.xml

@@ -32,7 +32,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-model/pom.xml

@@ -82,7 +82,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-platform/pom.xml

@@ -32,7 +32,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-ptl/pom.xml

@@ -32,7 +32,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-report/pom.xml

@@ -33,7 +33,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-screen/pom.xml

@@ -6,7 +6,6 @@
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
         <version>1.0-TEST-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java

@@ -8,6 +8,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -25,6 +27,8 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("动作")
 public class ScrAction extends BaseBean implements Serializable {

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentParam.java

@@ -1,52 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * @author Wynne.Lu
- * @date 2021/5/20 17:51
- * @desc
- */
-@Entity
-@Table(name = "SCR_COMPONENT_PARAM")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel("组件参数")
-public class ScrComponentParam extends BaseBean implements Serializable {
-    private static final long serialVersionUID = -3232417792617757722L;
-
-    @Column(name = "COMPONENT_TYPE")
-    @ApiModelProperty(value = "组件类型")
-    private String componentType;
-
-    @Column(name = "PARAM_NAME")
-    @ApiModelProperty(value = "参数名")
-    private String paramName;
-
-    @Column(name = "SEARCH_NAME")
-    @ApiModelProperty(value = "搜索名称")
-    private String searchName;
-
-    @Lob
-    @Column(name = "SEARCH_WHERE")
-    @ApiModelProperty(value = "搜索条件")
-    private String searchWhere;
-
-
-}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponentParamDetail.java

@@ -1,47 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * @author Wynne.Lu
- * @date 2021/5/20 17:51
- * @desc
- */
-@Entity
-@Table(name = "SCR_COMPONENT_PARAM_DETAIL")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel("组件参数配置")
-public class ScrComponentParamDetail extends BaseBean implements Serializable {
-    private static final long serialVersionUID = 4771034700299839870L;
-
-    @Column(name = "COMPONENT_CODE")
-    @ApiModelProperty(value = "组件代码")
-    private String componentCode;
-
-    @Column(name = "COMPONENT_TYPE")
-    @ApiModelProperty(value = "组件类型")
-    private String componentType;
-
-    @Lob
-    @Column(name = "COMPONENT_PARAM_DETAIL")
-    @ApiModelProperty(value = "组件参数信息")
-    private String componentParamDetail;
-
-}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java

@@ -8,6 +8,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -25,6 +27,8 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("数据权限")
 public class ScrDataAuth extends BaseBean implements Serializable {

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java

@@ -10,6 +10,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -28,6 +30,8 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("数据对象管理")
 public class ScrDataObject extends BaseBean implements Serializable {

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java

@@ -8,6 +8,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -25,6 +27,8 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("数据对象约束管理")
 public class ScrDataObjectIndex extends BaseBean implements Serializable {

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -10,6 +8,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -27,6 +27,8 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("数据对象管理")
 public class ScrDataObjectProperty extends BaseBean implements Serializable {

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java

@@ -8,6 +8,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -26,6 +28,8 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("数据源管理")
 public class ScrDatasource extends BaseBean implements Serializable {

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEvent.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -9,6 +8,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -27,6 +28,8 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@DynamicUpdate
+@DynamicInsert
 @ApiModel("事件")
 public class ScrEvent extends BaseBean implements Serializable {
     private static final long serialVersionUID = -6217007706865821613L;

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -9,6 +8,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -26,6 +27,8 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("事件动作")
 public class ScrEventAction extends BaseBean implements Serializable {

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrFile.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -9,6 +8,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -26,6 +27,8 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("文件")
 public class ScrFile extends BaseBean implements Serializable {

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutColumn.java

@@ -1,54 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午5:01
- * @desc
- */
-@Entity
-@Table(name = "SCR_LAYOUT_COLUMN")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel("布局-父类-列")
-public class ScrLayoutColumn extends BaseBean implements Serializable {
-    private static final long serialVersionUID = 5001564292608042287L;
-
-    @Column(name = "LAYOUT_CODE")
-    @ApiModelProperty("布局代码")
-    private String layoutCode;
-
-    @Column(name = "ROW_CODE")
-    @ApiModelProperty("列代码")
-    private String rowCode;
-
-    @Column(name = "COLUMN_CODE")
-    @ApiModelProperty("列代码")
-    private String columnCode;
-
-    @Column(name = "COLUMN_SEQ")
-    @ApiModelProperty("列顺序")
-    private Integer columnSeq;
-
-    @Column(name = "COLUMN_SPAN")
-    @ApiModelProperty("列占位")
-    private Integer columnSpan;
-
-}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayoutRow.java

@@ -1,51 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午5:01
- * @desc
- */
-@Entity
-@Table(name = "SCR_LAYOUT_ROW")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel("布局-行")
-public class ScrLayoutRow extends BaseBean implements Serializable {
-    private static final long serialVersionUID = 6042010183759804616L;
-
-    @Column(name = "LAYOUT_CODE")
-    @ApiModelProperty("布局代码")
-    private String layoutCode;
-
-    @Column(name = "ROW_CODE")
-    @ApiModelProperty("行代码")
-    private String rowCode;
-
-    @Column(name = "ROW_HEIGHT")
-    @ApiModelProperty("行高")
-    private Double rowHeight;
-
-    @Column(name = "ROW_SEQ")
-    @ApiModelProperty("行顺序")
-    private Integer rowSeq;
-
-
-}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrMenu.java

@@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
@@ -17,7 +16,6 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Index;
 import javax.persistence.Lob;
 import javax.persistence.Table;
 import javax.persistence.Transient;
@@ -35,6 +33,8 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicInsert
+@DynamicUpdate
 @Builder
 @ApiModel("通用界面-功能目录")
 public class ScrMenu extends BaseBean implements Serializable {
@@ -98,10 +98,6 @@ public class ScrMenu extends BaseBean implements Serializable {
     @ApiParam(value = "所属模块")
     private Integer softType;
 
-    @Column(name = "MENU_STATUS")
-    @ApiParam(value = "菜单状态")
-    private Integer menuStatus;
-
     @Transient
     @ApiParam(value = "菜单子集")
     private List<ScrMenu> menuList;

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java

@@ -8,6 +8,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -25,6 +27,8 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("model")
 public class ScrModel extends BaseBean implements Serializable {

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java

@@ -8,6 +8,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -26,6 +28,8 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("model字段")
 public class ScrModelField extends BaseBean implements Serializable {
@@ -39,39 +43,39 @@ public class ScrModelField extends BaseBean implements Serializable {
     @ApiModelProperty("字段代码")
     private String fieldCode;
 
-    @Column(name = "DISPLAY_NAME")
-    @ApiModelProperty("显示名称")
-    private String displayName;
-
     @Column(name = "FIELD_NAME")
     @ApiModelProperty("字段名称")
     private String fieldName;
 
+    @Column(name = "DISPLAY_NAME")
+    @ApiModelProperty("显示名称")
+    private String displayName;
+
     @Column(name = "FIELD_TYPE")
     @ApiModelProperty(value = "字段类型")
-    private String fieldType;
+    private Integer fieldType;
 
     @Column(name = "IS_FUZZY_SEARCH")
     @ApiModelProperty("是否支持模糊查询")
-    private Boolean isFuzzySearch = false;
+    private Integer isFuzzySearch;
 
     @Column(name = "IS_SHOW_IN_NEW")
     @ApiModelProperty("是否在新增时展示")
-    private Boolean isShowInNew = true;
+    private Integer isShowInNew;
 
     @Column(name = "IS_SHOW_IN_EDIT")
     @ApiModelProperty("是否在编辑时展示")
-    private Boolean isShowInEdit = true;
+    private Integer isShowInEdit;
 
     @Column(name = "IS_ALLOW_SORT")
     @ApiModelProperty("是否支持排序")
-    private Boolean isAllowSort = false;
+    private Integer isAllowSort;
 
     @Column(name = "IS_REQUIRED")
     @ApiModelProperty("是否必填")
-    private Boolean isRequired = false;
+    private Integer isRequired;
 
-    @Column(name = "SEQ",columnDefinition = "int(11) default 0")
+    @Column(name = "SEQ", columnDefinition = "int(11) default 0")
     @ApiModelProperty("表单顺序")
     private Integer seq;
 
@@ -81,7 +85,7 @@ public class ScrModelField extends BaseBean implements Serializable {
 
     @Column(name = "IS_VIRTUAL")
     @ApiModelProperty("是否是虚拟的")
-    private Boolean isVirtual;
+    private Integer isVirtual;
 
     @Column(name = "MODEL_FIELD_DATASOURCE")
     @ApiModelProperty("字段数据来源")
@@ -91,10 +95,6 @@ public class ScrModelField extends BaseBean implements Serializable {
     @ApiModelProperty("model字段来源属性")
     private String modelFieldDatasourceProps;
 
-    @Column(name = "DATA_ROW_AUTH")
-    @ApiModelProperty("数据列权限")
-    private String dataRowAuth;
-
     @Transient
     private Object fieldValue;
 

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -9,11 +8,11 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -28,6 +27,8 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("model字段约束")
 public class ScrModelFieldIndex extends BaseBean implements Serializable {
@@ -51,8 +52,7 @@ public class ScrModelFieldIndex extends BaseBean implements Serializable {
 
     @Column(name = "IS_USER_CREATED")
     @ApiModelProperty("是否是用户创建的")
-    @Enumerated(EnumType.STRING)
-    private CommonEnumUtil.TRUE_OR_FALSE isUserCreated;
+    private Integer isUserCreated;
 
     @Column(name = "PRIMARY_KEY_SWITCH")
     @ApiModelProperty("model主键唯一检查开关")

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldVirtual.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -9,6 +8,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -26,6 +27,8 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("model虚拟字段")
 public class ScrModelFieldVirtual extends BaseBean implements Serializable {

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreenHistory.java

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -10,6 +8,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -28,6 +28,8 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("数据对象管理")
 public class ScrScreenHistory extends BaseBean implements Serializable {

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrComponent.java

@@ -1,7 +1,6 @@
-package cn.estsh.i3plus.pojo.screen.bean;
+package cn.estsh.i3plus.pojo.screen.bean.diagram;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -9,6 +8,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -18,7 +19,7 @@ import java.io.Serializable;
 
 /**
  * @author Wynne.Lu
- * @date 2021/3/22 上午10:43
+ * @date 2021/3/22 下午7:47
  * @desc
  */
 @Entity
@@ -27,27 +28,24 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("组件")
 public class ScrComponent extends BaseBean implements Serializable {
-    private static final long serialVersionUID = 3832856363595940018L;
+    private static final long serialVersionUID = 989032210658930856L;
 
     @Column(name = "COMPONENT_CODE")
-    @ApiModelProperty(value = "组件代码")
+    @ApiModelProperty("组件代码")
     private String componentCode;
 
     @Column(name = "COMPONENT_TYPE")
-    @ApiModelProperty(value = "组件类型")
+    @ApiModelProperty("组件类型")
     private String componentType;
 
-    @Column(name = "MODEL_CODE")
-    @ApiModelProperty(value = "model代码")
-    private String modelCode;
-
     @Lob
     @Column(name = "COMPONENT_PROPERTY")
-    @ApiModelProperty(value = "组件描述")
+    @ApiModelProperty("组件属性")
     private String componentProperty;
 
-
-}
+}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrLayout.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.screen.bean;
+package cn.estsh.i3plus.pojo.screen.bean.diagram;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.ApiModel;
@@ -8,6 +8,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -25,6 +27,8 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("布局")
 public class ScrLayout extends BaseBean implements Serializable {
@@ -42,4 +46,9 @@ public class ScrLayout extends BaseBean implements Serializable {
     @ApiModelProperty("布局类型")
     private Integer layoutType;
 
+    @Column(name = "IS_CUSTOMIZE")
+    @ApiModelProperty("是否为自定义布局")
+    private Integer isCustomize;
+
+
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrLayoutItem.java

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.screen.bean.diagram;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/7/2 14:05
+ * @desc
+ */
+@Entity
+@Table(name = "SCR_LAYOUT_ITEM")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
+@Builder
+@ApiModel("布局信息")
+public class ScrLayoutItem extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -4379591189797358245L;
+
+    @Column(name = "LAYOUT_CODE")
+    @ApiModelProperty("布局代码")
+    private String layoutCode;
+
+    @Column(name = "LAYOUT_ITEM_CODE")
+    @ApiModelProperty("布局单块代码")
+    private String layoutItemCode;
+
+    @Column(name = "HORIZONTAL_COORDINATE")
+    @ApiModelProperty("x轴")
+    private Integer horizontalCoordinate;
+
+    @Column(name = "VERTICAL_COORDINATE")
+    @ApiModelProperty("y轴")
+    private Integer verticalCoordinate;
+
+    @Column(name = "WIDTH")
+    @ApiModelProperty("宽度")
+    private Integer width;
+
+    @Column(name = "HEIGHT")
+    @ApiModelProperty("高度")
+    private Integer height;
+
+    @Column(name = "IS_STATIC")
+    @ApiModelProperty("是否静态固定")
+    private Integer isStatic;
+}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrPanel.java

@@ -1,7 +1,6 @@
-package cn.estsh.i3plus.pojo.screen.bean;
+package cn.estsh.i3plus.pojo.screen.bean.diagram;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -9,9 +8,12 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -26,9 +28,12 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("Panel")
 public class ScrPanel extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -5363041058961623658L;
 
     @Column(name = "PANEL_CODE")
     @ApiModelProperty("Panel代码")
@@ -38,11 +43,13 @@ public class ScrPanel extends BaseBean implements Serializable {
     @ApiModelProperty("Panel名称")
     private String panelName;
 
-    @Column(name = "PANEL_LAYOUT_CODE")
-    @ApiModelProperty("布局代码")
-    private String layoutCode;
+    @Column(name = "IS_TEMPLATE")
+    @ApiModelProperty("是否为模板")
+    private Integer isTemplate;
+
+    @Lob
+    @Column(name = "PANEL_PROPERTY")
+    @ApiModelProperty("Panel属性")
+    private String panelProperty;
 
-    @Column(name = "USAGE_AMOUNT")
-    @ApiModelProperty("使用数量")
-    private Integer usageAmount;
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrPanelComponent.java

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.screen.bean.diagram;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/22 下午7:50
+ * @desc
+ */
+@Entity
+@Table(name = "SCR_PANEL_COMPONENT")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
+@Builder
+@ApiModel("panel与组件的关系")
+public class ScrPanelComponent extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -9070313428476817410L;
+
+    @Column(name = "PANEL_CODE")
+    @ApiModelProperty("Panel代码")
+    private String panelCode;
+
+    @Column(name = "LAYOUT_CODE")
+    @ApiModelProperty("布局代码")
+    private String layoutCode;
+
+    @Column(name = "LAYOUT_ITEM_CODE")
+    @ApiModelProperty("布局单元代码")
+    private String layoutItemCode;
+
+    @Column(name = "COMPONENT_CODE")
+    @ApiModelProperty("组件代码")
+    private String componentCode;
+
+    @Column(name = "SEQ")
+    @ApiModelProperty("组件顺序")
+    private Integer seq;
+
+}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrScreen.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.screen.bean;
+package cn.estsh.i3plus.pojo.screen.bean.diagram;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.ApiModel;
@@ -8,9 +8,12 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -25,6 +28,8 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
 @ApiModel("页面")
 public class ScrScreen extends BaseBean implements Serializable {
@@ -42,16 +47,21 @@ public class ScrScreen extends BaseBean implements Serializable {
     @ApiModelProperty("页面版本")
     private String screenVersion;
 
-    @Column(name = "SCREEN_LAYOUT_CODE")
-    @ApiModelProperty("布局代码")
-    private String layoutCode;
+    @Column(name = "DEVICE_TYPE")
+    @ApiModelProperty("设备类型")
+    private Integer deviceType;
 
-    @Column(name = "SCREEN_TYPE")
-    @ApiModelProperty("页面类型")
-    private Integer screenType;
+    @Column(name = "TEMPLATE_TYPE")
+    @ApiModelProperty("模板类型")
+    private Integer templateType;
 
     @Column(name = "SCREEN_OWNING_SYSTEM")
     @ApiModelProperty("界面所属系统")
     private Integer screenOwningSystem;
 
+    @Lob
+    @Column(name = "SCREEN_PROPERTY")
+    @ApiModelProperty("布局代码")
+    private String screenProperty;
+
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/diagram/ScrScreenPanel.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.screen.bean.relation;
+package cn.estsh.i3plus.pojo.screen.bean.diagram;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.ApiModel;
@@ -8,31 +8,31 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import java.io.Serializable;
 
 /**
  * @author Wynne.Lu
- * @date 2021/3/25 下午4:33
+ * @date 2021/3/22 下午7:50
  * @desc
  */
 @Entity
-@Table(name = "SCR_SCREEN_PANEL",
-        uniqueConstraints = {
-                @UniqueConstraint(columnNames = {"SCREEN_CODE", "LAYOUT_CODE"})
-        }
-)
+@Table(name = "SCR_SCREEN_PANEL")
 @Data
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("Screen与Panel的关系")
-public class ScrScreenPanel extends BaseBean {
-    private static final long serialVersionUID = 3459027655126916483L;
+@ApiModel("screen与panel的关系")
+public class ScrScreenPanel extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 2586321557100106523L;
 
     @Column(name = "SCREEN_CODE")
     @ApiModelProperty("Screen代码")
@@ -42,15 +42,11 @@ public class ScrScreenPanel extends BaseBean {
     @ApiModelProperty("布局代码")
     private String layoutCode;
 
-    @Column(name = "ROW_CODE")
-    @ApiModelProperty("行代码")
-    private String rowCode;
-
-    @Column(name = "COLUMN_CODE")
-    @ApiModelProperty("列代码")
-    private String columnCode;
+    @Column(name = "LAYOUT_ITEM_CODE")
+    @ApiModelProperty("布局单元代码")
+    private String layoutItemCode;
 
     @Column(name = "PANEL_CODE")
-    @ApiModelProperty(value = "panel代码")
+    @ApiModelProperty("panel代码")
     private String panelCode;
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentEventAction.java

@@ -1,39 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.bean.relation;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/25 上午9:56
- * @desc
- */
-@Entity
-@Table(name = "SCR_COMPONENT_EVENT_ACTION")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel("组件事件动作")
-public class ScrComponentEventAction extends BaseBean {
-    private static final long serialVersionUID = 7600064730551351570L;
-
-    @Column(name = "COMPONENT_CODE")
-    @ApiModelProperty("组件代码")
-    private String componentCode;
-
-    @Column(name = "EVENT_ACTION_CODE")
-    @ApiModelProperty("事件动作代码")
-    private String eventActionCode;
-}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrComponentModelField.java

@@ -1,98 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.bean.relation;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.io.Serializable;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/22 下午8:42
- * @desc
- */
-@Entity
-@Table(name = "SCR_COMPONENT_MODEL_FIELD")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel("Panel与Model字段的关系")
-public class ScrComponentModelField extends BaseBean implements Serializable {
-    private static final long serialVersionUID = -3441031841089357196L;
-
-    @Column(name = "PANEL_CODE")
-    @ApiModelProperty("Panel代码")
-    private String panelCode;
-
-    @Column(name = "COMPONENT_CODE")
-    @ApiModelProperty("组件代码")
-    private String componentCode;
-
-    @Column(name = "MODEL_CODE")
-    @ApiModelProperty("model代码")
-    private String modelCode;
-
-    @Column(name = "FIELD_CODE")
-    @ApiModelProperty("字段代码")
-    private String fieldCode;
-
-    @Column(name = "DISPLAY_NAME")
-    @ApiModelProperty("字段名称")
-    private String displayName;
-
-    @Column(name = "IS_FUZZY_SEARCH")
-    @ApiModelProperty("是否支持模糊查询")
-    private Boolean isFuzzySearch;
-
-    @Column(name = "IS_SHOW_IN_NEW")
-    @ApiModelProperty("是否在新增时展示")
-    private Boolean isShowInNew;
-
-    @Column(name = "IS_SHOW_IN_EDIT")
-    @ApiModelProperty("是否在编辑时展示")
-    private Boolean isShowInEdit;
-
-    @Column(name = "IS_ALLOW_SORT")
-    @ApiModelProperty("是否支持排序")
-    private Boolean isAllowSort;
-
-    @Column(name = "FORM_SEQ")
-    @ApiModelProperty("表单顺序")
-    private Integer formSeq;
-
-    @Column(name = "TABLE_SEQ")
-    @ApiModelProperty("表格顺序")
-    private Integer tableSeq;
-
-    @Column(name = "VALIDATION")
-    @ApiModelProperty("校验")
-    private String validation;
-
-    @Column(name = "DICTIONARY")
-    @ApiModelProperty("字典")
-    private String dictionary;
-
-    @Column(name = "IS_VIRTUAL")
-    @ApiModelProperty("是否是虚拟的")
-    private boolean isVirtual;
-
-    @Column(name = "FIELD_NAME")
-    @ApiModelProperty("字段名称")
-    private String fieldName;
-
-    @Column(name = "SPEL_VIRTUAL_VALUE")
-    @ApiModelProperty("SPEL表达式虚拟属性")
-    private String spelVirtualValue;
-
-
-}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/relation/ScrPanelComponent.java

@@ -1,53 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.bean.relation;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/25 下午4:33
- * @desc
- */
-@Entity
-@Table(name = "SCR_PANEL_COMPONENT",
-//        indexes = {
-//        @Index(columnList = "PANEL_CODE")},
-        uniqueConstraints = {
-                @UniqueConstraint(columnNames = {"PANEL_CODE", "LAYOUT_CODE"})
-        }
-)
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("Panel与组件的关系")
-public class ScrPanelComponent extends BaseBean {
-    private static final long serialVersionUID = 3459027655126916483L;
-
-    @Column(name = "PANEL_CODE")
-    @ApiModelProperty("panel代码")
-    private String panelCode;
-
-    @Column(name = "LAYOUT_CODE")
-    @ApiModelProperty("布局代码")
-    private String layoutCode;
-
-    @Column(name = "ROW_CODE")
-    @ApiModelProperty("行代码")
-    private String rowCode;
-
-    @Column(name = "COLUMN_CODE")
-    @ApiModelProperty("列代码")
-    private String columnCode;
-
-    @Column(name = "COMPONENT_CODE")
-    @ApiModelProperty(value = "组件代码")
-    private String componentCode;
-}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrClassInfoModel.java

@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/6/29 21:54
+ * @desc
+ */
+@Data
+@NoArgsConstructor
+@ApiModel("类信息")
+public class ScrClassInfoModel {
+
+    private String classSimpleName;
+
+    private String classDescription;
+
+    private Class<?> clazz;
+
+    public ScrClassInfoModel(Class<?> clazz) {
+        this.clazz = clazz;
+
+        this.classSimpleName = clazz.getSimpleName();
+
+        ApiModel apiModel = clazz.getAnnotation(ApiModel.class);
+        if (apiModel != null) {
+            this.classDescription = apiModel.value();
+        }
+    }
+}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDisplayModel.java

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/7/7 16:15
+ * @desc
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("通用界面回显model")
+public class ScrDisplayModel implements Serializable {
+    private static final long serialVersionUID = 5679787673783301941L;
+
+    @ApiModelProperty("页面与容器的关系")
+    private ScrScreenPanelModel screenPanelModel;
+
+    @ApiModelProperty("容器与组件的关系")
+    private List<ScrPanelComponentModel> panelComponentModels;
+}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrInnerMessageModel.java

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/6/29 17:18
+ * @desc
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("通用界面内部消息队列处理消息")
+public class ScrInnerMessageModel implements Serializable {
+    private static final long serialVersionUID = -6049477827975249515L;
+
+    @ApiModelProperty("消息类型")
+    private Integer messageType;
+
+    @ApiModelProperty("信息")
+    private String payload;
+
+    @ApiModelProperty
+    private Integer operation;
+
+
+}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrLayoutModel.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.screen.model;
 
-import cn.estsh.i3plus.pojo.screen.bean.ScrLayout;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayout;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayoutItem;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,7 +22,7 @@ public class ScrLayoutModel implements Serializable {
     @ApiModelProperty("布局")
     private ScrLayout layout;
 
-    @ApiModelProperty("布局中的行列关系")
-    private List<ScrRowColumnModel> rowColumnModels;
+    @ApiModelProperty("布局中的单元关系")
+    private List<ScrLayoutItem> layoutItems;
 
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentCreateModel.java

@@ -1,46 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model;
-
-import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/28 上午12:42
- * @desc
- */
-@Data
-@ApiModel("Panel与组件关系的创建model")
-public class ScrPanelComponentCreateModel implements Serializable {
-    private static final long serialVersionUID = -5832175256726333348L;
-
-    @ApiModelProperty("panel代码")
-    private String panelCode;
-
-    @ApiModelProperty("布局代码")
-    private String layoutCode;
-
-    @ApiModelProperty("行序号")
-    private Integer rowSeq;
-
-    @ApiModelProperty("列序号")
-    private Integer columnSeq;
-
-    @ApiModelProperty("组件参数信息")
-    private Map<String, Object> baseComponent;
-
-    @ApiModelProperty("model代码")
-    private String modelCode;
-
-    @ApiModelProperty("该组件的事件动作集合")
-    private List<String> eventActions;
-
-    @ApiModelProperty("组件使用到的model字段集合")
-    private List<ScrModelField> modelFields;
-
-}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentModel.java

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrComponent;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayout;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayoutItem;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrPanel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/28 上午12:42
+ * @desc
+ */
+@Data
+@Builder
+@ApiModel("Panel与组件关系的创建model")
+public class ScrPanelComponentModel implements Serializable {
+    private static final long serialVersionUID = -5832175256726333348L;
+
+    @ApiModelProperty("panel")
+    private ScrPanel panel;
+
+    @ApiModelProperty("布局")
+    private ScrLayout layout;
+
+    @ApiModelProperty("布局单元")
+    private List<ScrLayoutItem> layoutItems;
+
+    @ApiModelProperty("布局单元与组件集合的对应map")
+    private LinkedHashMap<String, List<ScrComponent>> componentsMap;
+
+}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelComponentQueryModel.java

@@ -1,38 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model;
-
-import cn.estsh.i3plus.pojo.screen.bean.ScrComponent;
-import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction;
-import cn.estsh.i3plus.pojo.screen.bean.relation.ScrComponentModelField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/28 上午12:42
- * @desc
- */
-@Data
-@ApiModel("Panel和组件的查询model")
-public class ScrPanelComponentQueryModel implements Serializable {
-    private static final long serialVersionUID = 4133777603151273736L;
-
-    @ApiModelProperty("行代码")
-    private String rowCode;
-
-    @ApiModelProperty("列代码")
-    private String columnCode;
-
-    @ApiModelProperty("组件")
-    private ScrComponent component;
-
-    @ApiModelProperty("动作事件")
-    private ScrEventAction eventAction;
-
-    @ApiModelProperty("组件与model字段的关系")
-    private List<ScrComponentModelField> modelFields;
-
-}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrPanelLayoutModel.java

@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayout;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayoutItem;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrPanel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/27 下午6:10
+ * @desc
+ */
+@Data
+@ApiModel("容器布局model")
+public class ScrPanelLayoutModel implements Serializable {
+    private static final long serialVersionUID = 3311398396212346985L;
+
+    @ApiModelProperty("panel")
+    private ScrPanel panel;
+
+    @ApiModelProperty("布局")
+    private ScrLayout layout;
+
+    @ApiModelProperty("布局中的单元关系")
+    private List<ScrLayoutItem> layoutItems;
+
+}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrRowColumnModel.java

@@ -1,27 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model;
-
-import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutColumn;
-import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/27 下午8:35
- * @desc
- */
-@Data
-@ApiModel("行列Model")
-public class ScrRowColumnModel implements Serializable {
-    private static final long serialVersionUID = 7450630220924238356L;
-
-    @ApiModelProperty("行")
-    private ScrLayoutRow row;
-
-    @ApiModelProperty("行中的列")
-    private List<ScrLayoutColumn> columns;
-}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelCreateModel.java

@@ -1,34 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/28 上午12:42
- * @desc
- */
-@Data
-@ApiModel("Screen与Panel的创建Model")
-public class ScrScreenPanelCreateModel implements Serializable {
-    private static final long serialVersionUID = -5832175256726333348L;
-
-    @ApiModelProperty("screen代码")
-    private String screenCode;
-
-    @ApiModelProperty("布局代码")
-    private String layoutCode;
-
-    @ApiModelProperty("行代码")
-    private String rowCode;
-
-    @ApiModelProperty("列代码")
-    private String columnCode;
-
-    @ApiModelProperty("panel代码")
-    private String panelCode;
-
-}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrScreenPanelModel.java

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayout;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayoutItem;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrPanel;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrScreen;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/28 上午12:42
+ * @desc
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("Screen与Panel的创建Model")
+public class ScrScreenPanelModel implements Serializable {
+    private static final long serialVersionUID = -5832175256726333348L;
+
+    @ApiModelProperty("页面")
+    private ScrScreen screen;
+
+    @ApiModelProperty("布局")
+    private ScrLayout layout;
+
+    @ApiModelProperty("布局单元")
+    private List<ScrLayoutItem> layoutItems;
+
+    @ApiModelProperty("布局单元与容器")
+    private LinkedHashMap<String, ScrPanel> panelsMap;
+
+
+}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutColumnRepository.java

@@ -1,15 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.screen.bean.ScrLayout;
-import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutColumn;
-
-/**
- * @Description :
- * @Reference :
- * @Author : wei.peng
- * @CreateDate : 20-5-28 下午3:39
- * @Modify:
- **/
-public interface ScrLayoutColumnRepository extends BaseRepository<ScrLayoutColumn, Long> {
-}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrLayoutRowRepository.java

@@ -1,15 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.screen.bean.ScrLayout;
-import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow;
-
-/**
- * @Description :
- * @Reference :
- * @Author : wei.peng
- * @CreateDate : 20-5-28 下午3:39
- * @Modify:
- **/
-public interface ScrLayoutRowRepository extends BaseRepository<ScrLayoutRow, Long> {
-}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrModelFieldRepository.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow;
 import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
 
 /**

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrComponentRepository.java

@@ -1,7 +1,7 @@
-package cn.estsh.i3plus.pojo.screen.repository;
+package cn.estsh.i3plus.pojo.screen.repository.diagram;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.screen.bean.ScrComponent;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrComponent;
 
 /**
  * @Description :

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrLayoutItemRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.screen.repository.diagram;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayoutItem;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrLayoutItemRepository extends BaseRepository<ScrLayoutItem, Long> {
+}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrLayoutRepository.java

@@ -1,7 +1,7 @@
-package cn.estsh.i3plus.pojo.screen.repository;
+package cn.estsh.i3plus.pojo.screen.repository.diagram;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.screen.bean.ScrLayout;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrLayout;
 
 /**
  * @Description :

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrPanelComponentRepository.java

@@ -1,7 +1,7 @@
-package cn.estsh.i3plus.pojo.screen.repository.rel;
+package cn.estsh.i3plus.pojo.screen.repository.diagram;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.screen.bean.relation.ScrPanelComponent;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrPanelComponent;
 
 /**
  * @Description :

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrPanelRepository.java

@@ -1,8 +1,7 @@
-package cn.estsh.i3plus.pojo.screen.repository;
+package cn.estsh.i3plus.pojo.screen.repository.diagram;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.screen.bean.ScrAction;
-import cn.estsh.i3plus.pojo.screen.bean.ScrPanel;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrPanel;
 
 /**
  * @Description :

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrScreenPanelRepository.java

@@ -1,7 +1,7 @@
-package cn.estsh.i3plus.pojo.screen.repository.rel;
+package cn.estsh.i3plus.pojo.screen.repository.diagram;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.screen.bean.relation.ScrScreenPanel;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrScreenPanel;
 
 /**
  * @Description :

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/diagram/ScrScreenRepository.java

@@ -1,7 +1,7 @@
-package cn.estsh.i3plus.pojo.screen.repository;
+package cn.estsh.i3plus.pojo.screen.repository.diagram;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.screen.bean.ScrScreen;
+import cn.estsh.i3plus.pojo.screen.bean.diagram.ScrScreen;
 
 /**
  * @Description :

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentEventActionRepository.java

@@ -1,14 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.repository.rel;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.screen.bean.relation.ScrComponentEventAction;
-
-/**
- * @Description :
- * @Reference :
- * @Author : wei.peng
- * @CreateDate : 20-5-28 下午3:39
- * @Modify:
- **/
-public interface ScrComponentEventActionRepository extends BaseRepository<ScrComponentEventAction, Long> {
-}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/rel/ScrComponentModelFieldRepository.java

@@ -1,14 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.repository.rel;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.screen.bean.relation.ScrComponentModelField;
-
-/**
- * @Description :
- * @Reference :
- * @Author : wei.peng
- * @CreateDate : 20-5-28 下午3:39
- * @Modify:
- **/
-public interface ScrComponentModelFieldRepository extends BaseRepository<ScrComponentModelField, Long> {
-}

modules/i3plus-pojo-softswitch/pom.xml

@@ -33,7 +33,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-sweb/pom.xml

@@ -32,7 +32,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-wms/pom.xml

@@ -50,7 +50,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

modules/i3plus-pojo-workflow/pom.xml

@@ -26,7 +26,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

pom.xml

@@ -251,7 +251,7 @@
         <profile>
             <id>test</id>
             <properties>
-                <profileActive>TEST</profileActive>
+                <profileActive>DEV</profileActive>
             </properties>
         </profile>
         <profile>

sonar-project.properties

@@ -7,7 +7,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 sonar.projectName=i3plus-pojo
 
 # defaults to 'not provided'
-sonar.projectVersion=1.0-TEST-SNAPSHOT
+sonar.projectVersion=1.0-DEV-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./