opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-19 17:58:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

代码整理

Browse Source
This commit is contained in:
Github_lizhw 2026-04-04 23:29:26 +08:00
parent 049d07812e
commit d2e857f70b
60 changed files with 597 additions and 4739 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/pom.xml
View File

@ -105,11 +105,14 @@
<groupId>org.apache.dubbo</groupId> <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-nacos-spring-boot-starter</artifactId> <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
</dependency> </dependency>
<!-- dubbo 远程调用接口 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-md-system-saas-api</artifactId> <artifactId>ruoyi-md-system-saas-api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-system-service</artifactId>
</dependency>
</dependencies> </dependencies>

105
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasApplicationController.java
View File

@ -1,105 +0,0 @@
package org.dromara.system.saas.controller.system;
import java.util.List;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.system.saas.domain.bo.SysSaasApplicationBo;
import org.dromara.system.saas.domain.vo.SysSaasApplicationVo;
import org.dromara.system.saas.service.ISysSaasApplicationService;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
/**
* 应用
*
* @author Lion Li
* @date 2024-10-14
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/saasApplication")
public class SysSaasApplicationController extends BaseController {
private final ISysSaasApplicationService sysSaasApplicationService;
/**
* 查询应用列表
*/
@SaCheckPermission("system:saasApplication:list")
@GetMapping("/list")
public TableDataInfo<SysSaasApplicationVo> list(SysSaasApplicationBo bo, PageQuery pageQuery) {
return sysSaasApplicationService.queryPageList(bo, pageQuery);
}
/**
* 导出应用列表
*/
@SaCheckPermission("system:saasApplication:export")
@Log(title = "应用", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysSaasApplicationBo bo, HttpServletResponse response) {
List<SysSaasApplicationVo> list = sysSaasApplicationService.queryList(bo);
ExcelUtil.exportExcel(list, "应用", SysSaasApplicationVo.class, response);
}
/**
* 获取应用详细信息
*
* @param applicationId 主键
*/
@SaCheckPermission("system:saasApplication:query")
@GetMapping("/{applicationId}")
public R<SysSaasApplicationVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long applicationId) {
return R.ok(sysSaasApplicationService.queryById(applicationId));
}
/**
* 新增应用
*/
@SaCheckPermission("system:saasApplication:add")
@Log(title = "应用", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysSaasApplicationBo bo) {
return toAjax(sysSaasApplicationService.insertByBo(bo));
}
/**
* 修改应用
*/
@SaCheckPermission("system:saasApplication:edit")
@Log(title = "应用", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysSaasApplicationBo bo) {
return toAjax(sysSaasApplicationService.updateByBo(bo));
}
/**
* 删除应用
*
* @param applicationIds 主键串
*/
@SaCheckPermission("system:saasApplication:remove")
@Log(title = "应用", businessType = BusinessType.DELETE)
@DeleteMapping("/{applicationIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] applicationIds) {
return toAjax(sysSaasApplicationService.deleteWithValidByIds(List.of(applicationIds), true));
}
}

137
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasConfigController.java
View File

@ -1,137 +0,0 @@
//package org.dromara.system.saas.controller.system;
//
//import cn.dev33.satoken.annotation.SaCheckPermission;
//import org.dromara.common.core.domain.R;
//import org.dromara.common.excel.utils.ExcelUtil;
//import org.dromara.common.log.annotation.Log;
//import org.dromara.common.log.enums.BusinessType;
//import org.dromara.common.mybatis.core.page.PageQuery;
//import org.dromara.common.mybatis.core.page.TableDataInfo;
//import org.dromara.common.web.core.BaseController;
//import org.dromara.system.saas.domain.bo.SysSaasConfigBo;
//import org.dromara.system.saas.domain.vo.SysSaasConfigVo;
//import org.dromara.system.saas.service.ISysSaasConfigService;
//import jakarta.servlet.http.HttpServletResponse;
//import lombok.RequiredArgsConstructor;
//import org.springframework.validation.annotation.Validated;
//import org.springframework.web.bind.annotation.*;
//
//import java.util.List;
//
///**
// * 参数配置 信息操作处理
// *
// * @author Lion Li
// */
//@Validated
//@RequiredArgsConstructor
//@RestController
//@RequestMapping("/system/saasConfig")
//public class SysSaasConfigController extends BaseController {
//
// private final ISysSaasConfigService configService;
//
// /**
// * 获取参数配置列表
// */
// @SaCheckPermission("system:config:list")
// @GetMapping("/list")
// public TableDataInfo<SysSaasConfigVo> list(SysSaasConfigBo config, PageQuery pageQuery) {
// return configService.selectPageConfigList(config, pageQuery);
// }
//
// /**
// * 导出参数配置列表
// */
// @Log(title = "参数管理", businessType = BusinessType.EXPORT)
// @SaCheckPermission("system:config:export")
// @PostMapping("/export")
// public void export(SysSaasConfigBo config, HttpServletResponse response) {
// List<SysSaasConfigVo> list = configService.selectConfigList(config);
// ExcelUtil.exportExcel(list, "参数数据", SysSaasConfigVo.class, response);
// }
//
// /**
// * 根据参数编号获取详细信息
// *
// * @param configId 参数ID
// */
// @SaCheckPermission("system:config:query")
// @GetMapping(value = "/{configId}")
// public R<SysSaasConfigVo> getInfo(@PathVariable Long configId) {
// return R.ok(configService.selectConfigById(configId));
// }
//
// /**
// * 根据参数键名查询参数值
// *
// * @param configKey 参数Key
// */
// @GetMapping(value = "/configKey/{configKey}")
// public R<String> getConfigKey(@PathVariable String configKey) {
// return R.ok("操作成功", configService.selectConfigByKey(configKey));
// }
//
// /**
// * 新增参数配置
// */
// @SaCheckPermission("system:config:add")
// @Log(title = "参数管理", businessType = BusinessType.INSERT)
// @PostMapping
// public R<Void> add(@Validated @RequestBody SysSaasConfigBo config) {
// if (!configService.checkConfigKeyUnique(config)) {
// return R.fail("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
// }
// configService.insertConfig(config);
// return R.ok();
// }
//
// /**
// * 修改参数配置
// */
// @SaCheckPermission("system:config:edit")
// @Log(title = "参数管理", businessType = BusinessType.UPDATE)
// @PutMapping
// public R<Void> edit(@Validated @RequestBody SysSaasConfigBo config) {
// if (!configService.checkConfigKeyUnique(config)) {
// return R.fail("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
// }
// configService.updateConfig(config);
// return R.ok();
// }
//
// /**
// * 根据参数键名修改参数配置
// */
// @SaCheckPermission("system:config:edit")
// @Log(title = "参数管理", businessType = BusinessType.UPDATE)
// @PutMapping("/updateByKey")
// public R<Void> updateByKey(@RequestBody SysSaasConfigBo config) {
// configService.updateConfig(config);
// return R.ok();
// }
//
// /**
// * 删除参数配置
// *
// * @param configIds 参数ID串
// */
// @SaCheckPermission("system:config:remove")
// @Log(title = "参数管理", businessType = BusinessType.DELETE)
// @DeleteMapping("/{configIds}")
// public R<Void> remove(@PathVariable Long[] configIds) {
// configService.deleteConfigByIds(configIds);
// return R.ok();
// }
//
// /**
// * 刷新参数缓存
// */
// @SaCheckPermission("system:config:remove")
// @Log(title = "参数管理", businessType = BusinessType.CLEAN)
// @DeleteMapping("/refreshCache")
// public R<Void> refreshCache() {
// configService.resetConfigCache();
// return R.ok();
// }
//}

105
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasOssConfigController.java
View File

@ -1,105 +0,0 @@
package org.dromara.system.saas.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.core.validate.QueryGroup;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.system.saas.domain.bo.SysSaasOssConfigBo;
import org.dromara.system.saas.domain.vo.SysSaasOssConfigVo;
import org.dromara.system.saas.service.ISysSaasOssConfigService;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 对象存储配置
*
* @author Lion Li
* @author 孤舟烟雨
* @date 2021-08-13
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/resource2/oss/config")
public class SysSaasOssConfigController extends BaseController {
private final ISysSaasOssConfigService ossConfigService;
/**
* 查询对象存储配置列表
*/
@SaCheckPermission("system:ossConfig:list")
@GetMapping("/list")
public TableDataInfo<SysSaasOssConfigVo> list(@Validated(QueryGroup.class) SysSaasOssConfigBo bo, PageQuery pageQuery) {
return ossConfigService.queryPageList(bo, pageQuery);
}
/**
* 获取对象存储配置详细信息
*
* @param ossConfigId OSS配置ID
*/
@SaCheckPermission("system:ossConfig:list")
@GetMapping("/{ossConfigId}")
public R<SysSaasOssConfigVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long ossConfigId) {
return R.ok(ossConfigService.queryById(ossConfigId));
}
/**
* 新增对象存储配置
*/
@SaCheckPermission("system:ossConfig:add")
@Log(title = "对象存储配置", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysSaasOssConfigBo bo) {
return toAjax(ossConfigService.insertByBo(bo));
}
/**
* 修改对象存储配置
*/
@SaCheckPermission("system:ossConfig:edit")
@Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysSaasOssConfigBo bo) {
return toAjax(ossConfigService.updateByBo(bo));
}
/**
* 删除对象存储配置
*
* @param ossConfigIds OSS配置ID串
*/
@SaCheckPermission("system:ossConfig:remove")
@Log(title = "对象存储配置", businessType = BusinessType.DELETE)
@DeleteMapping("/{ossConfigIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ossConfigIds) {
return toAjax(ossConfigService.deleteWithValidByIds(List.of(ossConfigIds), true));
}
/**
* 状态修改
*/
@SaCheckPermission("system:ossConfig:edit")
@Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public R<Void> changeStatus(@RequestBody SysSaasOssConfigBo bo) {
return toAjax(ossConfigService.updateOssConfigStatus(bo));
}
}

179
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantController.java
View File

@ -1,179 +0,0 @@
package org.dromara.system.saas.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaCheckRole;
import com.baomidou.lock.annotation.Lock4j;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.constant.TenantConstants;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.encrypt.annotation.ApiEncrypt;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.common.web.core.BaseController;
import org.dromara.system.saas.domain.bo.SysSaasTenantBo;
import org.dromara.system.saas.domain.vo.SysSaasTenantVo;
import org.dromara.system.saas.service.ISysSaasTenantService;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 租户管理
*
* @author Michelle.Chung
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/saasTenant")
@ConditionalOnProperty(value = "tenant.enable", havingValue = "true")
public class SysSaasTenantController extends BaseController {
private final ISysSaasTenantService tenantService;
/**
* 查询租户列表
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:list")
@GetMapping("/list")
public TableDataInfo<SysSaasTenantVo> list(SysSaasTenantBo bo, PageQuery pageQuery) {
return tenantService.queryPageList(bo, pageQuery);
}
/**
* 导出租户列表
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:export")
@Log(title = "租户", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysSaasTenantBo bo, HttpServletResponse response) {
List<SysSaasTenantVo> list = tenantService.queryList(bo);
ExcelUtil.exportExcel(list, "租户", SysSaasTenantVo.class, response);
}
/**
* 获取租户详细信息
*
* @param id 主键
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:query")
@GetMapping("/{id}")
public R<SysSaasTenantVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(tenantService.queryById(id));
}
/**
* 新增租户
*/
@ApiEncrypt
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:add")
@Log(title = "租户", businessType = BusinessType.INSERT)
@Lock4j
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysSaasTenantBo bo) {
if (!tenantService.checkCompanyNameUnique(bo)) {
return R.fail("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在");
}
return toAjax(TenantHelper.ignore(() -> tenantService.insertByBo(bo)));
}
/**
* 修改租户
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:edit")
@Log(title = "租户", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysSaasTenantBo bo) {
tenantService.checkTenantAllowed(bo.getTenantId());
if (!tenantService.checkCompanyNameUnique(bo)) {
return R.fail("修改租户'" + bo.getCompanyName() + "'失败，公司名称已存在");
}
return toAjax(tenantService.updateByBo(bo));
}
/**
* 状态修改
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:edit")
@Log(title = "租户", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public R<Void> changeStatus(@RequestBody SysSaasTenantBo bo) {
tenantService.checkTenantAllowed(bo.getTenantId());
return toAjax(tenantService.updateTenantStatus(bo));
}
/**
* 删除租户
*
* @param ids 主键串
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:remove")
@Log(title = "租户", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(tenantService.deleteWithValidByIds(List.of(ids), true));
}
/**
* 动态切换租户
*
* @param tenantId 租户ID
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@GetMapping("/dynamic/{tenantId}")
public R<Void> dynamicTenant(@NotBlank(message = "租户ID不能为空") @PathVariable String tenantId) {
// TenantHelper.setDynamic(tenantId, true);
return R.ok();
}
// /**
// * 清除动态租户
// */
// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
// @GetMapping("/dynamic/clear")
// public R<Void> dynamicClear() {
// TenantHelper.clearDynamic();
// return R.ok();
// }
/**
* 同步租户套餐
*
* @param tenantId 租户id
* @param packageId 套餐id
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:edit")
@Log(title = "租户", businessType = BusinessType.UPDATE)
@GetMapping("/syncTenantPackage")
public R<Void> syncTenantPackage(@NotBlank(message = "租户ID不能为空") String tenantId,
@NotNull(message = "套餐ID不能为空") Long packageId) {
return toAjax(TenantHelper.ignore(() -> tenantService.syncTenantPackage(tenantId, packageId)));
}
}

142
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantPackageController.java
View File

@ -1,142 +0,0 @@
package org.dromara.system.saas.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaCheckRole;
import org.dromara.common.core.constant.TenantConstants;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.system.saas.domain.bo.SysSaasTenantPackageBo;
import org.dromara.system.saas.domain.vo.SysSaasTenantPackageVo;
import org.dromara.system.saas.service.ISysSaasTenantPackageService;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 租户套餐管理
*
* @author Michelle.Chung
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/saasTenant/package")
@ConditionalOnProperty(value = "tenant.enable", havingValue = "true")
public class SysSaasTenantPackageController extends BaseController {
private final ISysSaasTenantPackageService tenantPackageService;
/**
* 查询租户套餐列表
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenantPackage:list")
@GetMapping("/list")
public TableDataInfo<SysSaasTenantPackageVo> list(SysSaasTenantPackageBo bo, PageQuery pageQuery) {
return tenantPackageService.queryPageList(bo, pageQuery);
}
/**
* 查询租户套餐下拉选列表
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenantPackage:list")
@GetMapping("/selectList")
public R<List<SysSaasTenantPackageVo>> selectList() {
return R.ok(tenantPackageService.selectList());
}
/**
* 导出租户套餐列表
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenantPackage:export")
@Log(title = "租户套餐", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysSaasTenantPackageBo bo, HttpServletResponse response) {
List<SysSaasTenantPackageVo> list = tenantPackageService.queryList(bo);
ExcelUtil.exportExcel(list, "租户套餐", SysSaasTenantPackageVo.class, response);
}
/**
* 获取租户套餐详细信息
*
* @param packageId 主键
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenantPackage:query")
@GetMapping("/{packageId}")
public R<SysSaasTenantPackageVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long packageId) {
return R.ok(tenantPackageService.queryById(packageId));
}
/**
* 新增租户套餐
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenantPackage:add")
@Log(title = "租户套餐", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysSaasTenantPackageBo bo) {
if (!tenantPackageService.checkPackageNameUnique(bo)) {
return R.fail("新增套餐'" + bo.getPackageName() + "'失败，套餐名称已存在");
}
return toAjax(tenantPackageService.insertByBo(bo));
}
/**
* 修改租户套餐
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenantPackage:edit")
@Log(title = "租户套餐", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysSaasTenantPackageBo bo) {
if (!tenantPackageService.checkPackageNameUnique(bo)) {
return R.fail("修改套餐'" + bo.getPackageName() + "'失败，套餐名称已存在");
}
return toAjax(tenantPackageService.updateByBo(bo));
}
/**
* 状态修改
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenantPackage:edit")
@Log(title = "租户套餐", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public R<Void> changeStatus(@RequestBody SysSaasTenantPackageBo bo) {
return toAjax(tenantPackageService.updatePackageStatus(bo));
}
/**
* 删除租户套餐
*
* @param packageIds 主键串
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenantPackage:remove")
@Log(title = "租户套餐", businessType = BusinessType.DELETE)
@DeleteMapping("/{packageIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] packageIds) {
return toAjax(tenantPackageService.deleteWithValidByIds(List.of(packageIds), true));
}
}

9
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasUserController.java
View File

@ -53,7 +53,7 @@ public class SysSaasUserController extends BaseController {
private final ISysSaasRoleService roleService; private final ISysSaasRoleService roleService;
private final ISysSaasPostService postService; private final ISysSaasPostService postService;
private final ISysSaasDeptService deptService; private final ISysSaasDeptService deptService;
private final ISysSaasTenantService tenantService; // private final ISysSaasTenantService tenantService;
/** /**
* 获取用户列表 * 获取用户列表
@ -170,9 +170,10 @@ public class SysSaasUserController extends BaseController {
return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
} }
if (TenantHelper.isEnable()) { if (TenantHelper.isEnable()) {
if (!tenantService.checkAccountBalance(LoginHelper.getTenantId())) { //TODO 应该查询系统的
return R.fail("当前租户下用户名额不足，请联系管理员"); // if (!tenantService.checkAccountBalance(LoginHelper.getTenantId())) {
} // return R.fail("当前租户下用户名额不足，请联系管理员");
// }
} }
user.setPassword(BCrypt.hashpw(user.getPassword())); user.setPassword(BCrypt.hashpw(user.getPassword()));
return toAjax(userService.insertUser(user)); return toAjax(userService.insertUser(user));

42
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasApplication.java
View File

@ -1,42 +0,0 @@
package org.dromara.system.saas.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;
/**
* 应用对象 sys_saas_application
*
* @author Lion Li
* @date 2024-10-14
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_saas_application")
public class SysSaasApplication extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(value = "application_id")
private Long applicationId;
/**
* 应用名称
*/
private String applicationName;
/**
* 应用code
*/
private String applicationCode;
}

47
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasCache.java
View File

@ -1,47 +0,0 @@
package org.dromara.system.saas.domain;
import org.dromara.common.core.utils.StringUtils;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 缓存信息
*
* @author Lion Li
*/
@Data
@NoArgsConstructor
public class SysSaasCache {
/**
* 缓存名称
*/
private String cacheName = "";
/**
* 缓存键名
*/
private String cacheKey = "";
/**
* 缓存内容
*/
private String cacheValue = "";
/**
* 备注
*/
private String remark = "";
public SysSaasCache(String cacheName, String remark) {
this.cacheName = cacheName;
this.remark = remark;
}
public SysSaasCache(String cacheName, String cacheKey, String cacheValue) {
this.cacheName = StringUtils.replace(cacheName, ":", "");
this.cacheKey = StringUtils.replace(cacheKey, cacheName, "");
this.cacheValue = cacheValue;
}
}

51
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasConfig.java
View File

@ -1,51 +0,0 @@
package org.dromara.system.saas.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import org.dromara.common.tenant.core.TenantEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 参数配置表 sys_saas_config
*
* @author Lion Li
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_saas_config")
public class SysSaasConfig extends TenantEntity {
/**
* 参数主键
*/
@TableId(value = "config_id")
private Long configId;
/**
* 参数名称
*/
private String configName;
/**
* 参数键名
*/
private String configKey;
/**
* 参数键值
*/
private String configValue;
/**
* 系统内置（Y是 N否）
*/
private String configType;
/**
* 备注
*/
private String remark;
}

89
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasOssConfig.java
View File

@ -1,89 +0,0 @@
package org.dromara.system.saas.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
/**
* 对象存储配置对象 sys_saas_oss_config
*
* @author Lion Li
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_saas_oss_config")
public class SysSaasOssConfig extends BaseEntity {
/**
* 主键
*/
@TableId(value = "oss_config_id")
private Long ossConfigId;
/**
* 配置key
*/
private String configKey;
/**
* accessKey
*/
private String accessKey;
/**
* 秘钥
*/
private String secretKey;
/**
* 桶名称
*/
private String bucketName;
/**
* 前缀
*/
private String prefix;
/**
* 访问站点
*/
private String endpoint;
/**
* 自定义域名
*/
private String domain;
/**
* 是否https（0否 1是）
*/
private String isHttps;
/**
* 域
*/
private String region;
/**
* 是否默认（0=是,1=否）
*/
private String status;
/**
* 扩展字段
*/
private String ext1;
/**
* 备注
*/
private String remark;
/**
* 桶权限类型(0private 1public 2custom)
*/
private String accessPolicy;
}

103
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenant.java
View File

@ -1,103 +0,0 @@
package org.dromara.system.saas.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
import java.util.Date;
/**
* 租户对象 sys_saas_tenant
*
* @author Michelle.Chung
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_saas_tenant")
public class SysSaasTenant extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@TableId(value = "id")
private Long id;
/**
* 租户编号
*/
private String tenantId;
/**
* 联系人
*/
private String contactUserName;
/**
* 联系电话
*/
private String contactPhone;
/**
* 企业名称
*/
private String companyName;
/**
* 统一社会信用代码
*/
private String licenseNumber;
/**
* 地址
*/
private String address;
/**
* 域名
*/
private String domain;
/**
* 企业简介
*/
private String intro;
/**
* 备注
*/
private String remark;
/**
* 租户套餐编号
*/
private Long packageId;
/**
* 过期时间
*/
private Date expireTime;
/**
* 用户数量（-1不限制）
*/
private Long accountCount;
/**
* 租户状态（0正常 1停用）
*/
private String status;
/**
* 删除标志（0代表存在 2代表删除）
*/
@TableLogic
private String delFlag;
}

34
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenantApplication.java
View File

@ -1,34 +0,0 @@
package org.dromara.system.saas.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 租户和应用关联对象 sys_saas_tenant_application
*
* @author Lion Li
* @date 2024-09-22
*/
@Data
@TableName("sys_saas_tenant_application")
public class SysSaasTenantApplication implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 租户id
*/
@TableId(value = "td")
private Long td;
/**
* 应用ID
*/
private Long applicationId;
}

54
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenantPackage.java
View File

@ -1,54 +0,0 @@
package org.dromara.system.saas.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
import org.dromara.common.mybatis.core.domain.BaseEntity;
/**
* 租户套餐对象 sys_saas_tenant_package
*
* @author Michelle.Chung
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_saas_tenant_package")
public class SysSaasTenantPackage extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 租户套餐id
*/
@TableId(value = "package_id")
private Long packageId;
/**
* 套餐名称
*/
private String packageName;
/**
* 关联菜单id
*/
private String menuIds;
/**
* 备注
*/
private String remark;
/**
* 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
*/
private Boolean menuCheckStrictly;
/**
* 状态（0正常 1停用）
*/
private String status;
/**
* 删除标志（0代表存在 2代表删除）
*/
@TableLogic
private String delFlag;
}

43
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasApplicationBo.java
View File

@ -1,43 +0,0 @@
package org.dromara.system.saas.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.system.saas.domain.SysSaasApplication;
/**
* 应用业务对象 sys_saas_application
*
* @author Lion Li
* @date 2024-10-14
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = SysSaasApplication.class, reverseConvertGenerate = false)
public class SysSaasApplicationBo extends BaseEntity {
/**
* id
*/
@NotNull(message = "id不能为空", groups = { EditGroup.class })
private Long applicationId;
/**
* 应用名称
*/
@NotBlank(message = "应用名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String applicationName;
/**
* 应用code
*/
@NotBlank(message = "应用code不能为空", groups = { AddGroup.class, EditGroup.class })
private String applicationCode;
}

59
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasConfigBo.java
View File

@ -1,59 +0,0 @@
package org.dromara.system.saas.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.system.saas.domain.SysSaasConfig;
/**
* 参数配置业务对象 sys_saas_config
*
* @author Michelle.Chung
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = SysSaasConfig.class, reverseConvertGenerate = false)
public class SysSaasConfigBo extends BaseEntity {
/**
* 参数主键
*/
private Long configId;
/**
* 参数名称
*/
@NotBlank(message = "参数名称不能为空")
@Size(min = 0, max = 100, message = "参数名称不能超过{max}个字符")
private String configName;
/**
* 参数键名
*/
@NotBlank(message = "参数键名不能为空")
@Size(min = 0, max = 100, message = "参数键名长度不能超过{max}个字符")
private String configKey;
/**
* 参数键值
*/
@NotBlank(message = "参数键值不能为空")
@Size(min = 0, max = 500, message = "参数键值长度不能超过{max}个字符")
private String configValue;
/**
* 系统内置（Y是 N否）
*/
private String configType;
/**
* 备注
*/
private String remark;
}

109
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssConfigBo.java
View File

@ -1,109 +0,0 @@
package org.dromara.system.saas.domain.bo;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.system.saas.domain.SysSaasOssConfig;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 对象存储配置业务对象 sys_saas_oss_config
*
* @author Lion Li
* @author 孤舟烟雨
* @date 2021-08-13
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = SysSaasOssConfig.class, reverseConvertGenerate = false)
public class SysSaasOssConfigBo extends BaseEntity {
/**
* 主键
*/
@NotNull(message = "主键不能为空", groups = {EditGroup.class})
private Long ossConfigId;
/**
* 配置key
*/
@NotBlank(message = "配置key不能为空", groups = {AddGroup.class, EditGroup.class})
@Size(min = 2, max = 100, message = "configKey长度必须介于{min}和{max} 之间")
private String configKey;
/**
* accessKey
*/
@NotBlank(message = "accessKey不能为空", groups = {AddGroup.class, EditGroup.class})
@Size(min = 2, max = 100, message = "accessKey长度必须介于{min}和{max} 之间")
private String accessKey;
/**
* 秘钥
*/
@NotBlank(message = "secretKey不能为空", groups = {AddGroup.class, EditGroup.class})
@Size(min = 2, max = 100, message = "secretKey长度必须介于{min}和{max} 之间")
private String secretKey;
/**
* 桶名称
*/
@NotBlank(message = "桶名称不能为空", groups = {AddGroup.class, EditGroup.class})
@Size(min = 2, max = 100, message = "bucketName长度必须介于{min}和{max}之间")
private String bucketName;
/**
* 前缀
*/
private String prefix;
/**
* 访问站点
*/
@NotBlank(message = "访问站点不能为空", groups = {AddGroup.class, EditGroup.class})
@Size(min = 2, max = 100, message = "endpoint长度必须介于{min}和{max}之间")
private String endpoint;
/**
* 自定义域名
*/
private String domain;
/**
* 是否https（Y=是,N=否）
*/
private String isHttps;
/**
* 是否默认（0=是,1=否）
*/
private String status;
/**
* 域
*/
private String region;
/**
* 扩展字段
*/
private String ext1;
/**
* 备注
*/
private String remark;
/**
* 桶权限类型(0private 1public 2custom)
*/
@NotBlank(message = "桶权限类型不能为空", groups = {AddGroup.class, EditGroup.class})
private String accessPolicy;
}

32
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantApplicationBo.java
View File

@ -1,32 +0,0 @@
package org.dromara.system.saas.domain.bo;
import org.dromara.system.saas.domain.SysSaasTenantApplication;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
/**
* 租户和应用关联业务对象 sys_saas_tenant_application
*
* @author Lion Li
* @date 2024-09-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = SysSaasTenantApplication.class, reverseConvertGenerate = false)
public class SysSaasTenantApplicationBo extends BaseEntity {
@NotNull(message = "租户ID不能为空", groups = {EditGroup.class})
private Long tenantId;
/**
* 应用ID
*/
@NotNull(message = "应用ID不能为空", groups = {EditGroup.class})
private Long applicationId;
}

114
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantBo.java
View File

@ -1,114 +0,0 @@
package org.dromara.system.saas.domain.bo;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.system.saas.domain.SysSaasTenant;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
import org.dromara.common.mybatis.core.domain.BaseEntity;
/**
* 租户业务对象 sys_saas_tenant
*
* @author Michelle.Chung
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = SysSaasTenant.class, reverseConvertGenerate = false)
public class SysSaasTenantBo extends BaseEntity {
/**
* id
*/
@NotNull(message = "id不能为空", groups = { EditGroup.class })
private Long id;
/**
* 租户编号
*/
private String tenantId;
/**
* 联系人
*/
@NotBlank(message = "联系人不能为空", groups = { AddGroup.class, EditGroup.class })
private String contactUserName;
/**
* 联系电话
*/
@NotBlank(message = "联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
private String contactPhone;
/**
* 企业名称
*/
@NotBlank(message = "企业名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String companyName;
/**
* 用户名（创建系统用户）
*/
@NotBlank(message = "用户名不能为空", groups = { AddGroup.class })
private String username;
/**
* 密码（创建系统用户）
*/
@NotBlank(message = "密码不能为空", groups = { AddGroup.class })
private String password;
/**
* 统一社会信用代码
*/
private String licenseNumber;
/**
* 地址
*/
private String address;
/**
* 域名
*/
private String domain;
/**
* 企业简介
*/
private String intro;
/**
* 备注
*/
private String remark;
/**
* 租户套餐编号
*/
@NotNull(message = "租户套餐不能为空", groups = { AddGroup.class })
private Long packageId;
/**
* 过期时间
*/
private Date expireTime;
/**
* 用户数量（-1不限制）
*/
private Long accountCount;
/**
* 租户状态（0正常 1停用）
*/
private String status;
}

59
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantPackageBo.java
View File

@ -1,59 +0,0 @@
package org.dromara.system.saas.domain.bo;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.system.saas.domain.SysSaasTenantPackage;
import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMapping;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.mybatis.core.domain.BaseEntity;
/**
* 租户套餐业务对象 sys_saas_tenant_package
*
* @author Michelle.Chung
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = SysSaasTenantPackage.class, reverseConvertGenerate = false)
public class SysSaasTenantPackageBo extends BaseEntity {
/**
* 租户套餐id
*/
@NotNull(message = "租户套餐id不能为空", groups = { EditGroup.class })
private Long packageId;
/**
* 套餐名称
*/
@NotBlank(message = "套餐名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String packageName;
/**
* 关联菜单id
*/
@AutoMapping(target = "menuIds", expression = "java(org.dromara.common.core.utils.StringUtils.join(source.getMenuIds(), \",\"))")
private Long[] menuIds;
/**
* 备注
*/
private String remark;
/**
* 菜单树选择项是否关联显示
*/
private Boolean menuCheckStrictly;
/**
* 状态（0正常 1停用）
*/
private String status;
}

18
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasTenantVoConvert.java
View File

@ -1,18 +0,0 @@
package org.dromara.system.saas.domain.convert;
import io.github.linpeilie.BaseMapper;
import org.dromara.system.saas.api.domain.vo.RemoteTenantVo;
import org.dromara.system.saas.domain.vo.SysSaasTenantVo;
import org.mapstruct.Mapper;
import org.mapstruct.MappingConstants;
import org.mapstruct.ReportingPolicy;
/**
* 租户转换器
*
* @author zhujie
*/
@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface SysSaasTenantVoConvert extends BaseMapper<SysSaasTenantVo, RemoteTenantVo> {
}

46
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasApplicationVo.java
View File

@ -1,46 +0,0 @@
package org.dromara.system.saas.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.system.saas.domain.SysSaasApplication;
import java.io.Serial;
import java.io.Serializable;
/**
* 应用视图对象 sys_saas_application
*
* @author Lion Li
* @date 2024-10-14
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = SysSaasApplication.class)
public class SysSaasApplicationVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@ExcelProperty(value = "id")
private Long applicationId;
/**
* 应用名称
*/
@ExcelProperty(value = "应用名称")
private String applicationName;
/**
* 应用code
*/
@ExcelProperty(value = "应用code")
private String applicationCode;
}

72
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasConfigVo.java
View File

@ -1,72 +0,0 @@
package org.dromara.system.saas.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.system.saas.domain.SysSaasConfig;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 参数配置视图对象 sys_saas_config
*
* @author Michelle.Chung
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = SysSaasConfig.class)
public class SysSaasConfigVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 参数主键
*/
@ExcelProperty(value = "参数主键")
private Long configId;
/**
* 参数名称
*/
@ExcelProperty(value = "参数名称")
private String configName;
/**
* 参数键名
*/
@ExcelProperty(value = "参数键名")
private String configKey;
/**
* 参数键值
*/
@ExcelProperty(value = "参数键值")
private String configValue;
/**
* 系统内置（Y是 N否）
*/
@ExcelProperty(value = "系统内置", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_saas_yes_no")
private String configType;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
}

97
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssConfigVo.java
View File

@ -1,97 +0,0 @@
package org.dromara.system.saas.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import org.dromara.system.saas.domain.SysSaasOssConfig;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 对象存储配置视图对象 sys_saas_oss_config
*
* @author Lion Li
* @author 孤舟烟雨
* @date 2021-08-13
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = SysSaasOssConfig.class)
public class SysSaasOssConfigVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private Long ossConfigId;
/**
* 配置key
*/
private String configKey;
/**
* accessKey
*/
private String accessKey;
/**
* 秘钥
*/
private String secretKey;
/**
* 桶名称
*/
private String bucketName;
/**
* 前缀
*/
private String prefix;
/**
* 访问站点
*/
private String endpoint;
/**
* 自定义域名
*/
private String domain;
/**
* 是否https（Y=是,N=否）
*/
private String isHttps;
/**
* 域
*/
private String region;
/**
* 是否默认（0=是,1=否）
*/
private String status;
/**
* 扩展字段
*/
private String ext1;
/**
* 备注
*/
private String remark;
/**
* 桶权限类型(0private 1public 2custom)
*/
private String accessPolicy;
}

38
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantApplicationVo.java
View File

@ -1,38 +0,0 @@
package org.dromara.system.saas.domain.vo;
import org.dromara.system.saas.domain.SysSaasTenantApplication;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 租户和应用关联视图对象 sys_saas_tenant_application
*
* @author Lion Li
* @date 2024-09-22
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = SysSaasTenantApplication.class)
public class SysSaasTenantApplicationVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@ExcelProperty(value = "租户id")
private Long td;
/**
* 应用ID
*/
@ExcelProperty(value = "应用ID")
private Long applicationId;
}

66
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantPackageVo.java
View File

@ -1,66 +0,0 @@
package org.dromara.system.saas.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.system.saas.domain.SysSaasTenantPackage;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 租户套餐视图对象 sys_saas_tenant_package
*
* @author Michelle.Chung
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = SysSaasTenantPackage.class)
public class SysSaasTenantPackageVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 租户套餐id
*/
@ExcelProperty(value = "租户套餐id")
private Long packageId;
/**
* 套餐名称
*/
@ExcelProperty(value = "套餐名称")
private String packageName;
/**
* 关联菜单id
*/
@ExcelProperty(value = "关联菜单id")
private String menuIds;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 菜单树选择项是否关联显示
*/
@ExcelProperty(value = "菜单树选择项是否关联显示")
private Boolean menuCheckStrictly;
/**
* 状态（0正常 1停用）
*/
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=正常,1=停用")
private String status;
}

115
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantVo.java
View File

@ -1,115 +0,0 @@
package org.dromara.system.saas.domain.vo;
import java.util.Date;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import org.dromara.system.saas.domain.SysSaasTenant;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 租户视图对象 sys_saas_tenant
*
* @author Michelle.Chung
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = SysSaasTenant.class)
public class SysSaasTenantVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* id
*/
@ExcelProperty(value = "id")
private Long id;
/**
* 租户编号
*/
@ExcelProperty(value = "租户编号")
private String tenantId;
/**
* 联系人
*/
@ExcelProperty(value = "联系人")
private String contactUserName;
/**
* 联系电话
*/
@ExcelProperty(value = "联系电话")
private String contactPhone;
/**
* 企业名称
*/
@ExcelProperty(value = "企业名称")
private String companyName;
/**
* 统一社会信用代码
*/
@ExcelProperty(value = "统一社会信用代码")
private String licenseNumber;
/**
* 地址
*/
@ExcelProperty(value = "地址")
private String address;
/**
* 域名
*/
@ExcelProperty(value = "域名")
private String domain;
/**
* 企业简介
*/
@ExcelProperty(value = "企业简介")
private String intro;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 租户套餐编号
*/
@ExcelProperty(value = "租户套餐编号")
private Long packageId;
/**
* 过期时间
*/
@ExcelProperty(value = "过期时间")
private Date expireTime;
/**
* 用户数量（-1不限制）
*/
@ExcelProperty(value = "用户数量")
private Long accountCount;
/**
* 租户状态（0正常 1停用）
*/
@ExcelProperty(value = "租户状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=正常,1=停用")
private String status;
}

6
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteConfigServiceImpl.java
View File

@ -3,7 +3,7 @@ package org.dromara.system.saas.dubbo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.system.saas.api.RemoteConfigService; import org.dromara.system.saas.api.RemoteConfigService;
import org.dromara.system.saas.service.ISysSaasConfigService; import org.dromara.system.service.ISysConfigService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
@ -16,14 +16,14 @@ import org.springframework.stereotype.Service;
@DubboService @DubboService
public class RemoteConfigServiceImpl implements RemoteConfigService { public class RemoteConfigServiceImpl implements RemoteConfigService {
private final ISysSaasConfigService sysSaasConfigService; private final ISysConfigService sysConfigService;
/** /**
* 获取注册开关 * 获取注册开关
*/ */
@Override @Override
public boolean selectRegisterEnabled(String tenantId) { public boolean selectRegisterEnabled(String tenantId) {
return sysSaasConfigService.selectRegisterEnabled(tenantId); return sysConfigService.selectRegisterEnabled(tenantId);
} }
} }

12
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteTenantServiceImpl.java
View File

@ -3,11 +3,11 @@ package org.dromara.system.saas.dubbo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.system.domain.bo.SysTenantBo;
import org.dromara.system.domain.vo.SysTenantVo;
import org.dromara.system.saas.api.RemoteTenantService; import org.dromara.system.saas.api.RemoteTenantService;
import org.dromara.system.saas.api.domain.vo.RemoteTenantVo; import org.dromara.system.saas.api.domain.vo.RemoteTenantVo;
import org.dromara.system.saas.domain.bo.SysSaasTenantBo; import org.dromara.system.service.ISysTenantService;
import org.dromara.system.saas.domain.vo.SysSaasTenantVo;
import org.dromara.system.saas.service.ISysSaasTenantService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
@ -20,14 +20,14 @@ import java.util.List;
@DubboService @DubboService
public class RemoteTenantServiceImpl implements RemoteTenantService { public class RemoteTenantServiceImpl implements RemoteTenantService {
private final ISysSaasTenantService tenantSaasService; private final ISysTenantService sysTenantService;
/** /**
* 根据租户id获取租户详情 * 根据租户id获取租户详情
*/ */
@Override @Override
public RemoteTenantVo queryByTenantId(String tenantId) { public RemoteTenantVo queryByTenantId(String tenantId) {
SysSaasTenantVo vo = tenantSaasService.queryByTenantId(tenantId); SysTenantVo vo = sysTenantService.queryByTenantId(tenantId);
return MapstructUtils.convert(vo, RemoteTenantVo.class); return MapstructUtils.convert(vo, RemoteTenantVo.class);
} }
@ -36,7 +36,7 @@ public class RemoteTenantServiceImpl implements RemoteTenantService {
*/ */
@Override @Override
public List<RemoteTenantVo> queryList() { public List<RemoteTenantVo> queryList() {
List<SysSaasTenantVo> list = tenantSaasService.queryList(new SysSaasTenantBo()); List<SysTenantVo> list = sysTenantService.queryList(new SysTenantBo());
return MapstructUtils.convert(list, RemoteTenantVo.class); return MapstructUtils.convert(list, RemoteTenantVo.class);
} }

3
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteUserServiceImpl.java
View File

@ -28,6 +28,7 @@ import org.dromara.system.saas.domain.vo.SysSaasRoleVo;
import org.dromara.system.saas.domain.vo.SysSaasUserVo; import org.dromara.system.saas.domain.vo.SysSaasUserVo;
import org.dromara.system.saas.mapper.SysSaasUserMapper; import org.dromara.system.saas.mapper.SysSaasUserMapper;
import org.dromara.system.saas.service.*; import org.dromara.system.saas.service.*;
import org.dromara.system.service.ISysConfigService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
@ -45,10 +46,10 @@ public class RemoteUserServiceImpl implements RemoteUserService {
private final ISysSaasUserService userService; private final ISysSaasUserService userService;
private final SaasUserService saasUserService; private final SaasUserService saasUserService;
private final ISysSaasPermissionService permissionService; private final ISysSaasPermissionService permissionService;
private final ISysSaasConfigService configService;
private final ISysSaasRoleService roleService; private final ISysSaasRoleService roleService;
private final ISysSaasDeptService deptService; private final ISysSaasDeptService deptService;
private final SysSaasUserMapper userMapper; private final SysSaasUserMapper userMapper;
private final ISysConfigService configService;
/** /**
* 通过用户名查询用户信息 * 通过用户名查询用户信息

4
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/listener/SysUserImportListener.java
View File

@ -14,9 +14,9 @@ import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.system.saas.domain.bo.SysSaasUserBo; import org.dromara.system.saas.domain.bo.SysSaasUserBo;
import org.dromara.system.saas.domain.vo.SysSaasUserImportVo; import org.dromara.system.saas.domain.vo.SysSaasUserImportVo;
import org.dromara.system.saas.domain.vo.SysSaasUserVo; import org.dromara.system.saas.domain.vo.SysSaasUserVo;
import org.dromara.system.saas.service.ISysSaasConfigService;
import org.dromara.system.saas.service.ISysSaasUserService; import org.dromara.system.saas.service.ISysSaasUserService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.system.service.ISysConfigService;
import java.util.List; import java.util.List;
@ -42,7 +42,7 @@ public class SysUserImportListener extends AnalysisEventListener<SysSaasUserImpo
private final StringBuilder failureMsg = new StringBuilder(); private final StringBuilder failureMsg = new StringBuilder();
public SysUserImportListener(Boolean isUpdateSupport) { public SysUserImportListener(Boolean isUpdateSupport) {
String initPassword = SpringUtils.getBean(ISysSaasConfigService.class).selectConfigByKey("sys.user.initPassword"); String initPassword = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.user.initPassword");
this.userService = SpringUtils.getBean(ISysSaasUserService.class); this.userService = SpringUtils.getBean(ISysSaasUserService.class);
this.password = BCrypt.hashpw(initPassword); this.password = BCrypt.hashpw(initPassword);
this.isUpdateSupport = isUpdateSupport; this.isUpdateSupport = isUpdateSupport;

17
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasApplicationMapper.java
View File

@ -1,17 +0,0 @@
package org.dromara.system.saas.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.system.saas.domain.SysSaasApplication;
import org.dromara.system.saas.domain.vo.SysSaasApplicationVo;
/**
* 应用Mapper接口
*
* @author Lion Li
* @date 2024-10-14
*/
@Mapper
public interface SysSaasApplicationMapper extends BaseMapperPlus<SysSaasApplication, SysSaasApplicationVo> {
}

16
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasConfigMapper.java
View File

@ -1,16 +0,0 @@
package org.dromara.system.saas.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.system.saas.domain.SysSaasConfig;
import org.dromara.system.saas.domain.vo.SysSaasConfigVo;
/**
* 参数配置 数据层
*
* @author Lion Li
*/
@Mapper
public interface SysSaasConfigMapper extends BaseMapperPlus<SysSaasConfig, SysSaasConfigVo> {
}

18
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasOssConfigMapper.java
View File

@ -1,18 +0,0 @@
package org.dromara.system.saas.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.system.saas.domain.SysSaasOssConfig;
import org.dromara.system.saas.domain.vo.SysSaasOssConfigVo;
/**
* 对象存储配置Mapper接口
*
* @author Lion Li
* @author 孤舟烟雨
* @date 2021-08-13
*/
@Mapper
public interface SysSaasOssConfigMapper extends BaseMapperPlus<SysSaasOssConfig, SysSaasOssConfigVo> {
}

17
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantApplicationMapper.java
View File

@ -1,17 +0,0 @@
package org.dromara.system.saas.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.system.saas.domain.SysSaasTenantApplication;
import org.dromara.system.saas.domain.vo.SysSaasTenantApplicationVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 租户和应用关联Mapper接口
*
* @author Lion Li
* @date 2024-09-22
*/
@Mapper
public interface SysSaasTenantApplicationMapper extends BaseMapperPlus<SysSaasTenantApplication, SysSaasTenantApplicationVo> {
}

16
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantMapper.java
View File

@ -1,16 +0,0 @@
package org.dromara.system.saas.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.system.saas.domain.SysSaasTenant;
import org.dromara.system.saas.domain.vo.SysSaasTenantVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 租户Mapper接口
*
* @author Michelle.Chung
*/
@Mapper
public interface SysSaasTenantMapper extends BaseMapperPlus<SysSaasTenant, SysSaasTenantVo> {
}

16
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantPackageMapper.java
View File

@ -1,16 +0,0 @@
package org.dromara.system.saas.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.system.saas.domain.SysSaasTenantPackage;
import org.dromara.system.saas.domain.vo.SysSaasTenantPackageVo;
/**
* 租户套餐Mapper接口
*
* @author Michelle.Chung
*/
@Mapper
public interface SysSaasTenantPackageMapper extends BaseMapperPlus<SysSaasTenantPackage, SysSaasTenantPackageVo> {
}

28
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/runner/System2ApplicationRunner.java
View File

@ -1,28 +0,0 @@
package org.dromara.system.saas.runner;
import org.dromara.system.saas.service.ISysSaasOssConfigService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
/**
* 初始化 system 模块对应业务数据
*
* @author Lion Li
*/
@Slf4j
@RequiredArgsConstructor
@Component
public class System2ApplicationRunner implements ApplicationRunner {
private final ISysSaasOssConfigService ossConfigService;
@Override
public void run(ApplicationArguments args) throws Exception {
ossConfigService.init();
log.info("初始化OSS配置成功");
}
}

68
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasApplicationService.java
View File

@ -1,68 +0,0 @@
package org.dromara.system.saas.service;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.system.saas.domain.bo.SysSaasApplicationBo;
import org.dromara.system.saas.domain.vo.SysSaasApplicationVo;
import java.util.Collection;
import java.util.List;
/**
* 应用Service接口
*
* @author Lion Li
* @date 2024-10-14
*/
public interface ISysSaasApplicationService {
/**
* 查询应用
*
* @param applicationId 主键
* @return 应用
*/
SysSaasApplicationVo queryById(Long applicationId);
/**
* 分页查询应用列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 应用分页列表
*/
TableDataInfo<SysSaasApplicationVo> queryPageList(SysSaasApplicationBo bo, PageQuery pageQuery);
/**
* 查询符合条件的应用列表
*
* @param bo 查询条件
* @return 应用列表
*/
List<SysSaasApplicationVo> queryList(SysSaasApplicationBo bo);
/**
* 新增应用
*
* @param bo 应用
* @return 是否新增成功
*/
Boolean insertByBo(SysSaasApplicationBo bo);
/**
* 修改应用
*
* @param bo 应用
* @return 是否修改成功
*/
Boolean updateByBo(SysSaasApplicationBo bo);
/**
* 校验并批量删除应用信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

87
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasConfigService.java
View File

@ -1,87 +0,0 @@
package org.dromara.system.saas.service;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.system.saas.domain.bo.SysSaasConfigBo;
import org.dromara.system.saas.domain.vo.SysSaasConfigVo;
import java.util.List;
/**
* 参数配置 服务层
*
* @author Lion Li
*/
public interface ISysSaasConfigService {
TableDataInfo<SysSaasConfigVo> selectPageConfigList(SysSaasConfigBo config, PageQuery pageQuery);
/**
* 查询参数配置信息
*
* @param configId 参数配置ID
* @return 参数配置信息
*/
SysSaasConfigVo selectConfigById(Long configId);
/**
* 根据键名查询参数配置信息
*
* @param configKey 参数键名
* @return 参数键值
*/
String selectConfigByKey(String configKey);
/**
* 获取注册开关
* @param tenantId 租户id
* @return true开启，false关闭
*/
boolean selectRegisterEnabled(String tenantId);
/**
* 查询参数配置列表
*
* @param config 参数配置信息
* @return 参数配置集合
*/
List<SysSaasConfigVo> selectConfigList(SysSaasConfigBo config);
/**
* 新增参数配置
*
* @param bo 参数配置信息
* @return 结果
*/
String insertConfig(SysSaasConfigBo bo);
/**
* 修改参数配置
*
* @param bo 参数配置信息
* @return 结果
*/
String updateConfig(SysSaasConfigBo bo);
/**
* 批量删除参数信息
*
* @param configIds 需要删除的参数ID
*/
void deleteConfigByIds(Long[] configIds);
/**
* 重置参数缓存数据
*/
void resetConfigCache();
/**
* 校验参数键名是否唯一
*
* @param config 参数信息
* @return 结果
*/
boolean checkConfigKeyUnique(SysSaasConfigBo config);
}

64
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasOssConfigService.java
View File

@ -1,64 +0,0 @@
package org.dromara.system.saas.service;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.system.saas.domain.bo.SysSaasOssConfigBo;
import org.dromara.system.saas.domain.vo.SysSaasOssConfigVo;
import java.util.Collection;
/**
* 对象存储配置Service接口
*
* @author Lion Li
* @author 孤舟烟雨
* @date 2021-08-13
*/
public interface ISysSaasOssConfigService {
/**
* 初始化OSS配置
*/
void init();
/**
* 查询单个
*/
SysSaasOssConfigVo queryById(Long ossConfigId);
/**
* 查询列表
*/
TableDataInfo<SysSaasOssConfigVo> queryPageList(SysSaasOssConfigBo bo, PageQuery pageQuery);
/**
* 根据新增业务对象插入对象存储配置
*
* @param bo 对象存储配置新增业务对象
* @return 结果
*/
Boolean insertByBo(SysSaasOssConfigBo bo);
/**
* 根据编辑业务对象修改对象存储配置
*
* @param bo 对象存储配置编辑业务对象
* @return 结果
*/
Boolean updateByBo(SysSaasOssConfigBo bo);
/**
* 校验并删除数据
*
* @param ids 主键集合
* @param isValid 是否校验,true-删除前校验,false-不校验
* @return 结果
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 启用停用状态
*/
int updateOssConfigStatus(SysSaasOssConfigBo bo);
}

68
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasTenantApplicationService.java
View File

@ -1,68 +0,0 @@
package org.dromara.system.saas.service;
import org.dromara.system.saas.domain.vo.SysSaasTenantApplicationVo;
import org.dromara.system.saas.domain.bo.SysSaasTenantApplicationBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 租户和应用关联Service接口
*
* @author Lion Li
* @date 2024-09-22
*/
public interface ISysSaasTenantApplicationService {
/**
* 查询租户和应用关联
*
* @param tenantId 主键
* @return 租户和应用关联
*/
SysSaasTenantApplicationVo queryById(Long tenantId);
/**
* 分页查询租户和应用关联列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 租户和应用关联分页列表
*/
TableDataInfo<SysSaasTenantApplicationVo> queryPageList(SysSaasTenantApplicationBo bo, PageQuery pageQuery);
/**
* 查询符合条件的租户和应用关联列表
*
* @param bo 查询条件
* @return 租户和应用关联列表
*/
List<SysSaasTenantApplicationVo> queryList(SysSaasTenantApplicationBo bo);
/**
* 新增租户和应用关联
*
* @param bo 租户和应用关联
* @return 是否新增成功
*/
Boolean insertByBo(SysSaasTenantApplicationBo bo);
/**
* 修改租户和应用关联
*
* @param bo 租户和应用关联
* @return 是否修改成功
*/
Boolean updateByBo(SysSaasTenantApplicationBo bo);
/**
* 校验并批量删除租户和应用关联信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

62
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasTenantPackageService.java
View File

@ -1,62 +0,0 @@
package org.dromara.system.saas.service;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.system.saas.domain.bo.SysSaasTenantPackageBo;
import org.dromara.system.saas.domain.vo.SysSaasTenantPackageVo;
import java.util.Collection;
import java.util.List;
/**
* 租户套餐Service接口
*
* @author Michelle.Chung
*/
public interface ISysSaasTenantPackageService {
/**
* 查询租户套餐
*/
SysSaasTenantPackageVo queryById(Long packageId);
/**
* 查询租户套餐列表
*/
TableDataInfo<SysSaasTenantPackageVo> queryPageList(SysSaasTenantPackageBo bo, PageQuery pageQuery);
/**
* 查询租户套餐已启用列表
*/
List<SysSaasTenantPackageVo> selectList();
/**
* 查询租户套餐列表
*/
List<SysSaasTenantPackageVo> queryList(SysSaasTenantPackageBo bo);
/**
* 新增租户套餐
*/
Boolean insertByBo(SysSaasTenantPackageBo bo);
/**
* 修改租户套餐
*/
Boolean updateByBo(SysSaasTenantPackageBo bo);
/**
* 校验套餐名称是否唯一
*/
boolean checkPackageNameUnique(SysSaasTenantPackageBo bo);
/**
* 修改套餐状态
*/
int updatePackageStatus(SysSaasTenantPackageBo bo);
/**
* 校验并批量删除租户套餐信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

82
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasTenantService.java
View File

@ -1,82 +0,0 @@
package org.dromara.system.saas.service;
import org.dromara.system.saas.domain.vo.SysSaasTenantVo;
import org.dromara.system.saas.domain.bo.SysSaasTenantBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 租户Service接口
*
* @author Michelle.Chung
*/
public interface ISysSaasTenantService {
/**
* 查询租户
*/
SysSaasTenantVo queryById(Long id);
/**
* 基于租户ID查询租户
*/
SysSaasTenantVo queryByTenantId(String tenantId);
/**
* 查询租户列表
*/
TableDataInfo<SysSaasTenantVo> queryPageList(SysSaasTenantBo bo, PageQuery pageQuery);
/**
* 查询租户列表
*/
List<SysSaasTenantVo> queryList(SysSaasTenantBo bo);
/**
* 新增租户
*/
Boolean insertByBo(SysSaasTenantBo bo);
/**
* 修改租户
*/
Boolean updateByBo(SysSaasTenantBo bo);
/**
* 修改租户状态
*/
int updateTenantStatus(SysSaasTenantBo bo);
/**
* 校验租户是否允许操作
*/
void checkTenantAllowed(String tenantId);
/**
* 校验并批量删除租户信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 校验企业名称是否唯一
*/
boolean checkCompanyNameUnique(SysSaasTenantBo bo);
/**
* 校验账号余额
*/
boolean checkAccountBalance(String tenantId);
/**
* 校验有效期
*/
boolean checkExpireTime(String tenantId);
/**
* 同步租户套餐
*/
Boolean syncTenantPackage(String tenantId, Long packageId);
}

130
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasApplicationServiceImpl.java
View File

@ -1,130 +0,0 @@
package org.dromara.system.saas.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.system.saas.domain.SysSaasApplication;
import org.dromara.system.saas.domain.bo.SysSaasApplicationBo;
import org.dromara.system.saas.domain.vo.SysSaasApplicationVo;
import org.dromara.system.saas.mapper.SysSaasApplicationMapper;
import org.dromara.system.saas.service.ISysSaasApplicationService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 应用Service业务层处理
*
* @author Lion Li
* @date 2024-10-14
*/
@RequiredArgsConstructor
@Service
public class SysSaasApplicationServiceImpl implements ISysSaasApplicationService {
private final SysSaasApplicationMapper baseMapper;
/**
* 查询应用
*
* @param applicationId 主键
* @return 应用
*/
@Override
public SysSaasApplicationVo queryById(Long applicationId) {
return baseMapper.selectVoById(applicationId);
}
/**
* 分页查询应用列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 应用分页列表
*/
@Override
public TableDataInfo<SysSaasApplicationVo> queryPageList(SysSaasApplicationBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SysSaasApplication> lqw = buildQueryWrapper(bo);
Page<SysSaasApplicationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的应用列表
*
* @param bo 查询条件
* @return 应用列表
*/
@Override
public List<SysSaasApplicationVo> queryList(SysSaasApplicationBo bo) {
LambdaQueryWrapper<SysSaasApplication> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SysSaasApplication> buildQueryWrapper(SysSaasApplicationBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysSaasApplication> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getApplicationName()), SysSaasApplication::getApplicationName, bo.getApplicationName());
lqw.eq(StringUtils.isNotBlank(bo.getApplicationCode()), SysSaasApplication::getApplicationCode, bo.getApplicationCode());
return lqw;
}
/**
* 新增应用
*
* @param bo 应用
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(SysSaasApplicationBo bo) {
SysSaasApplication add = MapstructUtils.convert(bo, SysSaasApplication.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setApplicationId(add.getApplicationId());
}
return flag;
}
/**
* 修改应用
*
* @param bo 应用
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(SysSaasApplicationBo bo) {
SysSaasApplication update = MapstructUtils.convert(bo, SysSaasApplication.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(SysSaasApplication entity) {
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除应用信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

219
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasConfigServiceImpl.java
View File

@ -1,219 +0,0 @@
package org.dromara.system.saas.service.impl;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.dromara.common.core.constant.CacheNames;
import org.dromara.common.core.constant.UserConstants;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.service.ConfigService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.redis.utils.CacheUtils;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.saas.domain.SysSaasConfig;
import org.dromara.system.saas.domain.bo.SysSaasConfigBo;
import org.dromara.system.saas.domain.vo.SysSaasConfigVo;
import org.dromara.system.saas.mapper.SysSaasConfigMapper;
import org.dromara.system.saas.service.ISysSaasConfigService;
import lombok.RequiredArgsConstructor;
import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* 参数配置 服务层实现
*
* @author Lion Li
*/
@RequiredArgsConstructor
@Service
public class SysSaasConfigServiceImpl implements ISysSaasConfigService, ConfigService {
private final SysSaasConfigMapper baseMapper;
@Override
public TableDataInfo<SysSaasConfigVo> selectPageConfigList(SysSaasConfigBo config, PageQuery pageQuery) {
LambdaQueryWrapper<SysSaasConfig> lqw = buildQueryWrapper(config);
Page<SysSaasConfigVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(page);
}
/**
* 查询参数配置信息
*
* @param configId 参数配置ID
* @return 参数配置信息
*/
@Override
@DS("master")
public SysSaasConfigVo selectConfigById(Long configId) {
return baseMapper.selectVoById(configId);
}
/**
* 根据键名查询参数配置信息
*
* @param configKey 参数key
* @return 参数键值
*/
@Cacheable(cacheNames = CacheNames.SYS_CONFIG, key = "#configKey")
@Override
public String selectConfigByKey(String configKey) {
SysSaasConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysSaasConfig>()
.eq(SysSaasConfig::getConfigKey, configKey));
if (ObjectUtil.isNotNull(retConfig)) {
return retConfig.getConfigValue();
}
return StringUtils.EMPTY;
}
/**
* 获取注册开关
* @param tenantId 租户id
* @return true开启，false关闭
*/
@Override
public boolean selectRegisterEnabled(String tenantId) {
SysSaasConfig retConfig = TenantHelper.dynamic(tenantId, () -> {
return baseMapper.selectOne(new LambdaQueryWrapper<SysSaasConfig>()
.eq(SysSaasConfig::getConfigKey, "sys.account.registerUser"));
});
if (ObjectUtil.isNull(retConfig)) {
return false;
}
return Convert.toBool(retConfig.getConfigValue());
}
/**
* 查询参数配置列表
*
* @param config 参数配置信息
* @return 参数配置集合
*/
@Override
public List<SysSaasConfigVo> selectConfigList(SysSaasConfigBo config) {
LambdaQueryWrapper<SysSaasConfig> lqw = buildQueryWrapper(config);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SysSaasConfig> buildQueryWrapper(SysSaasConfigBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysSaasConfig> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getConfigName()), SysSaasConfig::getConfigName, bo.getConfigName());
lqw.eq(StringUtils.isNotBlank(bo.getConfigType()), SysSaasConfig::getConfigType, bo.getConfigType());
lqw.like(StringUtils.isNotBlank(bo.getConfigKey()), SysSaasConfig::getConfigKey, bo.getConfigKey());
lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
SysSaasConfig::getCreateTime, params.get("beginTime"), params.get("endTime"));
lqw.orderByAsc(SysSaasConfig::getConfigId);
return lqw;
}
/**
* 新增参数配置
*
* @param bo 参数配置信息
* @return 结果
*/
@CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey")
@Override
public String insertConfig(SysSaasConfigBo bo) {
SysSaasConfig config = MapstructUtils.convert(bo, SysSaasConfig.class);
int row = baseMapper.insert(config);
if (row > 0) {
return config.getConfigValue();
}
throw new ServiceException("操作失败");
}
/**
* 修改参数配置
*
* @param bo 参数配置信息
* @return 结果
*/
@CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey")
@Override
public String updateConfig(SysSaasConfigBo bo) {
int row = 0;
SysSaasConfig config = MapstructUtils.convert(bo, SysSaasConfig.class);
if (config.getConfigId() != null) {
SysSaasConfig temp = baseMapper.selectById(config.getConfigId());
if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey())) {
CacheUtils.evict(CacheNames.SYS_CONFIG, temp.getConfigKey());
}
row = baseMapper.updateById(config);
} else {
CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey());
row = baseMapper.update(config, new LambdaQueryWrapper<SysSaasConfig>()
.eq(SysSaasConfig::getConfigKey, config.getConfigKey()));
}
if (row > 0) {
return config.getConfigValue();
}
throw new ServiceException("操作失败");
}
/**
* 批量删除参数信息
*
* @param configIds 需要删除的参数ID
*/
@Override
public void deleteConfigByIds(Long[] configIds) {
for (Long configId : configIds) {
SysSaasConfig config = baseMapper.selectById(configId);
if (StringUtils.equals(UserConstants.YES, config.getConfigType())) {
throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
}
CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey());
}
baseMapper.deleteByIds(Arrays.asList(configIds));
}
/**
* 重置参数缓存数据
*/
@Override
public void resetConfigCache() {
CacheUtils.clear(CacheNames.SYS_CONFIG);
}
/**
* 校验参数键名是否唯一
*
* @param config 参数配置信息
* @return 结果
*/
@Override
public boolean checkConfigKeyUnique(SysSaasConfigBo config) {
long configId = ObjectUtil.isNull(config.getConfigId()) ? -1L : config.getConfigId();
SysSaasConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysSaasConfig>().eq(SysSaasConfig::getConfigKey, config.getConfigKey()));
if (ObjectUtil.isNotNull(info) && info.getConfigId() != configId) {
return false;
}
return true;
}
/**
* 根据参数 key 获取参数值
*
* @param configKey 参数 key
* @return 参数值
*/
@Override
public String getConfigValue(String configKey) {
return SpringUtils.getAopProxy(this).selectConfigByKey(configKey);
}
}

52
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java
View File

@ -14,13 +14,19 @@ import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.TreeBuildUtils; import org.dromara.common.core.utils.TreeBuildUtils;
import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.system.saas.domain.*; import org.dromara.system.domain.vo.SysTenantPackageVo;
import org.dromara.system.saas.domain.SysSaasMenu;
import org.dromara.system.saas.domain.SysSaasRole;
import org.dromara.system.saas.domain.SysSaasRoleMenu;
import org.dromara.system.saas.domain.bo.SysSaasMenuBo; import org.dromara.system.saas.domain.bo.SysSaasMenuBo;
import org.dromara.system.saas.domain.vo.SysSaasMenuVo;
import org.dromara.system.saas.domain.vo.TwoMetaVo; import org.dromara.system.saas.domain.vo.TwoMetaVo;
import org.dromara.system.saas.domain.vo.TwoRouterVo; import org.dromara.system.saas.domain.vo.TwoRouterVo;
import org.dromara.system.saas.domain.vo.SysSaasMenuVo; import org.dromara.system.saas.mapper.SysSaasMenuMapper;
import org.dromara.system.saas.mapper.*; import org.dromara.system.saas.mapper.SysSaasRoleMapper;
import org.dromara.system.saas.mapper.SysSaasRoleMenuMapper;
import org.dromara.system.saas.service.ISysSaasMenuService; import org.dromara.system.saas.service.ISysSaasMenuService;
import org.dromara.system.service.ISysTenantPackageService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
@ -37,7 +43,7 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService {
private final SysSaasMenuMapper baseMapper; private final SysSaasMenuMapper baseMapper;
private final SysSaasRoleMapper roleMapper; private final SysSaasRoleMapper roleMapper;
private final SysSaasRoleMenuMapper roleMenuMapper; private final SysSaasRoleMenuMapper roleMenuMapper;
private final SysSaasTenantPackageMapper tenantPackageMapper; private final ISysTenantPackageService sysTenantPackageService;
/** /**
* 根据用户查询系统菜单列表 * 根据用户查询系统菜单列表
@ -71,11 +77,11 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService {
} else { } else {
QueryWrapper<SysSaasMenu> wrapper = Wrappers.query(); QueryWrapper<SysSaasMenu> wrapper = Wrappers.query();
wrapper.inSql("r.role_id", "select role_id from sys_saas_user_role where user_id = " + userId) wrapper.inSql("r.role_id", "select role_id from sys_saas_user_role where user_id = " + userId)
.like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName()) .like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName())
.eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible()) .eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible())
.eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus()) .eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus())
.orderByAsc("m.parent_id") .orderByAsc("m.parent_id")
.orderByAsc("m.order_num"); .orderByAsc("m.order_num");
List<SysSaasMenu> list = baseMapper.selectMenuListByUserId(wrapper); List<SysSaasMenu> list = baseMapper.selectMenuListByUserId(wrapper);
menuList = MapstructUtils.convert(list, SysSaasMenuVo.class); menuList = MapstructUtils.convert(list, SysSaasMenuVo.class);
} }
@ -155,7 +161,7 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService {
*/ */
@Override @Override
public List<Long> selectMenuListByPackageId(Long packageId) { public List<Long> selectMenuListByPackageId(Long packageId) {
SysSaasTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); SysTenantPackageVo tenantPackage = sysTenantPackageService.queryById(packageId);
List<Long> menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); List<Long> menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong);
if (CollUtil.isEmpty(menuIds)) { if (CollUtil.isEmpty(menuIds)) {
return List.of(); return List.of();
@ -163,12 +169,16 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService {
List<Long> parentIds = null; List<Long> parentIds = null;
if (tenantPackage.getMenuCheckStrictly()) { if (tenantPackage.getMenuCheckStrictly()) {
parentIds = baseMapper.selectObjs(new LambdaQueryWrapper<SysSaasMenu>() parentIds = baseMapper.selectObjs(new LambdaQueryWrapper<SysSaasMenu>()
.select(SysSaasMenu::getParentId) .select(SysSaasMenu::getParentId)
.in(SysSaasMenu::getMenuId, menuIds), x -> {return Convert.toLong(x);}); .in(SysSaasMenu::getMenuId, menuIds), x -> {
return Convert.toLong(x);
});
} }
return baseMapper.selectObjs(new LambdaQueryWrapper<SysSaasMenu>() return baseMapper.selectObjs(new LambdaQueryWrapper<SysSaasMenu>()
.in(SysSaasMenu::getMenuId, menuIds) .in(SysSaasMenu::getMenuId, menuIds)
.notIn(CollUtil.isNotEmpty(parentIds), SysSaasMenu::getMenuId, parentIds), x -> {return Convert.toLong(x);}); .notIn(CollUtil.isNotEmpty(parentIds), SysSaasMenu::getMenuId, parentIds), x -> {
return Convert.toLong(x);
});
} }
/** /**
@ -238,10 +248,10 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService {
return CollUtil.newArrayList(); return CollUtil.newArrayList();
} }
return TreeBuildUtils.build(menus, (menu, tree) -> return TreeBuildUtils.build(menus, (menu, tree) ->
tree.setId(menu.getMenuId()) tree.setId(menu.getMenuId())
.setParentId(menu.getParentId()) .setParentId(menu.getParentId())
.setName(menu.getMenuName()) .setName(menu.getMenuName())
.setWeight(menu.getOrderNum())); .setWeight(menu.getOrderNum()));
} }
/** /**
@ -321,9 +331,9 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService {
@Override @Override
public boolean checkMenuNameUnique(SysSaasMenuBo menu) { public boolean checkMenuNameUnique(SysSaasMenuBo menu) {
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysSaasMenu>() boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysSaasMenu>()
.eq(SysSaasMenu::getMenuName, menu.getMenuName()) .eq(SysSaasMenu::getMenuName, menu.getMenuName())
.eq(SysSaasMenu::getParentId, menu.getParentId()) .eq(SysSaasMenu::getParentId, menu.getParentId())
.ne(ObjectUtil.isNotNull(menu.getMenuId()), SysSaasMenu::getMenuId, menu.getMenuId())); .ne(ObjectUtil.isNotNull(menu.getMenuId()), SysSaasMenu::getMenuId, menu.getMenuId()));
return !exist; return !exist;
} }

176
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasOssConfigServiceImpl.java
View File

@ -1,176 +0,0 @@
package org.dromara.system.saas.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.CacheNames;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.oss.constant.OssConstant;
import org.dromara.common.redis.utils.CacheUtils;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.system.saas.domain.SysSaasOssConfig;
import org.dromara.system.saas.domain.bo.SysSaasOssConfigBo;
import org.dromara.system.saas.domain.vo.SysSaasOssConfigVo;
import org.dromara.system.saas.mapper.SysSaasOssConfigMapper;
import org.dromara.system.saas.service.ISysSaasOssConfigService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.List;
/**
* 对象存储配置Service业务层处理
*
* @author Lion Li
* @author 孤舟烟雨
* @date 2021-08-13
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class SysSaasOssConfigServiceImpl implements ISysSaasOssConfigService {
private final SysSaasOssConfigMapper baseMapper;
/**
* 项目启动时，初始化参数到缓存，加载配置类
*/
@Override
public void init() {
List<SysSaasOssConfig> list = baseMapper.selectList();
// 加载OSS初始化配置
for (SysSaasOssConfig config : list) {
String configKey = config.getConfigKey();
if ("0".equals(config.getStatus())) {
RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, configKey);
}
CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
}
}
@Override
public SysSaasOssConfigVo queryById(Long ossConfigId) {
return baseMapper.selectVoById(ossConfigId);
}
@Override
public TableDataInfo<SysSaasOssConfigVo> queryPageList(SysSaasOssConfigBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SysSaasOssConfig> lqw = buildQueryWrapper(bo);
Page<SysSaasOssConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
private LambdaQueryWrapper<SysSaasOssConfig> buildQueryWrapper(SysSaasOssConfigBo bo) {
LambdaQueryWrapper<SysSaasOssConfig> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getConfigKey()), SysSaasOssConfig::getConfigKey, bo.getConfigKey());
lqw.like(StringUtils.isNotBlank(bo.getBucketName()), SysSaasOssConfig::getBucketName, bo.getBucketName());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysSaasOssConfig::getStatus, bo.getStatus());
lqw.orderByAsc(SysSaasOssConfig::getOssConfigId);
return lqw;
}
@Override
public Boolean insertByBo(SysSaasOssConfigBo bo) {
SysSaasOssConfig config = MapstructUtils.convert(bo, SysSaasOssConfig.class);
validEntityBeforeSave(config);
boolean flag = baseMapper.insert(config) > 0;
if (flag) {
// 从数据库查询完整的数据做缓存
config = baseMapper.selectById(config.getOssConfigId());
CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
}
return flag;
}
@Override
public Boolean updateByBo(SysSaasOssConfigBo bo) {
SysSaasOssConfig config = MapstructUtils.convert(bo, SysSaasOssConfig.class);
validEntityBeforeSave(config);
LambdaUpdateWrapper<SysSaasOssConfig> luw = new LambdaUpdateWrapper<>();
luw.set(ObjectUtil.isNull(config.getPrefix()), SysSaasOssConfig::getPrefix, "");
luw.set(ObjectUtil.isNull(config.getRegion()), SysSaasOssConfig::getRegion, "");
luw.set(ObjectUtil.isNull(config.getExt1()), SysSaasOssConfig::getExt1, "");
luw.set(ObjectUtil.isNull(config.getRemark()), SysSaasOssConfig::getRemark, "");
luw.eq(SysSaasOssConfig::getOssConfigId, config.getOssConfigId());
boolean flag = baseMapper.update(config, luw) > 0;
if (flag) {
// 从数据库查询完整的数据做缓存
config = baseMapper.selectById(config.getOssConfigId());
CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
}
return flag;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(SysSaasOssConfig entity) {
if (StringUtils.isNotEmpty(entity.getConfigKey())
&& !checkConfigKeyUnique(entity)) {
throw new ServiceException("操作配置'" + entity.getConfigKey() + "'失败, 配置key已存在!");
}
}
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) {
if (CollUtil.containsAny(ids, OssConstant.SYSTEM_DATA_IDS)) {
throw new ServiceException("系统内置, 不可删除!");
}
}
List<SysSaasOssConfig> list = CollUtil.newArrayList();
for (Long configId : ids) {
SysSaasOssConfig config = baseMapper.selectById(configId);
list.add(config);
}
boolean flag = baseMapper.deleteByIds(ids) > 0;
if (flag) {
list.forEach(sysSaasOssConfig ->
CacheUtils.evict(CacheNames.SYS_OSS_CONFIG, sysSaasOssConfig.getConfigKey()));
}
return flag;
}
/**
* 判断configKey是否唯一
*/
private boolean checkConfigKeyUnique(SysSaasOssConfig sysSaasOssConfig) {
long ossConfigId = ObjectUtil.isNull(sysSaasOssConfig.getOssConfigId()) ? -1L : sysSaasOssConfig.getOssConfigId();
SysSaasOssConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysSaasOssConfig>()
.select(SysSaasOssConfig::getOssConfigId, SysSaasOssConfig::getConfigKey)
.eq(SysSaasOssConfig::getConfigKey, sysSaasOssConfig.getConfigKey()));
if (ObjectUtil.isNotNull(info) && info.getOssConfigId() != ossConfigId) {
return false;
}
return true;
}
/**
* 启用禁用状态
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int updateOssConfigStatus(SysSaasOssConfigBo bo) {
SysSaasOssConfig sysSaasOssConfig = MapstructUtils.convert(bo, SysSaasOssConfig.class);
int row = baseMapper.update(null, new LambdaUpdateWrapper<SysSaasOssConfig>()
.set(SysSaasOssConfig::getStatus, "1"));
row += baseMapper.updateById(sysSaasOssConfig);
if (row > 0) {
RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, sysSaasOssConfig.getConfigKey());
}
return row;
}
}

127
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantApplicationServiceImpl.java
View File

@ -1,127 +0,0 @@
package org.dromara.system.saas.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.system.saas.domain.SysSaasTenantApplication;
import org.dromara.system.saas.domain.bo.SysSaasTenantApplicationBo;
import org.dromara.system.saas.domain.vo.SysSaasTenantApplicationVo;
import org.dromara.system.saas.mapper.SysSaasTenantApplicationMapper;
import org.dromara.system.saas.service.ISysSaasTenantApplicationService;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 租户和应用关联Service业务层处理
*
* @author Lion Li
* @date 2024-09-22
*/
@RequiredArgsConstructor
@Service
public class SysSaasTenantApplicationServiceImpl implements ISysSaasTenantApplicationService {
private final SysSaasTenantApplicationMapper baseMapper;
/**
* 查询租户和应用关联
*
* @param tenantId 主键
* @return 租户和应用关联
*/
@Override
public SysSaasTenantApplicationVo queryById(Long tenantId){
return baseMapper.selectVoById(tenantId);
}
/**
* 分页查询租户和应用关联列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 租户和应用关联分页列表
*/
@Override
public TableDataInfo<SysSaasTenantApplicationVo> queryPageList(SysSaasTenantApplicationBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SysSaasTenantApplication> lqw = buildQueryWrapper(bo);
Page<SysSaasTenantApplicationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的租户和应用关联列表
*
* @param bo 查询条件
* @return 租户和应用关联列表
*/
@Override
public List<SysSaasTenantApplicationVo> queryList(SysSaasTenantApplicationBo bo) {
LambdaQueryWrapper<SysSaasTenantApplication> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SysSaasTenantApplication> buildQueryWrapper(SysSaasTenantApplicationBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysSaasTenantApplication> lqw = Wrappers.lambdaQuery();
return lqw;
}
/**
* 新增租户和应用关联
*
* @param bo 租户和应用关联
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(SysSaasTenantApplicationBo bo) {
SysSaasTenantApplication add = MapstructUtils.convert(bo, SysSaasTenantApplication.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setTenantId(add.getTd());
}
return flag;
}
/**
* 修改租户和应用关联
*
* @param bo 租户和应用关联
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(SysSaasTenantApplicationBo bo) {
SysSaasTenantApplication update = MapstructUtils.convert(bo, SysSaasTenantApplication.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(SysSaasTenantApplication entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除租户和应用关联信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

157
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantPackageServiceImpl.java
View File

@ -1,157 +0,0 @@
package org.dromara.system.saas.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.constant.TenantConstants;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.system.saas.domain.SysSaasTenant;
import org.dromara.system.saas.domain.SysSaasTenantPackage;
import org.dromara.system.saas.domain.bo.SysSaasTenantPackageBo;
import org.dromara.system.saas.domain.vo.SysSaasTenantPackageVo;
import org.dromara.system.saas.mapper.SysSaasTenantMapper;
import org.dromara.system.saas.mapper.SysSaasTenantPackageMapper;
import org.dromara.system.saas.service.ISysSaasTenantPackageService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
/**
* 租户套餐Service业务层处理
*
* @author Michelle.Chung
*/
@RequiredArgsConstructor
@Service
public class SysSaasTenantPackageServiceImpl implements ISysSaasTenantPackageService {
private final SysSaasTenantPackageMapper baseMapper;
private final SysSaasTenantMapper tenantMapper;
/**
* 查询租户套餐
*/
@Override
public SysSaasTenantPackageVo queryById(Long packageId){
return baseMapper.selectVoById(packageId);
}
/**
* 查询租户套餐列表
*/
@Override
public TableDataInfo<SysSaasTenantPackageVo> queryPageList(SysSaasTenantPackageBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SysSaasTenantPackage> lqw = buildQueryWrapper(bo);
Page<SysSaasTenantPackageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@Override
public List<SysSaasTenantPackageVo> selectList() {
return baseMapper.selectVoList(new LambdaQueryWrapper<SysSaasTenantPackage>()
.eq(SysSaasTenantPackage::getStatus, TenantConstants.NORMAL));
}
/**
* 查询租户套餐列表
*/
@Override
public List<SysSaasTenantPackageVo> queryList(SysSaasTenantPackageBo bo) {
LambdaQueryWrapper<SysSaasTenantPackage> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SysSaasTenantPackage> buildQueryWrapper(SysSaasTenantPackageBo bo) {
LambdaQueryWrapper<SysSaasTenantPackage> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getPackageName()), SysSaasTenantPackage::getPackageName, bo.getPackageName());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysSaasTenantPackage::getStatus, bo.getStatus());
lqw.orderByAsc(SysSaasTenantPackage::getPackageId);
return lqw;
}
/**
* 新增租户套餐
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(SysSaasTenantPackageBo bo) {
SysSaasTenantPackage add = MapstructUtils.convert(bo, SysSaasTenantPackage.class);
// 保存菜单id
List<Long> menuIds = Arrays.asList(bo.getMenuIds());
if (CollUtil.isNotEmpty(menuIds)) {
add.setMenuIds(StringUtils.join(menuIds, ", "));
} else {
add.setMenuIds("");
}
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setPackageId(add.getPackageId());
}
return flag;
}
/**
* 修改租户套餐
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateByBo(SysSaasTenantPackageBo bo) {
SysSaasTenantPackage update = MapstructUtils.convert(bo, SysSaasTenantPackage.class);
// 保存菜单id
List<Long> menuIds = Arrays.asList(bo.getMenuIds());
if (CollUtil.isNotEmpty(menuIds)) {
update.setMenuIds(StringUtils.join(menuIds, ", "));
} else {
update.setMenuIds("");
}
return baseMapper.updateById(update) > 0;
}
/**
* 校验套餐名称是否唯一
*/
@Override
public boolean checkPackageNameUnique(SysSaasTenantPackageBo bo) {
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysSaasTenantPackage>()
.eq(SysSaasTenantPackage::getPackageName, bo.getPackageName())
.ne(ObjectUtil.isNotNull(bo.getPackageId()), SysSaasTenantPackage::getPackageId, bo.getPackageId()));
return !exist;
}
/**
* 修改套餐状态
*
* @param bo 套餐信息
* @return 结果
*/
@Override
public int updatePackageStatus(SysSaasTenantPackageBo bo) {
SysSaasTenantPackage tenantPackage = MapstructUtils.convert(bo, SysSaasTenantPackage.class);
return baseMapper.updateById(tenantPackage);
}
/**
* 批量删除租户套餐
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
boolean exists = tenantMapper.exists(new LambdaQueryWrapper<SysSaasTenant>().in(SysSaasTenant::getPackageId, ids));
if (exists) {
throw new ServiceException("租户套餐已被使用");
}
}
return baseMapper.deleteByIds(ids) > 0;
}
}

372
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantServiceImpl.java
View File

@ -1,372 +0,0 @@
package org.dromara.system.saas.service.impl;
import cn.dev33.satoken.secure.BCrypt;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.constant.CacheNames;
import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.constant.TenantConstants;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.system.saas.domain.bo.SysSaasTenantBo;
import org.dromara.system.saas.domain.vo.SysSaasTenantVo;
import org.dromara.system.saas.service.ISysSaasTenantService;
import org.dromara.system.saas.domain.*;
import org.dromara.system.saas.mapper.*;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
/**
* 租户Service业务层处理
*
* @author Michelle.Chung
*/
@RequiredArgsConstructor
@Service
public class SysSaasTenantServiceImpl implements ISysSaasTenantService {
private final SysSaasTenantMapper baseMapper;
private final SysSaasTenantPackageMapper tenantPackageMapper;
private final SysSaasUserMapper userMapper;
private final SysSaasDeptMapper deptMapper;
private final SysSaasRoleMapper roleMapper;
private final SysSaasRoleMenuMapper roleMenuMapper;
private final SysSaasRoleDeptMapper roleDeptMapper;
private final SysSaasUserRoleMapper userRoleMapper;
private final SysSaasDictTypeMapper dictTypeMapper;
private final SysSaasDictDataMapper dictDataMapper;
private final SysSaasConfigMapper configMapper;
/**
* 查询租户
*/
@Override
public SysSaasTenantVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
/**
* 基于租户ID查询租户
*/
@Cacheable(cacheNames = CacheNames.SYS_TENANT, key = "#tenantId")
@Override
public SysSaasTenantVo queryByTenantId(String tenantId) {
return baseMapper.selectVoOne(new LambdaQueryWrapper<SysSaasTenant>().eq(SysSaasTenant::getTenantId, tenantId));
}
/**
* 查询租户列表
*/
@Override
public TableDataInfo<SysSaasTenantVo> queryPageList(SysSaasTenantBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SysSaasTenant> lqw = buildQueryWrapper(bo);
Page<SysSaasTenantVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询租户列表
*/
@Override
public List<SysSaasTenantVo> queryList(SysSaasTenantBo bo) {
LambdaQueryWrapper<SysSaasTenant> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SysSaasTenant> buildQueryWrapper(SysSaasTenantBo bo) {
LambdaQueryWrapper<SysSaasTenant> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), SysSaasTenant::getTenantId, bo.getTenantId());
lqw.like(StringUtils.isNotBlank(bo.getContactUserName()), SysSaasTenant::getContactUserName, bo.getContactUserName());
lqw.eq(StringUtils.isNotBlank(bo.getContactPhone()), SysSaasTenant::getContactPhone, bo.getContactPhone());
lqw.like(StringUtils.isNotBlank(bo.getCompanyName()), SysSaasTenant::getCompanyName, bo.getCompanyName());
lqw.eq(StringUtils.isNotBlank(bo.getLicenseNumber()), SysSaasTenant::getLicenseNumber, bo.getLicenseNumber());
lqw.eq(StringUtils.isNotBlank(bo.getAddress()), SysSaasTenant::getAddress, bo.getAddress());
lqw.eq(StringUtils.isNotBlank(bo.getIntro()), SysSaasTenant::getIntro, bo.getIntro());
lqw.like(StringUtils.isNotBlank(bo.getDomain()), SysSaasTenant::getDomain, bo.getDomain());
lqw.eq(bo.getPackageId() != null, SysSaasTenant::getPackageId, bo.getPackageId());
lqw.eq(bo.getExpireTime() != null, SysSaasTenant::getExpireTime, bo.getExpireTime());
lqw.eq(bo.getAccountCount() != null, SysSaasTenant::getAccountCount, bo.getAccountCount());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysSaasTenant::getStatus, bo.getStatus());
lqw.orderByAsc(SysSaasTenant::getId);
return lqw;
}
/**
* 新增租户
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(SysSaasTenantBo bo) {
SysSaasTenant add = MapstructUtils.convert(bo, SysSaasTenant.class);
// 获取所有租户编号
List<String> tenantIds = baseMapper.selectObjs(
new LambdaQueryWrapper<SysSaasTenant>().select(SysSaasTenant::getTenantId), x -> {return Convert.toStr(x);});
String tenantId = generateTenantId(tenantIds);
add.setTenantId(tenantId);
boolean flag = baseMapper.insert(add) > 0;
if (!flag) {
throw new ServiceException("创建租户失败");
}
bo.setId(add.getId());
// 根据套餐创建角色
Long roleId = createTenantRole(tenantId, bo.getPackageId());
// 创建部门: 公司名是部门名称
SysSaasDept dept = new SysSaasDept();
dept.setTenantId(tenantId);
dept.setDeptName(bo.getCompanyName());
dept.setParentId(Constants.TOP_PARENT_ID);
dept.setAncestors(Constants.TOP_PARENT_ID.toString());
deptMapper.insert(dept);
Long deptId = dept.getDeptId();
// 角色和部门关联表
SysSaasRoleDept roleDept = new SysSaasRoleDept();
roleDept.setRoleId(roleId);
roleDept.setDeptId(deptId);
roleDeptMapper.insert(roleDept);
// 创建系统用户
SysSaasUser user = new SysSaasUser();
user.setTenantId(tenantId);
user.setUserName(bo.getUsername());
user.setNickName(bo.getUsername());
user.setPassword(BCrypt.hashpw(bo.getPassword()));
user.setDeptId(deptId);
userMapper.insert(user);
//新增系统用户后，默认当前用户为部门的负责人
SysSaasDept sd = new SysSaasDept();
sd.setLeader(user.getUserId());
sd.setDeptId(deptId);
deptMapper.updateById(sd);
// 用户和角色关联表
SysSaasUserRole userRole = new SysSaasUserRole();
userRole.setUserId(user.getUserId());
userRole.setRoleId(roleId);
userRoleMapper.insert(userRole);
String defaultTenantId = TenantConstants.DEFAULT_TENANT_ID;
List<SysSaasDictType> dictTypeList = dictTypeMapper.selectList(
new LambdaQueryWrapper<SysSaasDictType>().eq(SysSaasDictType::getTenantId, defaultTenantId));
List<SysSaasDictData> dictDataList = dictDataMapper.selectList(
new LambdaQueryWrapper<SysSaasDictData>().eq(SysSaasDictData::getTenantId, defaultTenantId));
for (SysSaasDictType dictType : dictTypeList) {
dictType.setDictId(null);
dictType.setTenantId(tenantId);
}
for (SysSaasDictData dictData : dictDataList) {
dictData.setDictCode(null);
dictData.setTenantId(tenantId);
}
dictTypeMapper.insertBatch(dictTypeList);
dictDataMapper.insertBatch(dictDataList);
List<SysSaasConfig> sysSaasConfigList = configMapper.selectList(
new LambdaQueryWrapper<SysSaasConfig>().eq(SysSaasConfig::getTenantId, defaultTenantId));
for (SysSaasConfig config : sysSaasConfigList) {
config.setConfigId(null);
config.setTenantId(tenantId);
}
configMapper.insertBatch(sysSaasConfigList);
return true;
}
/**
* 生成租户id
*
* @param tenantIds 已有租户id列表
* @return 租户id
*/
private String generateTenantId(List<String> tenantIds) {
// 随机生成6位
String numbers = RandomUtil.randomNumbers(6);
// 判断是否存在，如果存在则重新生成
if (tenantIds.contains(numbers)) {
generateTenantId(tenantIds);
}
return numbers;
}
/**
* 根据租户菜单创建租户角色
*
* @param tenantId 租户编号
* @param packageId 租户套餐id
* @return 角色id
*/
private Long createTenantRole(String tenantId, Long packageId) {
// 获取租户套餐
SysSaasTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId);
if (ObjectUtil.isNull(tenantPackage)) {
throw new ServiceException("套餐不存在");
}
// 获取套餐菜单id
List<Long> menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong);
// 创建角色
SysSaasRole role = new SysSaasRole();
role.setTenantId(tenantId);
role.setRoleName(TenantConstants.TENANT_ADMIN_ROLE_NAME);
role.setRoleKey(TenantConstants.TENANT_ADMIN_ROLE_KEY);
role.setRoleSort(1);
role.setStatus(TenantConstants.NORMAL);
roleMapper.insert(role);
Long roleId = role.getRoleId();
// 创建角色菜单
List<SysSaasRoleMenu> roleMenus = new ArrayList<>(menuIds.size());
menuIds.forEach(menuId -> {
SysSaasRoleMenu roleMenu = new SysSaasRoleMenu();
roleMenu.setRoleId(roleId);
roleMenu.setMenuId(menuId);
roleMenus.add(roleMenu);
});
roleMenuMapper.insertBatch(roleMenus);
return roleId;
}
/**
* 修改租户
*/
@CacheEvict(cacheNames = CacheNames.SYS_TENANT, key = "#bo.tenantId")
@Override
public Boolean updateByBo(SysSaasTenantBo bo) {
SysSaasTenant tenant = MapstructUtils.convert(bo, SysSaasTenant.class);
tenant.setTenantId(null);
tenant.setPackageId(null);
return baseMapper.updateById(tenant) > 0;
}
/**
* 修改租户状态
*
* @param bo 租户信息
* @return 结果
*/
@CacheEvict(cacheNames = CacheNames.SYS_TENANT, key = "#bo.tenantId")
@Override
public int updateTenantStatus(SysSaasTenantBo bo) {
SysSaasTenant tenant = MapstructUtils.convert(bo, SysSaasTenant.class);
return baseMapper.updateById(tenant);
}
/**
* 校验租户是否允许操作
*
* @param tenantId 租户ID
*/
@Override
public void checkTenantAllowed(String tenantId) {
if (ObjectUtil.isNotNull(tenantId) && TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
throw new ServiceException("不允许操作管理租户");
}
}
/**
* 批量删除租户
*/
@CacheEvict(cacheNames = CacheNames.SYS_TENANT, allEntries = true)
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) {
// 做一些业务上的校验,判断是否需要校验
if (ids.contains(TenantConstants.SUPER_ADMIN_ID)) {
throw new ServiceException("超管租户不能删除");
}
}
return baseMapper.deleteByIds(ids) > 0;
}
/**
* 校验企业名称是否唯一
*/
@Override
public boolean checkCompanyNameUnique(SysSaasTenantBo bo) {
boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysSaasTenant>()
.eq(SysSaasTenant::getCompanyName, bo.getCompanyName())
.ne(ObjectUtil.isNotNull(bo.getTenantId()), SysSaasTenant::getTenantId, bo.getTenantId()));
return !exist;
}
/**
* 校验账号余额
*/
@Override
public boolean checkAccountBalance(String tenantId) {
SysSaasTenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId);
// 如果余额为-1代表不限制
if (tenant.getAccountCount() == -1) {
return true;
}
Long userNumber = userMapper.selectCount(new LambdaQueryWrapper<>());
// 如果余额大于0代表还有可用名额
return tenant.getAccountCount() - userNumber > 0;
}
/**
* 校验有效期
*/
@Override
public boolean checkExpireTime(String tenantId) {
SysSaasTenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId);
// 如果未设置过期时间代表不限制
if (ObjectUtil.isNull(tenant.getExpireTime())) {
return true;
}
// 如果当前时间在过期时间之前则通过
return new Date().before(tenant.getExpireTime());
}
/**
* 同步租户套餐
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean syncTenantPackage(String tenantId, Long packageId) {
SysSaasTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId);
List<SysSaasRole> roles = roleMapper.selectList(
new LambdaQueryWrapper<SysSaasRole>().eq(SysSaasRole::getTenantId, tenantId));
List<Long> roleIds = new ArrayList<>(roles.size() - 1);
List<Long> menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong);
roles.forEach(item -> {
if (TenantConstants.TENANT_ADMIN_ROLE_KEY.equals(item.getRoleKey())) {
List<SysSaasRoleMenu> roleMenus = new ArrayList<>(menuIds.size());
menuIds.forEach(menuId -> {
SysSaasRoleMenu roleMenu = new SysSaasRoleMenu();
roleMenu.setRoleId(item.getRoleId());
roleMenu.setMenuId(menuId);
roleMenus.add(roleMenu);
});
roleMenuMapper.delete(new LambdaQueryWrapper<SysSaasRoleMenu>().eq(SysSaasRoleMenu::getRoleId, item.getRoleId()));
roleMenuMapper.insertBatch(roleMenus);
} else {
roleIds.add(item.getRoleId());
}
});
if (!roleIds.isEmpty()) {
roleMenuMapper.delete(
new LambdaQueryWrapper<SysSaasRoleMenu>().in(SysSaasRoleMenu::getRoleId, roleIds).notIn(!menuIds.isEmpty(), SysSaasRoleMenu::getMenuId, menuIds));
}
return true;
}
}

7
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasApplicationMapper.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.system.saas.mapper.SysSaasApplicationMapper">
</mapper>

7
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasConfigMapper.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.system.saas.mapper.SysSaasConfigMapper">
</mapper>

7
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasOssConfigMapper.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.system.saas.mapper.SysSaasOssConfigMapper">
</mapper>

7
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasTenantApplicationMapper.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.system.saas.mapper.SysSaasTenantApplicationMapper">
</mapper>

7
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasTenantMapper.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.system.saas.mapper.SysSaasTenantMapper">
</mapper>

7
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasTenantPackageMapper.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.system.saas.mapper.SysSaasTenantPackageMapper">
</mapper>

3
ruoyi-site/ruoyi-admin/src/main/resources/application-dev.yml
View File

@ -119,9 +119,6 @@ tenant:
- sys_client - sys_client
- sys_oss_config - sys_oss_config
- sys_saas_menu - sys_saas_menu
- sys_saas_tenant
- sys_saas_tenant_package
- sys_saas_application
- sys_saas_role_dept - sys_saas_role_dept
- sys_saas_role_menu - sys_saas_role_menu
- sys_saas_user_post - sys_saas_user_post

3
ruoyi-site/ruoyi-admin/src/main/resources/application-local.yml
View File

@ -119,9 +119,6 @@ tenant:
- sys_client - sys_client
- sys_oss_config - sys_oss_config
- sys_saas_menu - sys_saas_menu
- sys_saas_tenant
- sys_saas_tenant_package
- sys_saas_application
- sys_saas_role_dept - sys_saas_role_dept
- sys_saas_role_menu - sys_saas_role_menu
- sys_saas_user_post - sys_saas_user_post

1501
script/sql/tenant/ry_vue_5.X.sql
View File

File diff suppressed because it is too large Load Diff