Merge branch 'dev' into test

yun-zuoyi
wynne1005 4 years ago
commit 0e21856803

@ -264,6 +264,8 @@ public class ScreenEnumUtil {
}
return tmp;
}
}
public enum LAYOUT_TYPE {
@ -786,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;
}
}
}

@ -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 ScreenEnumUtil.ACTION_TYPE actionType;
private Integer actionType;
}

@ -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;
@ -33,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;
@ -41,30 +42,29 @@ 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("权限类型 (行,列)")
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.AUTH_TYPE authType;
private Integer authType;
}

@ -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,9 +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 javax.persistence.Transient;
import java.io.Serializable;
/**
@ -35,52 +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 = "数据类型")
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.DATA_OBJECT_SOURCE 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("是否能为空")
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.NULLABLE nullable;
@Transient
@ApiModelProperty(value="数据源名称")
private String datasourceName;
}

@ -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,15 +36,26 @@ public class ScrDataObjectIndex extends BaseBean implements Serializable {
@Column(name = "INDEX_TYPE")
@ApiModelProperty("约束类型")
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.INDEX_TYPE indexType;
private Integer indexType;
@Column(name = "GROUP_NO")
@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;
}

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

@ -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 ScreenEnumUtil.DATASOURCE_CONNECTION_STATUS sourceConnectionStatus;
private Integer sourceConnectionStatus;
@Column(name = "SOURCE_TYPE")
@ApiModelProperty(value = "数据源类型", name = "CommonEnumUtil.DATA_SOURCE_TYPE")
@Enumerated(EnumType.STRING)
private CommonEnumUtil.DATA_SOURCE_TYPE sourceType;
private Integer sourceType;
@Column(name = "SOURCE_HOST")
@ApiModelProperty(value = "数据源连接地址")

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

@ -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 ScreenEnumUtil.LAYOUT_TYPE layoutType;
private Integer layoutType;
}

@ -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;
@ -37,16 +34,16 @@ 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的类型")
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.MODEL_TYPE modelType;
private Integer modelType;
@Column(name = "DATA_OBJECT_CODE")
@ApiModelProperty("数据对象代码")
private String dataObjectCode;
@Column(name = "DATA_COlUMN_AUTH")
@ApiModelProperty("数据列权限")
private String dataColumnAuth;
}

@ -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;
@ -75,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;
@ -89,8 +85,7 @@ public class ScrModelField extends BaseBean implements Serializable {
@Column(name = "MODEL_FIELD_DATASOURCE")
@ApiModelProperty("字段数据来源")
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.MODEL_FIELD_DATASOURCE modelFieldDatasource;
private Integer modelFieldDatasource;
@Column(name = "MODEL_FIELD_DATASOURCE_PROPS")
@ApiModelProperty("model字段来源属性")
@ -103,5 +98,4 @@ public class ScrModelField extends BaseBean implements Serializable {
@Transient
private Object fieldValue;
}

@ -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 ScreenEnumUtil.INDEX_TYPE indexType;
private Integer 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 CommonEnumUtil.TRUE_OR_FALSE primaryKeySwitch;
private Integer primaryKeySwitch;
@Column(name = "UNIQUE_KEY_SWITCH")
@ApiModelProperty("model唯一键唯一检查开关")
@Enumerated(EnumType.STRING)
private CommonEnumUtil.TRUE_OR_FALSE uniqueKeySwitch;
private Integer uniqueKeySwitch;
}

@ -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 ScreenEnumUtil.SCREEN_TYPE screenType;
private Integer screenType;
@Column(name = "SCREEN_OWNING_SYSTEM")
@ApiModelProperty("界面所属系统")
@Enumerated(EnumType.STRING)
private CommonEnumUtil.SOFT_TYPE screenOwningSystem;
private Integer screenOwningSystem;
}

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

@ -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> {
}
Loading…
Cancel
Save