Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -73,6 +73,7 @@ public class CommonEnumUtil {
         GATEWAY(96, 9000, 0, 0, "impp-gateway", "服务网关"),
         CLOUD(97, 0, 0, 0, "i3cloud", "微服务"),
         CENTER(99, 8000, 1, 0, "icloud-server", "注册中心"),
+        SCREEN(100, 8110, 23, 0, "i3screen", "通用界面"),
 
         /**
          * 平台服务
@@ -2032,7 +2033,7 @@ public class CommonEnumUtil {
                     "&useSSL=false" +
                     "&characterEncoding=utf-8" +
                     "&allowPublicKeyRetrieval=true" +
-                    "&serverTimezone=CST";
+                    "&serverTimezone=Asia/Shanghai";
         }
 
         //MySQL8.x时区设置

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

@@ -1084,7 +1084,8 @@ public class ImppEnumUtil {
         LOG(7, "日志配置"),
         WORK_WECHAT(8, "企业微信配置"),
         SMS(9, "短信配置"),
-        SSO(10, "单点登录配置");
+        SSO(10, "单点登录配置"),
+        PASSWORD_EXPIRE(11, "密码过期策略");
 
         private final int value;
         private final String description;

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

@@ -16,8 +16,8 @@ public class MdmEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MDM_OPERATE_TYPE {
-        INSERT(1,  "新增"),
-        UPDATE(2,  "修改");
+        INSERT(1, "新增"),
+        UPDATE(2, "修改");
 
         private int value;
         private String description;
@@ -120,10 +120,10 @@ public class MdmEnumUtil {
     /**
      * mdm
      */
-    public enum MDM_SYNC_TYPE{
-        INSERT(1,  "新增"),
-        UPDATE(2,  "修改"),
-        DELETE(3,  "删除");
+    public enum MDM_SYNC_TYPE {
+        INSERT(1, "新增"),
+        UPDATE(2, "修改"),
+        DELETE(3, "删除");
 
         private int value;
         private String description;
@@ -162,4 +162,51 @@ public class MdmEnumUtil {
         }
     }
 
+    /**
+     * MDM 同步应用类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MDM_SYNC_APP_TYPE {
+        INTERNAL(1, "内部系统"),
+        EXTERNAL(2, "外部系统");
+
+        private int value;
+        private String description;
+
+        private MDM_SYNC_APP_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+
+        public String getDescription() {
+            return description;
+        }
+
+        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 MdmEnumUtil.MDM_SYNC_APP_TYPE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
+
+
 }

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

@@ -83,4 +83,213 @@ public class ScreenEnumUtil {
         }
     }
 
+    public enum LAYOUT_TYPE {
+        SCREEN(10, "SCREEN", "Screen布局"),
+        PANEL(20, "PANEL", "Panel布局");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        LAYOUT_TYPE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    public enum DATASOURCE_CONNECTION_STATUS {
+        SUCCESS(10, "success", "连接成功"),
+        FAILED(20, "failed", "连接失败");
+
+        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", "查询", "scrSearchActionStrategy"),
+        CREATE(20, "create", "保存", "scrCreateActionStrategy"),
+        UPDATE(30, "update", "更新", "scrUpdateActionStrategy"),
+        DELETE(40, "delete", "删除", "scrDeleteActionStrategy"),
+        VALID(50, "valid", "启用", "scrValidActionStrategy"),
+        INVALID(60, "invalid", "禁用", "scrInvalidActionStrategy"),
+        SEARCH_PAGER(70, "searchPager", "分页查询", "scrSearchPagerActionStrategy"),
+        ENUM(80, "enum", "枚举查询", "scrEnumActionStrategy"),
+        DIRECT(90, "direct", "跳转", "scrDirectActionStrategy"),
+        DOWNLOAD(100, "download", "下载", "scrDownloadActionStrategy"),
+        UPLOAD(110, "upload", "上传", "scrUploadActionStrategy"),
+        INVOKE(120, "invoke", "调用", "scrInvokeActionStrategy");
+
+        private Integer value;
+        private String code;
+        private String description;
+        private String beanName;
+
+        ACTION(Integer value, String code, String description, String beanName) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+            this.beanName = beanName;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String beanOfCode(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equalsIgnoreCase(code)) {
+                    tmp = values()[i].beanName;
+                }
+            }
+            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 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-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBean.java

@@ -7,7 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil;
 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 io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import javax.persistence.Column;
@@ -29,12 +29,12 @@ public abstract class BaseMdmBean extends BaseBean {
     private static final long serialVersionUID = 3957595289035947441L;
 
     @Transient
-    @ApiModelProperty("是否主数据")
+    @ApiParam("是否主数据")
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
     public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
 
     @Column(name = "MDM_VERSION")
-    @ApiModelProperty("mdm数据版本")
+    @ApiParam("mdm数据版本")
     @JsonSerialize(using = ToStringSerializer.class)
     @AnnoOutputColumn(hidden = true)
     private Long mdmVersion;
@@ -50,12 +50,12 @@ public abstract class BaseMdmBean extends BaseBean {
     }
 
     @Column(name = "IS_MDM_PUBLISHED")
-    @ApiModelProperty("是否发布")
+    @ApiParam("是否发布")
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
     private Integer isMdmPublished;
 
     @Column(name = "MDM_OPERATE_TYPE")
-    @ApiModelProperty("操作类型")
+    @ApiParam("操作类型")
     @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_OPERATE_TYPE.class,hidden = true)
     private Integer mdmOperateType;
 
@@ -68,7 +68,7 @@ public abstract class BaseMdmBean extends BaseBean {
     }
 
     @Column(name = "MDM_REF_ID")
-    @ApiModelProperty("关联id")
+    @ApiParam("关联id")
     @JsonSerialize(using = ToStringSerializer.class)
     @AnnoOutputColumn(hidden = true)
     private Long mdmRefId;

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiExtdBean.java

@@ -5,7 +5,7 @@ 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.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import javax.persistence.Column;
@@ -27,23 +27,24 @@ public class BaseMdmBusiExtdBean extends BaseMdmBean {
     private static final long serialVersionUID = 4267453020130810967L;
 
     @Transient
-    @ApiModelProperty("是否主数据")
+    @ApiParam("是否主数据")
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,hidden = true)
     public static Integer isMdmMaster  = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 
     @Transient
-    @ApiModelProperty("主数据Class")
+    @ApiParam("主数据Class")
     @AnnoOutputColumn(hidden = true)
     protected static Class<BaseMdmBean> mdmMasterClass  = BaseMdmBean.class;
 
     @Transient
-    @ApiModelProperty("软件模块")
+    @ApiParam("软件模块")
     @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true)
     protected static Integer mdmSoftType;
 
     @Column(name = "MDM_MASTER_ID")
-    @ApiModelProperty("主数据id")
+    @ApiParam("主数据id")
     @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
     public Long mdmMasterId;
 
 }

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/BaseMdmBusiModelBean.java

@@ -1,6 +1,6 @@
 package cn.estsh.i3plus.pojo.mdm.bean.base;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
 
 /**
  * @Description :MDM模型bean
@@ -16,10 +16,10 @@ public abstract class BaseMdmBusiModelBean<M extends BaseMdmBean, B extends Base
         this.mdmBusiBean = mdmBusiBean;
     }
 
-    @ApiModelProperty("主数据")
+    @ApiParam("主数据")
     private M mdmMasterBean;
 
-    @ApiModelProperty("业务扩展")
+    @ApiParam("业务扩展")
     private B mdmBusiBean;
 
     public BaseMdmBusiModelBean() {

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/base/MdmSyncData.java

@@ -4,7 +4,7 @@ import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -23,27 +23,37 @@ public class MdmSyncData implements Serializable {
 
     private static final long serialVersionUID = -1642626000860074060L;
 
-    @ApiModelProperty("同步数据类型")
+    @ApiParam("同步数据类型")
     @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_SYNC_TYPE.class)
     private Integer syncType;
 
-    public int getSyncTypeVal(){
+    public int getSyncTypeVal() {
         return syncType == null ? MdmEnumUtil.MDM_SYNC_TYPE.INSERT.getValue() : syncType;
     }
 
-    public String getSyncTypeTxt(){
-        return syncType == null ? "无":MdmEnumUtil.MDM_SYNC_TYPE.valueOfDescription(syncType);
+    public String getSyncTypeTxt() {
+        return syncType == null ? "无" : MdmEnumUtil.MDM_SYNC_TYPE.valueOfDescription(syncType);
     }
 
-    @ApiModelProperty("同步模块")
-    @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class)
-    private Integer syncSoftType;
+    @ApiParam("同步模块")
+    @AnnoOutputColumn(refClass = MdmEnumUtil.MDM_SYNC_APP_TYPE.class)
+    private Integer syncAppType;
 
-    public String getSyncSoftTypeTxt(){
-        return syncSoftType == null ? "无":CommonEnumUtil.SOFT_TYPE.valueOfDescription(syncSoftType);
+    public int getSyncAppTypeVal() {
+        return syncAppType == null ? MdmEnumUtil.MDM_SYNC_APP_TYPE.INTERNAL.getValue() : syncAppType;
     }
 
-    @ApiModelProperty("是否是主数据")
+    public String getSyncAppTypeTxt() {
+        return syncAppType == null ? "无" : MdmEnumUtil.MDM_SYNC_APP_TYPE.valueOfDescription(syncAppType);
+    }
+
+    @ApiParam("同步模块")
+    private Long syncSoftType;
+
+    @ApiParam("同步模块名称")
+    private String syncSoftTypeName;
+
+    @ApiParam("是否是主数据")
     @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
     private Integer isMasterData;
 
@@ -51,36 +61,36 @@ public class MdmSyncData implements Serializable {
         return isMasterData == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isMasterData;
     }
 
-    public String getIsMasterDataTxt(){
-        return isMasterData == null ? "无":CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(isMasterData);
+    public String getIsMasterDataTxt() {
+        return isMasterData == null ? "无" : CommonEnumUtil.TRUE_OR_FALSE.valueOfDescription(isMasterData);
     }
 
-    @ApiModelProperty("同步数据class")
+    @ApiParam("同步数据class")
     private String syncDataClass;
 
-    public String getSyncDataClassSimpleName(){
-        if(syncDataClass == null){
+    public String getSyncDataClassSimpleName() {
+        if (syncDataClass == null) {
             return null;
         }
 
         return syncDataClass.trim().substring(syncDataClass.trim().lastIndexOf(".") + 1);
     }
 
-    @ApiModelProperty("同步数据id")
+    @ApiParam("同步数据id")
     private List<Long> syncDataId;
 
-    @ApiModelProperty("同步数据用户名")
+    @ApiParam("同步数据用户名")
     private String syncDateUserName;
 
-    @ApiModelProperty("同步时间")
+    @ApiParam("同步时间")
     private String syncDateTime;
 
-    @ApiModelProperty("同步失败键")
+    @ApiParam("同步失败键")
     private String syncFailKey;
 
-    @ApiModelProperty("同步失败时间")
+    @ApiParam("同步失败时间")
     private String syncFailDateTime;
 
-    @ApiModelProperty("同步失败信息")
+    @ApiParam("同步失败信息")
     private String syncFailMessage;
 }

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribe.java

@@ -0,0 +1,100 @@
+package cn.estsh.i3plus.pojo.mdm.bean.busi;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+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.Transient;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2021-03-29 17:37
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MDM_DATA_SUBSCRIBE")
+@ApiModel("数据订阅信息")
+public class MdmDataSubscribe extends BaseBean {
+
+    private static final long serialVersionUID = 8821827445193232389L;
+
+    @Column(name = "MDM_CLASS_NAME")
+    @ApiParam("主数据类名")
+    private String mdmClassName;
+
+    @Column(name = "MDM_NAME")
+    @ApiParam("主数据名称")
+    private String mdmName;
+
+    @Column(name = "INTERNAL_APP_NUM")
+    @ApiParam("内部订阅应用数量")
+    private Integer internalAppNum;
+
+    public long addInternalAppNum() {
+        if (internalAppNum == null) {
+            internalAppNum = 1;
+        } else {
+            internalAppNum++;
+        }
+        return internalAppNum;
+    }
+
+    @Column(name = "EXTERNAL_APP_NUM")
+    @ApiParam("外部订阅应用数量")
+    private Integer externalAppNum;
+
+    public long addExternalAppNum() {
+        if (externalAppNum == null) {
+            externalAppNum = 1;
+        } else {
+            externalAppNum++;
+        }
+        return externalAppNum;
+    }
+
+    @Transient
+    @ApiParam("内部订阅信息")
+    private List<MdmDataSubscribeDetail> internalAppSubList;
+
+    public List<MdmDataSubscribeDetail> getInternalAppSubList() {
+        return internalAppSubList == null ? new ArrayList<>() : internalAppSubList;
+    }
+
+    public void addInternalApp(MdmDataSubscribeDetail detail) {
+        if (internalAppSubList == null) {
+            internalAppSubList = new ArrayList<>();
+        }
+        internalAppSubList.add(detail);
+    }
+
+    @Transient
+    @ApiParam("外部订阅信息")
+    private List<MdmDataSubscribeDetail> externalAppSubList;
+
+    public List<MdmDataSubscribeDetail> getExternalAppSubList() {
+        return externalAppSubList == null ? new ArrayList<>() : externalAppSubList;
+    }
+
+    public void addExternalApp(MdmDataSubscribeDetail detail) {
+        if (externalAppSubList == null) {
+            externalAppSubList = new ArrayList<>();
+        }
+        externalAppSubList.add(detail);
+    }
+
+}

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmDataSubscribeDetail.java

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.mdm.bean.busi;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2021-03-29 17:37
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MDM_DATA_SUBSCRIBE_DETAIL")
+@ApiModel("数据订阅明细")
+public class MdmDataSubscribeDetail extends BaseBean {
+
+    private static final long serialVersionUID = -741233265567034262L;
+
+    @Column(name = "DATA_SUBSCRIBE_ID")
+    @ApiParam("数据订阅id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long dataSubscribeId;
+
+    @Column(name = "APP_ID")
+    @ApiParam("应用id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long appId;
+
+    @Column(name = "APP_TYPE")
+    @ApiParam("应用类型")
+    private Integer appType;
+
+    public int getAppTypeVal() {
+        return appType == null ? MdmEnumUtil.MDM_SYNC_APP_TYPE.INTERNAL.getValue() : appType;
+    }
+
+    @Column(name = "APP_NAME")
+    @ApiParam("应用名称")
+    private String appName;
+}

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/MdmExternalApp.java

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.mdm.bean.busi;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2021-03-29 17:41
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MDM_EXTERNAL_APP")
+@ApiModel("外部应用信息")
+public class MdmExternalApp extends BaseBean {
+
+    private static final long serialVersionUID = -5344361274535836969L;
+
+    @Column(name = "APP_NAME")
+    @ApiParam("应用名称")
+    private String appName;
+
+    @Column(name = "APP_CODE")
+    @ApiParam("应用代码")
+    private String appCode;
+
+    @Column(name = "CALL_TOKEN")
+    @ApiParam("调用令牌")
+    private String callToken;
+
+    @Column(name = "CALLBACK_URL")
+    @ApiParam("回调地址")
+    private String callbackUrl;
+
+}

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/busi/core/MdmGearCoreBusiExtd.java

@@ -5,7 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiExtdBean;
 import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
@@ -35,17 +35,17 @@ public class MdmGearCoreBusiExtd extends BaseMdmBusiExtdBean {
     private static final long serialVersionUID = -3535174942277452194L;
 
     @Transient
-    @ApiModelProperty("主数据Class")
+    @ApiParam("主数据Class")
     @AnnoOutputColumn(hidden = true)
     public static Class mdmMasterClass  = MdmGear.class;
 
     @Transient
-    @ApiModelProperty("软件模块")
+    @ApiParam("软件模块")
     @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,hidden = true)
     public static Integer mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue();
 
     @Column(name = "CORE_NUM")
-    @ApiModelProperty("核心数量")
+    @ApiParam("核心数量")
     public String coreNum;
 
 }

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/bean/master/MdmGear.java

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.pojo.mdm.bean.master;
 
 import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
@@ -31,11 +31,11 @@ public class MdmGear extends BaseMdmBean {
     private static final long serialVersionUID = -7580444601811207793L;
 
     @Column(name="NAME")
-    @ApiModelProperty("齿轮名称")
+    @ApiParam("齿轮名称")
     private String name;
 
     @Column(name="GEAR_MODEL")
-    @ApiModelProperty("齿轮规格")
+    @ApiParam("齿轮规格")
     private String gearModel;
 
 }

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmDataSubscribeDetailRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mdm.repository.busi;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmDataSubscribeDetail;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2021-04-14 10:56
+ * @Modify:
+ **/
+public interface MdmDataSubscribeDetailRepository extends BaseRepository<MdmDataSubscribeDetail, Long> {
+}

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmDataSubscribeRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mdm.repository.busi;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmDataSubscribe;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2021-03-29 17:44
+ * @Modify:
+ **/
+@Repository
+public interface MdmDataSubscribeRepository extends BaseRepository<MdmDataSubscribe, Long> {
+}

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/repository/busi/MdmExternalAppRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mdm.repository.busi;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmExternalApp;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2021-03-29 17:52
+ * @Modify:
+ **/
+@Repository
+public interface MdmExternalAppRepository extends BaseRepository<MdmExternalApp, Long> {
+}

modules/i3plus-pojo-mdm/src/main/java/cn/estsh/i3plus/pojo/mdm/sqlpack/MdmHqlPack.java

@@ -0,0 +1,71 @@
+package cn.estsh.i3plus.pojo.mdm.sqlpack;
+
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmDataSubscribe;
+import cn.estsh.i3plus.pojo.mdm.bean.busi.MdmExternalApp;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2021-04-14 19:33
+ * @Modify:
+ **/
+public class MdmHqlPack {
+
+    /**
+     * mdm订阅信息查询条件拼接
+     *
+     * @param mdmDataSubscribe
+     * @return
+     */
+    public static DdlPackBean packHqlMdmDataSubscribe(MdmDataSubscribe mdmDataSubscribe) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmDataSubscribe);
+
+        DdlPreparedPack.getStringLikerPack(mdmDataSubscribe.getMdmName(), "mdmName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(mdmDataSubscribe.getMdmClassName(), "mdmClassName", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlCheckMdmDataSubscribeOnly(MdmDataSubscribe mdmDataSubscribe) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmDataSubscribe);
+
+        DdlPreparedPack.getNumNOEqualPack(mdmDataSubscribe.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(mdmDataSubscribe.getMdmClassName(), "mdmClassName", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 外部应用查询条件拼接
+     *
+     * @param mdmExternalApp
+     * @return
+     */
+    public static DdlPackBean packHqlMdmExternalApp(MdmExternalApp mdmExternalApp) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmExternalApp);
+
+        DdlPreparedPack.getStringLikerPack(mdmExternalApp.getAppName(), "appName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(mdmExternalApp.getAppCode(), "appCode", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 数据对象查询条件拼接
+     *
+     * @param mdmExternalApp
+     * @return
+     */
+    public static DdlPackBean packHqlCheckMdmExternalAppOnly(MdmExternalApp mdmExternalApp) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mdmExternalApp);
+
+        DdlPreparedPack.getNumNOEqualPack(mdmExternalApp.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(mdmExternalApp.getAppCode(), "appCode", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java

@@ -6,16 +6,13 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
+
+import javax.persistence.*;
+
 import lombok.EqualsAndHashCode;
 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;
 
 /**
@@ -29,7 +26,11 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
-@Table(name = "IF_EDI_INITIAL_DATA")
+@Table(name = "IF_EDI_INITIAL_DATA", indexes = {
+        @Index(columnList = "PROGRAM_DATA"),
+        @Index(columnList = "CONTENT"),
+        @Index(columnList = "SYNC_STATUS")
+})
 @Api("EDI_初始数据表")
 public class IfEdiInitialData extends BaseBean implements Serializable {
     private static final long serialVersionUID = -523843818485699827L;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java

@@ -4,15 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
+
+import javax.persistence.*;
+
 import lombok.EqualsAndHashCode;
 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;
 
 /**
@@ -27,7 +25,11 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
-@Table(name = "MES_JIT_LOCK_CACHE")
+@Table(name = "MES_JIT_LOCK_CACHE", indexes = {
+        @Index(columnList = "JIT_ACTUAL_NO"),
+        @Index(columnList = "WO_TYPE"),
+        @Index(columnList = "STATUS")
+})
 @Api("MES_JIT队列锁定池")
 public class MesJitLockCache extends BaseBean implements Serializable {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java

@@ -4,15 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
+
+import javax.persistence.*;
+
 import lombok.EqualsAndHashCode;
 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;
 
 /**
@@ -27,7 +25,11 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
-@Table(name = "MES_JIT_ORDER_CACHE")
+@Table(name = "MES_JIT_ORDER_CACHE", indexes = {
+        @Index(columnList = "JIT_ACTUAL_NO"),
+        @Index(columnList = "WO_TYPE"),
+        @Index(columnList = "STATUS")
+})
 @Api("MES_JIT队列订单池")
 public class MesJitOrderCache extends BaseBean implements Serializable {
     private static final long serialVersionUID = -613326904053045367L;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java

@@ -125,6 +125,10 @@ public class MesKpData extends BaseBean implements Serializable {
     @ApiParam("采集结果")
     private Integer result;
 
+    @Transient
+    @ApiParam("物料名称")
+    private String partName;
+
 
     public double getKeyDataCountVal() {
         return this.keyDataCount == null ? 0 : this.keyDataCount;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java

@@ -207,6 +207,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("工序名称")
     private String processName;
 
+    @Transient
+    @ApiParam("产品条码")
+    private String productSn;
+
     public MesPackage() {
     }
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java

@@ -248,6 +248,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("组内编号")
     private Integer groupNo;
 
+    @Transient
+    @ApiParam("总数")
+    private long sumQty;
+
     public MesProduceSn() {
     }
 
@@ -257,6 +261,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
         this.qty = qty;
     }
 
+
+    public MesProduceSn(String workCenterCode, String partNo, String partNameRdd, long sumQty) {
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.sumQty = sumQty;
+    }
+
     public MesProduceSn(Long id, String serialNumber, String productSn, String partNo, String partNameRdd, Double qty, Integer qcStatus, Integer snStatus,
                         Integer printCount, Integer printStatus, String workCenterCode, String workCellCode, String routeCode, String processCode,
                         String nextProcessCode, String inWorkCenterTime, String outWorkCenterTime, String shippingTime, String workOrderNo,

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java

@@ -159,4 +159,8 @@ public class MesQcOrder extends BaseBean implements Serializable {
     @Transient
     @ApiParam("班长")
     private String squadLeader;
+
+    @Transient
+    @ApiParam("质检单集合")
+    private List<String> orderNoList;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java

@@ -78,11 +78,11 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
 
     @Column(name = "QTY")
     @ApiParam("数量")
-    private Integer qty;
+    private Integer qty = 0;
 
     @Column(name = "FINISH_QTY")
     @ApiParam("已检数量")
-    private Integer finishQty;
+    private Integer finishQty = 0;
 
     @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java

@@ -40,6 +40,9 @@ public class MesControlPlanModel {
     @ApiParam("是否启用")
     private Integer isEnable;
 
+    @ApiParam("是否删除")
+    private Integer isCutOut;
+
     @ApiParam("质量标准数组")
     private List<MesQualityStandardModel> standardList;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java

@@ -51,6 +51,11 @@ public class ExcelImportModel<T> implements Serializable {
         result = true;
     }
 
+    public ExcelImportModel(List<T> excelList) {
+        result = true;
+        this.excelList = excelList;
+    }
+
     public void addErrorMsg(ImportErrorModel errorModel) {
         if (importErrorModels == null) {
             importErrorModels = new ArrayList<>();

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java

@@ -28,6 +28,7 @@ public class WmsJobParamModel implements Serializable {
     private Integer erpSyncFlag;//查询SHIPPING表的条件
     private String filterZoneNos;//过滤存储区
     private String zoneNos;//存储区
+    private String lineNo;//产线
 
 
     public int getMinuteDiffVal() {

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java

@@ -28,92 +28,96 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_USER")
-@Api(value="账号登陆表",description = "账号登陆系统账户。")
+@Table(name = "SYS_USER")
+@Api(value = "账号登陆表", description = "账号登陆系统账户。")
 public class SysUser extends BaseBean {
 
     private static final long serialVersionUID = 3721769401146979123L;
-    @Column(name="USER_INFO_ID")
-    @ApiParam(value ="人员ID" , example = "-1")
+    @Column(name = "USER_INFO_ID")
+    @ApiParam(value = "人员ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long userInfoId;
 
-    @Column(name="LANGUAGE_CODE")
-    @ApiParam(value ="用户语言")
+    @Column(name = "LANGUAGE_CODE")
+    @ApiParam(value = "用户语言")
     private String languageCode;
 
-    @Column(name="USER_NAME_RDD")
-    @ApiParam(value ="用户名称" , access ="账号名称")
+    @Column(name = "USER_NAME_RDD")
+    @ApiParam(value = "用户名称", access = "账号名称")
     private String userName;
 
-    @Column(name="USER_LOGIN_NAME")
-    @ApiParam(value ="登陆名称" , access ="登陆名称")
+    @Column(name = "USER_LOGIN_NAME")
+    @ApiParam(value = "登陆名称", access = "登陆名称")
     private String userLoginName;
 
-    @Column(name="USER_EMP_NO")
-    @ApiParam(value ="工号")
+    @Column(name = "USER_EMP_NO")
+    @ApiParam(value = "工号")
     private String userEmpNo;
 
     @Deprecated // 废弃密码新 , 使用ID作为密码信息, 改密码作为数据传输使用
-    @Column(name="USER_LOGIN_PASSWORD")
-    @ApiParam(value ="登陆密码")
+    @Column(name = "USER_LOGIN_PASSWORD")
+    @ApiParam(value = "登陆密码")
     private String userLoginPassword;
 
-    @Column(name="USER_LOGIN_PASSWORD_ID")
-    @ApiParam(value ="密码ID" , example = "-1")
+    @Column(name = "USER_LOGIN_PASSWORD_ID")
+    @ApiParam(value = "密码ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long userLoginPasswordId;
 
-    @Column(name="USER_TYPE")
-    @ApiParam(value ="账号类型（枚举，待定）" , example ="-1")
+    @Column(name = "USER_PASSWORD_LAST_MODIFY_TIME")
+    @ApiParam(value = "用户最后一次修改密码时间")
+    private String userPasswordLastModifyTime;
+
+    @Column(name = "USER_TYPE")
+    @ApiParam(value = "账号类型（枚举，待定）", example = "-1")
     private Integer userType;
 
-    @Column(name="USER_EMAIL")
-    @ApiParam(value ="邮箱" , access ="邮箱")
+    @Column(name = "USER_EMAIL")
+    @ApiParam(value = "邮箱", access = "邮箱")
     private String userEmail;
 
-    @Column(name="USER_PHONE")
-    @ApiParam(value ="手机号" , access ="手机号")
+    @Column(name = "USER_PHONE")
+    @ApiParam(value = "手机号", access = "手机号")
     private String userPhone;
 
-    @Column(name="USER_WECHAT_NO")
-    @ApiParam(value ="微信号")
+    @Column(name = "USER_WECHAT_NO")
+    @ApiParam(value = "微信号")
     private String userWeChatNo;
 
-    @Column(name="USER_STATUS")
-    @ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1")
+    @Column(name = "USER_STATUS")
+    @ApiParam(value = "账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)", example = "-1")
     private Integer userStatus;
 
-    @Column(name="USER_LOGIN_NUM")
-    @ApiParam(value ="登录次数",example = "0")
+    @Column(name = "USER_LOGIN_NUM")
+    @ApiParam(value = "登录次数", example = "0")
     private Integer userLoginNum;
 
     @Deprecated
-    @Column(name="USER_LOGIN_LAST_DATE_TIME")
-    @ApiParam(value ="账号最后登录时间")
+    @Column(name = "USER_LOGIN_LAST_DATE_TIME")
+    @ApiParam(value = "账号最后登录时间")
     private String userLoginLastDateTime;
 
-/********************************** 关系信息 ********************************/
+    /********************************** 关系信息 ********************************/
 
-    @Column(name="DEPARTMENT_ID")
-    @ApiParam(value ="部门ID" , example ="-1")
+    @Column(name = "DEPARTMENT_ID")
+    @ApiParam(value = "部门ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long departmentId;
 
-    @Column(name="ORGANIZE_ID")
-    @ApiParam(value ="组织ID" , example = "0")
+    @Column(name = "ORGANIZE_ID")
+    @ApiParam(value = "组织ID", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long organizeId;
 
 
-/********************************** 冗余信息 ********************************/
+    /********************************** 冗余信息 ********************************/
 
-    @Column(name="DEPARTMENT_NAME_RDD")
-    @ApiParam(value ="部门名称" , access ="部门名称")
+    @Column(name = "DEPARTMENT_NAME_RDD")
+    @ApiParam(value = "部门名称", access = "部门名称")
     private String departmentNameRdd;
 
-    @Column(name="ORGANIZE_NAME_RDD")
-    @ApiParam(value ="组织名称" , access ="组织名称")
+    @Column(name = "ORGANIZE_NAME_RDD")
+    @ApiParam(value = "组织名称", access = "组织名称")
     private String organizeNameRdd;
 
 //    @Lob
@@ -131,44 +135,44 @@ public class SysUser extends BaseBean {
 //    @ApiParam(value ="组织名称集合")
 //    private String organizeNamesRdd;
 
-/********************************** 非数据库信息 ********************************/
+    /********************************** 非数据库信息 ********************************/
 
     @Transient
-    @ApiParam(value ="用户部门信息")
+    @ApiParam(value = "用户部门信息")
     private SysDepartment department;
 
     @Transient
-    @ApiParam(value ="用户组织信息")
+    @ApiParam(value = "用户组织信息")
     private SysOrganize organize;
 
     @Transient
-    @ApiParam(value ="账号所有操作组织信息")
+    @ApiParam(value = "账号所有操作组织信息")
     private List<SysOrganize> organizeList;
 
     @Transient
-    @ApiParam(value ="账号所有操作部门 Id 集合")
+    @ApiParam(value = "账号所有操作部门 Id 集合")
     private List<String> departmentIdList;
 
     @Transient
-    @ApiParam(value ="账号所有操作部门信息")
+    @ApiParam(value = "账号所有操作部门信息")
     private List<SysDepartment> departmentList;
 
     @Transient
-    @ApiParam(value ="角色ID" , example = "0")
+    @ApiParam(value = "角色ID", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
 
     @Transient
-    @ApiParam(value ="角色ID集合" , example = "0")
+    @ApiParam(value = "角色ID集合", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private List<String> roleIdList;
 
     @Transient
-    @ApiParam(value ="账号所有角色信息")
+    @ApiParam(value = "账号所有角色信息")
     private List<SysRole> roleList;
 
     @Transient
-    @ApiParam(value ="账号所有操作权限信息")
+    @ApiParam(value = "账号所有操作权限信息")
     private List<SysMenu> menuList;
 
     /*** test ***/

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -98,8 +98,7 @@ public class CoreHqlPack {
             DdlPreparedPack.getNumEqualPack(resource.getResourceType(), "resourceType", result);
             // 是否多类型查询
             if (StringUtils.isNotBlank(resource.getResourceTypes())) {
-                DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result);
-            }
+                DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result);            }
 
             DdlPreparedPack.getNumEqualPack(resource.getSoftType(), "softType", result);
             DdlPreparedPack.getNumEqualPack(resource.getIsSystem(), "isSystem", result);

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/BaseScreenBean.java

@@ -9,8 +9,7 @@ import lombok.Data;
  * @desc
  */
 @Data
-public abstract class AbstractScreenBean extends BaseBean {
+public abstract class BaseScreenBean extends BaseBean {
     private static final long serialVersionUID = 3535186340743573771L;
 
-    private Integer version;
 }

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

@@ -2,7 +2,9 @@ package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,15 +28,20 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("动作")
+@ApiModel("动作")
 public class ScrAction extends BaseBean implements Serializable {
     private static final long serialVersionUID = 3832856363595940018L;
 
     @Column(name = "ACTION_CODE")
-    @ApiParam("动作代码")
+    @ApiModelProperty("动作代码")
     private String actionCode;
 
     @Column(name = "ACTION_NAME")
-    @ApiParam("动作名称")
+    @ApiModelProperty("动作名称")
     private String actionName;
+
+    @Column(name = "ACTION_TYPE")
+    @ApiModelProperty("动作类型")
+    private String actionType;
+
 }

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

@@ -0,0 +1,53 @@
+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.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/22 上午10:43
+ * @desc
+ */
+@Entity
+@Table(name = "SCR_COMPONENT")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("组件")
+public class ScrComponent extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 3832856363595940018L;
+
+    @Column(name = "COMPONENT_CODE")
+    @ApiModelProperty(value = "组件代码")
+    private String componentCode;
+
+    @Column(name = "COMPONENT_TYPE")
+    @ApiModelProperty(value = "组件代码")
+    private String componentType;
+
+    @Column(name = "MODEL_CODE")
+    @ApiModelProperty(value = "model代码")
+    private String modelCode;
+
+    @Lob
+    @Column(name = "COMPONENT_PROPERTY")
+    @ApiModelProperty(value = "组件描述")
+    private String componentProperty;
+
+
+}

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

@@ -1,8 +1,11 @@
 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.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,28 +29,33 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("数据对象管理")
+@ApiModel("数据对象管理")
 public class ScrDataObject extends BaseBean implements Serializable {
     private static final long serialVersionUID = -270662014158685376L;
 
+    @Column(name = "DATA_SOURCE_ID")
+    @ApiModelProperty(value = "数据源ID", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long dataSourceId;
+
     @Column(name = "DATA_OBJECT_CODE")
-    @ApiParam(value = "数据对象代码")
+    @ApiModelProperty(value = "数据对象代码")
     private String dataObjectCode;
 
     @Column(name = "SOURCE_CODE")
-    @ApiParam(value = "数据源编码")
+    @ApiModelProperty(value = "数据源编码")
     private String sourceCode;
 
-    @Column(name = "DATA_OBJECT_SOURCE")
-    @ApiParam(value = "数据名称")
-    private String dataObjectSource;
+    @Column(name = "DATA_OBJECT_SOURCE_CODE")
+    @ApiModelProperty(value = "数据名称")
+    private String dataObjectSourceCode;
 
     @Column(name = "DATA_TYPE")
-    @ApiParam(value = "数据类型")
-    private Integer dataType;
+    @ApiModelProperty(value = "数据类型")
+    private String dataType;
 
     @Column(name = "DESCRIPTION")
-    @ApiParam(value = "描述")
+    @ApiModelProperty(value = "描述")
     private String description;
 
 

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

@@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,32 +27,33 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("数据对象属性")
+@ApiModel("数据对象属性")
 public class ScrDataObjectProperty extends BaseBean implements Serializable {
     private static final long serialVersionUID = 6954106365899677132L;
 
     @Column(name = "DATA_OBJECT_CODE")
-    @ApiParam(value = "数据对象ID")
-    private Long dataObjectCode;
+    @ApiModelProperty(value = "数据对象代码")
+    private String dataObjectCode;
 
     @Column(name = "FIELD_CODE")
-    @ApiParam(value = "字段代码")
+    @ApiModelProperty(value = "字段代码")
     private String fieldCode;
 
+    @Column(name = "DISPLAY_NAME")
+    @ApiModelProperty(value = "字段名称")
+    private String displayName;
+
     @Column(name = "FIELD_TYPE")
-    @ApiParam(value = "字段类型")
+    @ApiModelProperty(value = "字段类型")
     private String fieldType;
 
-    @Column(name="IS_PRIMARY_KEY")
-    @ApiParam(value ="是否主键")
+    @Column(name = "IS_PRIMARY_KEY")
+    @ApiModelProperty(value = "是否主键")
     private Integer isPrimaryKey;
 
-    @Column(name="IS_NULLABLE")
-    @ApiParam(value = "是否允许为空")
+    @Column(name = "IS_NULLABLE")
+    @ApiModelProperty(value = "是否允许为空")
     private Integer isNullable;
 
 
-
-
-
 }

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

@@ -1,8 +1,10 @@
 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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -11,6 +13,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;
 
@@ -27,47 +31,48 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("数据源管理")
+@ApiModel("数据源管理")
 public class ScrDatasource extends BaseBean implements Serializable {
     private static final long serialVersionUID = 2660387454249572573L;
 
-    @Column(name="SOURCE_NAME")
-    @ApiParam(value ="数据源名称")
+    @Column(name = "SOURCE_NAME")
+    @ApiModelProperty(value = "数据源名称")
     private String sourceName;
 
-    @Column(name="SOURCE_CODE")
-    @ApiParam(value ="数据源代码")
+    @Column(name = "SOURCE_CODE")
+    @ApiModelProperty(value = "数据源代码")
     private String sourceCode;
 
-    @Column(name="SOURCE_STATUS")
-    @ApiParam(value ="数据源状态",name = "状态：可用，不可用 看枚举当中是否存在")
-    private Integer sourceStatus;
+    @Column(name = "SOURCE_CONNECTION_STATUS")
+    @ApiModelProperty(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")
+    @ApiModelProperty(value = "数据源类型", name = "CommonEnumUtil.DATA_SOURCE_TYPE")
     private Integer sourceType;
 
-    @Column(name="SOURCE_HOST")
-    @ApiParam(value ="数据源连接地址")
+    @Column(name = "SOURCE_HOST")
+    @ApiModelProperty(value = "数据源连接地址")
     private String sourceHost;
 
-    @Column(name="SOURCE_PORT")
-    @ApiParam(value ="数据源端口")
+    @Column(name = "SOURCE_PORT")
+    @ApiModelProperty(value = "数据源端口")
     private Integer sourcePort;
 
-    @Column(name="SOURCE_DATA_BASE_NAME")
-    @ApiParam(value ="数据库名称")
+    @Column(name = "SOURCE_DATA_BASE_NAME")
+    @ApiModelProperty(value = "数据库名称")
     private String sourceDataBaseName;
 
-    @Column(name="SOURCE_USER_NAME")
-    @ApiParam(value ="数据库用户名称")
+    @Column(name = "SOURCE_USER_NAME")
+    @ApiModelProperty(value = "数据库用户名称")
     private String sourceUserName;
 
-    @Column(name="SOURCE_PASSWORD")
-    @ApiParam(value ="数据库用户密码")
+    @Column(name = "SOURCE_PASSWORD")
+    @ApiModelProperty(value = "数据库用户密码")
     private String sourcePassword;
 
-    @Column(name="SOURCE_DESCRIPTION")
-    @ApiParam(value ="数据源描述")
+    @Column(name = "SOURCE_DESCRIPTION")
+    @ApiModelProperty(value = "数据源描述")
     private String sourceDescription;
 }

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

@@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,15 +27,15 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("事件")
+@ApiModel("事件")
 public class ScrEvent extends BaseBean implements Serializable {
     private static final long serialVersionUID = -6217007706865821613L;
 
     @Column(name = "EVENT_CODE")
-    @ApiParam("事件代码")
+    @ApiModelProperty("事件代码")
     private String eventCode;
 
     @Column(name = "EVENT_NAME")
-    @ApiParam("事件名称")
+    @ApiModelProperty("事件名称")
     private String eventName;
 }

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

@@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,31 +27,31 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("事件动作")
+@ApiModel("事件动作")
 public class ScrEventAction extends BaseBean implements Serializable {
     private static final long serialVersionUID = -6217007706865821613L;
 
     @Column(name = "EVENT_ACTION_CODE")
-    @ApiParam("事件动作代码")
+    @ApiModelProperty("事件动作CODE")
     private String eventActionCode;
 
     @Column(name = "EVENT_ACTION_NAME")
-    @ApiParam("事件动作名称")
+    @ApiModelProperty("事件动作名称")
     private String eventActionName;
 
     @Column(name = "EVENT_CODE")
-    @ApiParam("事件代码")
+    @ApiModelProperty("事件代码")
     private String eventCode;
 
     @Column(name = "PRE_ACTION_CODE")
-    @ApiParam("执行前动作代码")
+    @ApiModelProperty("执行前动作代码")
     private String preActionCode;
 
     @Column(name = "EXECUTE_ACTION_CODE")
-    @ApiParam("执行的动作代码")
+    @ApiModelProperty("执行的动作代码")
     private String executeActionCode;
 
     @Column(name = "POST_ACTION_CODE")
-    @ApiParam("执行前动作代码")
+    @ApiModelProperty("执行前动作代码")
     private String postActionCode;
 }

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

@@ -1,9 +1,61 @@
 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/22 下午9:59
  * @desc
  */
-public class ScrFile {
+@Entity
+@Table(name = "SCR_FILE")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("文件")
+public class ScrFile extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 2343301746531746105L;
+
+    @Column(name = "FILE_NAME")
+    @ApiModelProperty("文件名称")
+    private String fileName;
+
+    @Column(name = "FILE_URL")
+    @ApiModelProperty("文件URL")
+    private String fileUrl;
+
+    @Column(name = "GROUP_NAME")
+    @ApiModelProperty("组名")
+    private String groupName;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiModelProperty("文件原名")
+    private String fileOriginName;
+
+    @Column(name = "FILE_SIZE")
+    @ApiModelProperty("文件大小")
+    private String fileSize;
+
+    @Column(name = "FILE_TYPE")
+    @ApiModelProperty("文件类型名称")
+    private String fileType;
+
+    @Column(name = "SYNC_TAG")
+    @ApiModelProperty("同步标记")
+    private Integer syncTag = 0;
 }

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

@@ -1,8 +1,10 @@
 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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -11,6 +13,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;
 
@@ -26,24 +30,21 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("布局")
+@ApiModel("布局")
 public class ScrLayout extends BaseBean implements Serializable {
-
     private static final long serialVersionUID = 3390463604300159807L;
+
     @Column(name = "LAYOUT_CODE")
-    @ApiParam("布局代码")
+    @ApiModelProperty("布局代码")
     private String layoutCode;
 
     @Column(name = "LAYOUT_NAME")
-    @ApiParam("布局名称")
+    @ApiModelProperty("布局名称")
     private String layoutName;
 
-    @Column(name = "ROW_SEQ")
-    @ApiParam("行顺序")
-    private Integer rowSeq;
-
-    @Column(name = "ROW_CODE")
-    @ApiParam("行代码")
-    private String rowCode;
+    @Column(name = "LAYOUT_TYPE")
+    @ApiModelProperty("布局类型")
+    @Enumerated(EnumType.STRING)
+    private ScreenEnumUtil.LAYOUT_TYPE layoutType;
 
 }

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

@@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -25,21 +26,29 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
-//@Builder
-@Api("布局-列")
+@Builder
+@ApiModel("布局-父类-列")
 public class ScrLayoutColumn extends BaseBean implements Serializable {
     private static final long serialVersionUID = 5001564292608042287L;
 
-    @Column(name = "COL_CODE")
-    @ApiParam("列代码")
-    private String colCode;
+    @Column(name = "LAYOUT_CODE")
+    @ApiModelProperty("布局代码")
+    private String layoutCode;
 
-    @Column(name ="COL_NAME")
-    @ApiParam("列名称")
-    private String colName;
+    @Column(name = "ROW_CODE")
+    @ApiModelProperty("列代码")
+    private String rowCode;
 
-    @Column(name ="COL_SPAN")
-    @ApiParam("列占位")
-    private Integer colSpan;
+    @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

@@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,29 +27,25 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("布局-行")
+@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")
-    @ApiParam("行代码")
+    @ApiModelProperty("行代码")
     private String rowCode;
 
-    @Column(name = "ROW_NAME")
-    @ApiParam("行名称")
-    private String rowName;
-
     @Column(name = "ROW_HEIGHT")
-    @ApiParam("行高")
+    @ApiModelProperty("行高")
     private Double rowHeight;
 
-    @Column(name = "COL_SEQ")
-    @ApiParam("列序号")
-    private Integer colSeq;
-
-    @Column(name = "COL_CODE")
-    @ApiParam("列代码")
-    private String colCode;
+    @Column(name = "ROW_SEQ")
+    @ApiModelProperty("行顺序")
+    private Integer rowSeq;
 
 
 }

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

@@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,16 +27,16 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("model")
+@ApiModel("model")
 public class ScrModel extends BaseBean implements Serializable {
     private static final long serialVersionUID = -4609944173378718944L;
 
     @Column(name = "MODEL_CODE")
-    @ApiParam("model代码")
+    @ApiModelProperty("model代码")
     private String modelCode;
 
     @Column(name = "DATA_OBJECT_CODE")
-    @ApiParam("数据对象代码")
+    @ApiModelProperty("数据对象代码")
     private String dataObjectCode;
 
 }

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

@@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,60 +27,64 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("model字段")
+@ApiModel("model字段")
 public class ScrModelField extends BaseBean implements Serializable {
     private static final long serialVersionUID = 3893137576091823152L;
 
     @Column(name = "MODEL_CODE")
-    @ApiParam("model代码")
+    @ApiModelProperty("model代码")
     private String modelCode;
 
     @Column(name = "FIELD_CODE")
-    @ApiParam("字段代码")
+    @ApiModelProperty("字段代码")
     private String fieldCode;
 
+    @Column(name = "DISPLAY_NAME")
+    @ApiModelProperty("字段名称")
+    private String displayName;
+
     @Column(name = "IS_FUZZY_SEARCH")
-    @ApiParam("是否支持模糊查询")
+    @ApiModelProperty("是否支持模糊查询")
     private Boolean isFuzzySearch;
 
     @Column(name = "IS_SHOW_IN_NEW")
-    @ApiParam("是否在新增时展示")
+    @ApiModelProperty("是否在新增时展示")
     private Boolean isShowInNew;
 
     @Column(name = "IS_SHOW_IN_EDIT")
-    @ApiParam("是否在编辑时展示")
+    @ApiModelProperty("是否在编辑时展示")
     private Boolean isShowInEdit;
 
     @Column(name = "IS_ALLOW_SORT")
-    @ApiParam("是否支持排序")
+    @ApiModelProperty("是否支持排序")
     private Boolean isAllowSort;
 
     @Column(name = "FORM_SEQ")
-    @ApiParam("表单顺序")
+    @ApiModelProperty("表单顺序")
     private Integer formSeq;
 
     @Column(name = "TABLE_SEQ")
-    @ApiParam("表格顺序")
+    @ApiModelProperty("表格顺序")
     private Integer tableSeq;
 
     @Column(name = "VALIDATION")
-    @ApiParam("校验")
+    @ApiModelProperty("校验")
     private String validation;
 
     @Column(name = "DICTIONARY")
-    @ApiParam("字典")
+    @ApiModelProperty("字典")
     private String dictionary;
 
     @Column(name = "IS_VIRTUAL")
-    @ApiParam("是否是虚拟的")
+    @ApiModelProperty("是否是虚拟的")
     private boolean isVirtual;
 
     @Column(name = "FIELD_NAME")
-    @ApiParam("字段名称")
+    @ApiModelProperty("字段名称")
     private String fieldName;
 
     @Column(name = "SPEL_VIRTUAL_VALUE")
-    @ApiParam("SPEL表达式虚拟属性")
+    @ApiModelProperty("SPEL表达式虚拟属性")
     private String spelVirtualValue;
 
 }

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

@@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,23 +27,23 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("model字段约束")
+@ApiModel("model字段约束")
 public class ScrModelFieldConstraint extends BaseBean implements Serializable {
     private static final long serialVersionUID = 5020158684534641672L;
 
     @Column(name = "MODEL_CODE")
-    @ApiParam("model代码")
+    @ApiModelProperty("model代码")
     private String modelCode;
 
     @Column(name = "CONSTRAINT_TYPE")
-    @ApiParam("约束类型")
+    @ApiModelProperty("约束类型")
     private String constraintType;
 
     @Column(name = "GROUP_NO")
-    @ApiParam("组号")
+    @ApiModelProperty("组号")
     private Integer groupNo;
 
     @Column(name = "FIELD_CODE")
-    @ApiParam("字段代码")
+    @ApiModelProperty("字段代码")
     private String fieldCode;
 }

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

@@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,28 +27,28 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("model虚拟字段")
+@ApiModel("model虚拟字段")
 public class ScrModelFieldVirtual extends BaseBean implements Serializable {
     private static final long serialVersionUID = -7756539161394751580L;
 
     @Column(name = "MODEL_CODE")
-    @ApiParam("model代码")
+    @ApiModelProperty("model代码")
     private String modelCode;
 
     @Column(name = "VIRTUAL_FIELD_NAME")
-    @ApiParam("虚拟字段名称")
+    @ApiModelProperty("虚拟字段名称")
     private String virtualFieldName;
 
     @Column(name = "SPEL_CALC_EXPRESSION")
-    @ApiParam("SPEL计算表达式")
+    @ApiModelProperty("SPEL计算表达式")
     private String spelCalcExpression;
 
     @Column(name = "GROUP_NO")
-    @ApiParam("组号")
+    @ApiModelProperty("组号")
     private Integer groupNo;
 
     @Column(name = "FIELD_CODE")
-    @ApiParam("字段代码")
+    @ApiModelProperty("字段代码")
     private String fieldCode;
 
 }

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

@@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,22 +27,22 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("Panel")
+@ApiModel("Panel")
 public class ScrPanel extends BaseBean implements Serializable {
 
     @Column(name = "PANEL_CODE")
-    @ApiParam("Panel代码")
+    @ApiModelProperty("Panel代码")
     private String panelCode;
 
     @Column(name = "PANEL_NAME")
-    @ApiParam("Panel名称")
+    @ApiModelProperty("Panel名称")
     private String panelName;
 
-    @Column(name = "LAYOUT_CODE")
-    @ApiParam("布局代码")
+    @Column(name = "PANEL_LAYOUT_CODE")
+    @ApiModelProperty("布局代码")
     private String layoutCode;
 
     @Column(name = "USAGE_AMOUNT")
-    @ApiParam("使用数量")
+    @ApiModelProperty("使用数量")
     private Integer usageAmount;
 }

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

@@ -1,35 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.bean;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-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_PANEL_LAYOUT_COLUMN")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@Api("Panel布局-列")
-public class ScrPanelLayoutColumn extends ScrLayoutColumn implements Serializable {
-    private static final long serialVersionUID = 6577099884589179886L;
-
-    @Column(name = "COMPONENT_CODE")
-    @ApiParam("组件代码")
-    private String componentCode;
-}

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

@@ -1,45 +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.ApiParam;
-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_PANEL_MODEL")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@Api("Panel与Model的关系")
-public class ScrPanelModel extends BaseBean implements Serializable {
-    private static final long serialVersionUID = -6998319452471117206L;
-
-    @Column(name = "PANEL_MODEL_CODE")
-    @ApiParam("Panel与Model的关系代码")
-    private String panelModelCode;
-
-    @Column(name = "PANEL_CODE")
-    @ApiParam("Panel代码")
-    private String panelCode;
-
-    @Column(name = "MODEL_CODE")
-    @ApiParam("Model代码")
-    private String modelCode;
-
-}

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

@@ -1,42 +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.ApiParam;
-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_PANEL_MODEL_COMPONENT")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@Api("Panel与Model组件的关系")
-public class ScrPanelModelComponent extends BaseBean implements Serializable {
-    private static final long serialVersionUID = 2011504067317832781L;
-
-    @Column(name = "PANEL_MODEL_CODE")
-    @ApiParam("Panel与Model的关系代码")
-    private String panelModelCode;
-
-    @Column(name = "COMPONENT_CODE")
-    @ApiParam("组件代码")
-    private String componentCode;
-
-
-}

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

@@ -2,7 +2,8 @@ package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,24 +27,24 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("页面")
+@ApiModel("页面")
 public class ScrScreen extends BaseBean implements Serializable {
     private static final long serialVersionUID = -6755902986892118213L;
 
     @Column(name = "SCREEN_CODE")
-    @ApiParam("页面代码")
+    @ApiModelProperty("页面代码")
     private String screenCode;
 
     @Column(name = "SCREEN_NAME")
-    @ApiParam("页面名称")
+    @ApiModelProperty("页面名称")
     private String screenName;
 
     @Column(name = "SCREEN_VERSION")
-    @ApiParam("页面版本")
+    @ApiModelProperty("页面版本")
     private String screenVersion;
 
-    @Column(name = "LAYOUT_CODE")
-    @ApiParam("布局代码")
+    @Column(name = "SCREEN_LAYOUT_CODE")
+    @ApiModelProperty("布局代码")
     private String layoutCode;
 
 }

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

@@ -0,0 +1,50 @@
+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;
+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/3/22 下午1:27
+ * @desc
+ */
+@Entity
+@Table(name = "SCR_SCREEN_HISTORY")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("数据对象管理")
+public class ScrScreenHistory extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -2191090486124097302L;
+
+    @Column(name = "SCREEN_CODE")
+    @ApiModelProperty(value = "界面代码")
+    private String screenCode;
+
+    @Column(name = "SCREEN_VERSION")
+    @ApiModelProperty(value = "页面版本")
+    private String screenVersion;
+
+    @Lob
+    @Column(name = "SCREEN_DETAIL")
+    @ApiModelProperty(value = "界面详情")
+    private String screenDetail;
+
+
+}

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

@@ -1,36 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.bean;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-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_SCREEN_LAYOUT_COLUMN")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@Api("Screen布局-列")
-public class ScrScreenLayoutColumn extends ScrLayoutColumn implements Serializable {
-    private static final long serialVersionUID = 4084273106415805804L;
-
-    @Column(name = "PANEL_CODE")
-    @ApiParam("Panel代码")
-    private String panelCode;
-
-}

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

@@ -0,0 +1,39 @@
+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,8 +1,8 @@
-package cn.estsh.i3plus.pojo.screen.bean;
+package cn.estsh.i3plus.pojo.screen.bean.relation;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -20,66 +20,79 @@ import java.io.Serializable;
  * @desc
  */
 @Entity
-@Table(name = "SCR_PANEL_MODEL_FIELD")
+@Table(name = "SCR_COMPONENT_MODEL_FIELD")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("Panel与Model字段的关系")
-public class ScrPanelModelField extends BaseBean implements Serializable {
+@ApiModel("Panel与Model字段的关系")
+public class ScrComponentModelField extends BaseBean implements Serializable {
     private static final long serialVersionUID = -3441031841089357196L;
 
-    @Column(name = "PANEL_MODEL_CODE")
-    @ApiParam("Panel与Model的关系代码")
-    private String panelModelCode;
+    @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")
-    @ApiParam("字段代码")
+    @ApiModelProperty("字段代码")
     private String fieldCode;
 
+    @Column(name = "DISPLAY_NAME")
+    @ApiModelProperty("字段名称")
+    private String displayName;
+
     @Column(name = "IS_FUZZY_SEARCH")
-    @ApiParam("是否支持模糊查询")
+    @ApiModelProperty("是否支持模糊查询")
     private Boolean isFuzzySearch;
 
     @Column(name = "IS_SHOW_IN_NEW")
-    @ApiParam("是否在新增时展示")
+    @ApiModelProperty("是否在新增时展示")
     private Boolean isShowInNew;
 
     @Column(name = "IS_SHOW_IN_EDIT")
-    @ApiParam("是否在编辑时展示")
+    @ApiModelProperty("是否在编辑时展示")
     private Boolean isShowInEdit;
 
     @Column(name = "IS_ALLOW_SORT")
-    @ApiParam("是否支持排序")
+    @ApiModelProperty("是否支持排序")
     private Boolean isAllowSort;
 
     @Column(name = "FORM_SEQ")
-    @ApiParam("表单顺序")
+    @ApiModelProperty("表单顺序")
     private Integer formSeq;
 
     @Column(name = "TABLE_SEQ")
-    @ApiParam("表格顺序")
+    @ApiModelProperty("表格顺序")
     private Integer tableSeq;
 
     @Column(name = "VALIDATION")
-    @ApiParam("校验")
+    @ApiModelProperty("校验")
     private String validation;
 
     @Column(name = "DICTIONARY")
-    @ApiParam("字典")
+    @ApiModelProperty("字典")
     private String dictionary;
 
     @Column(name = "IS_VIRTUAL")
-    @ApiParam("是否是虚拟的")
+    @ApiModelProperty("是否是虚拟的")
     private boolean isVirtual;
 
     @Column(name = "FIELD_NAME")
-    @ApiParam("字段名称")
+    @ApiModelProperty("字段名称")
     private String fieldName;
 
     @Column(name = "SPEL_VIRTUAL_VALUE")
-    @ApiParam("SPEL表达式虚拟属性")
+    @ApiModelProperty("SPEL表达式虚拟属性")
     private String spelVirtualValue;
 
+
 }

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

@@ -0,0 +1,53 @@
+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/bean/relation/ScrScreenPanel.java

@@ -0,0 +1,56 @@
+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 javax.persistence.UniqueConstraint;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/25 下午4:33
+ * @desc
+ */
+@Entity
+@Table(name = "SCR_SCREEN_PANEL",
+        uniqueConstraints = {
+                @UniqueConstraint(columnNames = {"SCREEN_CODE", "LAYOUT_CODE"})
+        }
+)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("Screen与Panel的关系")
+public class ScrScreenPanel extends BaseBean {
+    private static final long serialVersionUID = 3459027655126916483L;
+
+    @Column(name = "SCREEN_CODE")
+    @ApiModelProperty("Screen代码")
+    private String screenCode;
+
+    @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 = "PANEL_CODE")
+    @ApiModelProperty(value = "panel代码")
+    private String panelCode;
+}

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

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.screen.component.base;
+
+import cn.estsh.i3plus.pojo.screen.bean.BaseScreenBean;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:32
+ * @desc
+ */
+@Data
+public abstract class BaseComponent extends BaseScreenBean {
+
+    private static final long serialVersionUID = 6768391193506016205L;
+
+    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/base/BaseView.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.screen.component.base;
+
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:30
+ * @desc
+ */
+@Data
+public abstract class BaseView extends BaseComponent {
+
+    private String jsEnhance;
+
+}

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.screen.component.base;
+
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:30
+ * @desc
+ */
+@Data
+public abstract class BaseWidget extends BaseComponent {
+
+}

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.screen.component.view;
+
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:31
+ * @desc
+ */
+@Data
+public class ScrViewBarChart extends ScrViewChart {
+    private static final long serialVersionUID = 7114030006928397461L;
+
+    private List<Object> xAxis;
+
+    private List<Object> yAxis;
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.screen.component.view;
+
+import cn.estsh.i3plus.pojo.screen.component.base.BaseView;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:31
+ * @desc
+ */
+@Data
+public class ScrViewChart extends BaseView {
+    private static final long serialVersionUID = 3786868086148227665L;
+    private Integer autoRefreshInterval;
+
+}

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

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.screen.component.view;
+
+import cn.estsh.i3plus.pojo.screen.component.base.BaseView;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:30
+ * @desc
+ */
+@Data
+public class ScrViewForm extends BaseView {
+
+    private Map<String, String> fields;
+
+    private String action;
+}

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.screen.component.view;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:31
+ * @desc
+ */
+@Data
+public class ScrViewLineChart extends ScrViewChart {
+
+//    private List<Object> xAxis;
+//
+//    private List<Object> yAxis;
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.screen.component.view;
+
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:31
+ * @desc
+ */
+
+@Data
+public class ScrViewPieChart extends ScrViewChart {
+    private static final long serialVersionUID = -4334873164110780274L;
+
+//    private Map<String, Double> data;
+}

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

@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.screen.component.view;
+
+import cn.estsh.i3plus.pojo.screen.component.base.BaseView;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:29
+ * @desc
+ */
+@Data
+public class ScrViewTable extends BaseView {
+
+    private static final long serialVersionUID = -795585853717859678L;
+    private Integer autoRefreshInterval = 0;
+
+    private Boolean isShowChoice;
+
+    private Boolean isPagination;
+
+}

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

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.screen.component.view;
+
+import cn.estsh.i3plus.pojo.screen.component.base.BaseView;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:30
+ * @desc
+ */
+@Data
+public class ScrViewTree extends BaseView {
+    private static final long serialVersionUID = 3615560061167536377L;
+
+    private String parentField;
+
+    private String showField;
+
+}

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

@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.screen.component.widget;
+
+import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:30
+ * @desc
+ */
+@Data
+public class ScrWidgetButton extends BaseWidget {
+
+    private String icon;
+
+    private String type;
+
+    private String size;
+
+    private String action;
+}

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.screen.component.widget;
+
+import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:31
+ * @desc
+ */
+@Data
+public class ScrWidgetCascader extends BaseWidget {
+}

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

@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
+package cn.estsh.i3plus.pojo.screen.component.widget;
 
+import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget;
 import lombok.Data;
 
 /**
@@ -8,7 +9,7 @@ import lombok.Data;
  * @desc
  */
 @Data
-public class DatetimePicker extends AbstractWidget {
+public class ScrWidgetDatetimePicker extends BaseWidget {
 
     private String dateFormat;
 

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.screen.component.widget;
+
+import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/11 下午12:31
+ * @desc
+ */
+@Data
+public class ScrWidgetLabel extends BaseWidget {
+
+    private String text;
+}

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

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.screen.model;
+package cn.estsh.i3plus.pojo.screen.component.widget;
 
 import lombok.Data;
 
@@ -8,7 +8,7 @@ import lombok.Data;
  * @desc
  */
 @Data
-public class Pagination {
+public class ScrWidgetPagination {
 
     private Integer pageSize;
 

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

@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
+package cn.estsh.i3plus.pojo.screen.component.widget;
 
+import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget;
 import lombok.Data;
 
 /**
@@ -8,7 +9,7 @@ import lombok.Data;
  * @desc
  */
 @Data
-public class Preview extends AbstractWidget {
+public class ScrWidgetPreview extends BaseWidget {
 
     private String type;
 

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

@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
+package cn.estsh.i3plus.pojo.screen.component.widget;
 
+import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget;
 import lombok.Data;
 
 /**
@@ -8,7 +9,7 @@ import lombok.Data;
  * @desc
  */
 @Data
-public class Selector extends AbstractWidget {
+public class ScrWidgetSelector extends BaseWidget {
 
     private String placeholder;
 

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

@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
+package cn.estsh.i3plus.pojo.screen.component.widget;
 
+import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget;
 import lombok.Data;
 
 /**
@@ -8,7 +9,7 @@ import lombok.Data;
  * @desc
  */
 @Data
-public class Text extends AbstractWidget {
+public class ScrWidgetText extends BaseWidget {
 
     private String placeholder;
 

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

@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
+package cn.estsh.i3plus.pojo.screen.component.widget;
 
+import cn.estsh.i3plus.pojo.screen.component.base.BaseWidget;
 import lombok.Data;
 
 /**
@@ -8,7 +9,7 @@ import lombok.Data;
  * @desc
  */
 @Data
-public class Upload extends AbstractWidget {
+public class ScrWidgetUpload extends BaseWidget {
 
     private Boolean isAllowDraw;
 

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

@@ -1,23 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model;
-
-import cn.estsh.i3plus.pojo.screen.bean.ScrModel;
-import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
-import cn.estsh.i3plus.pojo.screen.model.component.AbstractComponent;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午1:14
- * @desc
- */
-@Data
-public class PanelModelField {
-
-    private ScrModel model;
-
-    private List<ScrModelField> modelFields;
-
-    private AbstractComponent component;
-}

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

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import cn.estsh.i3plus.pojo.screen.bean.ScrLayout;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/27 下午6:10
+ * @desc
+ */
+@Data
+public class ScrLayoutModel implements Serializable {
+    private static final long serialVersionUID = -2767386371499251918L;
+
+    private ScrLayout layout;
+
+    private List<ScrRowColumnModel> rowColumnModels;
+
+}

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

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import cn.estsh.i3plus.pojo.screen.bean.ScrComponent;
+import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
+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
+ * @date 2021/3/28 上午12:42
+ * @desc
+ */
+@Data
+public class ScrPanelComponentCreateModel implements Serializable {
+    private static final long serialVersionUID = -5832175256726333348L;
+
+    private String panelCode;
+
+    private String layoutCode;
+
+    private String rowCode;
+
+    private String columnCode;
+
+    private Map<String, Object> baseComponent;
+
+    private String modelCode;
+
+    private List<String> eventActions;
+
+    private List<ScrModelField> modelFields;
+
+}

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

@@ -0,0 +1,30 @@
+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 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 ScrEventAction eventAction;
+
+    private List<ScrComponentModelField> 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/ScrRowColumnModel.java

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.screen.model;
+
+import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutColumn;
+import cn.estsh.i3plus.pojo.screen.bean.ScrLayoutRow;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/27 下午8:35
+ * @desc
+ */
+@Data
+public class ScrRowColumnModel {
+
+    private ScrLayoutRow row;
+
+    private List<ScrLayoutColumn> columns;
+}

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;
+
+}

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

@@ -1,26 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:32
- * @desc
- */
-@Data
-public abstract class AbstractComponent extends AbstractContainer {
-
-    private static final long serialVersionUID = 6768391193506016205L;
-    private String cssStyle;
-
-    private String name;
-
-    private Integer tabIndex;
-
-    private List<ScrEventAction> eventAction;
-
-
-}

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

@@ -1,24 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:27
- * @desc
- */
-@Data
-public abstract class AbstractContainer extends BaseBean {
-    private static final long serialVersionUID = 7696523743371800661L;
-
-    private String background;
-
-    private String cssStyle;
-
-    private List<ScrEventAction> eventAction;
-
-}

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

@@ -1,18 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-import java.util.Map;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:30
- * @desc
- */
-@Data
-public abstract class AbstractView extends AbstractComponent {
-
-    private String jsEnhance;
-
-    private Map<String, String> viewTemplateMap;
-}

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

@@ -1,15 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:30
- * @desc
- */
-@Data
-public abstract class AbstractWidget extends AbstractComponent {
-
-    private String labelText;
-
-}

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

@@ -1,18 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:31
- * @desc
- */
-@Data
-public class BarChart extends Chart {
-
-    private List<Object> xAxis;
-
-    private List<Object> yAxis;
-}

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

@@ -1,20 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:30
- * @desc
- */
-@Data
-public class Button extends AbstractWidget {
-
-    private String icon;
-
-    private String type;
-
-    private String size;
-
-    private String onClick;
-}

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

@@ -1,12 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:31
- * @desc
- */
-@Data
-public class Cascader extends AbstractWidget{
-}

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

@@ -1,14 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:31
- * @desc
- */
-@Data
-public class Chart extends AbstractWidget {
-    private Integer autoRefreshInterval;
-
-}

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

@@ -1,16 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-import java.util.Map;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:30
- * @desc
- */
-@Data
-public class Form extends AbstractView{
-
-    private Map<String,String> fields;
-}

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

@@ -1,14 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:31
- * @desc
- */
-@Data
-public class Label extends AbstractWidget {
-
-    private String text;
-}

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

@@ -1,18 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:31
- * @desc
- */
-@Data
-public class LineChart extends Chart {
-
-    private List<Object> xAxis;
-
-    private List<Object> yAxis;
-}

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

@@ -1,17 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-import java.util.Map;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:31
- * @desc
- */
-
-@Data
-public class PieChart extends Chart {
-
-    private Map<String, Double> data;
-}

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

@@ -1,22 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import cn.estsh.i3plus.pojo.screen.model.Pagination;
-import lombok.Data;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:29
- * @desc
- */
-@Data
-public class Table extends AbstractView {
-
-    private Integer autoRefreshInterval = 0;
-
-    private Boolean isShowChoice;
-
-    private Boolean isPagination;
-
-    private Pagination defaultPagination;
-
-}

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

@@ -1,20 +0,0 @@
-package cn.estsh.i3plus.pojo.screen.model.component;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author Wynne.Lu
- * @date 2021/3/11 下午12:30
- * @desc
- */
-@Data
-public class Tree extends AbstractView {
-
-    private String parentField;
-
-    private String showField;
-
-    private List<Object> data;
-}

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

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

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

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