From f26e3302ac122f4555fabbc4f216f625ddceb767 Mon Sep 17 00:00:00 2001 From: suhailong <3528551583@qq.com> Date: Mon, 16 Jan 2023 14:54:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A8=A1=E5=9D=97(=E8=8B=8F?= =?UTF-8?q?=E6=B5=B7=E9=BE=99)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bwie/ruoyi/pojo/TbPerm.java | 58 ------------- .../java/com/bwie/ruoyi/pojo/TbRolePerm.java | 58 ------------- .../java/com/bwie/ruoyi/pojo/TbUserRole.java | 63 --------------- .../java/com/bwie/user/domain/TbPerm.java | 81 +++++++++++++++++++ .../java/com/bwie/user/domain/TbRolePerm.java | 81 +++++++++++++++++++ .../java/com/bwie/user/domain/TbUserRole.java | 69 ++++++++++++++++ 6 files changed, 231 insertions(+), 179 deletions(-) delete mode 100644 ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbPerm.java delete mode 100644 ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbRolePerm.java delete mode 100644 ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbUserRole.java create mode 100644 ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbPerm.java create mode 100644 ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbRolePerm.java create mode 100644 ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbUserRole.java diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbPerm.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbPerm.java deleted file mode 100644 index 98b151ed..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbPerm.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.bwie.ruoyi.pojo; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -/** - * 权限表 - * @TableName tb_perm - */ -@TableName(value ="tb_perm") -@Data -public class TbPerm implements Serializable { - /** - * - */ - @TableId(type = IdType.AUTO) - private Integer permId; - - /** - * 权限名称 - */ - private String permName; - - /** - * 权限编码 - */ - private String permCode; - - /** - * 删除状态0：未删除1：已删除 - */ - private Integer deleted; - - /** - * 创建时间 - */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date createTime; - - /** - * 更新时间 - */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date updateTime; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbRolePerm.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbRolePerm.java deleted file mode 100644 index 47ac169b..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbRolePerm.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.bwie.ruoyi.pojo; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -/** - * 角色权限表 - * @TableName tb_role_perm - */ -@TableName(value ="tb_role_perm") -@Data -public class TbRolePerm implements Serializable { - /** - * - */ - @TableId(type = IdType.AUTO) - private Integer rolePermId; - - /** - * 角色ID - */ - private Integer roleId; - - /** - * 权限ID - */ - private Integer permId; - - /** - * 删除状态0：未删除1：已删除 - */ - private Integer deleted; - - /** - * 创建时间 - */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date createTime; - - /** - * 更新时间 - */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date updateTime; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbUserRole.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbUserRole.java deleted file mode 100644 index 44293573..00000000 --- a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/ruoyi/pojo/TbUserRole.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.bwie.ruoyi.pojo; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -/** - * 用户类型表 - * @TableName tb_user_role - */ -@TableName(value ="tb_user_role") -@Data -public class TbUserRole implements Serializable { - /** - * 类型ID - */ - @TableId(type = IdType.AUTO) - private Long userRoleId; - - /** - * 用户角色类型 - */ - private String userRoleName; - - /** - * 创建者 - */ - private String createBy; - - /** - * 创建时间 - */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date createTime; - - /** - * 更新者 - */ - private String updateBy; - - /** - * 更新时间 - */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date updateTime; - - /** - * 用户角色有哪些功能 - */ - private String roleFunction; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; -} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbPerm.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbPerm.java new file mode 100644 index 00000000..55f771b5 --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbPerm.java @@ -0,0 +1,81 @@ +package com.bwie.user.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 权限对象 tb_perm + * + * @author ruoyi + * @date 2023-01-15 + */ +public class TbPerm extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long permId; + + /** 权限名称 */ + @Excel(name = "权限名称") + private String permName; + + /** 权限编码 */ + @Excel(name = "权限编码") + private String permCode; + + /** 删除状态0：未删除1：已删除 */ + @Excel(name = "删除状态0：未删除1：已删除") + private Integer deleted; + + public void setPermId(Long permId) + { + this.permId = permId; + } + + public Long getPermId() + { + return permId; + } + public void setPermName(String permName) + { + this.permName = permName; + } + + public String getPermName() + { + return permName; + } + public void setPermCode(String permCode) + { + this.permCode = permCode; + } + + public String getPermCode() + { + return permCode; + } + public void setDeleted(Integer deleted) + { + this.deleted = deleted; + } + + public Integer getDeleted() + { + return deleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("permId", getPermId()) + .append("permName", getPermName()) + .append("permCode", getPermCode()) + .append("deleted", getDeleted()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbRolePerm.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbRolePerm.java new file mode 100644 index 00000000..38b97c1b --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbRolePerm.java @@ -0,0 +1,81 @@ +package com.bwie.user.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 角色权限对象 tb_role_perm + * + * @author xs + * @date 2023-01-15 + */ +public class TbRolePerm extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 角色权限id */ + private Long rolePermId; + + /** 角色ID */ + @Excel(name = "角色ID") + private Long roleId; + + /** 权限ID */ + @Excel(name = "权限ID") + private Long permId; + + /** 删除状态0：未删除1：已删除 */ + @Excel(name = "删除状态0：未删除1：已删除") + private Integer deleted; + + public void setRolePermId(Long rolePermId) + { + this.rolePermId = rolePermId; + } + + public Long getRolePermId() + { + return rolePermId; + } + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + public Long getRoleId() + { + return roleId; + } + public void setPermId(Long permId) + { + this.permId = permId; + } + + public Long getPermId() + { + return permId; + } + public void setDeleted(Integer deleted) + { + this.deleted = deleted; + } + + public Integer getDeleted() + { + return deleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("rolePermId", getRolePermId()) + .append("roleId", getRoleId()) + .append("permId", getPermId()) + .append("deleted", getDeleted()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbUserRole.java b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbUserRole.java new file mode 100644 index 00000000..7745c8ca --- /dev/null +++ b/ruoyi-modules/ruoyi-user/src/main/java/com/bwie/user/domain/TbUserRole.java @@ -0,0 +1,69 @@ +package com.bwie.user.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 用户类型对象 tb_user_role + * + * @author xs + * @date 2023-01-15 + */ +public class TbUserRole extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 类型ID */ + private Long userRoleId; + + /** 用户角色类型 */ + @Excel(name = "用户角色类型") + private String userRoleName; + + /** 用户角色有哪些功能 */ + @Excel(name = "用户角色有哪些功能") + private String roleFunction; + + public void setUserRoleId(Long userRoleId) + { + this.userRoleId = userRoleId; + } + + public Long getUserRoleId() + { + return userRoleId; + } + public void setUserRoleName(String userRoleName) + { + this.userRoleName = userRoleName; + } + + public String getUserRoleName() + { + return userRoleName; + } + public void setRoleFunction(String roleFunction) + { + this.roleFunction = roleFunction; + } + + public String getRoleFunction() + { + return roleFunction; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("userRoleId", getUserRoleId()) + .append("userRoleName", getUserRoleName()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("roleFunction", getRoleFunction()) + .toString(); + } +}