From aa3171d1ab381ed356b095a5ec346942a010a20c Mon Sep 17 00:00:00 2001 From: ziin Date: Fri, 5 Dec 2025 15:11:36 +0800 Subject: [PATCH] =?UTF-8?q?feat(system):=20=E6=96=B0=E5=A2=9E=20Web=20AI?= =?UTF-8?q?=20=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=9D=83=E9=99=90=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenantagencypackage/vo/TenantAgencyPackagePageReqVO.java | 4 ++++ .../tenantagencypackage/vo/TenantAgencyPackageRespVO.java | 4 ++++ .../tenantagencypackage/vo/TenantAgencyPackageSaveReqVO.java | 3 +++ .../controller/admin/user/vo/user/UserClientSaveReqVO.java | 3 +++ .../system/controller/admin/user/vo/user/UserRespVO.java | 3 +++ .../system/controller/admin/user/vo/user/UserSaveReqVO.java | 3 +++ .../tenantagencypackage/TenantAgencyPackageDO.java | 5 +++++ .../yudao/module/system/dal/dataobject/user/AdminUserDO.java | 3 +++ .../module/system/service/tenant/TenantServiceImpl.java | 4 ++++ 9 files changed, 32 insertions(+) diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackagePageReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackagePageReqVO.java index 515d8ed..f62954f 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackagePageReqVO.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackagePageReqVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.system.controller.admin.tenantagencypackage.vo; +import com.alibaba.excel.annotation.ExcelProperty; import lombok.*; import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; @@ -50,4 +51,7 @@ public class TenantAgencyPackagePageReqVO extends PageParam { @Schema(description = "套餐类型", example = "2") private Integer packageType; + @Schema(description = "WebAi权限 0关闭 1开启") + private Integer webAi; + } \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackageRespVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackageRespVO.java index d40b8c5..dffd552 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackageRespVO.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackageRespVO.java @@ -63,4 +63,8 @@ public class TenantAgencyPackageRespVO { @Schema(description = "Ai自动回复权限 0关闭 1 开启") @ExcelProperty("Ai 自动回复权限 0关闭 1开启") private Integer aiReplay; + + @Schema(description = "WebAi权限 0关闭 1开启") + @ExcelProperty("WebAi权限 0关闭 1开启") + private Integer webAi; } \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackageSaveReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackageSaveReqVO.java index 6ad445f..c124bac 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackageSaveReqVO.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenantagencypackage/vo/TenantAgencyPackageSaveReqVO.java @@ -49,4 +49,7 @@ public class TenantAgencyPackageSaveReqVO { @Schema(description = "Ai自动回复权限 0关闭 1 开启") private Integer aiReplay; + + @Schema(description = "WebAi权限 0关闭 1开启") + private Integer webAi; } \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserClientSaveReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserClientSaveReqVO.java index e0d5e7e..bbb4fdd 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserClientSaveReqVO.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserClientSaveReqVO.java @@ -36,4 +36,7 @@ public class UserClientSaveReqVO { @Schema(description = "是否允许使用 AI 回复", example = "0不允许，1允许") private Byte aiReplay; + + @Schema(description = "是否允许登录 Web AI 客户端", example = "0不允许，1允许") + private Byte webAi; } diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java index 4f4cffd..3745302 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java @@ -83,4 +83,7 @@ public class UserRespVO{ @Schema(description = "是否允许使用 AI 回复", example = "0不允许，1允许") private Byte aiReplay; + + @Schema(description = "是否允许登录 Web AI 客户端", example = "0不允许，1允许") + private Byte webAi; } diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java index be7689b..091525e 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSaveReqVO.java @@ -91,4 +91,7 @@ public class UserSaveReqVO { @Schema(description = "是否允许使用 AI 回复", example = "0不允许，1允许") private Byte aiReplay; + + @Schema(description = "是否允许登录 Web AI 客户端", example = "0不允许，1允许") + private Byte webAi; } diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenantagencypackage/TenantAgencyPackageDO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenantagencypackage/TenantAgencyPackageDO.java index 8b39f38..1a4b31c 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenantagencypackage/TenantAgencyPackageDO.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/tenantagencypackage/TenantAgencyPackageDO.java @@ -78,4 +78,9 @@ public class TenantAgencyPackageDO extends BaseDO { * Ai自动回复权限 0关闭 1开启 */ private Integer aiReplay; + + /** + * WebAi权限 0关闭 1开启 + */ + private Integer webAi; } \ No newline at end of file diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java index b0a20c7..08cb237 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/user/AdminUserDO.java @@ -108,4 +108,7 @@ public class AdminUserDO extends TenantBaseDO { @Schema(description = "是否允许使用AI回复", example = "0不允许，1允许") private Byte aiReplay; + + @Schema(description = "是否允许登录Web AI客户端", example = "0不允许，1允许") + private Byte webAi; } diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java index e6d202f..69a7877 100755 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java @@ -257,6 +257,7 @@ public class TenantServiceImpl implements TenantService { if (tenantAgencyPackageDO.getAiClient() == 1){ tenant.setAiExpireTime(offset); } + if(tenantAgencyPackageDO.getBrotherClient() == 2){} // 设置新租户的级别为当前租户级别+1（层级关系） if (createReqVO.getTenantType().equals(TenantEnum.AGENCY.getTenantType())){ tenant.setTenantLevel(currentTenant.getTenantLevel() + 1); @@ -302,6 +303,9 @@ public class TenantServiceImpl implements TenantService { if (tenantAgencyPackageDO.getAiReplay() == 1){ user.setAiReplay((byte) 1); } + if (tenantAgencyPackageDO.getWebAi() == 1){ + user.setWebAi((byte) 1); + } userMapper.updateById(user); // 将创建的用户设置为租户的联系人（管理员） tenantMapper.updateById(new TenantDO().setId(tenant.getId()).setContactUserId(userId));