BaseTenantDTO

server-common/src/main/java/com/makeit/common/dto/BaseTenantIdDTO.java → server-common/src/main/java/com/makeit/common/dto/BaseTenantDTO.java

@@ -10,16 +10,16 @@ import lombok.experimental.FieldNameConstants;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 
 
-@ApiModel("厂别dto")
+@ApiModel("租户dto")
 @FieldNameConstants
 @FieldNameConstants
 @Data
 @Data
 @AllArgsConstructor
 @AllArgsConstructor
 @NoArgsConstructor
 @NoArgsConstructor
 //@Builder
 //@Builder
-public class BaseTenantIdDTO extends BaseIdDTO implements Serializable {
+public class BaseTenantDTO extends BaseIdDTO implements Serializable {
 
 
     @ExcelIgnore
     @ExcelIgnore
-    @ApiModelProperty(value = "厂别id", required = true)
+    @ApiModelProperty(value = "租户id", required = true)
     private String tenantId;
     private String tenantId;
 
 
 }
 }

server-common/src/main/java/com/makeit/module/admin/dto/SysDeptQueryDTO.java

 package com.makeit.module.admin.dto;
 package com.makeit.module.admin.dto;
 
 
-import com.makeit.common.dto.BaseTenantIdDTO;
+import com.makeit.common.dto.BaseTenantDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 @ApiModel("部门 查询")
 @ApiModel("部门 查询")
 @Data
 @Data
-public class SysDeptQueryDTO extends BaseTenantIdDTO {
+public class SysDeptQueryDTO extends BaseTenantDTO {
 
 
     @ApiModelProperty(value = "名称")
     @ApiModelProperty(value = "名称")
     private String name;
     private String name;

server-common/src/main/java/com/makeit/module/admin/dto/SysRoleDTOVO.java

 package com.makeit.module.admin.dto;
 package com.makeit.module.admin.dto;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.makeit.common.dto.BaseTenantIdDTO;
+import com.makeit.common.dto.BaseTenantDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
@@ -15,7 +15,7 @@ import java.util.List;
 
 
 @ApiModel("角色 列表 新增 编辑 详情")
 @ApiModel("角色 列表 新增 编辑 详情")
 @Data
 @Data
-public class SysRoleDTOVO extends BaseTenantIdDTO implements Serializable {
+public class SysRoleDTOVO extends BaseTenantDTO implements Serializable {
 
 
     @NotBlank(message = "名称不能为空")
     @NotBlank(message = "名称不能为空")
     @Size(max = 64, message = "名称最长为64字符")
     @Size(max = 64, message = "名称最长为64字符")

server-common/src/main/java/com/makeit/module/admin/dto/SysRoleMenuDTO.java

 package com.makeit.module.admin.dto;
 package com.makeit.module.admin.dto;
 
 
-import com.makeit.common.dto.BaseTenantIdDTO;
+import com.makeit.common.dto.BaseTenantDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
@@ -11,7 +11,7 @@ import java.util.List;
 
 
 @ApiModel("角色分配菜单")
 @ApiModel("角色分配菜单")
 @Data
 @Data
-public class SysRoleMenuDTO extends BaseTenantIdDTO implements Serializable {
+public class SysRoleMenuDTO extends BaseTenantDTO implements Serializable {
 
 
 //    @ApiModelProperty(value = "菜单id")
 //    @ApiModelProperty(value = "菜单id")
 //    private String menuId;
 //    private String menuId;

server-common/src/main/java/com/makeit/module/admin/dto/SysUserRoleDTO.java

 package com.makeit.module.admin.dto;
 package com.makeit.module.admin.dto;
 
 
-import com.makeit.common.dto.BaseTenantIdDTO;
+import com.makeit.common.dto.BaseTenantDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
@@ -9,7 +9,7 @@ import java.io.Serializable;
 
 
 @ApiModel("角色分配用户")
 @ApiModel("角色分配用户")
 @Data
 @Data
-public class SysUserRoleDTO extends BaseTenantIdDTO implements Serializable {
+public class SysUserRoleDTO extends BaseTenantDTO implements Serializable {
     @ApiModelProperty(value = "用户id")
     @ApiModelProperty(value = "用户id")
     private String userId;
     private String userId;
 
 

server-common/src/main/java/com/makeit/module/system/dto/SysConfigCategoryDTOVO.java

 package com.makeit.module.system.dto;
 package com.makeit.module.system.dto;
 
 
-import com.makeit.common.dto.BaseTenantIdDTO;
+import com.makeit.common.dto.BaseTenantDTO;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 @Data
 @Data
-public class SysConfigCategoryDTOVO extends BaseTenantIdDTO {
+public class SysConfigCategoryDTOVO extends BaseTenantDTO {
     @ApiModelProperty("编码")
     @ApiModelProperty("编码")
     private String code;
     private String code;
 
 

server-common/src/main/java/com/makeit/utils/sql/WrapperUtil.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.makeit.common.dto.BaseTenantIdDTO;
+import com.makeit.common.dto.BaseTenantDTO;
 import com.makeit.common.entity.BaseBusEntity;
 import com.makeit.common.entity.BaseBusEntity;
 import com.makeit.global.aspect.tenant.TenantIdUtil;
 import com.makeit.global.aspect.tenant.TenantIdUtil;
 
 
@@ -30,7 +30,7 @@ public class WrapperUtil {
         return lambdaQueryWrapper;
         return lambdaQueryWrapper;
     }
     }
 
 
-    public static <T extends BaseBusEntity> LambdaQueryWrapper<T> withTenantId(BaseTenantIdDTO baseFactoryDTO, Class<T> clazz) {
+    public static <T extends BaseBusEntity> LambdaQueryWrapper<T> withTenantId(BaseTenantDTO baseFactoryDTO, Class<T> clazz) {
         LambdaQueryWrapper<T> lambdaQueryWrapper = new LambdaQueryWrapper<>(clazz);
         LambdaQueryWrapper<T> lambdaQueryWrapper = new LambdaQueryWrapper<>(clazz);
         lambdaQueryWrapper.eq(BaseBusEntity::getTenantId, baseFactoryDTO.getTenantId());
         lambdaQueryWrapper.eq(BaseBusEntity::getTenantId, baseFactoryDTO.getTenantId());
         return lambdaQueryWrapper;
         return lambdaQueryWrapper;

server-common/src/main/java/com/makeit/utils/user/tenant/SysUserVO.java

 package com.makeit.utils.user.tenant;
 package com.makeit.utils.user.tenant;
 
 
-import com.makeit.common.dto.BaseTenantIdDTO;
+import com.makeit.common.dto.BaseTenantDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 @ApiModel("厂别用户vo")
 @ApiModel("厂别用户vo")
 @Data
 @Data
-public class SysUserVO extends BaseTenantIdDTO {
+public class SysUserVO extends BaseTenantDTO {
 
 
     @ApiModelProperty(value = "姓名")
     @ApiModelProperty(value = "姓名")
     private String name;
     private String name;