screen修改关系表名 增加历史表

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

@@ -158,27 +158,29 @@ public class ScreenEnumUtil {
     }
 
     public enum ACTION {
-        SEARCH(10, "search", "查询"),
-        CREATE(20, "create", "保存"),
-        UPDATE(30, "update", "更新"),
-        DELETE(40, "delete", "删除"),
-        VALID(50, "valid", "查询"),
-        INVALID(60, "inValid", "查询"),
-        SEARCH_PAGER(70, "searchPager", "查询"),
-        ENUM(80, "enum", "查询"),
-        DIRECT(90, "direct", "查询"),
-        DOWNLOAD(100, "download", "查询"),
-        UPLOAD(110, "upload", "查询"),
-        INVOKE(120, "invoke", "查询");
+        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) {
+        ACTION(Integer value, String code, String description, String beanName) {
             this.value = value;
             this.code = code;
             this.description = description;
+            this.beanName = beanName;
         }
 
         public Integer getValue() {
@@ -193,6 +195,16 @@ public class ScreenEnumUtil {
             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++) {

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,20 +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")
-    @ApiParam("动作类型")
+    @ApiModelProperty("动作类型")
     private String actionType;
 
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrComponent.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;
@@ -27,25 +28,25 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("组件")
+@ApiModel("组件")
 public class ScrComponent extends BaseBean implements Serializable {
     private static final long serialVersionUID = 3832856363595940018L;
 
     @Column(name = "COMPONENT_CODE")
-    @ApiParam(value = "组件代码")
+    @ApiModelProperty(value = "组件代码")
     private String componentCode;
 
     @Column(name = "COMPONENT_TYPE")
-    @ApiParam(value = "组件代码")
+    @ApiModelProperty(value = "组件代码")
     private String componentType;
 
     @Column(name = "MODEL_CODE")
-    @ApiParam(value = "model代码")
+    @ApiModelProperty(value = "model代码")
     private String modelCode;
 
     @Lob
     @Column(name = "COMPONENT_PROPERTY")
-    @ApiParam(value = "组件描述")
+    @ApiModelProperty(value = "组件描述")
     private String componentProperty;
 
 

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

@@ -4,7 +4,8 @@ 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;
@@ -28,33 +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")
-    @ApiParam(value = "数据源ID", example = "-1")
+    @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_CODE")
-    @ApiParam(value = "数据名称")
+    @ApiModelProperty(value = "数据名称")
     private String dataObjectSourceCode;
 
     @Column(name = "DATA_TYPE")
-    @ApiParam(value = "数据类型")
+    @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,32 @@ 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 = "数据对象代码")
+    @ApiModelProperty(value = "数据对象代码")
     private String dataObjectCode;
 
     @Column(name = "FIELD_CODE")
-    @ApiParam(value = "字段代码")
+    @ApiModelProperty(value = "字段代码")
     private String fieldCode;
 
     @Column(name = "DISPLAY_NAME")
-    @ApiParam(value = "字段名称")
+    @ApiModelProperty(value = "字段名称")
     private String displayName;
 
     @Column(name = "FIELD_TYPE")
-    @ApiParam(value = "字段类型")
+    @ApiModelProperty(value = "字段类型")
     private String fieldType;
 
     @Column(name = "IS_PRIMARY_KEY")
-    @ApiParam(value = "是否主键")
+    @ApiModelProperty(value = "是否主键")
     private Integer isPrimaryKey;
 
     @Column(name = "IS_NULLABLE")
-    @ApiParam(value = "是否允许为空")
+    @ApiModelProperty(value = "是否允许为空")
     private Integer isNullable;
 
 

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

@@ -3,7 +3,8 @@ 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;
@@ -30,48 +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 = "数据源名称")
+    @ApiModelProperty(value = "数据源名称")
     private String sourceName;
 
     @Column(name = "SOURCE_CODE")
-    @ApiParam(value = "数据源代码")
+    @ApiModelProperty(value = "数据源代码")
     private String sourceCode;
 
     @Column(name = "SOURCE_CONNECTION_STATUS")
-    @ApiParam(value = "数据源状态", name = "状态：可用，不可用 看枚举当中是否存在")
+    @ApiModelProperty(value = "数据源状态", name = "状态：可用，不可用 看枚举当中是否存在")
     @Enumerated(EnumType.STRING)
     private ScreenEnumUtil.DATASOURCE_CONNECTION_STATUS sourceConnectionStatus;
 
     @Column(name = "SOURCE_TYPE")
-    @ApiParam(value = "数据源类型", name = "CommonEnumUtil.DATA_SOURCE_TYPE")
+    @ApiModelProperty(value = "数据源类型", name = "CommonEnumUtil.DATA_SOURCE_TYPE")
     private Integer sourceType;
 
     @Column(name = "SOURCE_HOST")
-    @ApiParam(value = "数据源连接地址")
+    @ApiModelProperty(value = "数据源连接地址")
     private String sourceHost;
 
     @Column(name = "SOURCE_PORT")
-    @ApiParam(value = "数据源端口")
+    @ApiModelProperty(value = "数据源端口")
     private Integer sourcePort;
 
     @Column(name = "SOURCE_DATA_BASE_NAME")
-    @ApiParam(value = "数据库名称")
+    @ApiModelProperty(value = "数据库名称")
     private String sourceDataBaseName;
 
     @Column(name = "SOURCE_USER_NAME")
-    @ApiParam(value = "数据库用户名称")
+    @ApiModelProperty(value = "数据库用户名称")
     private String sourceUserName;
 
     @Column(name = "SOURCE_PASSWORD")
-    @ApiParam(value = "数据库用户密码")
+    @ApiModelProperty(value = "数据库用户密码")
     private String sourcePassword;
 
     @Column(name = "SOURCE_DESCRIPTION")
-    @ApiParam(value = "数据源描述")
+    @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("事件动作CODE")
+    @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

@@ -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,35 +27,35 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("文件")
+@ApiModel("文件")
 public class ScrFile extends BaseBean implements Serializable {
     private static final long serialVersionUID = 2343301746531746105L;
 
     @Column(name = "FILE_NAME")
-    @ApiParam("文件名称")
+    @ApiModelProperty("文件名称")
     private String fileName;
 
     @Column(name = "FILE_URL")
-    @ApiParam("文件URL")
+    @ApiModelProperty("文件URL")
     private String fileUrl;
 
     @Column(name = "GROUP_NAME")
-    @ApiParam("组名")
+    @ApiModelProperty("组名")
     private String groupName;
 
     @Column(name = "FILE_ORIGIN_NAME")
-    @ApiParam("文件原名")
+    @ApiModelProperty("文件原名")
     private String fileOriginName;
 
     @Column(name = "FILE_SIZE")
-    @ApiParam("文件大小")
+    @ApiModelProperty("文件大小")
     private String fileSize;
 
     @Column(name = "FILE_TYPE")
-    @ApiParam("文件类型名称")
+    @ApiModelProperty("文件类型名称")
     private String fileType;
 
     @Column(name = "SYNC_TAG")
-    @ApiParam("同步标记")
+    @ApiModelProperty("同步标记")
     private Integer syncTag = 0;
 }

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

@@ -3,7 +3,8 @@ 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;
@@ -29,20 +30,20 @@ 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 = "LAYOUT_TYPE")
-    @ApiParam("布局类型")
+    @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;
@@ -26,28 +27,28 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("布局-父类-列")
+@ApiModel("布局-父类-列")
 public class ScrLayoutColumn extends BaseBean implements Serializable {
     private static final long serialVersionUID = 5001564292608042287L;
 
     @Column(name = "LAYOUT_CODE")
-    @ApiParam("布局代码")
+    @ApiModelProperty("布局代码")
     private String layoutCode;
 
     @Column(name = "ROW_CODE")
-    @ApiParam("列代码")
+    @ApiModelProperty("列代码")
     private String rowCode;
 
     @Column(name = "COLUMN_CODE")
-    @ApiParam("列代码")
+    @ApiModelProperty("列代码")
     private String columnCode;
 
     @Column(name = "COLUMN_SEQ")
-    @ApiParam("列顺序")
+    @ApiModelProperty("列顺序")
     private Integer columnSeq;
 
     @Column(name = "COLUMN_SPAN")
-    @ApiParam("列占位")
+    @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,24 +27,24 @@ 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")
-    @ApiParam("布局代码")
+    @ApiModelProperty("布局代码")
     private String layoutCode;
 
     @Column(name = "ROW_CODE")
-    @ApiParam("行代码")
+    @ApiModelProperty("行代码")
     private String rowCode;
 
     @Column(name = "ROW_HEIGHT")
-    @ApiParam("行高")
+    @ApiModelProperty("行高")
     private Double rowHeight;
 
     @Column(name = "ROW_SEQ")
-    @ApiParam("行顺序")
+    @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,64 +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")
-    @ApiParam("字段名称")
+    @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 = "PANEL_LAYOUT_CODE")
-    @ApiParam("布局代码")
+    @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/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 = "SCREEN_LAYOUT_CODE")
-    @ApiParam("布局代码")
+    @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/relation/ScrComponentEventAction.java

@@ -1,8 +1,8 @@
-package cn.estsh.i3plus.pojo.screen.bean.rel;
+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;
@@ -19,21 +19,21 @@ import javax.persistence.Table;
  * @desc
  */
 @Entity
-@Table(name = "SCR_COMPONENT_EVENT_ACTION_REL")
+@Table(name = "SCR_COMPONENT_EVENT_ACTION")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("组件事件动作")
-public class ScrComponentEventActionRel extends BaseBean {
+@ApiModel("组件事件动作")
+public class ScrComponentEventAction extends BaseBean {
     private static final long serialVersionUID = 7600064730551351570L;
 
     @Column(name = "COMPONENT_CODE")
-    @ApiParam("组件代码")
+    @ApiModelProperty("组件代码")
     private String componentCode;
 
     @Column(name = "EVENT_ACTION_CODE")
-    @ApiParam("事件动作代码")
+    @ApiModelProperty("事件动作代码")
     private String eventActionCode;
 }

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

@@ -1,9 +1,8 @@
-package cn.estsh.i3plus.pojo.screen.bean.rel;
+package cn.estsh.i3plus.pojo.screen.bean.relation;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
-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;
@@ -12,11 +11,8 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @author Wynne.Lu
@@ -24,90 +20,78 @@ import java.util.List;
  * @desc
  */
 @Entity
-@Table(name = "SCR_COMPONENT_MODEL_FIELD_REL")
+@Table(name = "SCR_COMPONENT_MODEL_FIELD")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@Api("Panel与Model字段的关系")
-public class ScrComponentModelFieldRel extends BaseBean implements Serializable {
+@ApiModel("Panel与Model字段的关系")
+public class ScrComponentModelField extends BaseBean implements Serializable {
     private static final long serialVersionUID = -3441031841089357196L;
 
     @Column(name = "PANEL_CODE")
-    @ApiParam("Panel代码")
+    @ApiModelProperty("Panel代码")
     private String panelCode;
 
-    @Column(name = "LAYOUT_CODE")
-    @ApiParam("布局代码")
-    private String layoutCode;
-
-    @Column(name = "ROW_CODE")
-    @ApiParam("行代码")
-    private String rowCode;
-
-    @Column(name = "COLUMN_CODE")
-    @ApiParam("列代码")
-    private String columnCode;
-
     @Column(name = "COMPONENT_CODE")
-    @ApiParam("组件代码")
+    @ApiModelProperty("组件代码")
     private String componentCode;
 
     @Column(name = "MODEL_CODE")
-    @ApiParam("model代码")
+    @ApiModelProperty("model代码")
     private String modelCode;
 
     @Column(name = "FIELD_CODE")
-    @ApiParam("字段代码")
+    @ApiModelProperty("字段代码")
     private String fieldCode;
 
     @Column(name = "DISPLAY_NAME")
-    @ApiParam("字段名称")
+    @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

@@ -1,17 +1,16 @@
-package cn.estsh.i3plus.pojo.screen.bean.rel;
+package cn.estsh.i3plus.pojo.screen.bean.relation;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.screen.component.base.BaseComponent;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
+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.Lob;
+import javax.persistence.Index;
 import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
 
 /**
  * @author Wynne.Lu
@@ -19,30 +18,36 @@ import javax.persistence.Table;
  * @desc
  */
 @Entity
-@Table(name = "SCR_PANEL_COMPONENT_REL")
+@Table(name = "SCR_PANEL_COMPONENT",
+//        indexes = {
+//        @Index(columnList = "PANEL_CODE")},
+        uniqueConstraints = {
+                @UniqueConstraint(columnNames = {"PANEL_CODE", "LAYOUT_CODE"})
+        }
+)
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Api("Panel与组件的关系")
-public class ScrPanelComponentRel extends BaseBean {
+@ApiModel("Panel与组件的关系")
+public class ScrPanelComponent extends BaseBean {
     private static final long serialVersionUID = 3459027655126916483L;
 
     @Column(name = "PANEL_CODE")
-    @ApiParam("panel代码")
+    @ApiModelProperty("panel代码")
     private String panelCode;
 
     @Column(name = "LAYOUT_CODE")
-    @ApiParam("布局代码")
+    @ApiModelProperty("布局代码")
     private String layoutCode;
 
     @Column(name = "ROW_CODE")
-    @ApiParam("行代码")
+    @ApiModelProperty("行代码")
     private String rowCode;
 
     @Column(name = "COLUMN_CODE")
-    @ApiParam("列代码")
+    @ApiModelProperty("列代码")
     private String columnCode;
 
     @Column(name = "COMPONENT_CODE")
-    @ApiParam(value = "组件代码")
+    @ApiModelProperty(value = "组件代码")
     private String componentCode;
 }

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

@@ -1,8 +1,8 @@
-package cn.estsh.i3plus.pojo.screen.bean.rel;
+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;
@@ -12,6 +12,7 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
 
 /**
  * @author Wynne.Lu
@@ -19,33 +20,37 @@ import javax.persistence.Table;
  * @desc
  */
 @Entity
-@Table(name = "SCR_SCREEN_PANEL_REL")
+@Table(name = "SCR_SCREEN_PANEL",
+        uniqueConstraints = {
+                @UniqueConstraint(columnNames = {"SCREEN_CODE", "LAYOUT_CODE"})
+        }
+)
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
 @EqualsAndHashCode(callSuper = true)
-@Api("Screen与Panel的关系")
-public class ScrScreenPanelRel extends BaseBean {
+@ApiModel("Screen与Panel的关系")
+public class ScrScreenPanel extends BaseBean {
     private static final long serialVersionUID = 3459027655126916483L;
 
     @Column(name = "SCREEN_CODE")
-    @ApiParam("Screen代码")
+    @ApiModelProperty("Screen代码")
     private String screenCode;
 
     @Column(name = "LAYOUT_CODE")
-    @ApiParam("布局代码")
+    @ApiModelProperty("布局代码")
     private String layoutCode;
 
     @Column(name = "ROW_CODE")
-    @ApiParam("行代码")
+    @ApiModelProperty("行代码")
     private String rowCode;
 
     @Column(name = "COLUMN_CODE")
-    @ApiParam("列代码")
+    @ApiModelProperty("列代码")
     private String columnCode;
 
     @Column(name = "PANEL_CODE")
-    @ApiParam(value = "panel代码")
+    @ApiModelProperty(value = "panel代码")
     private String panelCode;
 }

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

@@ -2,11 +2,7 @@ package cn.estsh.i3plus.pojo.screen.model;
 
 import cn.estsh.i3plus.pojo.screen.bean.ScrComponent;
 import cn.estsh.i3plus.pojo.screen.bean.ScrEventAction;
-import cn.estsh.i3plus.pojo.screen.bean.ScrLayout;
-import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
-import cn.estsh.i3plus.pojo.screen.bean.ScrPanel;
-import cn.estsh.i3plus.pojo.screen.bean.rel.ScrComponentModelFieldRel;
-import cn.estsh.i3plus.pojo.screen.component.base.BaseComponent;
+import cn.estsh.i3plus.pojo.screen.bean.relation.ScrComponentModelField;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,8 +23,8 @@ public class ScrPanelComponentQueryModel implements Serializable {
 
     private ScrComponent component;
 
-    private List<ScrEventAction> eventActions;
+    private ScrEventAction eventAction;
 
-    private List<ScrComponentModelFieldRel> modelFields;
+    private List<ScrComponentModelField> modelFields;
 
 }

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

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

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

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

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

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

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

@@ -1,8 +1,7 @@
 package cn.estsh.i3plus.pojo.screen.repository.rel;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.screen.bean.ScrPanel;
-import cn.estsh.i3plus.pojo.screen.bean.rel.ScrPanelComponentRel;
+import cn.estsh.i3plus.pojo.screen.bean.relation.ScrPanelComponent;
 
 /**
  * @Description :
@@ -11,5 +10,5 @@ import cn.estsh.i3plus.pojo.screen.bean.rel.ScrPanelComponentRel;
  * @CreateDate : 20-5-28 下午3:39
  * @Modify:
  **/
-public interface ScrPanelComponentRelRepository extends BaseRepository<ScrPanelComponentRel, Long> {
+public interface ScrPanelComponentRepository extends BaseRepository<ScrPanelComponent, Long> {
 }

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

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.screen.repository.rel;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.screen.bean.rel.ScrScreenPanelRel;
+import cn.estsh.i3plus.pojo.screen.bean.relation.ScrScreenPanel;
 
 /**
  * @Description :
@@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.screen.bean.rel.ScrScreenPanelRel;
  * @CreateDate : 20-5-28 下午3:39
  * @Modify:
  **/
-public interface ScrScreenPanelRelRepository extends BaseRepository<ScrScreenPanelRel, Long> {
+public interface ScrScreenPanelRepository extends BaseRepository<ScrScreenPanel, Long> {
 }