代码合并

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

@@ -2160,6 +2160,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", "连接成功"),
+        TEST(10, "test", "待连接测试"),
-        FAILED(20, "failed", "连接失败");
+        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;
@@ -564,21 +530,20 @@ public class ScreenEnumUtil {
         }
     }
 
-    public enum MODEL_FIELD_DATASOURCE {
+    public enum MODEL_FIELD_SOURCE {
-        FROM_TEXT(10, "TEXT", "文本"),
+        FORM_TEXT(10, "TEXT", "文本"),
-        FROM_NUMBER(20, "NUMBER", "数字"),
+        FORM_NUMBER(20, "NUMBER", "数字"),
-        FROM_PASSWORD(30, "PASSWORD", "密码"),
+        FORM_PASSWORD(30, "PASSWORD", "密码"),
-        FROM_DATETIME(40, "DATETIME", "时间"),
+        FORM_DATETIME(40, "DATETIME", "时间"),
-        FROM_PICK_UP(50, "PICK_UP", "拾取"),
+        FORM_PICK_UP(50, "PICK_UP", "拾取"),
-        FROM_ENUM(60, "ENUM", "枚举"),
+        FORM_ENUM(60, "ENUM", "枚举"),
-        FROM_DICTIONARY(70, "DICTIONARY", "字典"),
+        FORM_DICTIONARY(70, "DICTIONARY", "字典");
-        FROM_API(80, "API", "API调用");
 
         private Integer value;
         private String code;
         private String description;
 
-        MODEL_FIELD_DATASOURCE(Integer value, String code, String description) {
+        MODEL_FIELD_SOURCE(Integer value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -741,11 +706,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 +756,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 +845,258 @@ 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;
+        }
+    }
+
+    /**
+     * 等待平台枚举抽入数据库或redis
+     */
+    public enum ENUM_SOFT_TYPE {
+        COMMON(10, "CommonEnumUtil", "通用枚举"),
+        IMPP(20, "ImppEnumUtil", "平台枚举"),
+        WMS(30, "WmsEnumUtil", "WMS枚举"),
+        SWEB(40, "SwebEnumUtil", "Sweb枚举"),
+        MES(50, "MesEnumUtil", "Mes枚举"),
+        MES_PCN(60, "MesPcnEnumUtil", "MesPcn枚举"),
+        ANDON(70, "AndonEnumUtil", "Andon枚举"),
+        APS(80, "ApsEnumUtil", "Aps枚举"),
+        BLOCK_FORM(90, "BlockFormEnumUtil", "动态表单枚举"),
+        BLOCK_REPORT(100, "BlockReportEnumUtil", "动态报表枚举"),
+        BLOCK_SOFT_SWITCH(110, "BlockSoftSwitchEnumUtil", "软适配枚举"),
+        LAC(120, "LacEnumUtil", "Lac枚举"),
+        MDM(130, "MdmEnumUtil", "主数据中心枚举"),
+        PTL(140, "PtlEnumUtil", "Ptl枚举"),
+        PTL_PCN(150, "PtlPcnEnumUtil", "PtlPcn枚举"),
+        SCREEN(160, "ScreenEnumUtil", "通用界面枚举");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        ENUM_SOFT_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 ENUM_SOFT_TYPE valueOfEnum(Integer value) {
+            ENUM_SOFT_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/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/EngineScriptPersistence.java

@@ -0,0 +1,75 @@
+package cn.estsh.i3plus.pojo.bsp.client.bean.po;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import lombok.Data;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * 脚本持久化实体类
+ *
+ * @author Rock.Yu
+ * @since 2019-03-18 14:22
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "SCRIPT_PERSISTENCE", uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SCRIPT_NO"})
+})
+@Api("系统动态脚本")
+public class EngineScriptPersistence extends BaseBean {
+    private static final long serialVersionUID = 7893111140559759490L;
+    // 脚本调用的唯一编号，例如：WMS_PDA_0001
+    @Column(name = "SCRIPT_NO", length = 50)
+    private String scriptNo;
+
+    // 脚本的中文名称
+    @Column(name = "SCRIPT_NAME", length = 50)
+    private String scriptName;
+
+    // 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本
+    @Column(name = "SCRIPT_TYPE")
+    private Integer scriptType;
+
+    // 脚本编写的语言
+    // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby
+    @Column(name = "LANGUAGE_TYPE")
+    private Integer languageType;
+
+    // 脚本的具体内容
+    @Lob
+    @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT")
+    private String scriptContent;
+
+    // 脚本的描述，包含脚本的用法，参数说明等
+    @Column(name = "SCRIPT_REMARK", length = 2000)
+    private String scriptRemark;
+
+    // 编译后的脚本内容，通过预编译加快脚本的运行速度
+    @Transient
+    private Object compiledScript;
+
+    // 构造方法，便于批量创建数据
+    public EngineScriptPersistence(Long id, String scriptNo, String scriptName, Integer scriptType, Integer languageType,
+                                   String scriptContent, String scriptRemark) {
+        this.id = id;
+        this.scriptNo = scriptNo;
+        this.scriptName = scriptName;
+        this.scriptType = scriptType;
+        this.languageType = languageType;
+        this.scriptContent = scriptContent;
+        this.scriptRemark = scriptRemark;
+    }
+}

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/MethodRegistryParam.java

@@ -30,11 +30,24 @@ public class MethodRegistryParam implements Serializable {
     private List<ParamDescription> parameterList;
     @ApiParam("方法的版本")
     private String version;
-    @ApiParam("方法影响了那些表")
+    @ApiParam("方法描述")
-    private String[] affectTableClassName;
+    private String description;
-    @ApiParam("方法的处理逻辑")
-    private String[] systemProcess;
-    @ApiParam("方法参数的验证逻辑")
-    private String[] validation;
 
+//    @ApiParam("方法影响了那些表")
+//    private String[] affectTableClassName;
+//    @ApiParam("方法的处理逻辑")
+//    private String[] systemProcess;
+//    @ApiParam("方法参数的验证逻辑")
+//    private String[] validation;
+//    @ApiParam("创建时间")
+//    private String createdDatetime;
+//    @ApiParam("更新时间")
+//    private String updatedDatetime;
+//    @ApiParam("更新日志")
+//    private String[] changeLog;
+//    @ApiParam("markdown 文件的路径")
+//    private String markdownFilePath;
+
+    @ApiParam("markdown 的文字内容")
+    private String markdownContent;
 }

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/client/bean/po/RegistryParam.java

@@ -22,6 +22,8 @@ public class RegistryParam  implements Serializable {
     private String appname;
     @ApiParam("执行器的地址")
     private String address;
+    @ApiParam(value = "注册类型 1:自动 2:手动", defaultValue = "1")
+    private Integer registryType;
     @ApiParam("执行器注册的方法信息")
     private List<MethodRegistryParam> methodRegistryParamList;
 

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/GroovyCommonUtil.java

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.bsp.common;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2021/7/22 15:38
+ * @Modify:
+ **/
+public class GroovyCommonUtil {
+}

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/HttpUtils.java

@@ -1,147 +1,149 @@
-package cn.estsh.i3plus.pojo.bsp.common;
+//package cn.estsh.i3plus.pojo.bsp.common;
-
+//
-import org.slf4j.Logger;
+//import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
-import org.slf4j.LoggerFactory;
+//import org.slf4j.Logger;
-
+//import org.slf4j.LoggerFactory;
-import javax.net.ssl.*;
+//
-import java.io.BufferedReader;
+//import javax.net.ssl.*;
-import java.io.DataOutputStream;
+//import java.io.BufferedReader;
-import java.io.InputStreamReader;
+//import java.io.DataOutputStream;
-import java.net.HttpURLConnection;
+//import java.io.InputStreamReader;
-import java.net.URL;
+//import java.net.HttpURLConnection;
-import java.security.cert.CertificateException;
+//import java.net.URL;
-import java.security.cert.X509Certificate;
+//import java.security.cert.CertificateException;
-
+//import java.security.cert.X509Certificate;
-/**
+//
- * @Description :
+///**
- * @Reference :
+// * @Description :
- * @Author : Castle
+// * @Reference :
- * @CreateDate : 2021/6/17 13:37
+// * @Author : Castle
- * @Modify:
+// * @CreateDate : 2021/6/17 13:37
- **/
+// * @Modify:
-public class HttpUtils {
+// **/
-    private static Logger logger = LoggerFactory.getLogger(HttpUtils.class);
+//public class HttpUtils {
-
+//    private static Logger logger = LoggerFactory.getLogger(HttpUtils.class);
-    // trust-https start
+//
-    private static void trustAllHosts(HttpsURLConnection connection) {
+//    // trust-https start
-        try {
+//    private static void trustAllHosts(HttpsURLConnection connection) {
-            SSLContext sc = SSLContext.getInstance("TLS");
+//        try {
-            sc.init(null, trustAllCerts, new java.security.SecureRandom());
+//            SSLContext sc = SSLContext.getInstance("TLS");
-            SSLSocketFactory newFactory = sc.getSocketFactory();
+//            sc.init(null, trustAllCerts, new java.security.SecureRandom());
-
+//            SSLSocketFactory newFactory = sc.getSocketFactory();
-            connection.setSSLSocketFactory(newFactory);
+//
-        } catch (Exception e) {
+//            connection.setSSLSocketFactory(newFactory);
-            logger.error(e.getMessage(), e);
+//        } catch (Exception e) {
-        }
+//            logger.error(e.getMessage(), e);
-        connection.setHostnameVerifier(new HostnameVerifier() {
+//        }
-            @Override
+//        connection.setHostnameVerifier(new HostnameVerifier() {
-            public boolean verify(String hostname, SSLSession session) {
+//            @Override
-                return true;
+//            public boolean verify(String hostname, SSLSession session) {
-            }
+//                return true;
-        });
+//            }
-    }
+//        });
-
+//    }
-    private static final TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() {
+//
-        @Override
+//    private static final TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() {
-        public X509Certificate[] getAcceptedIssuers() {
+//        @Override
-            return new X509Certificate[]{};
+//        public X509Certificate[] getAcceptedIssuers() {
-        }
+//            return new X509Certificate[]{};
-
+//        }
-        @Override
+//
-        public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+//        @Override
-        }
+//        public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
-
+//        }
-        @Override
+//
-        public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+//        @Override
-        }
+//        public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
-    }};
+//        }
-    // trust-https end
+//    }};
-
+//    // trust-https end
-
+//
-    /**
+//
-     * post
+//    /**
-     *
+//     * post
-     * @param url
+//     *
-     * @param timeout
+//     * @param url
-     * @param requestObj
+//     * @param timeout
-     * @return
+//     * @param requestObj
-     */
+//     * @return
-    public static ReturnT postBody(String url, int timeout, Object requestObj) {
+//     */
-        HttpURLConnection connection = null;
+//    public static ResultBean postBody(String url, int timeout, Object requestObj) {
-        BufferedReader bufferedReader = null;
+//        HttpURLConnection connection = null;
-        try {
+//        BufferedReader bufferedReader = null;
-            // connection
+//        try {
-            URL realUrl = new URL(url);
+//            // connection
-            connection = (HttpURLConnection) realUrl.openConnection();
+//            URL realUrl = new URL(url);
-
+//            connection = (HttpURLConnection) realUrl.openConnection();
-            // trust-https
+//
-            boolean useHttps = url.startsWith("https");
+//            // trust-https
-            if (useHttps) {
+//            boolean useHttps = url.startsWith("https");
-                HttpsURLConnection https = (HttpsURLConnection) connection;
+//            if (useHttps) {
-                trustAllHosts(https);
+//                HttpsURLConnection https = (HttpsURLConnection) connection;
-            }
+//                trustAllHosts(https);
-
+//            }
-            // connection setting
+//
-            connection.setRequestMethod("POST");
+//            // connection setting
-            connection.setDoOutput(true);
+//            connection.setRequestMethod("POST");
-            connection.setDoInput(true);
+//            connection.setDoOutput(true);
-            connection.setUseCaches(false);
+//            connection.setDoInput(true);
-            connection.setReadTimeout(timeout * 1000);
+//            connection.setUseCaches(false);
-            connection.setConnectTimeout(3 * 1000);
+//            connection.setReadTimeout(timeout * 1000);
-            connection.setRequestProperty("connection", "Keep-Alive");
+//            connection.setConnectTimeout(3 * 1000);
-            connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
+//            connection.setRequestProperty("connection", "Keep-Alive");
-            connection.setRequestProperty("Accept-Charset", "application/json;charset=UTF-8");
+//            connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
-
+//            connection.setRequestProperty("Accept-Charset", "application/json;charset=UTF-8");
-            // do connection
+//
-            connection.connect();
+//            // do connection
-
+//            connection.connect();
-            // write requestBody
+//
-            if (requestObj != null) {
+//            // write requestBody
-                String requestBody = GsonTool.toJson(requestObj);
+//            if (requestObj != null) {
-
+//                String requestBody = GsonTool.toJson(requestObj);
-                DataOutputStream dataOutputStream = new DataOutputStream(connection.getOutputStream());
+//
-                dataOutputStream.write(requestBody.getBytes("UTF-8"));
+//                DataOutputStream dataOutputStream = new DataOutputStream(connection.getOutputStream());
-                dataOutputStream.flush();
+//                dataOutputStream.write(requestBody.getBytes("UTF-8"));
-                dataOutputStream.close();
+//                dataOutputStream.flush();
-            }
+//                dataOutputStream.close();
-
+//            }
-            // valid StatusCode
+//
-            int statusCode = connection.getResponseCode();
+//            // valid StatusCode
-            if (statusCode != 200) {
+//            int statusCode = connection.getResponseCode();
-
+//            if (statusCode != 200) {
-                return new ReturnT<String>(ReturnT.FAIL_CODE, "rpc remoting fail, StatusCode(" + statusCode + ") invalid. for url : " + url);
+//                return ResultBean.fail("rpc remoting fail, StatusCode(" + statusCode + ") invalid. for url : " + url);
-            }
+////                return new BaseResultBean().errorMsg("rpc remoting fail, StatusCode(" + statusCode + ") invalid. for url : " + url);
-
+////                return new ReturnT<String>(ReturnT.FAIL_CODE, "rpc remoting fail, StatusCode(" + statusCode + ") invalid. for url : " + url);
-            // result
+//            }
-            bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+//
-            StringBuilder result = new StringBuilder();
+//            // result
-            String line;
+//            bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
-            while ((line = bufferedReader.readLine()) != null) {
+//            StringBuilder result = new StringBuilder();
-                result.append(line);
+//            String line;
-            }
+//            while ((line = bufferedReader.readLine()) != null) {
-            String resultJson = result.toString();
+//                result.append(line);
-            // parse returnT
+//            }
-            try {
+//            String resultJson = result.toString();
-                return GsonTool.fromJson(resultJson, ReturnT.class);
+//            // parse returnT
-            } catch (Exception e) {
+//            try {
-                logger.error("rpc remoting (url=" + url + ") response content invalid(" + resultJson + ").", e);
+//                return GsonTool.fromJson(resultJson, BaseResultBean.class);
-                return new ReturnT<String>(ReturnT.FAIL_CODE, "rpc remoting (url=" + url + ") response content invalid(" + resultJson + ").");
+//            } catch (Exception e) {
-            }
+//                logger.error("rpc remoting (url=" + url + ") response content invalid(" + resultJson + ").", e);
-        } catch (Exception e) {
+//                return ResultBean.fail("rpc remoting fail, StatusCode(" + statusCode + ") invalid. for url : " + url);
-            logger.error(e.getMessage(), e);
+//            }
-            return new ReturnT<String>(ReturnT.FAIL_CODE, "rpc remoting error(" + e.getMessage() + "), for url : " + url);
+//        } catch (Exception e) {
-        } finally {
+//            logger.error(e.getMessage(), e);
-            try {
+//            return ResultBean.fail("rpc remoting fail, error message(" + e.getMessage() + ") invalid. for url : " + url);
-                if (bufferedReader != null) {
+//        } finally {
-                    bufferedReader.close();
+//            try {
-                }
+//                if (bufferedReader != null) {
-                if (connection != null) {
+//                    bufferedReader.close();
-                    connection.disconnect();
+//                }
-                }
+//                if (connection != null) {
-            } catch (Exception e2) {
+//                    connection.disconnect();
-                logger.error(e2.getMessage(), e2);
+//                }
-            }
+//            } catch (Exception e2) {
-        }
+//                logger.error(e2.getMessage(), e2);
-    }
+//            }
-
+//        }
-}
+//    }
+//
+//}

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/common/ReturnT.java

@@ -1,56 +1,56 @@
-package cn.estsh.i3plus.pojo.bsp.common;
+//package cn.estsh.i3plus.pojo.bsp.common;
-
+//
-import java.io.Serializable;
+//import java.io.Serializable;
-
+//
-/**
+///**
- * @author Castle
+// * @author Castle
- */
+// */
-public class ReturnT<T> implements Serializable {
+//public class ReturnT<T> implements Serializable {
-    public static final long serialVersionUID = 42L;
+//    public static final long serialVersionUID = 42L;
-
+//
-    public static final int SUCCESS_CODE = 200;
+//    public static final int SUCCESS_CODE = 200;
-    public static final int FAIL_CODE = 500;
+//    public static final int FAIL_CODE = 500;
-
+//
-    public static final ReturnT<String> SUCCESS = new ReturnT<String>(null);
+//    public static final ReturnT<String> SUCCESS = new ReturnT<String>(null);
-    public static final ReturnT<String> FAIL = new ReturnT<String>(FAIL_CODE, null);
+//    public static final ReturnT<String> FAIL = new ReturnT<String>(FAIL_CODE, null);
-
+//
-    private int code;
+//    private int code;
-    private String msg;
+//    private String msg;
-    private T content;
+//    private T content;
-
+//
-    public ReturnT(){}
+//    public ReturnT(){}
-    public ReturnT(int code, String msg) {
+//    public ReturnT(int code, String msg) {
-        this.code = code;
+//        this.code = code;
-        this.msg = msg;
+//        this.msg = msg;
-    }
+//    }
-
+//
-    public ReturnT(T content) {
+//    public ReturnT(T content) {
-        this.code = SUCCESS_CODE;
+//        this.code = SUCCESS_CODE;
-        this.content = content;
+//        this.content = content;
-    }
+//    }
-
+//
-    public int getCode() {
+//    public int getCode() {
-        return code;
+//        return code;
-    }
+//    }
-    public void setCode(int code) {
+//    public void setCode(int code) {
-        this.code = code;
+//        this.code = code;
-    }
+//    }
-    public String getMsg() {
+//    public String getMsg() {
-        return msg;
+//        return msg;
-    }
+//    }
-    public void setMsg(String msg) {
+//    public void setMsg(String msg) {
-        this.msg = msg;
+//        this.msg = msg;
-    }
+//    }
-    public T getContent() {
+//    public T getContent() {
-        return content;
+//        return content;
-    }
+//    }
-    public void setContent(T content) {
+//    public void setContent(T content) {
-        this.content = content;
+//        this.content = content;
-    }
+//    }
-
+//
-    @Override
+//    @Override
-    public String toString() {
+//    public String toString() {
-        return "ReturnT [code=" + code + ", msg=" + msg + ", content=" + content + "]";
+//        return "ReturnT [code=" + code + ", msg=" + msg + ", content=" + content + "]";
-    }
+//    }
-
+//
-}
+//}

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupListModel.java

@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.bsp.server.bean.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description : 查询方法组使用的model
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2021/7/30 9:36
+ * @Modify:
+ **/
+@ApiModel("查询方法组")
+@Data
+public class MethodGroupListModel {
+
+    @ApiModelProperty("方法组名字")
+    private String methodGroupName;
+
+    @ApiModelProperty("方法组分类")
+    private String classify;
+}

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodGroupModel.java

@@ -1,12 +1,11 @@
 package cn.estsh.i3plus.pojo.bsp.server.bean.model;
 
-import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description :
@@ -17,13 +16,19 @@ import java.util.Map;
  **/
 @Data
 @AllArgsConstructor
-@Api("添加方法组")
+@ApiModel("添加方法组")
 public class MethodGroupModel {
 
-    @ApiParam("方法组的名称")
+    @ApiModelProperty("方法组的名称")
     private String methodGroupName;
-    @ApiParam("方法组的描述")
+
+    @ApiModelProperty("方法组的描述")
     private String description;
-    @ApiParam("方法组层级列表")
+
+    @ApiModelProperty("方法组层级列表")
     private List<MethodLevelModel> methodLevel;
+
+    @ApiModelProperty("方法组分类")
+    private String classify;
+
 }

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelModel.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.bsp.server.bean.model;
 
-import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -16,13 +16,15 @@ import java.util.List;
  **/
 @Data
 @AllArgsConstructor
-@Api("添加方法组层级")
+@ApiModel("添加方法组层级")
 public class MethodLevelModel {
 
-    @ApiParam("方法Id")
+    @ApiModelProperty("方法Id")
     private Long methodId;
-    @ApiParam("方法层级")
+    @ApiModelProperty("方法名称")
+    private String methodName;
+    @ApiModelProperty("方法层级")
     private String level;
-    @ApiParam("参数列表")
+    @ApiModelProperty("参数列表")
     List<MethodLevelParamModel> paramModels;
 }

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodLevelParamModel.java

@@ -1,12 +1,10 @@
 package cn.estsh.i3plus.pojo.bsp.server.bean.model;
 
-import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
-import java.util.Map;
-
 /**
  * @Description :
  * @Reference :
@@ -16,12 +14,12 @@ import java.util.Map;
  **/
 @Data
 @AllArgsConstructor
-@Api("添加方法组层级参数")
+@ApiModel("添加方法组层级参数")
 public class MethodLevelParamModel {
-    @ApiParam("根据出参生成，入参key = 层级 + methodId + 出参Name")
+    @ApiModelProperty("根据出参生成，入参key = 层级 + methodId + 出参Name")
     private String paramKey;
-    @ApiParam("对应本方法的入参名称")
+    @ApiModelProperty("对应本方法的入参名称")
-    private String paramValue;
+    private String methodParamName;
-    @ApiParam("入参类型，用于校验数据类型")
+    @ApiModelProperty("入参类型，用于校验数据类型")
     private String type;
 }

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/MethodListModel.java

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.bsp.server.bean.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2021/7/29 10:14
+ * @Modify:
+ **/
+@Data
+@ApiModel("分页查询方法列表")
+public class MethodListModel {
+
+    @ApiModelProperty(name = "执行器名")
+    private String appName;
+    @ApiModelProperty(name = "方法的版本号")
+    private String version;
+
+
+}

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMessageInfo.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.bsp.server.bean.model;
 
-import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -16,16 +16,16 @@ import java.util.List;
  **/
 @Data
 @AllArgsConstructor
-@Api("注册/心跳")
+@ApiModel("注册/心跳")
 public class RegistryMessageInfo {
 
-    @ApiParam("appName,根据appName分执行器组")
+    @ApiModelProperty("appName,根据appName分执行器组")
     private String appName;
 
-    @ApiParam("执行器地址")
+    @ApiModelProperty("执行器地址")
     private String address;
 
-    @ApiParam("方法列表")
+    @ApiModelProperty("方法列表")
     private List<RegistryMethodInfo> methodRegistryParamList;
 
 

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodInfo.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.bsp.server.bean.model;
 
-import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -16,16 +17,16 @@ import java.util.List;
  **/
 @Data
 @AllArgsConstructor
-@Api("注册方法信息")
+@ApiModel("注册方法信息")
 public class RegistryMethodInfo {
 
-    @ApiParam("方法名")
+    @ApiModelProperty("方法名")
     private String methodName;
 
-    @ApiParam("调用方法时的key")
+    @ApiModelProperty("调用方法时的key")
     private String methodHandlerKey;
 
-    @ApiParam("参数列表")
+    @ApiModelProperty("参数列表")
     private List<RegistryMethodParamInfo> methodParamList;
 
     /*-----------------------------------文档------------------------------------------------*/

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RegistryMethodParamInfo.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.bsp.server.bean.model;
 
-import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -14,16 +14,16 @@ import lombok.Data;
  **/
 @Data
 @AllArgsConstructor
-@Api("方法注册参数")
+@ApiModel("方法注册参数")
 public class RegistryMethodParamInfo {
 
-    @ApiParam("参数名")
+    @ApiModelProperty("参数名")
     private String name;
 
-    @ApiParam("参数类型，入参1，出参0")
+    @ApiModelProperty("参数类型，入参1，出参0")
     private Integer type;
 
-    @ApiParam("数据类型，基本数据类型")
+    @ApiModelProperty("数据类型，基本数据类型")
     private String typeName;
 
 

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/model/RouteParam.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.bsp.server.bean.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description :路由参数
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2021/7/5 14:02
+ * @Modify:
+ **/
+@Data
+@ApiModel("路由参数")
+public class RouteParam {
+
+    @ApiModelProperty(value = "执行方法Id")
+    private Long methodId;
+    @ApiModelProperty(value = "路由的权重配置")
+    private Map<String,Integer> weightConfig;
+    @ApiModelProperty(value = "执行器地址列表")
+    private List<String> addressList;
+}

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorGroupRegistryInfo.java

@@ -40,7 +40,7 @@ public class ExecutorGroupRegistryInfo extends BaseBean implements Serializable
 
     @Column(name = "TYPE",columnDefinition = "int default 0")
     @ApiModelProperty("自动注册 0，手动注册 1")
-    private String type;
+    private Integer type;
 
     @Column
     @ApiModelProperty("执行器组路由策略,默认随机")

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryInfo.java

@@ -40,4 +40,8 @@ public class ExecutorRegistryInfo extends BaseBean implements Serializable {
     @Column(name = "UPDATE_TIME")
     @ApiModelProperty("最近一次心跳时间")
     private Date updateTime;
+
+    @Column(name = "WEIGHT")
+    @ApiModelProperty("执行器权重")
+    private Integer weight;
 }

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/ExecutorRegistryMethodInfo.java

@@ -50,6 +50,10 @@ public class ExecutorRegistryMethodInfo extends BaseBean implements Serializable
     @ApiModelProperty("所属执行器的appName")
     private String appName;
 
+    @Column(name = "description")
+    @ApiModelProperty("方法描述")
+    private String description;
+
     @Transient
     @ApiModelProperty("方法参数列表")
     private List<ExecutorRegistryParamInfo> paramInfos;

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodGroupInfo.java

@@ -38,5 +38,9 @@ public class MethodGroupInfo extends BaseBean implements Serializable {
     @ApiModelProperty("方法组描述")
     private String description;
 
+    @Column(name = "CLASSIFY")
+    @ApiModelProperty("方法组分类(唯一)")
+    private String classify;
+
 
 }

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelInfo.java

@@ -43,6 +43,10 @@ public class MethodLevelInfo extends BaseBean implements Serializable {
     @ApiModelProperty("当前层级的方法ID")
     private Long methodId;
 
+    @Column(name = "METHOD_NAME")
+    @ApiModelProperty("方法名称")
+    private String methodName;
+
     @Transient
     @ApiModelProperty("方法的参数关系列表")
     private List<MethodLevelParamInfo> paramInfoList;

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/bean/po/MethodLevelParamInfo.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.bsp.server.bean.po;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import lombok.*;
 
 import javax.persistence.Column;
@@ -47,6 +48,12 @@ public class MethodLevelParamInfo extends BaseBean implements Serializable {
     @Column(name = "METHOD_ID")
     @ApiModelProperty("对应的当前层级的方法Id")
     private Long methodId;
+    /**
+     * 对应方法的名字,todo 临时字段 2021/8/1
+     */
+    @Column(name = "METHOD_NAME")
+    @ApiModelProperty("对应的当前层级的方法的名字")
+    private String methodName;
 
     @Column(name = "METHOD_GROUP_ID")
     @ApiModelProperty("对应方法组的Id")
@@ -54,13 +61,20 @@ public class MethodLevelParamInfo extends BaseBean implements Serializable {
     /**
      * 原有方法的入参是否必须，做验证
      */
-    @Column(name = "require")
+    @Column(name = "REQUIRE_TYPE",columnDefinition = "int")
     @ApiModelProperty("原有方法的入参是否必须，做调用前验证")
-    private Integer require;
+    private Integer requireType;
     /**
      * 参数类型，验证是否正确
      */
-    @Column(name = "type")
+    @Column(name = "TYPE")
     @ApiModelProperty("参数类型验证")
     private String type;
+
+    /**
+     * 层级的入参
+     */
+    @Column(name = "LEVEL")
+    @ApiModelProperty("层级的入参")
+    private String level;
 }

modules/i3plus-pojo-bsp/src/main/java/cn/estsh/i3plus/pojo/bsp/server/repository/ScriptRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.bsp.server.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.bsp.client.bean.po.EngineScriptPersistence;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2021/7/22 13:51
+ * @Modify:
+ **/
+public interface ScriptRepository extends BaseRepository<EngineScriptPersistence,Long> {
+}

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,43 @@ 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_ALLOW_MODIFY")
+    @ApiModelProperty("是否支持修改")
+    private Integer isAllowModify;
 
     @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,21 +89,18 @@ public class ScrModelField extends BaseBean implements Serializable {
 
     @Column(name = "IS_VIRTUAL")
     @ApiModelProperty("是否是虚拟的")
-    private Boolean isVirtual;
+    private Integer isVirtual;
 
-    @Column(name = "MODEL_FIELD_DATASOURCE")
+    @Column(name = "MODEL_FIELD_SOURCE")
     @ApiModelProperty("字段数据来源")
-    private Integer modelFieldDatasource;
+    private Integer modelFieldSource;
 
-    @Column(name = "MODEL_FIELD_DATASOURCE_PROPS")
+    @Column(name = "MODEL_FIELD_SOURCE_PROPS")
     @ApiModelProperty("model字段来源属性")
-    private String modelFieldDatasourceProps;
+    private String modelFieldSourceProps;
-
-    @Column(name = "DATA_ROW_AUTH")
-    @ApiModelProperty("数据列权限")
-    private String dataRowAuth;
 
     @Transient
+    @ApiModelProperty(value="模型字段值")
     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 Integer isUserCreated;
-    private CommonEnumUtil.TRUE_OR_FALSE 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")
+    @Column(name = "IS_TEMPLATE")
-    @ApiModelProperty("布局代码")
+    @ApiModelProperty("是否为模板")
-    private String layoutCode;
+    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")
+    @Column(name = "DEVICE_TYPE")
-    @ApiModelProperty("布局代码")
+    @ApiModelProperty("设备类型")
-    private String layoutCode;
+    private Integer deviceType;
 
-    @Column(name = "SCREEN_TYPE")
+    @Column(name = "TEMPLATE_TYPE")
-    @ApiModelProperty("页面类型")
+    @ApiModelProperty("模板类型")
-    private Integer screenType;
+    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",
+@Table(name = "SCR_SCREEN_PANEL")
-        uniqueConstraints = {
-                @UniqueConstraint(columnNames = {"SCREEN_CODE", "LAYOUT_CODE"})
-        }
-)
 @Data
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
+@DynamicUpdate
+@DynamicInsert
 @Builder
-@EqualsAndHashCode(callSuper = true)
+@ApiModel("screen与panel的关系")
-@ApiModel("Screen与Panel的关系")
+public class ScrScreenPanel extends BaseBean implements Serializable {
-public class ScrScreenPanel extends BaseBean {
+    private static final long serialVersionUID = 2586321557100106523L;
-    private static final long serialVersionUID = 3459027655126916483L;
 
     @Column(name = "SCREEN_CODE")
     @ApiModelProperty("Screen代码")
@@ -42,15 +42,11 @@ public class ScrScreenPanel extends BaseBean {
     @ApiModelProperty("布局代码")
     private String layoutCode;
 
-    @Column(name = "ROW_CODE")
+    @Column(name = "LAYOUT_ITEM_CODE")
-    @ApiModelProperty("行代码")
+    @ApiModelProperty("布局单元代码")
-    private String rowCode;
+    private String layoutItemCode;
-
-    @Column(name = "COLUMN_CODE")
-    @ApiModelProperty("列代码")
-    private String columnCode;
 
     @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("布局中的行列关系")
+    @ApiModelProperty("布局中的单元关系")
-    private List<ScrRowColumnModel> rowColumnModels;
+    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/ScrRequestModel.java

@@ -6,8 +6,8 @@ import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -61,15 +61,18 @@ public class ScrRequestModel implements Serializable {
     @ApiModelProperty("类名")
     private String className;
 
-    @ApiModelProperty("方法名")
+    @ApiModelProperty("方法ID")
-    private String methodName;
+    private Long methodGroupId;
 
     @ApiModelProperty("上传文件")
-    private MultipartFile file;
+    private transient File file;
 
     @ApiModelProperty("模型字段")
     private List<ScrModelField> modelFields;
 
+    @ApiModelProperty("模型字段代码")
+    private Map<String, Object> modelFieldMap;
+
     @ApiModelProperty("父代码")
     private String parentCode;
 
@@ -79,8 +82,8 @@ public class ScrRequestModel implements Serializable {
     @ApiModelProperty("where条件补充")
     private String whereAppender;
 
-    @ApiModelProperty("调用接口参数")
+    @ApiModelProperty("字段转换")
-    private Map<String,Object> param;
+    private Map<String, String> fieldConverter;
 
 
 }

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

@@ -1,13 +1,11 @@
 package cn.estsh.i3plus.pojo.screen.model;
 
 import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.Serializable;
 import java.util.List;

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.diagram.ScrPanel;
-import cn.estsh.i3plus.pojo.screen.bean.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> {
-}