From 977a3e775259ff9bd95e8678af3d6380069eccba Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: Tue, 7 Feb 2023 19:41:55 +0800 Subject: [PATCH] =?UTF-8?q?add=20TenantEntity=20=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E5=9F=BA=E7=B1=BB=20;=20update=20domain=20=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB=E7=BB=A7=E6=89=BF=20(=E9=83=A8=E5=88=86)=20;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/core/domain/TenantEntity.java | 20 +++++++++++++++++++ .../com/ruoyi/system/domain/SysNotice.java | 4 ++-- .../com/ruoyi/system/domain/SysOperLog.java | 5 +++++ .../java/com/ruoyi/system/domain/SysOss.java | 4 ++-- .../com/ruoyi/system/domain/SysOssConfig.java | 4 ++-- .../java/com/ruoyi/system/domain/SysPost.java | 4 ++-- .../java/com/ruoyi/system/domain/SysRole.java | 4 ++-- .../java/com/ruoyi/system/domain/SysUser.java | 4 ++-- .../ruoyi/system/domain/bo/SysNoticeBo.java | 4 ++-- .../com/ruoyi/system/domain/bo/SysOssBo.java | 4 ++-- .../system/domain/bo/SysOssConfigBo.java | 4 ++-- .../com/ruoyi/system/domain/bo/SysPostBo.java | 4 ++-- .../com/ruoyi/system/domain/bo/SysRoleBo.java | 4 ++-- .../com/ruoyi/system/domain/bo/SysUserBo.java | 4 ++-- 14 files changed, 49 insertions(+), 24 deletions(-) create mode 100644 ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/domain/TenantEntity.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/domain/TenantEntity.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/domain/TenantEntity.java new file mode 100644 index 000000000..50681efef --- /dev/null +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/domain/TenantEntity.java @@ -0,0 +1,20 @@ +package com.ruoyi.common.mybatis.core.domain; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 租户基类 + * + * @author Michelle.Chung + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TenantEntity extends BaseEntity { + + /** + * 租户编号 + */ + private String tenantId = "000000"; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java index 21fba9f0b..a6a7128c7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -2,7 +2,7 @@ package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.common.mybatis.core.domain.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys_notice") -public class SysNotice extends BaseEntity { +public class SysNotice extends TenantEntity { /** * 公告ID diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java index 0486569ef..354a7662c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java @@ -36,6 +36,11 @@ public class SysOperLog implements Serializable { @TableId(value = "oper_id") private Long operId; + /** + * 租户编号 + */ + private String tenantId; + /** * 操作模块 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java index 31104a5c0..e396d1203 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java @@ -2,7 +2,7 @@ package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.common.mybatis.core.domain.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys_oss") -public class SysOss extends BaseEntity { +public class SysOss extends TenantEntity { /** * 对象存储主键 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java index 36b8293bd..5e8dacf21 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java @@ -2,7 +2,7 @@ package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.common.mybatis.core.domain.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys_oss_config") -public class SysOssConfig extends BaseEntity { +public class SysOssConfig extends TenantEntity { /** * 主建 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index 01c2ea4cd..0d074b724 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -2,7 +2,7 @@ package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.common.mybatis.core.domain.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys_post") -public class SysPost extends BaseEntity { +public class SysPost extends TenantEntity { /** * 岗位序号 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java index 1c9a0b1f4..3a1d83a73 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java @@ -3,7 +3,7 @@ package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.common.mybatis.core.domain.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -18,7 +18,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName("sys_role") -public class SysRole extends BaseEntity { +public class SysRole extends TenantEntity { /** * 角色ID diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java index 0338b376d..c48030e17 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java @@ -2,7 +2,7 @@ package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.*; import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.common.mybatis.core.domain.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -19,7 +19,7 @@ import java.util.Date; @NoArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName("sys_user") -public class SysUser extends BaseEntity { +public class SysUser extends TenantEntity { /** * 用户ID diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysNoticeBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysNoticeBo.java index 0b8c88e86..09d9288b9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysNoticeBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysNoticeBo.java @@ -3,7 +3,7 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.xss.Xss; -import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.common.mybatis.core.domain.TenantEntity; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; @@ -18,7 +18,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) -public class SysNoticeBo extends BaseEntity { +public class SysNoticeBo extends TenantEntity { /** * 公告ID diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java index b0e49ffe1..a400535c9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java @@ -1,6 +1,6 @@ package com.ruoyi.system.domain.bo; -import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.common.mybatis.core.domain.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = true) -public class SysOssBo extends BaseEntity { +public class SysOssBo extends TenantEntity { /** * ossId diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java index 50886f3c4..75e2f3f1a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java @@ -2,7 +2,7 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.common.mybatis.core.domain.TenantEntity; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; @@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) -public class SysOssConfigBo extends BaseEntity { +public class SysOssConfigBo extends TenantEntity { /** * 主建 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysPostBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysPostBo.java index f0f96ad92..05708fe2c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysPostBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysPostBo.java @@ -2,7 +2,7 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.common.mybatis.core.domain.TenantEntity; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; @@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) -public class SysPostBo extends BaseEntity { +public class SysPostBo extends TenantEntity { /** * 岗位ID diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysRoleBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysRoleBo.java index 7ca4ab654..2ce749884 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysRoleBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysRoleBo.java @@ -3,7 +3,7 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.common.mybatis.core.domain.TenantEntity; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; @@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class SysRoleBo extends BaseEntity { +public class SysRoleBo extends TenantEntity { /** * 角色ID diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java index cd9dd4007..e967aa261 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java @@ -2,7 +2,7 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.xss.Xss; -import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.common.mybatis.core.domain.TenantEntity; import com.ruoyi.common.sensitive.annotation.Sensitive; import com.ruoyi.common.sensitive.core.SensitiveStrategy; import jakarta.validation.constraints.Email; @@ -23,7 +23,7 @@ import java.util.Date; @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class SysUserBo extends BaseEntity { +public class SysUserBo extends TenantEntity { /** * 用户ID