✨ Introducing new features. @TenantTable 注解

pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleCategoryEntity.java

@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.app.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
  * @date 2023-06-07 16:28:03
  */
 @Data
+@TenantTable
 @TableName("app_article_category")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "文章分类表")

pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleCollectEntity.java

@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.app.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
  * @date 2023-06-16 14:33:41
  */
 @Data
+@TenantTable
 @TableName("app_article_collect")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "文章收藏表")

pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppArticleEntity.java

@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.app.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -16,6 +17,7 @@ import java.time.LocalDateTime;
  * @date 2023-06-07 16:32:35
  */
 @Data
+@TenantTable
 @FieldNameConstants
 @TableName("app_article")
 @EqualsAndHashCode(callSuper = true)

pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppPageEntity.java

@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.app.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -14,6 +15,7 @@ import java.time.LocalDateTime;
  * @date 2023-06-08 11:19:23
  */
 @Data
+@TenantTable
 @TableName("app_page")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "页面")

pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppRole.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -34,6 +35,7 @@ import java.time.LocalDateTime;
  * @date 2022-12-07 09:52:03
  */
 @Data
+@TenantTable
 @TableName("app_role")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "app角色表")

pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppTabbarEntity.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonRawValue;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,6 +18,7 @@ import java.time.LocalDateTime;
  * @date 2023-06-08 11:18:46
  */
 @Data
+@TenantTable
 @TableName("app_tabbar")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "导航栏")

pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppUser.java

@@ -20,6 +20,7 @@ package com.pig4cloud.pigx.app.api.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -33,6 +34,7 @@ import java.time.LocalDateTime;
  * @date 2022-12-07 09:52:03
  */
 @Data
+@TenantTable
 @TableName("app_user")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "app用户表")

pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantTable.java

@@ -0,0 +1,15 @@
+package com.pig4cloud.pigx.common.core.util;
+
+import java.lang.annotation.*;
+
+/**
+ * @author lengleng
+ * @since v5.3
+ * <p>
+ * table 实体增加此组件自动声明为租户表
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
+public @interface TenantTable {
+}

pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java

@@ -17,12 +17,18 @@
 
 package com.pig4cloud.pigx.common.data.tenant;
 
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.NullValue;
+import org.springframework.core.annotation.AnnotationUtils;
+
+import java.util.Objects;
 
 /**
  * @author lengleng
@@ -34,54 +40,63 @@ import net.sf.jsqlparser.expression.NullValue;
 @RequiredArgsConstructor
 public class PigxTenantHandler implements TenantLineHandler {
 
-	private final PigxTenantConfigProperties properties;
+    private final PigxTenantConfigProperties properties;
 
-	/**
-	 * 获取租户 ID 值表达式，只支持单个 ID 值
-	 * <p>
-	 * @return 租户 ID 值表达式
-	 */
-	@Override
-	public Expression getTenantId() {
-		Long tenantId = TenantContextHolder.getTenantId();
-		log.debug("当前租户为 >> {}", tenantId);
+    /**
+     * 获取租户 ID 值表达式，只支持单个 ID 值
+     * <p>
+     *
+     * @return 租户 ID 值表达式
+     */
+    @Override
+    public Expression getTenantId() {
+        Long tenantId = TenantContextHolder.getTenantId();
+        log.debug("当前租户为 >> {}", tenantId);
 
-		if (tenantId == null) {
-			return new NullValue();
-		}
-		return new LongValue(tenantId);
-	}
+        if (tenantId == null) {
+            return new NullValue();
+        }
+        return new LongValue(tenantId);
+    }
 
-	/**
-	 * 获取租户字段名
-	 * @return 租户字段名
-	 */
-	@Override
-	public String getTenantIdColumn() {
-		return properties.getColumn();
-	}
+    /**
+     * 获取租户字段名
+     *
+     * @return 租户字段名
+     */
+    @Override
+    public String getTenantIdColumn() {
+        return properties.getColumn();
+    }
 
-	/**
-	 * 根据表名判断是否忽略拼接多租户条件
-	 * <p>
-	 * 默认都要进行解析并拼接多租户条件
-	 * @param tableName 表名
-	 * @return 是否忽略, true:表示忽略，false:需要解析并拼接多租户条件
-	 */
-	@Override
-	public boolean ignoreTable(String tableName) {
-		// 判断是否跳过当前查询的租户过滤
-		if (TenantContextHolder.getTenantSkip()) {
-			return Boolean.TRUE;
-		}
+    /**
+     * 根据表名判断是否忽略拼接多租户条件
+     * <p>
+     * 默认都要进行解析并拼接多租户条件
+     *
+     * @param tableName 表名
+     * @return 是否忽略, true:表示忽略，false:需要解析并拼接多租户条件
+     */
+    @Override
+    public boolean ignoreTable(String tableName) {
+        // 判断是否跳过当前查询的租户过滤
+        if (TenantContextHolder.getTenantSkip()) {
+            return Boolean.TRUE;
+        }
 
-		Long tenantId = TenantContextHolder.getTenantId();
-		// 租户中ID 为空，查询全部，不进行过滤
-		if (tenantId == null) {
-			return Boolean.TRUE;
-		}
+        Long tenantId = TenantContextHolder.getTenantId();
+        // 租户中ID 为空，查询全部，不进行过滤
+        if (tenantId == null) {
+            return Boolean.TRUE;
+        }
 
-		return !properties.getTables().contains(tableName);
-	}
+        //  判断实体类是否标记为多租户隔离
+        TableInfo tableInfo = TableInfoHelper.getTableInfo(tableName);
+        TenantTable annotation = null;
+        if (Objects.nonNull(tableInfo)) {
+            annotation = AnnotationUtils.findAnnotation(tableInfo.getEntityType(), TenantTable.class);
+        }
+        return !properties.getTables().contains(tableName) && annotation == null;
+    }
 
 }

pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/Process.java

@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -17,6 +18,7 @@ import java.time.LocalDateTime;
  */
 @Getter
 @Setter
+@TenantTable
 @Accessors(chain = true)
 @TableName("process")
 public class Process {

pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessCopy.java

@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -17,6 +18,7 @@ import java.time.LocalDateTime;
  */
 @Getter
 @Setter
+@TenantTable
 @Accessors(chain = true)
 @TableName("process_copy")
 public class ProcessCopy {

pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessGroup.java

@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -17,6 +18,7 @@ import java.time.LocalDateTime;
  */
 @Getter
 @Setter
+@TenantTable
 @Accessors(chain = true)
 @TableName("process_group")
 public class ProcessGroup {

pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessInstanceRecord.java

@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -18,6 +19,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
+@TenantTable
 @Accessors(chain = true)
 @TableName("process_instance_record")
 public class ProcessInstanceRecord {

pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessNodeData.java

@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -17,6 +18,7 @@ import java.time.LocalDateTime;
  */
 @Getter
 @Setter
+@TenantTable
 @Accessors(chain = true)
 @TableName("process_node_data")
 public class ProcessNodeData {

pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessNodeRecord.java

@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -18,6 +19,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
+@TenantTable
 @Accessors(chain = true)
 @TableName("process_node_record")
 public class ProcessNodeRecord {

pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessNodeRecordAssignUser.java

@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -17,6 +18,7 @@ import java.time.LocalDateTime;
  */
 @Getter
 @Setter
+@TenantTable
 @Accessors(chain = true)
 @TableName("process_node_record_assign_user")
 public class ProcessNodeRecordAssignUser {

pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/ProcessStarter.java

@@ -1,6 +1,7 @@
 package com.pig4cloud.pigx.flow.task.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -17,6 +18,7 @@ import java.time.LocalDateTime;
  */
 @Getter
 @Setter
+@TenantTable
 @Accessors(chain = true)
 @TableName("process_starter")
 public class ProcessStarter {

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysAuditLog.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2023-02-28 20:12:23
  */
 @Data
+@TenantTable
 @TableName("sys_audit_log")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "审计记录表")

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java

@@ -21,6 +21,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -38,6 +39,7 @@ import java.time.LocalDateTime;
  * @since 2018-01-22
  */
 @Data
+@TenantTable
 @Schema(description = "部门")
 @EqualsAndHashCode(callSuper = true)
 public class SysDept extends Model<SysDept> {

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java

@@ -18,6 +18,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -31,6 +32,7 @@ import java.time.LocalDateTime;
  * @date 2019/03/19
  */
 @Data
+@TenantTable
 @Schema(description = "字典类型")
 @EqualsAndHashCode(callSuper = true)
 public class SysDict extends Model<SysDict> {

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019/03/19
  */
 @Data
+@TenantTable
 @Schema(description = "字典项")
 @EqualsAndHashCode(callSuper = true)
 public class SysDictItem extends Model<SysDictItem> {

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-06-18 17:18:42
  */
 @Data
+@TenantTable
 @Schema(description = "文件")
 @EqualsAndHashCode(callSuper = true)
 public class SysFile extends Model<SysFile> {

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFileGroup.java

@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
  * @date 2023/7/25
  */
 @Data
+@TenantTable
 @Schema(description = "文件")
 @EqualsAndHashCode(callSuper = true)
 public class SysFileGroup extends Model<SysFile> {

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java

@@ -24,6 +24,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.*;
 import com.pig4cloud.pigx.common.core.sensitive.Sensitive;
 import com.pig4cloud.pigx.common.core.sensitive.SensitiveTypeEnum;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
@@ -40,6 +41,7 @@ import java.time.LocalDateTime;
  * @since 2017-11-20
  */
 @Data
+@TenantTable
 @Schema(description = "日志")
 public class SysLog implements Serializable {
 

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java

@@ -21,6 +21,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -38,6 +39,7 @@ import java.time.LocalDateTime;
  * @since 2017-11-08
  */
 @Data
+@TenantTable
 @Schema(description = "菜单")
 @EqualsAndHashCode(callSuper = true)
 public class SysMenu extends Model<SysMenu> {

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMessageEntity.java

@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
  * @date 2023-10-25 13:37:25
  */
 @Data
+@TenantTable
 @TableName("sys_message")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "站内信息")

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMessageRelationEntity.java

@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
  * @date 2023-10-25 18:07:23
  */
 @Data
+@TenantTable
 @TableName("sys_message_relation")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "系统消息推送记录")

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java

@@ -21,6 +21,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -37,6 +38,7 @@ import java.time.LocalDateTime;
  * @since 2018-05-15
  */
 @Data
+@TenantTable
 @Schema(description = "客户端信息")
 @EqualsAndHashCode(callSuper = true)
 public class SysOauthClientDetails extends Model<SysOauthClientDetails> {

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPost.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -34,6 +35,7 @@ import java.time.LocalDateTime;
  * @date 2022-03-26 12:50:43
  */
 @Data
+@TenantTable
 @TableName("sys_post")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "岗位信息表")

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-04-29
  */
 @Data
+@TenantTable
 @Schema(description = "公共参数")
 @EqualsAndHashCode(callSuper = true)
 public class SysPublicParam extends Model<SysPublicParam> {

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java

@@ -21,6 +21,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -38,6 +39,7 @@ import java.time.LocalDateTime;
  * @since 2017-10-29
  */
 @Data
+@TenantTable
 @Schema(description = "角色")
 @EqualsAndHashCode(callSuper = true)
 public class SysRole extends Model<SysRole> {

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysScheduleEntity.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -34,6 +35,7 @@ import java.time.LocalTime;
  * @date 2023-03-06 14:26:23
  */
 @Data
+@TenantTable
 @TableName("sys_schedule")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "日程")

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java

@@ -20,6 +20,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.pig4cloud.pigx.common.core.sensitive.Sensitive;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import com.pig4cloud.pigx.common.core.util.ValidGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -35,6 +36,7 @@ import java.time.LocalDateTime;
  * @date 2018-08-16 21:30:41
  */
 @Data
+@TenantTable
 @Schema(description = "第三方账号信息")
 @EqualsAndHashCode(callSuper = true)
 public class SysSocialDetails extends Model<SysSocialDetails> {

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java

@@ -21,6 +21,7 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.javers.core.metamodel.annotation.DiffInclude;
@@ -38,6 +39,7 @@ import java.time.LocalDateTime;
  * @since 2017-10-29
  */
 @Data
+@TenantTable
 @Schema(description = "用户")
 public class SysUser implements Serializable {
 

pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenDatasourceConf.java

@@ -18,6 +18,7 @@ package com.pig4cloud.pigx.codegen.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -30,6 +31,7 @@ import java.time.LocalDateTime;
  * @date 2019-03-31 16:00:20
  */
 @Data
+@TenantTable
 @TableName("gen_datasource_conf")
 @EqualsAndHashCode(callSuper = true)
 public class GenDatasourceConf extends Model<GenDatasourceConf> {

pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenFormConf.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.codegen.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-08-12 15:55:35
  */
 @Data
+@TenantTable
 @TableName("gen_form_conf")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "生成记录")

pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/GenTemplateEntity.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.codegen.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2023-02-21 17:15:44
  */
 @Data
+@TenantTable
 @TableName("gen_template")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "模板")

pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJob.java

@@ -22,11 +22,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -37,9 +35,11 @@ import java.time.LocalDateTime;
  */
 @Data
 @Builder
+@TenantTable
 @NoArgsConstructor
 @AllArgsConstructor
 @Schema(description = "定时任务")
+@EqualsAndHashCode(callSuper = true)
 public class SysJob extends Model<SysJob> {
 
 	private static final long serialVersionUID = 1L;

pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/entity/SysJobLog.java

@@ -22,11 +22,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
@@ -38,9 +36,11 @@ import java.time.LocalDateTime;
  */
 @Data
 @Builder
+@TenantTable
 @NoArgsConstructor
 @AllArgsConstructor
 @Schema(description = "定时任务日志")
+@EqualsAndHashCode(callSuper = true)
 public class SysJobLog extends Model<SysJobLog> {
 
 	private static final long serialVersionUID = 1L;

pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccount.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.pig4cloud.pigx.common.core.sensitive.Sensitive;
 import com.pig4cloud.pigx.common.core.sensitive.SensitiveTypeEnum;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-03-26 22:07:53
  */
 @Data
+@TenantTable
 @EqualsAndHashCode(callSuper = true)
 public class WxAccount extends Model<WxAccount> {
 

pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java

@@ -18,6 +18,7 @@ package com.pig4cloud.pigx.mp.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -30,6 +31,7 @@ import java.time.LocalDateTime;
  * @date 2019-03-26 22:08:08
  */
 @Data
+@TenantTable
 @EqualsAndHashCode(callSuper = true)
 public class WxAccountFans extends Model<WxAccountFans> {
 

pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountTag.java

@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.mp.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
  * @date 2021/12/31
  */
 @Data
+@TenantTable
 @EqualsAndHashCode(callSuper = true)
 public class WxAccountTag extends Model<WxAccount> {
 

pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxAutoReply.java

@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.mp.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
  * @date 2019-04-18 15:40:39
  */
 @Data
+@TenantTable
 @TableName("wx_auto_reply")
 @EqualsAndHashCode(callSuper = true)
 public class WxAutoReply extends Model<WxAutoReply> {

pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMpMenu.java

@@ -18,6 +18,7 @@ package com.pig4cloud.pigx.mp.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -30,6 +31,7 @@ import java.time.LocalDateTime;
  * @date 2019-03-27 20:45:18
  */
 @Data
+@TenantTable
 @EqualsAndHashCode(callSuper = true)
 public class WxMpMenu extends Model<WxMpMenu> {
 

pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/entity/WxMsg.java

@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.mp.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
  * @date 2019-05-28 16:12:10
  */
 @Data
+@TenantTable
 @TableName("wx_msg")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "微信消息")

pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayChannel.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.pay.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-05-28 23:57:58
  */
 @Data
+@TenantTable
 @TableName("pay_channel")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "渠道")

pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayGoodsOrder.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.pay.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-05-28 23:58:27
  */
 @Data
+@TenantTable
 @TableName("pay_goods_order")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "商品订单表")

pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayNotifyRecord.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.pay.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-05-28 23:57:23
  */
 @Data
+@TenantTable
 @TableName("pay_notify_record")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "异步通知记录")

pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayRefundOrder.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.pay.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-05-28 23:58:11
  */
 @Data
+@TenantTable
 @TableName("pay_refund_order")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "退款订单表")

pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/entity/PayTradeOrder.java

@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.pay.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.pig4cloud.pigx.common.core.util.TenantTable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,6 +33,7 @@ import java.time.LocalDateTime;
  * @date 2019-05-28 23:58:18
  */
 @Data
+@TenantTable
 @TableName("pay_trade_order")
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "支付订单表")