system-tenant 多应用多租户支持

This commit is contained in:
Github_lizhw 2024-10-14 22:37:46 +08:00
parent f947afff7a
commit d1198a267c
11 changed files with 106 additions and 125 deletions

14
pom.xml
View File

@ -13,6 +13,8 @@
<description>RuoYi-Vue-Plus多租户管理系统</description>
<properties>
<spring-cloud.version>2023.0.3</spring-cloud.version>
<spring-cloud-alibaba.version>2023.0.1.2</spring-cloud-alibaba.version>
<revision>5.2.2</revision>
<spring-boot.version>3.2.9</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -99,7 +101,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>2023.0.1</version>
<version>${spring-cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -107,15 +109,7 @@
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>2022.0.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Spring Cloud Alibaba -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>2022.0.0.0</version>
<version>${spring-cloud-alibaba.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

View File

@ -6,6 +6,10 @@ 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;
@ -17,43 +21,39 @@ 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;
import org.dromara.system.saas.domain.vo.Sys2ApplicationVo;
import org.dromara.system.saas.domain.bo.Sys2ApplicationBo;
import org.dromara.system.saas.service.ISys2ApplicationService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 应用
*
* @author Lion Li
* @date 2024-09-22
* @date 2024-10-14
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system2/application")
public class Sys2ApplicationController extends BaseController {
@RequestMapping("/system/saasApplication")
public class SysSaasApplicationController extends BaseController {
private final ISys2ApplicationService sysApplicationService;
private final ISysSaasApplicationService sysSaasApplicationService;
/**
* 查询应用列表
*/
@SaCheckPermission("system:application:list")
@SaCheckPermission("system:saasApplication:list")
@GetMapping("/list")
public TableDataInfo<Sys2ApplicationVo> list(Sys2ApplicationBo bo, PageQuery pageQuery) {
return sysApplicationService.queryPageList(bo, pageQuery);
public TableDataInfo<SysSaasApplicationVo> list(SysSaasApplicationBo bo, PageQuery pageQuery) {
return sysSaasApplicationService.queryPageList(bo, pageQuery);
}
/**
* 导出应用列表
*/
@SaCheckPermission("system:application:export")
@SaCheckPermission("system:saasApplication:export")
@Log(title = "应用", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(Sys2ApplicationBo bo, HttpServletResponse response) {
List<Sys2ApplicationVo> list = sysApplicationService.queryList(bo);
ExcelUtil.exportExcel(list, "应用", Sys2ApplicationVo.class, response);
public void export(SysSaasApplicationBo bo, HttpServletResponse response) {
List<SysSaasApplicationVo> list = sysSaasApplicationService.queryList(bo);
ExcelUtil.exportExcel(list, "应用", SysSaasApplicationVo.class, response);
}
/**
@ -61,33 +61,33 @@ public class Sys2ApplicationController extends BaseController {
*
* @param applicationId 主键
*/
@SaCheckPermission("system:application:query")
@SaCheckPermission("system:saasApplication:query")
@GetMapping("/{applicationId}")
public R<Sys2ApplicationVo> getInfo(@NotNull(message = "主键不能为空")
public R<SysSaasApplicationVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long applicationId) {
return R.ok(sysApplicationService.queryById(applicationId));
return R.ok(sysSaasApplicationService.queryById(applicationId));
}
/**
* 新增应用
*/
@SaCheckPermission("system:application:add")
@SaCheckPermission("system:saasApplication:add")
@Log(title = "应用", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody Sys2ApplicationBo bo) {
return toAjax(sysApplicationService.insertByBo(bo));
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysSaasApplicationBo bo) {
return toAjax(sysSaasApplicationService.insertByBo(bo));
}
/**
* 修改应用
*/
@SaCheckPermission("system:application:edit")
@SaCheckPermission("system:saasApplication:edit")
@Log(title = "应用", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody Sys2ApplicationBo bo) {
return toAjax(sysApplicationService.updateByBo(bo));
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysSaasApplicationBo bo) {
return toAjax(sysSaasApplicationService.updateByBo(bo));
}
/**
@ -95,11 +95,11 @@ public class Sys2ApplicationController extends BaseController {
*
* @param applicationIds 主键串
*/
@SaCheckPermission("system:application:remove")
@SaCheckPermission("system:saasApplication:remove")
@Log(title = "应用", businessType = BusinessType.DELETE)
@DeleteMapping("/{applicationIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] applicationIds) {
return toAjax(sysApplicationService.deleteWithValidByIds(List.of(applicationIds), true));
return toAjax(sysSaasApplicationService.deleteWithValidByIds(List.of(applicationIds), true));
}
}

View File

@ -1,9 +1,10 @@
package org.dromara.system.saas.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
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;
@ -11,12 +12,12 @@ import java.io.Serial;
* 应用对象 sys_saas_application
*
* @author Lion Li
* @date 2024-09-22
* @date 2024-10-14
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_saas_application")
public class Sys2Application extends BaseEntity {
public class SysSaasApplication extends BaseEntity {
@Serial
private static final long serialVersionUID = 1L;

View File

@ -1,24 +1,25 @@
package org.dromara.system.saas.domain.bo;
import org.dromara.system.saas.domain.Sys2Application;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
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-09-22
* @date 2024-10-14
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = Sys2Application.class, reverseConvertGenerate = false)
public class Sys2ApplicationBo extends BaseEntity {
@AutoMapper(target = SysSaasApplication.class, reverseConvertGenerate = false)
public class SysSaasApplicationBo extends BaseEntity {
/**
* id

View File

@ -1,10 +1,10 @@
package org.dromara.system.saas.domain.vo;
import org.dromara.system.saas.domain.Sys2Application;
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;
@ -14,12 +14,12 @@ import java.io.Serializable;
* 应用视图对象 sys_saas_application
*
* @author Lion Li
* @date 2024-09-22
* @date 2024-10-14
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = Sys2Application.class)
public class Sys2ApplicationVo implements Serializable {
@AutoMapper(target = SysSaasApplication.class)
public class SysSaasApplicationVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;

View File

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

View File

@ -0,0 +1,17 @@
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> {
}

View File

@ -1,9 +1,9 @@
package org.dromara.system.saas.service;
import org.dromara.system.saas.domain.vo.Sys2ApplicationVo;
import org.dromara.system.saas.domain.bo.Sys2ApplicationBo;
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;
@ -12,9 +12,9 @@ import java.util.List;
* 应用Service接口
*
* @author Lion Li
* @date 2024-09-22
* @date 2024-10-14
*/
public interface ISys2ApplicationService {
public interface ISysSaasApplicationService {
/**
* 查询应用
@ -22,7 +22,7 @@ public interface ISys2ApplicationService {
* @param applicationId 主键
* @return 应用
*/
Sys2ApplicationVo queryById(Long applicationId);
SysSaasApplicationVo queryById(Long applicationId);
/**
* 分页查询应用列表
@ -31,7 +31,7 @@ public interface ISys2ApplicationService {
* @param pageQuery 分页参数
* @return 应用分页列表
*/
TableDataInfo<Sys2ApplicationVo> queryPageList(Sys2ApplicationBo bo, PageQuery pageQuery);
TableDataInfo<SysSaasApplicationVo> queryPageList(SysSaasApplicationBo bo, PageQuery pageQuery);
/**
* 查询符合条件的应用列表
@ -39,7 +39,7 @@ public interface ISys2ApplicationService {
* @param bo 查询条件
* @return 应用列表
*/
List<Sys2ApplicationVo> queryList(Sys2ApplicationBo bo);
List<SysSaasApplicationVo> queryList(SysSaasApplicationBo bo);
/**
* 新增应用
@ -47,7 +47,7 @@ public interface ISys2ApplicationService {
* @param bo 应用
* @return 是否新增成功
*/
Boolean insertByBo(Sys2ApplicationBo bo);
Boolean insertByBo(SysSaasApplicationBo bo);
/**
* 修改应用
@ -55,7 +55,7 @@ public interface ISys2ApplicationService {
* @param bo 应用
* @return 是否修改成功
*/
Boolean updateByBo(Sys2ApplicationBo bo);
Boolean updateByBo(SysSaasApplicationBo bo);
/**
* 校验并批量删除应用信息

View File

@ -1,35 +1,35 @@
package org.dromara.system.saas.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
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 com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import org.dromara.system.saas.domain.Sys2Application;
import org.dromara.system.saas.domain.bo.Sys2ApplicationBo;
import org.dromara.system.saas.domain.vo.Sys2ApplicationVo;
import org.dromara.system.saas.mapper.Sys2ApplicationMapper;
import org.dromara.system.saas.service.ISys2ApplicationService;
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;
import java.util.Collection;
/**
* 应用Service业务层处理
*
* @author Lion Li
* @date 2024-09-22
* @date 2024-10-14
*/
@RequiredArgsConstructor
@Service
public class Sys2ApplicationServiceImpl implements ISys2ApplicationService {
public class SysSaasApplicationServiceImpl implements ISysSaasApplicationService {
private final Sys2ApplicationMapper baseMapper;
private final SysSaasApplicationMapper baseMapper;
/**
* 查询应用
@ -38,7 +38,7 @@ public class Sys2ApplicationServiceImpl implements ISys2ApplicationService {
* @return 应用
*/
@Override
public Sys2ApplicationVo queryById(Long applicationId){
public SysSaasApplicationVo queryById(Long applicationId) {
return baseMapper.selectVoById(applicationId);
}
@ -50,9 +50,9 @@ public class Sys2ApplicationServiceImpl implements ISys2ApplicationService {
* @return 应用分页列表
*/
@Override
public TableDataInfo<Sys2ApplicationVo> queryPageList(Sys2ApplicationBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<Sys2Application> lqw = buildQueryWrapper(bo);
Page<Sys2ApplicationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
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);
}
@ -63,16 +63,16 @@ public class Sys2ApplicationServiceImpl implements ISys2ApplicationService {
* @return 应用列表
*/
@Override
public List<Sys2ApplicationVo> queryList(Sys2ApplicationBo bo) {
LambdaQueryWrapper<Sys2Application> lqw = buildQueryWrapper(bo);
public List<SysSaasApplicationVo> queryList(SysSaasApplicationBo bo) {
LambdaQueryWrapper<SysSaasApplication> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<Sys2Application> buildQueryWrapper(Sys2ApplicationBo bo) {
private LambdaQueryWrapper<SysSaasApplication> buildQueryWrapper(SysSaasApplicationBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<Sys2Application> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getApplicationName()), Sys2Application::getApplicationName, bo.getApplicationName());
lqw.eq(StringUtils.isNotBlank(bo.getApplicationCode()), Sys2Application::getApplicationCode, bo.getApplicationCode());
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;
}
@ -83,8 +83,8 @@ public class Sys2ApplicationServiceImpl implements ISys2ApplicationService {
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(Sys2ApplicationBo bo) {
Sys2Application add = MapstructUtils.convert(bo, Sys2Application.class);
public Boolean insertByBo(SysSaasApplicationBo bo) {
SysSaasApplication add = MapstructUtils.convert(bo, SysSaasApplication.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
@ -100,8 +100,8 @@ public class Sys2ApplicationServiceImpl implements ISys2ApplicationService {
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(Sys2ApplicationBo bo) {
Sys2Application update = MapstructUtils.convert(bo, Sys2Application.class);
public Boolean updateByBo(SysSaasApplicationBo bo) {
SysSaasApplication update = MapstructUtils.convert(bo, SysSaasApplication.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
@ -109,7 +109,7 @@ public class Sys2ApplicationServiceImpl implements ISys2ApplicationService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(Sys2Application entity){
private void validEntityBeforeSave(SysSaasApplication entity) {
//TODO 做一些数据校验,如唯一约束
}
@ -122,7 +122,7 @@ public class Sys2ApplicationServiceImpl implements ISys2ApplicationService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;

View File

@ -35,7 +35,7 @@ import java.util.*;
public class SysSaasMenuServiceImpl implements ISysSaasMenuService {
private final SysSaasMenuMapper baseMapper;
private final Sys2ApplicationMapper applicationMapper;
private final SysSaasApplicationMapper applicationMapper;
private final Sys2RoleMapper roleMapper;
private final Sys2RoleMenuMapper roleMenuMapper;
private final Sys2TenantPackageMapper tenantPackageMapper;
@ -68,21 +68,6 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService {
.eq(StringUtils.isNotBlank(menu.getStatus()), SysSaasMenu::getStatus, menu.getStatus())
.orderByAsc(SysSaasMenu::getParentId)
.orderByAsc(SysSaasMenu::getOrderNum));
List<Long> appIds = menuList.stream().map(SysSaasMenuVo::getApplicationId).distinct().toList();
if (!appIds.isEmpty()){
List<SysSaasMenuVo> appList = applicationMapper.selectVoBatchIds(appIds)
.stream()
.map(item -> {
SysSaasMenuVo sysSaasMenuVo = new SysSaasMenuVo();
sysSaasMenuVo.setMenuName(item.getApplicationName());
sysSaasMenuVo.setMenuId(item.getApplicationId());
sysSaasMenuVo.setMenuType("A");
return sysSaasMenuVo;
}).toList();
//TODO 继续完善展示应用后展示菜单
menuList.addAll(appList);
}
} else {
QueryWrapper<SysSaasMenu> wrapper = Wrappers.query();
wrapper.inSql("r.role_id", "select role_id from sys2_user_role where user_id = " + userId)

View File

@ -2,6 +2,6 @@
<!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.Sys2ApplicationMapper">
<mapper namespace="org.dromara.system.saas.mapper.SysSaasApplicationMapper">
</mapper>