625 数据对象更新

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

@@ -788,8 +788,80 @@ public class ScreenEnumUtil {
             }
             return tmp;
         }
+    }
+
+    public enum AUTH_ACCESS_TYPE {
+        NO_AUTH(10, "NO_AUTH", "无权限"),
+        READONLY(20, "READONLY", "只读");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        AUTH_ACCESS_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 AUTH_KIND_TYPE {
+        USER(10, "USER", "用户"),
+        ROLE(20, "ROLE", "角色");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        AUTH_KIND_TYPE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
 
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
 
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
     }
 
 }

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

@@ -30,6 +30,10 @@ import java.io.Serializable;
 public class ScrDataAuth extends BaseBean implements Serializable {
     private static final long serialVersionUID = 8099384243374450186L;
 
+    @Column(name = "SCREEN_CODE")
+    @ApiModelProperty("页面代码")
+    private String screenCode;
+
     @Column(name = "MODEL_CODE")
     @ApiModelProperty("model代码")
     private String modelCode;
@@ -38,25 +42,25 @@ public class ScrDataAuth extends BaseBean implements Serializable {
     @ApiModelProperty("model字段代码")
     private String modelFieldCode;
 
-    @Column(name = "MODEL_FIELD_CONDITION")
-    @ApiModelProperty("model字段条件")
-    private String modelFieldCondition;
-
-    @Column(name = "ACCESS_ROLES")
+    @Column(name = "ROLE")
     @ApiModelProperty("可以访问的角色")
-    private String accessRoles;
+    private String role;
 
-    @Column(name = "DENIED_ROLES")
-    @ApiModelProperty("拒绝访问的角色")
-    private String deniedRoles;
+    @Column(name = "ACCESS_TYPE")
+    @ApiModelProperty("访问类型")
+    private Integer accessType;
 
-    @Column(name = "ACCESS_USERS")
-    @ApiModelProperty("可以访问的用户")
-    private String accessUsers;
+    @Column(name = "AUTH_KIND_TYPE")
+    @ApiModelProperty("行权限类型")
+    private Integer authKindType;
 
-    @Column(name = "DENIED_USERS")
-    @ApiModelProperty("拒绝访问的用户")
-    private String deniedUsers;
+    @Column(name="AUTH_VALUE")
+    @ApiModelProperty("权限制")
+    private String authValue;
+
+    @Column(name = "MODEL_FIELD_CONDITION")
+    @ApiModelProperty("model字段条件")
+    private String modelFieldCondition;
 
     @Column(name = "AUTH_TYPE")
     @ApiModelProperty("权限类型 （行，列）")

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

@@ -14,6 +14,7 @@ import lombok.NoArgsConstructor;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -32,50 +33,33 @@ import java.io.Serializable;
 public class ScrDataObject extends BaseBean implements Serializable {
     private static final long serialVersionUID = -270662014158685376L;
 
-    @Column(name = "DATA_SOURCE_ID")
+    @Column(name = "DATASOURCE_ID")
     @ApiModelProperty(value = "数据源ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long dataSourceId;
+    private Long datasourceId;
 
     @Column(name = "DATA_OBJECT_CODE")
     @ApiModelProperty(value = "数据对象代码")
     private String dataObjectCode;
 
+    @Column(name = "DATA_OBJECT_NAME")
+    @ApiModelProperty(value = "数据对象名称")
+    private String dataObjectName;
+
     @Column(name = "TABLE_NAME")
     @ApiModelProperty(value = "表或视图名称")
     private String tableName;
 
-    @Column(name = "DATA_TYPE")
-    @ApiModelProperty(value = "数据类型")
-    private Integer dataType;
-
-    @Column(name = "FIELD_CODE")
-    @ApiModelProperty(value = "字段代码")
-    private String fieldCode;
-
-    @Column(name = "FIELD_NAME")
-    @ApiModelProperty(value = "字段名称")
-    private String fieldName;
-
-
-    @Column(name = "FIELD_TYPE")
-    @ApiModelProperty(value = "字段类型")
-    private String fieldType;
-
-    @Column(name = "FIELD_SIZE")
-    @ApiModelProperty(value = "字段长度")
-    private Integer fieldSize;
-
-    @Column(name = "DISPLAY_NAME")
-    @ApiModelProperty(value = "字段名称")
-    private String displayName;
+    @Column(name = "TABLE_TYPE")
+    @ApiModelProperty(value = "表还是视图")
+    private Integer tableType;
 
-    @Column(name = "DESCRIPTION")
-    @ApiModelProperty(value = "描述")
-    private String description;
+    @Transient
+    @ApiModelProperty(value = "数据源代码")
+    private String datasourceCode;
 
-    @Column(name = "NULLABLE")
-    @ApiModelProperty("是否能为空")
-    private Integer nullable;
+    @Transient
+    @ApiModelProperty(value="数据源名称")
+    private String datasourceName;
 
 }

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

@@ -42,8 +42,20 @@ public class ScrDataObjectIndex extends BaseBean implements Serializable {
     @ApiModelProperty("组号")
     private Integer groupNo;
 
+    @Column(name = "SEQ_NO")
+    @ApiModelProperty("组号")
+    private Integer seqNo;
+
     @Column(name = "FIELD_CODE")
     @ApiModelProperty("字段代码")
     private String fieldCode;
 
+    @Column(name = "INDEX_NAME")
+    @ApiModelProperty("索引名字")
+    private String indexName;
+
+    @Column(name = "IS_UNIQUE")
+    @ApiModelProperty("是否唯一")
+    private Integer isUnique;
+
 }

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

@@ -0,0 +1,76 @@
+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.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/22 下午1:27
+ * @desc 数据对象管理
+ */
+@Entity
+@Table(name = "SCR_DATA_OBJECT_PROPERTY")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("数据对象管理")
+public class ScrDataObjectProperty extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -2729101772049144018L;
+
+    @Column(name = "DATA_OBJECT_CODE")
+    @ApiModelProperty(value = "数据对象代码")
+    private String dataObjectCode;
+
+    @Column(name = "DISPLAY_NAME")
+    @ApiModelProperty(value = "字段名称")
+    private String displayName;
+
+    @Column(name = "DATA_TYPE")
+    @ApiModelProperty(value = "数据类型")
+    private Integer dataType;
+
+    @Column(name = "DATA_TYPE_NAME")
+    @ApiModelProperty(value = "数据类型名称")
+    private String dataTypeName;
+
+    @Column(name = "FIELD_TYPE")
+    @ApiModelProperty(value = "java类型")
+    private String fieldType;
+
+    @Column(name = "FIELD_CODE")
+    @ApiModelProperty(value = "字段代码")
+    private String fieldCode;
+
+    @Column(name = "NULLABLE")
+    @ApiModelProperty("是否能为空")
+    private Integer nullable;
+
+    @Column(name = "FIELD_NAME")
+    @ApiModelProperty(value = "字段名称")
+    private String fieldName;
+
+    @Column(name = "FIELD_SIZE")
+    @ApiModelProperty(value = "字段长度")
+    private Integer fieldSize;
+
+    @Column(name = "DESCRIPTION")
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+
+}

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

@@ -44,6 +44,10 @@ public class ScrEventAction extends BaseBean implements Serializable {
     private String executeActionCode;
 
     @Column(name = "POST_ACTION_CODE")
-    @ApiModelProperty("执行前动作代码")
+    @ApiModelProperty("执行后动作代码")
     private String postActionCode;
+
+    @Column(name = "EXCEPTION_ACTION_CODE")
+    @ApiModelProperty("报错时动作代码")
+    private String exceptionActionCode;
 }

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

@@ -34,6 +34,10 @@ public class ScrModel extends BaseBean implements Serializable {
     @ApiModelProperty("model代码")
     private String modelCode;
 
+    @Column(name = "MODEL_NAME")
+    @ApiModelProperty("model名称")
+    private String modelName;
+
     @Column(name = "MODEL_TYPE")
     @ApiModelProperty("model的类型")
     private Integer modelType;
@@ -42,7 +46,4 @@ public class ScrModel extends BaseBean implements Serializable {
     @ApiModelProperty("数据对象代码")
     private String dataObjectCode;
 
-    @Column(name = "DATA_COlUMN_AUTH")
-    @ApiModelProperty("数据列权限")
-    private String dataColumnAuth;
 }

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

@@ -71,7 +71,7 @@ public class ScrModelField extends BaseBean implements Serializable {
     @ApiModelProperty("是否必填")
     private Boolean isRequired = false;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ",columnDefinition = "int(11) default 0")
     @ApiModelProperty("表单顺序")
     private Integer seq;
 
@@ -98,5 +98,4 @@ public class ScrModelField extends BaseBean implements Serializable {
     @Transient
     private Object fieldValue;
 
-
 }

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.screen.model;
 
 import cn.estsh.i3plus.pojo.screen.bean.ScrDataObject;
 import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectIndex;
+import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectProperty;
 import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource;
 import lombok.Builder;
 import lombok.Data;
@@ -21,7 +22,9 @@ public class ScrDataObjectIndexModel implements Serializable {
 
     private ScrDatasource datasource;
 
-    private List<ScrDataObject> dataObjects;
+    private ScrDataObject dataObject;
 
     private List<ScrDataObjectIndex> dataObjectIndices;
+
+    private List<ScrDataObjectProperty> dataObjectProperties;
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectPropertyRepository.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.ScrDataObjectProperty;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrDataObjectPropertyRepository extends BaseRepository<ScrDataObjectProperty, Long> {
+}