From 649f9ca6eda5ee9232b4f7efcfdee94e3f12264b Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 14 Jul 2023 09:38:19 +0800 Subject: [PATCH] add --- .../qiaoba/api/tenant/entity/SysTenant.java | 19 ++++++++++++++----- .../impl/SysTenantDatasourceServiceImpl.java | 8 +------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/SysTenant.java b/qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/SysTenant.java index 9f6eef2..369a1a8 100644 --- a/qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/SysTenant.java +++ b/qiaoba-api/qiaoba-api-tenant/src/main/java/com/qiaoba/api/tenant/entity/SysTenant.java @@ -6,12 +6,13 @@ import com.qiaoba.common.base.entity.BaseEntity; import com.qiaoba.common.base.validate.AddGroup; import com.qiaoba.common.base.validate.EditGroup; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import java.util.Date; /** @@ -30,32 +31,39 @@ public class SysTenant extends BaseEntity { private static final long serialVersionUID = 1L; @TableId - @NotNull(message = "id不能为空", groups = {EditGroup.class}) + @NotNull(message = "ID不能为空", groups = {EditGroup.class}) private String tenantId; - @NotBlank(message = "企业名称不能为空", groups = {AddGroup.class, EditGroup.class}) @Schema(description = "企业名称") + @NotBlank(message = "企业名称不能为空", groups = {AddGroup.class, EditGroup.class}) + @Size(max = 30, message = "企业名称不能超过{max}个字符", groups = {AddGroup.class, EditGroup.class}) private String companyName; @Schema(description = "联系人") + @Size(max = 30, message = "联系人不能超过{max}个字符", groups = {AddGroup.class, EditGroup.class}) private String contactName; @Schema(description = "联系电话") + @Size(max = 30, message = "联系电话不能超过{max}个字符", groups = {AddGroup.class, EditGroup.class}) private String contactPhone; @Schema(description = "地址") + @Size(max = 30, message = "地址不能超过{max}个字符", groups = {AddGroup.class, EditGroup.class}) private String address; @Schema(description = "企业简介") + @Size(max = 30, message = "企业简介不能超过{max}个字符", groups = {AddGroup.class, EditGroup.class}) private String profile; @Schema(description = "统一社会信用代码") + @Size(max = 20, message = "企业简介不能超过{max}个字符", groups = {AddGroup.class, EditGroup.class}) private String licenseNumber; @Schema(description = "域名") private String domain; @Schema(description = "备注") + @Size(max = 20, message = "备注不能超过{max}个字符", groups = {AddGroup.class, EditGroup.class}) private String remark; @NotNull(message = "过期时间不能为空", groups = {AddGroup.class, EditGroup.class}) @@ -66,8 +74,9 @@ public class SysTenant extends BaseEntity { @Schema(description = "用户数量") private Long accountCount; - @NotNull(message = "状态不能为空", groups = {AddGroup.class, EditGroup.class}) @Schema(description = "状态") + @NotNull(message = "状态不能为空", groups = {EditGroup.class}) + @Size(max = 1, message = "状态不能超过{max}个字符", groups = {EditGroup.class}) private String status; private String mode; diff --git a/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantDatasourceServiceImpl.java b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantDatasourceServiceImpl.java index 716f827..3d7c531 100644 --- a/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantDatasourceServiceImpl.java +++ b/qiaoba-module/qiaoba-module-tenant/src/main/java/com/qiaoba/module/tenant/service/impl/SysTenantDatasourceServiceImpl.java @@ -12,7 +12,6 @@ import com.qiaoba.common.base.constant.BaseConstant; import com.qiaoba.common.base.enums.BaseEnum; import com.qiaoba.common.base.enums.DataBaseEnum; import com.qiaoba.common.base.exception.ServiceException; -import com.qiaoba.common.database.config.DynamicDataSourceConfig; import com.qiaoba.common.database.context.BackupDatasourceContext; import com.qiaoba.common.database.context.PrimaryDatasourceContext; import com.qiaoba.common.database.entity.DynamicDataSource; @@ -136,10 +135,10 @@ public class SysTenantDatasourceServiceImpl implements SysTenantDatasourceServic int result = updateById(datasource); // 刷新PrimaryDatasourceMap if (result > BaseConstant.HANDLE_ERROR) { + Object oldDataSource = PrimaryDatasourceContext.get(tenantId); // 更新新得数据源为租户主要数据源 DatasourceUtil.changePrimaryDatasource(tenantId, dataSource); // 将老的租户数据源设置为备用 - Object oldDataSource = PrimaryDatasourceContext.get(tenantId); if (Objects.nonNull(oldDataSource)) { DruidDataSource druidDataSource = ((DruidDataSource) oldDataSource); String ip = DataBaseEnum.getIp(druidDataSource.getUrl(), druidDataSource.getDriverClassName()); @@ -153,11 +152,6 @@ public class SysTenantDatasourceServiceImpl implements SysTenantDatasourceServic return result; } - public int test(String tenantId, String datasourceId) { - List dataSources = BackupDatasourceContext.get(tenantId); - return 0; - } - @Override public DynamicDataSource transform(SysTenantDatasource datasource) { DynamicDataSource dynamicDataSource = BeanUtil.copyProperties(datasource, DynamicDataSource.class);