|
@@ -4,15 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
|
|
|
import com.baomidou.mybatisplus.annotation.TableField;
|
|
import com.baomidou.mybatisplus.annotation.TableField;
|
|
|
import com.baomidou.mybatisplus.annotation.TableId;
|
|
import com.baomidou.mybatisplus.annotation.TableId;
|
|
|
import com.baomidou.mybatisplus.annotation.TableName;
|
|
import com.baomidou.mybatisplus.annotation.TableName;
|
|
|
|
|
+import lombok.Data;
|
|
|
|
|
|
|
|
import java.io.Serializable;
|
|
import java.io.Serializable;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
|
|
|
|
|
-/**
|
|
|
|
|
- * 用户表
|
|
|
|
|
- * @TableName user
|
|
|
|
|
- */
|
|
|
|
|
@TableName(value ="user")
|
|
@TableName(value ="user")
|
|
|
|
|
+@Data
|
|
|
public class User implements Serializable {
|
|
public class User implements Serializable {
|
|
|
/**
|
|
/**
|
|
|
* 用户ID
|
|
* 用户ID
|
|
@@ -43,151 +41,35 @@ public class User implements Serializable {
|
|
|
/**
|
|
/**
|
|
|
* 用户角色
|
|
* 用户角色
|
|
|
*/
|
|
*/
|
|
|
- private String userRole = "用户";
|
|
|
|
|
|
|
+ private String userRole;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 创建时间
|
|
|
|
|
- */
|
|
|
|
|
- private Date createTime;
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 更新时间
|
|
|
|
|
- */
|
|
|
|
|
- private Date updateTime;
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 删除标志,0:未删除,1:已删除
|
|
|
|
|
- */
|
|
|
|
|
- private Integer deleteFlag;
|
|
|
|
|
-
|
|
|
|
|
- @TableField(exist = false)
|
|
|
|
|
- private static final long serialVersionUID = 1L;
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 用户ID
|
|
|
|
|
- */
|
|
|
|
|
- public Long getId() {
|
|
|
|
|
- return id;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 用户ID
|
|
|
|
|
- */
|
|
|
|
|
- public void setId(Long id) {
|
|
|
|
|
- this.id = id;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 用户账号
|
|
|
|
|
- */
|
|
|
|
|
- public String getUserAccount() {
|
|
|
|
|
- return userAccount;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 用户账号
|
|
|
|
|
- */
|
|
|
|
|
- public void setUserAccount(String userAccount) {
|
|
|
|
|
- this.userAccount = userAccount;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 用户密码
|
|
|
|
|
- */
|
|
|
|
|
- public String getUserPassword() {
|
|
|
|
|
- return userPassword;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 用户密码
|
|
|
|
|
- */
|
|
|
|
|
- public void setUserPassword(String userPassword) {
|
|
|
|
|
- this.userPassword = userPassword;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 用户名称
|
|
|
|
|
- */
|
|
|
|
|
- public String getUserName() {
|
|
|
|
|
- return userName;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 用户名称
|
|
|
|
|
- */
|
|
|
|
|
- public void setUserName(String userName) {
|
|
|
|
|
- this.userName = userName;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 用户头像
|
|
|
|
|
|
|
+ * 访问接口的accessKey
|
|
|
*/
|
|
*/
|
|
|
- public String getUserAvatar() {
|
|
|
|
|
- return userAvatar;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 用户头像
|
|
|
|
|
- */
|
|
|
|
|
- public void setUserAvatar(String userAvatar) {
|
|
|
|
|
- this.userAvatar = userAvatar;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ private String accessKey;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 用户角色
|
|
|
|
|
|
|
+ * 访问接口的secretKey
|
|
|
*/
|
|
*/
|
|
|
- public String getUserRole() {
|
|
|
|
|
- return userRole;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 用户角色
|
|
|
|
|
- */
|
|
|
|
|
- public void setUserRole(String userRole) {
|
|
|
|
|
- this.userRole = userRole;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 创建时间
|
|
|
|
|
- */
|
|
|
|
|
- public Date getCreateTime() {
|
|
|
|
|
- return createTime;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ private String secretKey;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 创建时间
|
|
* 创建时间
|
|
|
*/
|
|
*/
|
|
|
- public void setCreateTime(Date createTime) {
|
|
|
|
|
- this.createTime = createTime;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- /**
|
|
|
|
|
- * 更新时间
|
|
|
|
|
- */
|
|
|
|
|
- public Date getUpdateTime() {
|
|
|
|
|
- return updateTime;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ private Date createTime;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 更新时间
|
|
* 更新时间
|
|
|
*/
|
|
*/
|
|
|
- public void setUpdateTime(Date updateTime) {
|
|
|
|
|
- this.updateTime = updateTime;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ private Date updateTime;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 删除标志,0:未删除,1:已删除
|
|
* 删除标志,0:未删除,1:已删除
|
|
|
*/
|
|
*/
|
|
|
- public Integer getDeleteFlag() {
|
|
|
|
|
- return deleteFlag;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ private Integer deleteFlag;
|
|
|
|
|
|
|
|
- /**
|
|
|
|
|
- * 删除标志,0:未删除,1:已删除
|
|
|
|
|
- */
|
|
|
|
|
- public void setDeleteFlag(Integer deleteFlag) {
|
|
|
|
|
- this.deleteFlag = deleteFlag;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ @TableField(exist = false)
|
|
|
|
|
+ private static final long serialVersionUID = 1L;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public boolean equals(Object that) {
|
|
public boolean equals(Object that) {
|
|
@@ -202,14 +84,16 @@ public class User implements Serializable {
|
|
|
}
|
|
}
|
|
|
User other = (User) that;
|
|
User other = (User) that;
|
|
|
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
|
|
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
|
|
|
- && (this.getUserAccount() == null ? other.getUserAccount() == null : this.getUserAccount().equals(other.getUserAccount()))
|
|
|
|
|
- && (this.getUserPassword() == null ? other.getUserPassword() == null : this.getUserPassword().equals(other.getUserPassword()))
|
|
|
|
|
- && (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName()))
|
|
|
|
|
- && (this.getUserAvatar() == null ? other.getUserAvatar() == null : this.getUserAvatar().equals(other.getUserAvatar()))
|
|
|
|
|
- && (this.getUserRole() == null ? other.getUserRole() == null : this.getUserRole().equals(other.getUserRole()))
|
|
|
|
|
- && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
|
|
|
|
|
- && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
|
|
|
|
|
- && (this.getDeleteFlag() == null ? other.getDeleteFlag() == null : this.getDeleteFlag().equals(other.getDeleteFlag()));
|
|
|
|
|
|
|
+ && (this.getUserAccount() == null ? other.getUserAccount() == null : this.getUserAccount().equals(other.getUserAccount()))
|
|
|
|
|
+ && (this.getUserPassword() == null ? other.getUserPassword() == null : this.getUserPassword().equals(other.getUserPassword()))
|
|
|
|
|
+ && (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName()))
|
|
|
|
|
+ && (this.getUserAvatar() == null ? other.getUserAvatar() == null : this.getUserAvatar().equals(other.getUserAvatar()))
|
|
|
|
|
+ && (this.getUserRole() == null ? other.getUserRole() == null : this.getUserRole().equals(other.getUserRole()))
|
|
|
|
|
+ && (this.getAccessKey() == null ? other.getAccessKey() == null : this.getAccessKey().equals(other.getAccessKey()))
|
|
|
|
|
+ && (this.getSecretKey() == null ? other.getSecretKey() == null : this.getSecretKey().equals(other.getSecretKey()))
|
|
|
|
|
+ && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
|
|
|
|
|
+ && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
|
|
|
|
|
+ && (this.getDeleteFlag() == null ? other.getDeleteFlag() == null : this.getDeleteFlag().equals(other.getDeleteFlag()));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -222,6 +106,8 @@ public class User implements Serializable {
|
|
|
result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode());
|
|
result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode());
|
|
|
result = prime * result + ((getUserAvatar() == null) ? 0 : getUserAvatar().hashCode());
|
|
result = prime * result + ((getUserAvatar() == null) ? 0 : getUserAvatar().hashCode());
|
|
|
result = prime * result + ((getUserRole() == null) ? 0 : getUserRole().hashCode());
|
|
result = prime * result + ((getUserRole() == null) ? 0 : getUserRole().hashCode());
|
|
|
|
|
+ result = prime * result + ((getAccessKey() == null) ? 0 : getAccessKey().hashCode());
|
|
|
|
|
+ result = prime * result + ((getSecretKey() == null) ? 0 : getSecretKey().hashCode());
|
|
|
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
|
|
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
|
|
|
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
|
|
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
|
|
|
result = prime * result + ((getDeleteFlag() == null) ? 0 : getDeleteFlag().hashCode());
|
|
result = prime * result + ((getDeleteFlag() == null) ? 0 : getDeleteFlag().hashCode());
|
|
@@ -240,6 +126,8 @@ public class User implements Serializable {
|
|
|
sb.append(", userName=").append(userName);
|
|
sb.append(", userName=").append(userName);
|
|
|
sb.append(", userAvatar=").append(userAvatar);
|
|
sb.append(", userAvatar=").append(userAvatar);
|
|
|
sb.append(", userRole=").append(userRole);
|
|
sb.append(", userRole=").append(userRole);
|
|
|
|
|
+ sb.append(", accessKey=").append(accessKey);
|
|
|
|
|
+ sb.append(", secretKey=").append(secretKey);
|
|
|
sb.append(", createTime=").append(createTime);
|
|
sb.append(", createTime=").append(createTime);
|
|
|
sb.append(", updateTime=").append(updateTime);
|
|
sb.append(", updateTime=").append(updateTime);
|
|
|
sb.append(", deleteFlag=").append(deleteFlag);
|
|
sb.append(", deleteFlag=").append(deleteFlag);
|