first commit

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

@@ -2017,8 +2017,7 @@ public class CommonEnumUtil {
                     "?autoReconnect=true" +
                     "&useSSL=false" +
                     "&characterEncoding=utf-8" +
-                    "&allowPublicKeyRetrieval=true" +
-                    "&serverTimezone=CST";
+                    "&allowPublicKeyRetrieval=true";
         }
 
         private String getJDBCUrlOracle(String database, String host, Integer port) {

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

@@ -120,4 +120,164 @@ public class ScreenEnumUtil {
         }
     }
 
+    public enum DATASOURCE_CONNECTION_STATUS {
+        SUCCESS(10, "success", "连接成功"),
+        FAILED(20, "failed", "连接失败");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        DATASOURCE_CONNECTION_STATUS(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 ACTION {
+        SEARCH(10, "search", "查询"),
+        CREATE(20, "create", "保存"),
+        UPDATE(30, "update", "更新"),
+        DELETE(40, "delete", "删除"),
+        VALID(50, "valid", "查询"),
+        INVALID(60, "inValid", "查询"),
+        SEARCH_PAGER(70, "searchPager", "查询"),
+        ENUM(80, "enum", "查询"),
+        DIRECT(90, "direct", "查询"),
+        DOWNLOAD(100, "download", "查询"),
+        UPLOAD(110, "upload", "查询"),
+        INVOKE(120, "invoke", "查询");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        ACTION(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 COMMUNICATION_TYPE {
+        HTTP(10, "HTTP", "Http"),
+        WEBSOCKET(20, "WEBSOCKET", "WebSocket");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        COMMUNICATION_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 DATA_RESOURCE_TYPE {
+        ENUM(10, "enum", "枚举"),
+        WEBSOCKET(20, "WEBSOCKET", "WebSocket");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        DATA_RESOURCE_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;
+        }
+    }
+
+
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/annotation/ReferTo.java

@@ -0,0 +1,28 @@
+//package cn.estsh.i3plus.pojo.screen.annotation;
+//
+//import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
+//
+//import java.lang.annotation.Documented;
+//import java.lang.annotation.ElementType;
+//import java.lang.annotation.Retention;
+//import java.lang.annotation.RetentionPolicy;
+//import java.lang.annotation.Target;
+//
+///**
+// * @author Wynne.Lu
+// * @date 2021/3/30 下午9:11
+// * @desc
+// */
+//@Retention(RetentionPolicy.RUNTIME)
+//@Target({ElementType.FIELD)
+//@Documented
+//public @interface ReferTo {
+//
+//    ScreenEnumUtil.DATA_RESOURCE_TYPE refType() default ScreenEnumUtil.DATA_RESOURCE_TYPE.ENUM;
+//
+//    String refWhere();
+//
+//    String refField();
+//
+//
+//}

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

@@ -37,4 +37,9 @@ public class ScrAction extends BaseBean implements Serializable {
     @Column(name = "ACTION_NAME")
     @ApiParam("动作名称")
     private String actionName;
+
+    @Column(name = "ACTION_TYPE")
+    @ApiParam("动作类型")
+    private String actionType;
+
 }

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

@@ -39,8 +39,14 @@ public class ScrComponent extends BaseBean implements Serializable {
     @ApiParam(value = "组件代码")
     private String componentType;
 
+    @Column(name = "MODEL_CODE")
+    @ApiParam(value = "model代码")
+    private String modelCode;
+
     @Lob
     @Column(name = "COMPONENT_PROPERTY")
     @ApiParam(value = "组件描述")
     private String componentProperty;
+
+
 }

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

@@ -45,13 +45,13 @@ public class ScrDataObject extends BaseBean implements Serializable {
     @ApiParam(value = "数据源编码")
     private String sourceCode;
 
-    @Column(name = "DATA_OBJECT_SOURCE")
+    @Column(name = "DATA_OBJECT_SOURCE_CODE")
     @ApiParam(value = "数据名称")
-    private String dataObjectSource;
+    private String dataObjectSourceCode;
 
     @Column(name = "DATA_TYPE")
     @ApiParam(value = "数据类型")
-    private Integer dataType;
+    private String dataType;
 
     @Column(name = "DESCRIPTION")
     @ApiParam(value = "描述")

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

@@ -31,8 +31,8 @@ public class ScrDataObjectProperty extends BaseBean implements Serializable {
     private static final long serialVersionUID = 6954106365899677132L;
 
     @Column(name = "DATA_OBJECT_CODE")
-    @ApiParam(value = "数据对象ID")
-    private Long dataObjectId;
+    @ApiParam(value = "数据对象代码")
+    private String dataObjectCode;
 
     @Column(name = "FIELD_CODE")
     @ApiParam(value = "字段代码")

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
@@ -11,6 +12,8 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -31,43 +34,44 @@ import java.io.Serializable;
 public class ScrDatasource extends BaseBean implements Serializable {
     private static final long serialVersionUID = 2660387454249572573L;
 
-    @Column(name="SOURCE_NAME")
-    @ApiParam(value ="数据源名称")
+    @Column(name = "SOURCE_NAME")
+    @ApiParam(value = "数据源名称")
     private String sourceName;
 
-    @Column(name="SOURCE_CODE")
-    @ApiParam(value ="数据源代码")
+    @Column(name = "SOURCE_CODE")
+    @ApiParam(value = "数据源代码")
     private String sourceCode;
 
-    @Column(name="SOURCE_STATUS")
-    @ApiParam(value ="数据源状态",name = "状态：可用，不可用 看枚举当中是否存在")
-    private Integer sourceStatus;
+    @Column(name = "SOURCE_CONNECTION_STATUS")
+    @ApiParam(value = "数据源状态", name = "状态：可用，不可用 看枚举当中是否存在")
+    @Enumerated(EnumType.STRING)
+    private ScreenEnumUtil.DATASOURCE_CONNECTION_STATUS sourceConnectionStatus;
 
-    @Column(name="SOURCE_TYPE")
-    @ApiParam(value ="数据源类型",name = "CommonEnumUtil.DATA_SOURCE_TYPE")
+    @Column(name = "SOURCE_TYPE")
+    @ApiParam(value = "数据源类型", name = "CommonEnumUtil.DATA_SOURCE_TYPE")
     private Integer sourceType;
 
-    @Column(name="SOURCE_HOST")
-    @ApiParam(value ="数据源连接地址")
+    @Column(name = "SOURCE_HOST")
+    @ApiParam(value = "数据源连接地址")
     private String sourceHost;
 
-    @Column(name="SOURCE_PORT")
-    @ApiParam(value ="数据源端口")
+    @Column(name = "SOURCE_PORT")
+    @ApiParam(value = "数据源端口")
     private Integer sourcePort;
 
-    @Column(name="SOURCE_DATA_BASE_NAME")
-    @ApiParam(value ="数据库名称")
+    @Column(name = "SOURCE_DATA_BASE_NAME")
+    @ApiParam(value = "数据库名称")
     private String sourceDataBaseName;
 
-    @Column(name="SOURCE_USER_NAME")
-    @ApiParam(value ="数据库用户名称")
+    @Column(name = "SOURCE_USER_NAME")
+    @ApiParam(value = "数据库用户名称")
     private String sourceUserName;
 
-    @Column(name="SOURCE_PASSWORD")
-    @ApiParam(value ="数据库用户密码")
+    @Column(name = "SOURCE_PASSWORD")
+    @ApiParam(value = "数据库用户密码")
     private String sourcePassword;
 
-    @Column(name="SOURCE_DESCRIPTION")
-    @ApiParam(value ="数据源描述")
+    @Column(name = "SOURCE_DESCRIPTION")
+    @ApiParam(value = "数据源描述")
     private String sourceDescription;
 }

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

@@ -50,8 +50,4 @@ public class ScrLayoutColumn extends BaseBean implements Serializable {
     @ApiParam("列占位")
     private Integer columnSpan;
 
-    @Column(name = "ELEMENT_CODE")
-    @ApiParam("元素代码：panel or component")
-    private String elementCode;
-
 }

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

@@ -30,7 +30,7 @@ public class ScrScreenPanelRel extends BaseBean {
     private static final long serialVersionUID = 3459027655126916483L;
 
     @Column(name = "SCREEN_CODE")
-    @ApiParam("panel代码")
+    @ApiParam("Screen代码")
     private String screenCode;
 
     @Column(name = "LAYOUT_CODE")

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/base/BaseComponent.java

@@ -15,10 +15,14 @@ public abstract class BaseComponent extends BaseScreenBean {
 
     private String componentCode;
 
+    private String modelCode;
+
     private String cssStyle;
 
     private Integer tabIndex;
 
     private String componentType = this.getClass().getName();
 
+    private String communicationType;
+
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/view/ScrViewForm.java

@@ -13,5 +13,7 @@ import java.util.Map;
 @Data
 public class ScrViewForm extends BaseView {
 
-    private Map<String,String> fields;
+    private Map<String, String> fields;
+
+    private String action;
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/component/widget/ScrWidgetButton.java

@@ -17,5 +17,5 @@ public class ScrWidgetButton extends BaseWidget {
 
     private String size;
 
-    private String onClick;
+    private String action;
 }

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

@@ -1,16 +1,13 @@
 package cn.estsh.i3plus.pojo.screen.model;
 
 import cn.estsh.i3plus.pojo.screen.bean.ScrComponent;
-import cn.estsh.i3plus.pojo.screen.bean.ScrModel;
 import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
-import cn.estsh.i3plus.pojo.screen.bean.rel.ScrComponentEventActionRel;
-import cn.estsh.i3plus.pojo.screen.bean.rel.ScrComponentModelFieldRel;
-import cn.estsh.i3plus.pojo.screen.bean.rel.ScrPanelComponentRel;
 import cn.estsh.i3plus.pojo.screen.component.base.BaseComponent;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Wynne.Lu
@@ -18,7 +15,7 @@ import java.util.List;
  * @desc
  */
 @Data
-public class ScrPanelComponentModel implements Serializable {
+public class ScrPanelComponentCreateModel implements Serializable {
     private static final long serialVersionUID = -5832175256726333348L;
 
     private String panelCode;
@@ -29,7 +26,9 @@ public class ScrPanelComponentModel implements Serializable {
 
     private String columnCode;
 
-    private BaseComponent component;
+    private Map<String, Object> baseComponent;
+
+    private String modelCode;
 
     private List<String> eventActions;
 

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

@@ -0,0 +1,34 @@
+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.ScrLayout;
+import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
+import cn.estsh.i3plus.pojo.screen.bean.ScrPanel;
+import cn.estsh.i3plus.pojo.screen.bean.rel.ScrComponentModelFieldRel;
+import cn.estsh.i3plus.pojo.screen.component.base.BaseComponent;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/28 上午12:42
+ * @desc
+ */
+@Data
+public class ScrPanelComponentQueryModel implements Serializable {
+    private static final long serialVersionUID = 4133777603151273736L;
+
+    private String rowCode;
+
+    private String columnCode;
+
+    private ScrComponent component;
+
+    private List<ScrEventAction> eventActions;
+
+    private List<ScrComponentModelFieldRel> modelFields;
+
+}

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

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import cn.estsh.i3plus.pojo.screen.bean.ScrLayout;
+import cn.estsh.i3plus.pojo.screen.bean.ScrPanel;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/28 下午2:23
+ * @desc
+ */
+public class ScrPanelLayoutModel {
+
+    private ScrPanel panel;
+
+    private ScrLayout layout;
+
+    private List<ScrRowColumnModel> rowColumnModels;
+}

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/28 上午12:42
+ * @desc
+ */
+@Data
+public class ScrScreenPanelCreateModel implements Serializable {
+    private static final long serialVersionUID = -5832175256726333348L;
+
+    private String screenCode;
+
+    private String layoutCode;
+
+    private String rowCode;
+
+    private String columnCode;
+
+    private String panelCode;
+
+}