diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 16b245fb4..c72257f2e 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -125,6 +125,14 @@ tenant: - sys_user_role - sys_client - sys_oss_config + - sys_saas_menu + - sys_saas_tenant + - sys_saas_tenant_package + - sys_saas_application + - sys_saas_role_dept + - sys_saas_role_menu + - sys_saas_user_post + - sys_saas_user_role # MyBatisPlus配置 # https://baomidou.com/config/ diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/SaasDeptService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/SaasDeptService.java new file mode 100644 index 000000000..d06566cb3 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/SaasDeptService.java @@ -0,0 +1,18 @@ +package org.dromara.common.core.service; + +/** + * 通用 部门服务 + * + * @author Lion Li + */ +public interface SaasDeptService { + + /** + * 通过部门ID查询部门名称 + * + * @param deptIds 部门ID串逗号分隔 + * @return 部门名称串逗号分隔 + */ + String selectDeptNameByIds(String deptIds); + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/SaasDictService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/SaasDictService.java new file mode 100644 index 000000000..1a724da6e --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/SaasDictService.java @@ -0,0 +1,67 @@ +package org.dromara.common.core.service; + +import java.util.Map; + +/** + * 通用 字典服务 + * + * @author Lion Li + */ +public interface SaasDictService { + + /** + * 分隔符 + */ + String SEPARATOR = ","; + + /** + * 根据字典类型和字典值获取字典标签 + * + * @param dictType 字典类型 + * @param dictValue 字典值 + * @return 字典标签 + */ + default String getDictLabel(String dictType, String dictValue) { + return getDictLabel(dictType, dictValue, SEPARATOR); + } + + /** + * 根据字典类型和字典标签获取字典值 + * + * @param dictType 字典类型 + * @param dictLabel 字典标签 + * @return 字典值 + */ + default String getDictValue(String dictType, String dictLabel) { + return getDictValue(dictType, dictLabel, SEPARATOR); + } + + /** + * 根据字典类型和字典值获取字典标签 + * + * @param dictType 字典类型 + * @param dictValue 字典值 + * @param separator 分隔符 + * @return 字典标签 + */ + String getDictLabel(String dictType, String dictValue, String separator); + + /** + * 根据字典类型和字典标签获取字典值 + * + * @param dictType 字典类型 + * @param dictLabel 字典标签 + * @param separator 分隔符 + * @return 字典值 + */ + String getDictValue(String dictType, String dictLabel, String separator); + + /** + * 获取字典下所有的字典值与标签 + * + * @param dictType 字典类型 + * @return dictValue为key，dictLabel为值组成的Map + */ + Map getAllDictByDictType(String dictType); + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/SaasOssService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/SaasOssService.java new file mode 100644 index 000000000..4aa33f8bb --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/SaasOssService.java @@ -0,0 +1,29 @@ +package org.dromara.common.core.service; + +import org.dromara.common.core.domain.dto.OssDTO; + +import java.util.List; + +/** + * 通用 OSS服务 + * + * @author Lion Li + */ +public interface SaasOssService { + + /** + * 通过ossId查询对应的url + * + * @param ossIds ossId串逗号分隔 + * @return url串逗号分隔 + */ + String selectUrlByIds(String ossIds); + + /** + * 通过ossId查询列表 + * + * @param ossIds ossId串逗号分隔 + * @return 列表 + */ + List selectByIds(String ossIds); +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/SaasUserService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/SaasUserService.java new file mode 100644 index 000000000..1a3256c4c --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/SaasUserService.java @@ -0,0 +1,85 @@ +package org.dromara.common.core.service; + +import org.dromara.common.core.domain.dto.UserDTO; + +import java.util.List; + +/** + * 通用 用户服务 + * + * @author Lion Li + */ +public interface SaasUserService { + + /** + * 通过用户ID查询用户账户 + * + * @param userId 用户ID + * @return 用户账户 + */ + String selectUserNameById(Long userId); + + /** + * 通过用户ID查询用户账户 + * + * @param userId 用户ID + * @return 用户名称 + */ + String selectNicknameById(Long userId); + + /** + * 通过用户ID查询用户账户 + * + * @param userIds 用户ID 多个用逗号隔开 + * @return 用户名称 + */ + String selectNicknameByIds(String userIds); + + /** + * 通过用户ID查询用户手机号 + * + * @param userId 用户id + * @return 用户手机号 + */ + String selectPhonenumberById(Long userId); + + /** + * 通过用户ID查询用户邮箱 + * + * @param userId 用户id + * @return 用户邮箱 + */ + String selectEmailById(Long userId); + + /** + * 通过用户ID查询用户列表 + * + * @param userIds 用户ids + * @return 用户列表 + */ + List selectListByIds(List userIds); + + /** + * 通过角色ID查询用户ID + * + * @param roleIds 角色ids + * @return 用户ids + */ + List selectUserIdsByRoleIds(List roleIds); + + /** + * 通过角色ID查询用户 + * + * @param roleIds 角色ids + * @return 用户 + */ + List selectUsersByRoleIds(List roleIds); + + /** + * 通过部门ID查询用户 + * + * @param deptIds 部门ids + * @return 用户 + */ + List selectUsersByDeptIds(List deptIds); +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2NoticeController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2NoticeController.java index 444c8656d..7f347ab5d 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2NoticeController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2NoticeController.java @@ -3,7 +3,7 @@ package org.dromara.system.saas.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; -import org.dromara.common.core.service.TwoDictService; +import org.dromara.common.core.service.SaasDictService; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*; public class Sys2NoticeController extends BaseController { private final ISys2NoticeService noticeService; - private final TwoDictService dictService; + private final SaasDictService dictService; /** * 获取通知公告列表 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DeptServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DeptServiceImpl.java index b8b4208fd..af9dec210 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DeptServiceImpl.java @@ -11,7 +11,7 @@ import lombok.RequiredArgsConstructor; 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.TwoDeptService; +import org.dromara.common.core.service.SaasDeptService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; @@ -43,7 +43,7 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class Sys2DeptServiceImpl implements ISys2DeptService, TwoDeptService { +public class Sys2DeptServiceImpl implements ISys2DeptService, SaasDeptService { private final Sys2DeptMapper baseMapper; private final Sys2RoleMapper roleMapper; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DictTypeServiceImpl.java index 7dae2384f..5ecff7fcc 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DictTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DictTypeServiceImpl.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.TwoDictService; +import org.dromara.common.core.service.SaasDictService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StreamUtils; @@ -43,7 +43,7 @@ import java.util.stream.Collectors; */ @RequiredArgsConstructor @Service -public class Sys2DictTypeServiceImpl implements ISys2DictTypeService, TwoDictService { +public class Sys2DictTypeServiceImpl implements ISys2DictTypeService, SaasDictService { private final Sys2DictTypeMapper baseMapper; private final Sys2DictDataMapper dictDataMapper; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OssServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OssServiceImpl.java index 9e95e02e9..e5a635a71 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OssServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OssServiceImpl.java @@ -11,7 +11,7 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.domain.dto.OssDTO; import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.TwoOssService; +import org.dromara.common.core.service.SaasOssService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StreamUtils; @@ -48,7 +48,7 @@ import java.util.Map; */ @RequiredArgsConstructor @Service -public class Sys2OssServiceImpl implements ISys2OssService, TwoOssService { +public class Sys2OssServiceImpl implements ISys2OssService, SaasOssService { private final Sys2OssMapper baseMapper; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2UserServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2UserServiceImpl.java index 5ccb7130c..4ce1f24ae 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2UserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2UserServiceImpl.java @@ -17,7 +17,7 @@ import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.constant.UserConstants; import org.dromara.common.core.domain.dto.UserDTO; import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.TwoUserService; +import org.dromara.common.core.service.SaasUserService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StreamUtils; @@ -51,7 +51,7 @@ import java.util.Map; @Slf4j @RequiredArgsConstructor @Service -public class Sys2UserServiceImpl implements ISys2UserService, TwoUserService { +public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { private final Sys2UserMapper baseMapper; private final Sys2DeptMapper deptMapper; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/monitor/CacheController.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/monitor/CacheController.java deleted file mode 100644 index 378e97a97..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/monitor/CacheController.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.dromara.system.tenant.controller.monitor; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.system.tenant.domain.vo.CacheListInfoVo; -import lombok.RequiredArgsConstructor; -import org.redisson.spring.data.connection.RedissonConnectionFactory; -import org.springframework.data.redis.connection.RedisConnection; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.*; - -/** - * 缓存监控 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@RestController -@RequestMapping("/monitor/cache") -public class CacheController { - - private final RedissonConnectionFactory connectionFactory; - - /** - * 获取缓存监控列表 - */ - @SaCheckPermission("monitor:cache:list") - @GetMapping() - public R getInfo() throws Exception { - RedisConnection connection = connectionFactory.getConnection(); - Properties commandStats = connection.commands().info("commandstats"); - - List> pieList = new ArrayList<>(); - if (commandStats != null) { - commandStats.stringPropertyNames().forEach(key -> { - Map data = new HashMap<>(2); - String property = commandStats.getProperty(key); - data.put("name", StringUtils.removeStart(key, "cmdstat_")); - data.put("value", StringUtils.substringBetween(property, "calls=", ",usec")); - pieList.add(data); - }); - } - - CacheListInfoVo infoVo = new CacheListInfoVo(); - infoVo.setInfo(connection.commands().info()); - infoVo.setDbSize(connection.commands().dbSize()); - infoVo.setCommandStats(pieList); - return R.ok(infoVo); - } - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysApplicationMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysApplicationMapper.java deleted file mode 100644 index 2e127b300..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysApplicationMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.dromara.system.tenant.domain.SysApplication; -import org.dromara.system.tenant.domain.vo.SysApplicationVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 应用Mapper接口 - * - * @author Lion Li - * @date 2024-09-22 - */ -public interface SysApplicationMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysClientMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysClientMapper.java deleted file mode 100644 index 2e99db0f4..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysClientMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.apache.ibatis.annotations.Mapper; -import org.dromara.system.tenant.domain.SysClient; -import org.dromara.system.tenant.domain.vo.SysClientVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 授权管理Mapper接口 - * - * @author Michelle.Chung - * @date 2023-05-15 - */ -@Mapper -public interface SysClientMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysConfigMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysConfigMapper.java deleted file mode 100644 index 7291c22d5..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysConfigMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.tenant.domain.SysConfig; -import org.dromara.system.tenant.domain.vo.SysConfigVo; - -/** - * 参数配置 数据层 - * - * @author Lion Li - */ -public interface SysConfigMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysDictDataMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysDictDataMapper.java deleted file mode 100644 index cc35c8d20..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysDictDataMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.tenant.domain.SysDictData; -import org.dromara.system.tenant.domain.vo.SysDictDataVo; - -import java.util.List; - -/** - * 字典表 数据层 - * - * @author Lion Li - */ -public interface SysDictDataMapper extends BaseMapperPlus { - - default List selectDictDataByType(String dictType) { - return selectVoList( - new LambdaQueryWrapper() - .eq(SysDictData::getDictType, dictType) - .orderByAsc(SysDictData::getDictSort)); - } -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysDictTypeMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysDictTypeMapper.java deleted file mode 100644 index c6e85c90c..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysDictTypeMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.dromara.system.tenant.domain.SysDictType; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.tenant.domain.vo.SysDictTypeVo; - -/** - * 字典表 数据层 - * - * @author Lion Li - */ -public interface SysDictTypeMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysLogininforMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysLogininforMapper.java deleted file mode 100644 index a582318df..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysLogininforMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.tenant.domain.SysLogininfor; -import org.dromara.system.tenant.domain.vo.SysLogininforVo; - -/** - * 系统访问日志情况信息 数据层 - * - * @author Lion Li - */ -public interface SysLogininforMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysNoticeMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysNoticeMapper.java deleted file mode 100644 index f46d107ca..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysNoticeMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.tenant.domain.SysNotice; -import org.dromara.system.tenant.domain.vo.SysNoticeVo; - -/** - * 通知公告表 数据层 - * - * @author Lion Li - */ -public interface SysNoticeMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysOperLogMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysOperLogMapper.java deleted file mode 100644 index fa1e554ae..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysOperLogMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.tenant.domain.SysOperLog; -import org.dromara.system.tenant.domain.vo.SysOperLogVo; - -/** - * 操作日志 数据层 - * - * @author Lion Li - */ -public interface SysOperLogMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysOssConfigMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysOssConfigMapper.java deleted file mode 100644 index 63be48170..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysOssConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.tenant.domain.SysOssConfig; -import org.dromara.system.tenant.domain.vo.SysOssConfigVo; - -/** - * 对象存储配置Mapper接口 - * - * @author Lion Li - * @author 孤舟烟雨 - * @date 2021-08-13 - */ -public interface SysOssConfigMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysOssMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysOssMapper.java deleted file mode 100644 index 99606dc44..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysOssMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.tenant.domain.SysOss; -import org.dromara.system.tenant.domain.vo.SysOssVo; - -/** - * 文件上传 数据层 - * - * @author Lion Li - */ -public interface SysOssMapper extends BaseMapperPlus { -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysRoleDeptMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysRoleDeptMapper.java deleted file mode 100644 index c855a424d..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysRoleDeptMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.tenant.domain.SysRoleDept; - -/** - * 角色与部门关联表 数据层 - * - * @author Lion Li - */ -public interface SysRoleDeptMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysRoleMenuMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysRoleMenuMapper.java deleted file mode 100644 index c8b16ff0a..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysRoleMenuMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.tenant.domain.SysRoleMenu; - -/** - * 角色与菜单关联表 数据层 - * - * @author Lion Li - */ -public interface SysRoleMenuMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysSocialMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysSocialMapper.java deleted file mode 100644 index 96a1f6202..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysSocialMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.tenant.domain.SysSocial; -import org.dromara.system.tenant.domain.vo.SysSocialVo; - -/** - * 社会化关系Mapper接口 - * - * @author thiszhc - */ -public interface SysSocialMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysTenantApplicationMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysTenantApplicationMapper.java deleted file mode 100644 index cd0a81920..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysTenantApplicationMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.dromara.system.tenant.domain.SysTenantApplication; -import org.dromara.system.tenant.domain.vo.SysTenantApplicationVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 租户和应用关联Mapper接口 - * - * @author Lion Li - * @date 2024-09-22 - */ -public interface SysTenantApplicationMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysTenantMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysTenantMapper.java deleted file mode 100644 index eb6863fdf..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysTenantMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.dromara.system.tenant.domain.SysTenant; -import org.dromara.system.tenant.domain.vo.SysTenantVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 租户Mapper接口 - * - * @author Michelle.Chung - */ -public interface SysTenantMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysTenantPackageMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysTenantPackageMapper.java deleted file mode 100644 index 8f6d5ec09..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysTenantPackageMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.tenant.domain.SysTenantPackage; -import org.dromara.system.tenant.domain.vo.SysTenantPackageVo; - -/** - * 租户套餐Mapper接口 - * - * @author Michelle.Chung - */ -public interface SysTenantPackageMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysUserPostMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysUserPostMapper.java deleted file mode 100644 index 2c97d7d3a..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysUserPostMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.tenant.domain.SysUserPost; - -/** - * 用户与岗位关联表 数据层 - * - * @author Lion Li - */ -public interface SysUserPostMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysUserRoleMapper.java b/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysUserRoleMapper.java deleted file mode 100644 index 4b611308d..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysUserRoleMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.dromara.system.tenant.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.tenant.domain.SysUserRole; - -import java.util.List; - -/** - * 用户与角色关联表 数据层 - * - * @author Lion Li - */ -public interface SysUserRoleMapper extends BaseMapperPlus { - - List selectUserIdsByRoleId(Long roleId); - -} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysDictDataMapper.xml deleted file mode 100644 index eaa827069..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysDictDataMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysLogininforMapper.xml deleted file mode 100644 index 0d5c3421f..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysLogininforMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysTenantApplicationMapper.xml b/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysTenantApplicationMapper.xml deleted file mode 100644 index 6b4f31d0a..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysTenantApplicationMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysTenantPackageMapper.xml b/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysTenantPackageMapper.xml deleted file mode 100644 index bd73e9e2e..000000000 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysTenantPackageMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - -