fix(screen): 6.21 枚举调整 增删改查测试

6.21 枚举调整 增删改查测试

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

@@ -264,6 +264,8 @@ public class ScreenEnumUtil {
             }
             return tmp;
         }
+
+
     }
 
     public enum LAYOUT_TYPE {

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,8 +11,6 @@ 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;
 
@@ -43,7 +40,6 @@ public class ScrAction extends BaseBean implements Serializable {
 
     @Column(name = "ACTION_TYPE")
     @ApiModelProperty("动作类型")
-    @Enumerated(EnumType.STRING)
+    private Integer actionType;
-    private ScreenEnumUtil.ACTION_TYPE actionType;
 
 }

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,8 +11,6 @@ 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;
 
@@ -63,8 +60,7 @@ public class ScrDataAuth extends BaseBean implements Serializable {
 
     @Column(name = "AUTH_TYPE")
     @ApiModelProperty("权限类型 （行，列）")
-    @Enumerated(EnumType.STRING)
+    private Integer authType;
-    private ScreenEnumUtil.AUTH_TYPE authType;
 
 
 }

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
@@ -14,8 +13,6 @@ 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;
 
@@ -50,8 +47,7 @@ public class ScrDataObject extends BaseBean implements Serializable {
 
     @Column(name = "DATA_TYPE")
     @ApiModelProperty(value = "数据类型")
-    @Enumerated(EnumType.STRING)
+    private Integer dataType;
-    private ScreenEnumUtil.DATA_OBJECT_SOURCE dataType;
 
     @Column(name = "FIELD_CODE")
     @ApiModelProperty(value = "字段代码")
@@ -80,7 +76,6 @@ public class ScrDataObject extends BaseBean implements Serializable {
 
     @Column(name = "NULLABLE")
     @ApiModelProperty("是否能为空")
-    @Enumerated(EnumType.STRING)
+    private Integer nullable;
-    private ScreenEnumUtil.NULLABLE nullable;
 
 }

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,8 +11,6 @@ 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;
 
@@ -39,8 +36,7 @@ public class ScrDataObjectIndex extends BaseBean implements Serializable {
 
     @Column(name = "INDEX_TYPE")
     @ApiModelProperty("约束类型")
-    @Enumerated(EnumType.STRING)
+    private Integer indexType;
-    private ScreenEnumUtil.INDEX_TYPE indexType;
 
     @Column(name = "GROUP_NO")
     @ApiModelProperty("组号")

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

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -13,8 +11,6 @@ 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;
 
@@ -45,13 +41,11 @@ public class ScrDatasource extends BaseBean implements Serializable {
 
     @Column(name = "SOURCE_CONNECTION_STATUS")
     @ApiModelProperty(value = "数据源状态", name = "状态：可用，不可用 看枚举当中是否存在")
-    @Enumerated(EnumType.STRING)
+    private Integer sourceConnectionStatus;
-    private ScreenEnumUtil.DATASOURCE_CONNECTION_STATUS sourceConnectionStatus;
 
     @Column(name = "SOURCE_TYPE")
     @ApiModelProperty(value = "数据源类型", name = "CommonEnumUtil.DATA_SOURCE_TYPE")
-    @Enumerated(EnumType.STRING)
+    private Integer sourceType;
-    private CommonEnumUtil.DATA_SOURCE_TYPE sourceType;
 
     @Column(name = "SOURCE_HOST")
     @ApiModelProperty(value = "数据源连接地址")

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

@@ -1,8 +1,6 @@
 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.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -13,8 +11,6 @@ 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;
 
@@ -44,7 +40,6 @@ public class ScrLayout extends BaseBean implements Serializable {
 
     @Column(name = "LAYOUT_TYPE")
     @ApiModelProperty("布局类型")
-    @Enumerated(EnumType.STRING)
+    private Integer layoutType;
-    private ScreenEnumUtil.LAYOUT_TYPE layoutType;
 
 }

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,8 +11,6 @@ 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;
 
@@ -39,8 +36,7 @@ public class ScrModel extends BaseBean implements Serializable {
 
     @Column(name = "MODEL_TYPE")
     @ApiModelProperty("model的类型")
-    @Enumerated(EnumType.STRING)
+    private Integer modelType;
-    private ScreenEnumUtil.MODEL_TYPE modelType;
 
     @Column(name = "DATA_OBJECT_CODE")
     @ApiModelProperty("数据对象代码")

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

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -13,8 +11,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
@@ -89,8 +85,7 @@ public class ScrModelField extends BaseBean implements Serializable {
 
     @Column(name = "MODEL_FIELD_DATASOURCE")
     @ApiModelProperty("字段数据来源")
-    @Enumerated(EnumType.STRING)
+    private Integer modelFieldDatasource;
-    private ScreenEnumUtil.MODEL_FIELD_DATASOURCE modelFieldDatasource;
 
     @Column(name = "MODEL_FIELD_DATASOURCE_PROPS")
     @ApiModelProperty("model字段来源属性")

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

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -40,8 +39,7 @@ public class ScrModelFieldIndex extends BaseBean implements Serializable {
 
     @Column(name = "INDEX_TYPE")
     @ApiModelProperty("约束类型")
-    @Enumerated(EnumType.STRING)
+    private Integer indexType;
-    private ScreenEnumUtil.INDEX_TYPE indexType;
 
     @Column(name = "GROUP_NO")
     @ApiModelProperty("组号")
@@ -58,11 +56,9 @@ public class ScrModelFieldIndex extends BaseBean implements Serializable {
 
     @Column(name = "PRIMARY_KEY_SWITCH")
     @ApiModelProperty("model主键唯一检查开关")
-    @Enumerated(EnumType.STRING)
+    private Integer primaryKeySwitch;
-    private CommonEnumUtil.TRUE_OR_FALSE primaryKeySwitch;
 
     @Column(name = "UNIQUE_KEY_SWITCH")
     @ApiModelProperty("model唯一键唯一检查开关")
-    @Enumerated(EnumType.STRING)
+    private Integer uniqueKeySwitch;
-    private CommonEnumUtil.TRUE_OR_FALSE uniqueKeySwitch;
 }

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

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -13,8 +11,6 @@ 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;
 
@@ -52,12 +48,10 @@ public class ScrScreen extends BaseBean implements Serializable {
 
     @Column(name = "SCREEN_TYPE")
     @ApiModelProperty("页面类型")
-    @Enumerated(EnumType.STRING)
+    private Integer screenType;
-    private ScreenEnumUtil.SCREEN_TYPE screenType;
 
     @Column(name = "SCREEN_OWNING_SYSTEM")
     @ApiModelProperty("界面所属系统")
-    @Enumerated(EnumType.STRING)
+    private Integer screenOwningSystem;
-    private CommonEnumUtil.SOFT_TYPE screenOwningSystem;
 
 }