From bdb5e6e27c2cfa533c0748db9556ab745760cee6 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 11 Jun 2020 17:47:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=AD=96=E7=95=A5=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 43 ++++ .../estsh/i3plus/pojo/platform/bean/SysUser.java | 5 + .../i3plus/pojo/platform/bean/SysUserPassword.java | 47 ++++ .../repository/SysUserPasswordRepository.java | 14 ++ .../estsh/i3plus/pojo/report/bean/BrPojoAttr.java | 244 ++++++++++----------- .../report/repository/BrPojoAttrRepository.java | 30 +-- 6 files changed, 246 insertions(+), 137 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 0574e44..64a9161 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1234,4 +1234,47 @@ public class ImppEnumUtil { return null; } } + + /** + * 密码策略 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_TEXT { + PASSWORD_VERIFY(1, "保存策略"), + PASSWORD_LOGIN(2, "登录策略"); + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private CHECK_TEXT(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOf(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 CHECK_TEXT valueOfEnum(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 9afa74c..02c2570 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -58,6 +58,11 @@ public class SysUser extends BaseBean { @ApiParam(value ="登陆密码") private String userLoginPassword; + @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") private Integer userType; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java new file mode 100644 index 0000000..e2902ca --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserPassword.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.platform.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 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 : wei.peng + * @CreateDate : 20-6-4 下午3:38 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="SYS_USER_PASSWORD") +@Api(value="账号密码") +public class SysUserPassword extends BaseBean { + private static final long serialVersionUID = 4536854582252378921L; + + @Column(name="USER_ID") + @ApiParam(value ="人员ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name="USER_PASSWORD") + @ApiParam(value ="用户密码") + private String userPassword; + + @Column(name="USER_LOGIN_LAST_DATE_TIME") + @ApiParam(value ="账号最后登录时间") + private String userLoginLastDateTime; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.java new file mode 100644 index 0000000..dda7e76 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysUserPasswordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.SysUserPassword; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-6-4 下午3:46 + * @Modify: + **/ +public interface SysUserPasswordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java index 5387dcd..6a9df34 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoAttr.java @@ -1,122 +1,122 @@ -package cn.estsh.i3plus.pojo.report.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 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 : Adair Peng - * @CreateDate : 2019-01-18 11:32 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name="BR_POJO_ATTR") -@Api(value="对象属性",description = "对象属性") -public class BrPojoAttr extends BaseBean { - - private static final long serialVersionUID = -9025365832485707583L; - @Column(name="TEMPLATE_ID") - @ApiParam(value ="模板编号" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long templateId; - - @Column(name="SERVER_ID") - @ApiParam(value ="服务ID",example = "-1") - private Integer serverId; - - @Column(name="POJO_ID") - @ApiParam(value ="模板对象ID" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long pojoId; - - @Column(name="POJO_NAME") - @ApiParam(value ="对象名称") - private String pojoName; - - @Column(name="PACKAGE_NAME_RDD") - @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") - private String packageNameRdd; - - @Column(name="POJO_TABLE_NAME_ALIAS") - @ApiParam(value ="对象别名") - private String pojoTableNameAlias; - - @Column(name="ATTR_COLUMN_NAME") - @ApiParam(value ="属性别名") - private String attrColumnName; - - @Column(name="ATTR_COLUMN_NAME_ALIAS") - @ApiParam(value ="属性别名") - private String attrColumnNameAlias; - - @Column(name="PARENT_ID") - @ApiParam(value ="上级ID",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; - - @Column(name="ATTR_TYPE") - @ApiParam(value ="属性类型",example = "-1") - private Integer attrType; - - @Column(name="ATTR_REF_TYPE") - @ApiParam(value ="关系类型",example = "-1") - private Integer attrRefType; - - @Column(name="DATA_TYPE") - @ApiParam(value ="数据类型",example = "-1") - private Integer dataType; - - @Column(name="CHART_ATTR_NAME") - @ApiParam(value ="图标属性名称") - private String chartAttrName; - - @Column(name="AGGREGATION_TYPE") - @ApiParam(value ="聚合类型",example = "-1") - private Integer aggregationType; - - @Column(name="AGGREGATION_ID") - @ApiParam(value ="聚合类型",example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long aggregationId; - - @Column(name="ATTR_SORT") - @ApiParam(value ="字段排序") - private Integer attrSort; - - @Column(name="ATTR_DATA_SORT") - @ApiParam(value ="字段排序") - private Integer attrDataSort; - - @Column(name="ATTR_STYLE") - @ApiParam(value ="字段样式") - private Integer attrStyle; - - @Column(name="ATTR_STYLE_RDD") - @ApiParam(value ="字段样式") - private String attrStyleRdd; - - @Column(name="ATTR_DEFAULT_VALUE") - @ApiParam(value ="属性默认值") - private String attrDefaultValue; - - @Column(name="ATTR_SHOW") - @ApiParam(value ="属性是否显示",example = "-1") - private Integer attrShow; - -} +//package cn.estsh.i3plus.pojo.report.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 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 : Adair Peng +// * @CreateDate : 2019-01-18 11:32 +// * @Modify: +// **/ +//@Data +//@Entity +//@DynamicInsert +//@DynamicUpdate +//@EqualsAndHashCode(callSuper = true) +//@Table(name="BR_POJO_ATTR") +//@Api(value="对象属性",description = "对象属性") +//public class BrPojoAttr extends BaseBean { +// +// private static final long serialVersionUID = -9025365832485707583L; +// @Column(name="TEMPLATE_ID") +// @ApiParam(value ="模板编号" ,example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long templateId; +// +// @Column(name="SERVER_ID") +// @ApiParam(value ="服务ID",example = "-1") +// private Integer serverId; +// +// @Column(name="POJO_ID") +// @ApiParam(value ="模板对象ID" ,example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long pojoId; +// +// @Column(name="POJO_NAME") +// @ApiParam(value ="对象名称") +// private String pojoName; +// +// @Column(name="PACKAGE_NAME_RDD") +// @ApiParam(value ="主服务对象包名称" , access ="服务对象包名称") +// private String packageNameRdd; +// +// @Column(name="POJO_TABLE_NAME_ALIAS") +// @ApiParam(value ="对象别名") +// private String pojoTableNameAlias; +// +// @Column(name="ATTR_COLUMN_NAME") +// @ApiParam(value ="属性别名") +// private String attrColumnName; +// +// @Column(name="ATTR_COLUMN_NAME_ALIAS") +// @ApiParam(value ="属性别名") +// private String attrColumnNameAlias; +// +// @Column(name="PARENT_ID") +// @ApiParam(value ="上级ID",example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long parentId; +// +// @Column(name="ATTR_TYPE") +// @ApiParam(value ="属性类型",example = "-1") +// private Integer attrType; +// +// @Column(name="ATTR_REF_TYPE") +// @ApiParam(value ="关系类型",example = "-1") +// private Integer attrRefType; +// +// @Column(name="DATA_TYPE") +// @ApiParam(value ="数据类型",example = "-1") +// private Integer dataType; +// +// @Column(name="CHART_ATTR_NAME") +// @ApiParam(value ="图标属性名称") +// private String chartAttrName; +// +// @Column(name="AGGREGATION_TYPE") +// @ApiParam(value ="聚合类型",example = "-1") +// private Integer aggregationType; +// +// @Column(name="AGGREGATION_ID") +// @ApiParam(value ="聚合类型",example = "-1") +// @JsonSerialize(using = ToStringSerializer.class) +// private Long aggregationId; +// +// @Column(name="ATTR_SORT") +// @ApiParam(value ="字段排序") +// private Integer attrSort; +// +// @Column(name="ATTR_DATA_SORT") +// @ApiParam(value ="字段排序") +// private Integer attrDataSort; +// +// @Column(name="ATTR_STYLE") +// @ApiParam(value ="字段样式") +// private Integer attrStyle; +// +// @Column(name="ATTR_STYLE_RDD") +// @ApiParam(value ="字段样式") +// private String attrStyleRdd; +// +// @Column(name="ATTR_DEFAULT_VALUE") +// @ApiParam(value ="属性默认值") +// private String attrDefaultValue; +// +// @Column(name="ATTR_SHOW") +// @ApiParam(value ="属性是否显示",example = "-1") +// private Integer attrShow; +// +//} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java index 386bfc5..b719014 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrPojoAttrRepository.java @@ -1,15 +1,15 @@ -package cn.estsh.i3plus.pojo.report.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.report.bean.BrMenu; -import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr; - -/** - * @Description : - * @Reference : - * @Author : Adair Peng - * @CreateDate : 2019-01-18 15:03 - * @Modify: - **/ -public interface BrPojoAttrRepository extends BaseRepository { -} +//package cn.estsh.i3plus.pojo.report.repository; +// +//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +//import cn.estsh.i3plus.pojo.report.bean.BrMenu; +//import cn.estsh.i3plus.pojo.report.bean.BrPojoAttr; +// +///** +// * @Description : +// * @Reference : +// * @Author : Adair Peng +// * @CreateDate : 2019-01-18 15:03 +// * @Modify: +// **/ +//public interface BrPojoAttrRepository extends BaseRepository { +//}