ziin/vvDataAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(tenant-package): 精简代理套餐VO并调整枚举值

Browse Source 
- 去除AgencyTenantPackageSimpleRespVO的冗余校验注解
- 调整PackageTypeEnum代理类型数值199→999
- 精简列表接口返回TenantAgencyPackageDO并补充packageType、price字段
- 同步更新Service与Controller类型与调用链
This commit is contained in:
ziin
2025-11-28 14:27:39 +08:00
parent 7cda6e8781
commit cece05fd1f
8 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantPackageController.java
View File

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.*;
import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO;
import cn.iocoder.yudao.module.system.dal.dataobject.tenantagencypackage.TenantAgencyPackageDO;
import cn.iocoder.yudao.module.system.service.tenant.TenantPackageService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
@@ -73,7 +74,7 @@ public class TenantPackageController {
@GetMapping({"/get-simple-list", "simple-list"})
@Operation(summary = "获取租户套餐精简信息列表", description = "只包含被开启的租户套餐，主要用于前端的下拉选项")
public CommonResult<List<TenantPackageSimpleRespVO>> getTenantPackageList() {
List<TenantPackageDO> list = tenantPackageService.getTenantPackageListByStatus(CommonStatusEnum.ENABLE.getStatus());
List<TenantAgencyPackageDO> list = tenantPackageService.getTenantPackageListByStatus(CommonStatusEnum.ENABLE.getStatus());
return success(BeanUtils.toBean(list, TenantPackageSimpleRespVO.class));
}

3
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackageSimpleRespVO.java
View File

@@ -17,4 +17,7 @@ public class TenantPackageSimpleRespVO {
@NotNull(message = "套餐名不能为空")
private String name;
private Integer packageType;
private Integer price;
}

14
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/AgencyTenantPackageSimpleRespVO.java
View File

@@ -9,15 +9,15 @@ import javax.validation.constraints.NotNull;
@Data
public class AgencyTenantPackageSimpleRespVO {
@Schema(description = "套餐编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotNull(message = "套餐编号不能为空")
@Schema(description = "套餐编号", example = "1024")
private Long id;
@Schema(description = "套餐名", requiredMode = Schema.RequiredMode.REQUIRED, example = "VIP")
@NotNull(message = "套餐名不能为空")
@Schema(description = "套餐名", example = "VIP")
private String name;
@Schema(description = "Ai自动回复权限 0关闭 1 开启", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "Ai自动回复权限不能为空")
private Integer aiReplay;
@Schema(description = "Ai自动回复权限 0关闭 1 开启", example = "1")
private Integer packageType;
@Schema(description = "套餐价格", example = "1000")
private Integer price;
}

2
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/enums/agencyTenantPackage/PackageTypeEnum.java
View File

@@ -14,7 +14,7 @@ public enum PackageTypeEnum {
CRAWL(1, "爬虫"),
BROTHER_CRAWL(2, "兄弟爬虫"),
TEST(99, "测试账户"),
AGENCY(199, "代理");
AGENCY(999, "代理");
private final Integer value;
private final String name;

3
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageService.java
View File

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackagePageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.tenant.vo.packages.TenantPackageSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.tenant.TenantPackageDO;
import cn.iocoder.yudao.module.system.dal.dataobject.tenantagencypackage.TenantAgencyPackageDO;
import javax.validation.Valid;
import java.util.List;
@@ -67,6 +68,6 @@ public interface TenantPackageService {
* @param status 状态
* @return 租户套餐
*/
List<TenantPackageDO> getTenantPackageListByStatus(Integer status);
List<TenantAgencyPackageDO> getTenantPackageListByStatus(Integer status);
}

9
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImpl.java
View File

@@ -121,13 +121,14 @@ public class TenantPackageServiceImpl implements TenantPackageService {
}
@Override
public List<TenantPackageDO> getTenantPackageListByStatus(Integer status) {
public List<TenantAgencyPackageDO> getTenantPackageListByStatus(Integer status) {
Long tenantId = TenantContextHolder.getTenantId();
if (tenantId != 1) {
List<TenantAgencyPackageDO> tenantAgencyPackageDOS = tenantAgencyPackageMapper.selectListByStatus(status);
return BeanUtils.toBean(tenantAgencyPackageDOS, TenantPackageDO.class);
return tenantAgencyPackageMapper.selectListByStatus(status);
}
return tenantPackageMapper.selectListByStatus(status);
List<TenantPackageDO> tenantPackageDOS = tenantPackageMapper.selectListByStatus(status);
return BeanUtils.toBean(tenantPackageDOS, TenantAgencyPackageDO.class);
}

3
yudao-server/src/main/resources/application-dev.yaml
View File

@@ -7,6 +7,9 @@ spring:
autoconfigure:
exclude:
- com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 禁用 AI 模块的 Milvus，手动创建
- de.codecentric.boot.admin.server.config.AdminServerAutoConfiguration # 禁用 Spring Boot Admin 的 Server 的自动配置
- de.codecentric.boot.admin.server.ui.config.AdminServerUiAutoConfiguration # 禁用 Spring Boot Admin 的 Server UI 的自动配置
- de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration # 禁用 Spring Boot Admin 的 Client 的自动配置
# 数据源配置项
datasource:

2
yudao-server/src/main/resources/application-local.yaml
View File

@@ -12,7 +12,7 @@ spring:
- de.codecentric.boot.admin.server.ui.config.AdminServerUiAutoConfiguration # 禁用 Spring Boot Admin 的 Server UI 的自动配置
- de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration # 禁用 Spring Boot Admin 的 Client 的自动配置
- org.springframework.ai.autoconfigure.vectorstore.qdrant.QdrantVectorStoreAutoConfiguration # 禁用 AI 模块的 Qdrant，手动创建
- org.springframework.ai.autoconfigure.vectorstore.milvus.MilvusVectorStoreAutoConfiguration # 禁用 AI 模块的 Milvus，手动创建
- org.springframework.ai.autoconfigure.vectorstore.milvus.MilvusVectorStoreAutoConfiguration # 禁用 AI 模tenant-agency-package/get-simple-list块的 Milvus，手动创建
# 数据源配置项
datasource:
druid: # Druid 【监控】相关的全局配置