支持应用管理

This commit is contained in:
Github_lizhw 2024-09-22 22:46:41 +08:00
parent ac3a21c28e
commit 506d0923b0
17 changed files with 788 additions and 0 deletions

View File

@ -120,6 +120,7 @@ tenant:
- sys_menu - sys_menu
- sys_tenant - sys_tenant
- sys_tenant_package - sys_tenant_package
- sys_application
- sys_role_dept - sys_role_dept
- sys_role_menu - sys_role_menu
- sys_user_post - sys_user_post

View File

@ -0,0 +1,105 @@
package org.dromara.system.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.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;
import org.dromara.system.domain.vo.SysApplicationVo;
import org.dromara.system.domain.bo.SysApplicationBo;
import org.dromara.system.service.ISysApplicationService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 应用
*
* @author Lion Li
* @date 2024-09-22
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/application")
public class SysApplicationController extends BaseController {
private final ISysApplicationService sysApplicationService;
/**
* 查询应用列表
*/
@SaCheckPermission("system:application:list")
@GetMapping("/list")
public TableDataInfo<SysApplicationVo> list(SysApplicationBo bo, PageQuery pageQuery) {
return sysApplicationService.queryPageList(bo, pageQuery);
}
/**
* 导出应用列表
*/
@SaCheckPermission("system:application:export")
@Log(title = "应用", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysApplicationBo bo, HttpServletResponse response) {
List<SysApplicationVo> list = sysApplicationService.queryList(bo);
ExcelUtil.exportExcel(list, "应用", SysApplicationVo.class, response);
}
/**
* 获取应用详细信息
*
* @param applicationId 主键
*/
@SaCheckPermission("system:application:query")
@GetMapping("/{applicationId}")
public R<SysApplicationVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long applicationId) {
return R.ok(sysApplicationService.queryById(applicationId));
}
/**
* 新增应用
*/
@SaCheckPermission("system:application:add")
@Log(title = "应用", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysApplicationBo bo) {
return toAjax(sysApplicationService.insertByBo(bo));
}
/**
* 修改应用
*/
@SaCheckPermission("system:application:edit")
@Log(title = "应用", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysApplicationBo bo) {
return toAjax(sysApplicationService.updateByBo(bo));
}
/**
* 删除应用
*
* @param applicationIds 主键串
*/
@SaCheckPermission("system:application: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));
}
}

View File

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

View File

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

View File

@ -0,0 +1,42 @@
package org.dromara.system.domain.bo;
import org.dromara.system.domain.SysApplication;
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 lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
/**
* 应用业务对象 sys_application
*
* @author Lion Li
* @date 2024-09-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = SysApplication.class, reverseConvertGenerate = false)
public class SysApplicationBo 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;
}

View File

@ -0,0 +1,33 @@
package org.dromara.system.domain.bo;
import org.dromara.system.domain.SysTenantApplication;
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 lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
/**
* 租户和应用关联业务对象 sys_tenant_application
*
* @author Lion Li
* @date 2024-09-22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = SysTenantApplication.class, reverseConvertGenerate = false)
public class SysTenantApplicationBo extends BaseEntity {
@NotNull(message = "租户ID不能为空", groups = {EditGroup.class})
private Long tenantId;
/**
* 应用ID
*/
@NotNull(message = "应用ID不能为空", groups = {EditGroup.class})
private Long applicationId;
}

View File

@ -0,0 +1,50 @@
package org.dromara.system.domain.vo;
import org.dromara.system.domain.SysApplication;
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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 应用视图对象 sys_application
*
* @author Lion Li
* @date 2024-09-22
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = SysApplication.class)
public class SysApplicationVo 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;
}

View File

@ -0,0 +1,42 @@
package org.dromara.system.domain.vo;
import org.dromara.system.domain.SysTenantApplication;
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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* 租户和应用关联视图对象 sys_tenant_application
*
* @author Lion Li
* @date 2024-09-22
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = SysTenantApplication.class)
public class SysTenantApplicationVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@ExcelProperty(value = "应用ID")
private Long tenantId;
/**
* 应用ID
*/
@ExcelProperty(value = "应用ID")
private Long applicationId;
}

View File

@ -0,0 +1,15 @@
package org.dromara.system.mapper;
import org.dromara.system.domain.SysApplication;
import org.dromara.system.domain.vo.SysApplicationVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 应用Mapper接口
*
* @author Lion Li
* @date 2024-09-22
*/
public interface SysApplicationMapper extends BaseMapperPlus<SysApplication, SysApplicationVo> {
}

View File

@ -1,5 +1,6 @@
package org.dromara.system.mapper; package org.dromara.system.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.system.domain.SysClient; import org.dromara.system.domain.SysClient;
import org.dromara.system.domain.vo.SysClientVo; import org.dromara.system.domain.vo.SysClientVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author Michelle.Chung * @author Michelle.Chung
* @date 2023-05-15 * @date 2023-05-15
*/ */
@Mapper
public interface SysClientMapper extends BaseMapperPlus<SysClient, SysClientVo> { public interface SysClientMapper extends BaseMapperPlus<SysClient, SysClientVo> {
} }

View File

@ -0,0 +1,15 @@
package org.dromara.system.mapper;
import org.dromara.system.domain.SysTenantApplication;
import org.dromara.system.domain.vo.SysTenantApplicationVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
* 租户和应用关联Mapper接口
*
* @author Lion Li
* @date 2024-09-22
*/
public interface SysTenantApplicationMapper extends BaseMapperPlus<SysTenantApplication, SysTenantApplicationVo> {
}

View File

@ -0,0 +1,68 @@
package org.dromara.system.service;
import org.dromara.system.domain.vo.SysApplicationVo;
import org.dromara.system.domain.bo.SysApplicationBo;
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 ISysApplicationService {
/**
* 查询应用
*
* @param applicationId 主键
* @return 应用
*/
SysApplicationVo queryById(Long applicationId);
/**
* 分页查询应用列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 应用分页列表
*/
TableDataInfo<SysApplicationVo> queryPageList(SysApplicationBo bo, PageQuery pageQuery);
/**
* 查询符合条件的应用列表
*
* @param bo 查询条件
* @return 应用列表
*/
List<SysApplicationVo> queryList(SysApplicationBo bo);
/**
* 新增应用
*
* @param bo 应用
* @return 是否新增成功
*/
Boolean insertByBo(SysApplicationBo bo);
/**
* 修改应用
*
* @param bo 应用
* @return 是否修改成功
*/
Boolean updateByBo(SysApplicationBo bo);
/**
* 校验并批量删除应用信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

View File

@ -0,0 +1,68 @@
package org.dromara.system.service;
import org.dromara.system.domain.vo.SysTenantApplicationVo;
import org.dromara.system.domain.bo.SysTenantApplicationBo;
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 ISysTenantApplicationService {
/**
* 查询租户和应用关联
*
* @param tenantId 主键
* @return 租户和应用关联
*/
SysTenantApplicationVo queryById(Long tenantId);
/**
* 分页查询租户和应用关联列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 租户和应用关联分页列表
*/
TableDataInfo<SysTenantApplicationVo> queryPageList(SysTenantApplicationBo bo, PageQuery pageQuery);
/**
* 查询符合条件的租户和应用关联列表
*
* @param bo 查询条件
* @return 租户和应用关联列表
*/
List<SysTenantApplicationVo> queryList(SysTenantApplicationBo bo);
/**
* 新增租户和应用关联
*
* @param bo 租户和应用关联
* @return 是否新增成功
*/
Boolean insertByBo(SysTenantApplicationBo bo);
/**
* 修改租户和应用关联
*
* @param bo 租户和应用关联
* @return 是否修改成功
*/
Boolean updateByBo(SysTenantApplicationBo bo);
/**
* 校验并批量删除租户和应用关联信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

View File

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

View File

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

View File

@ -0,0 +1,7 @@
<?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.mapper.SysApplicationMapper">
</mapper>

View File

@ -0,0 +1,7 @@
<?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.mapper.SysTenantApplicationMapper">
</mapper>