From 808da93f110780541cc98da7789fac31b9fbf3fb Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 5 Nov 2019 15:45:17 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=9B=86=E5=9B=A2=E7=89=88][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E9=9B=86=E5=9B=A2=E7=89=88=E9=A2=84=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxBusiness.java | 4 +- .../domain/po/base/BaseTenantEntity.java | 6 +++ .../domain/po/base/TenantVEntity.java | 37 +++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java index e222d5dc2..185c9cee2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java @@ -2,7 +2,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseTenantEntity; +import com.iformall.domain.po.base.TenantVEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,7 +11,7 @@ import java.util.Date; @TableName(value = "wx_business") @Data @EqualsAndHashCode(callSuper = true) -public class WxBusiness extends BaseTenantEntity { +public class WxBusiness extends TenantVEntity { protected Integer id; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java index 10ec35f31..cdc4e68f1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java @@ -1,5 +1,7 @@ package com.iformall.domain.po.base; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,6 +15,10 @@ public class BaseTenantEntity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; + @TableField(exist = false) + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private TenantEntity tenantInfo; + public void updateTenantInfo(TenantEntity info) { setTenantId(info.getTenantId()); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java new file mode 100644 index 000000000..26c8f7f60 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java @@ -0,0 +1,37 @@ +package com.iformall.domain.po.base; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author Stormeye + * @date 2019/4/24 14:32 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class TenantVEntity extends BaseEntity { + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; + + @TableField(exist = false) + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + private TenantEntity tenantInfo; + + public void updateTenantInfo(TenantEntity info) { + setTenantId(info.getTenantId()); + } + + public void updateTenantInfo(TenantVEntity info) { + setTenantId(info.getTenantId()); + } + + public TenantEntity getTenantInfo() { + return new TenantEntity() {{ + setTenantId(tenantId); + }}; + } +}