diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2LogininforController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/SysSaasLogininforController.java similarity index 78% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2LogininforController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/SysSaasLogininforController.java index 4e53d365e..a05fb2ee4 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2LogininforController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/SysSaasLogininforController.java @@ -12,9 +12,9 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.web.core.BaseController; -import org.dromara.system.saas.domain.bo.Sys2LogininforBo; -import org.dromara.system.saas.domain.vo.Sys2LogininforVo; -import org.dromara.system.saas.service.ISys2LogininforService; +import org.dromara.system.saas.domain.bo.SysSaasLogininforBo; +import org.dromara.system.saas.domain.vo.SysSaasLogininforVo; +import org.dromara.system.saas.service.ISysSaasLogininforService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -29,16 +29,16 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/monitor2/logininfor") -public class Sys2LogininforController extends BaseController { +public class SysSaasLogininforController extends BaseController { - private final ISys2LogininforService logininforService; + private final ISysSaasLogininforService logininforService; /** * 获取系统访问记录列表 */ @SaCheckPermission("monitor:logininfor:list") @GetMapping("/list") - public TableDataInfo list(Sys2LogininforBo logininfor, PageQuery pageQuery) { + public TableDataInfo list(SysSaasLogininforBo logininfor, PageQuery pageQuery) { return logininforService.selectPageLogininforList(logininfor, pageQuery); } @@ -48,9 +48,9 @@ public class Sys2LogininforController extends BaseController { @Log(title = "登录日志", businessType = BusinessType.EXPORT) @SaCheckPermission("monitor:logininfor:export") @PostMapping("/export") - public void export(Sys2LogininforBo logininfor, HttpServletResponse response) { - List list = logininforService.selectLogininforList(logininfor); - ExcelUtil.exportExcel(list, "登录日志", Sys2LogininforVo.class, response); + public void export(SysSaasLogininforBo logininfor, HttpServletResponse response) { + List list = logininforService.selectLogininforList(logininfor); + ExcelUtil.exportExcel(list, "登录日志", SysSaasLogininforVo.class, response); } /** diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2OperlogController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/SysSaasOperlogController.java similarity index 74% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2OperlogController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/SysSaasOperlogController.java index 5cb346e37..fa626f7a0 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2OperlogController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/SysSaasOperlogController.java @@ -8,9 +8,9 @@ import org.dromara.common.core.domain.R; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.system.saas.domain.bo.Sys2OperLogBo; -import org.dromara.system.saas.domain.vo.Sys2OperLogVo; -import org.dromara.system.saas.service.ISys2OperLogService; +import org.dromara.system.saas.domain.bo.SysSaasOperLogBo; +import org.dromara.system.saas.domain.vo.SysSaasOperLogVo; +import org.dromara.system.saas.service.ISysSaasOperLogService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -27,16 +27,16 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/monitor2/operlog") -public class Sys2OperlogController extends BaseController { +public class SysSaasOperlogController extends BaseController { - private final ISys2OperLogService operLogService; + private final ISysSaasOperLogService operLogService; /** * 获取操作日志记录列表 */ @SaCheckPermission("monitor:operlog:list") @GetMapping("/list") - public TableDataInfo list(Sys2OperLogBo operLog, PageQuery pageQuery) { + public TableDataInfo list(SysSaasOperLogBo operLog, PageQuery pageQuery) { return operLogService.selectPageOperLogList(operLog, pageQuery); } @@ -46,9 +46,9 @@ public class Sys2OperlogController extends BaseController { @Log(title = "操作日志", businessType = BusinessType.EXPORT) @SaCheckPermission("monitor:operlog:export") @PostMapping("/export") - public void export(Sys2OperLogBo operLog, HttpServletResponse response) { - List list = operLogService.selectOperLogList(operLog); - ExcelUtil.exportExcel(list, "操作日志", Sys2OperLogVo.class, response); + public void export(SysSaasOperLogBo operLog, HttpServletResponse response) { + List list = operLogService.selectOperLogList(operLog); + ExcelUtil.exportExcel(list, "操作日志", SysSaasOperLogVo.class, response); } /** diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2UserOnlineController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/SysSaasUserOnlineController.java similarity index 89% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2UserOnlineController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/SysSaasUserOnlineController.java index 2e1e65920..c14a36ec4 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2UserOnlineController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/SysSaasUserOnlineController.java @@ -15,7 +15,7 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.web.core.BaseController; -import org.dromara.system.saas.domain.Sys2UserOnline; +import org.dromara.system.saas.domain.SysSaasUserOnline; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -31,7 +31,7 @@ import java.util.stream.Collectors; @RequiredArgsConstructor @RestController @RequestMapping("/monitor2/online") -public class Sys2UserOnlineController extends BaseController { +public class SysSaasUserOnlineController extends BaseController { /** * 获取在线用户监控列表 @@ -41,7 +41,7 @@ public class Sys2UserOnlineController extends BaseController { */ @SaCheckPermission("monitor:online:list") @GetMapping("/list") - public TableDataInfo list(String ipaddr, String userName) { + public TableDataInfo list(String ipaddr, String userName) { // 获取所有未过期的 token List keys = StpUtil.searchTokenValue("", 0, -1, false); List userOnlineDTOList = new ArrayList<>(); @@ -69,7 +69,7 @@ public class Sys2UserOnlineController extends BaseController { } Collections.reverse(userOnlineDTOList); userOnlineDTOList.removeAll(Collections.singleton(null)); - List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, Sys2UserOnline.class); + List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysSaasUserOnline.class); return TableDataInfo.build(userOnlineList); } @@ -93,17 +93,17 @@ public class Sys2UserOnlineController extends BaseController { * 获取当前用户登录在线设备 */ @GetMapping() - public TableDataInfo getInfo() { + public TableDataInfo getInfo() { // 获取指定账号 id 的 token 集合 List tokenIds = StpUtil.getTokenValueListByLoginId(StpUtil.getLoginIdAsString()); List userOnlineDTOList = tokenIds.stream() .filter(token -> StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) >= -1) .map(token -> (UserOnlineDTO) RedisUtils.getCacheObject(CacheConstants.ONLINE_TOKEN_KEY + token)) .collect(Collectors.toList()); - //复制和处理 Sys2UserOnline 对象列表 + //复制和处理 SysSaasUserOnline 对象列表 Collections.reverse(userOnlineDTOList); userOnlineDTOList.removeAll(Collections.singleton(null)); - List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, Sys2UserOnline.class); + List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysSaasUserOnline.class); return TableDataInfo.build(userOnlineList); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ProfileController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ProfileController.java index a45b75644..0c17d8049 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ProfileController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ProfileController.java @@ -14,15 +14,15 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.helper.DataPermissionHelper; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; -import org.dromara.system.saas.domain.bo.Sys2UserBo; -import org.dromara.system.saas.domain.bo.Sys2UserPasswordBo; -import org.dromara.system.saas.domain.bo.Sys2UserProfileBo; +import org.dromara.system.saas.domain.bo.SysSaasUserBo; +import org.dromara.system.saas.domain.bo.SysSaasUserPasswordBo; +import org.dromara.system.saas.domain.bo.SysSaasUserProfileBo; import org.dromara.system.saas.domain.vo.TwoAvatarVo; import org.dromara.system.saas.domain.vo.TwoProfileVo; -import org.dromara.system.saas.domain.vo.Sys2OssVo; -import org.dromara.system.saas.domain.vo.Sys2UserVo; -import org.dromara.system.saas.service.ISys2OssService; -import org.dromara.system.saas.service.ISys2UserService; +import org.dromara.system.saas.domain.vo.SysSaasOssVo; +import org.dromara.system.saas.domain.vo.SysSaasUserVo; +import org.dromara.system.saas.service.ISysSaasOssService; +import org.dromara.system.saas.service.ISysSaasUserService; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -41,15 +41,15 @@ import java.util.Arrays; @RequestMapping("/system2/user/profile") public class Sys2ProfileController extends BaseController { - private final ISys2UserService userService; - private final ISys2OssService ossService; + private final ISysSaasUserService userService; + private final ISysSaasOssService ossService; /** * 个人信息 */ @GetMapping public R profile() { - Sys2UserVo user = userService.selectUserById(LoginHelper.getUserId()); + SysSaasUserVo user = userService.selectUserById(LoginHelper.getUserId()); TwoProfileVo twoProfileVo = new TwoProfileVo(); twoProfileVo.setUser(user); twoProfileVo.setRoleGroup(userService.selectUserRoleGroup(user.getUserId())); @@ -63,8 +63,8 @@ public class Sys2ProfileController extends BaseController { @RepeatSubmit @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping - public R updateProfile(@Validated @RequestBody Sys2UserProfileBo profile) { - Sys2UserBo user = BeanUtil.toBean(profile, Sys2UserBo.class); + public R updateProfile(@Validated @RequestBody SysSaasUserProfileBo profile) { + SysSaasUserBo user = BeanUtil.toBean(profile, SysSaasUserBo.class); user.setUserId(LoginHelper.getUserId()); String username = LoginHelper.getUsername(); if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { @@ -89,8 +89,8 @@ public class Sys2ProfileController extends BaseController { @ApiEncrypt @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping("/updatePwd") - public R updatePwd(@Validated @RequestBody Sys2UserPasswordBo bo) { - Sys2UserVo user = userService.selectUserById(LoginHelper.getUserId()); + public R updatePwd(@Validated @RequestBody SysSaasUserPasswordBo bo) { + SysSaasUserVo user = userService.selectUserById(LoginHelper.getUserId()); String password = user.getPassword(); if (!BCrypt.checkpw(bo.getOldPassword(), password)) { return R.fail("修改密码失败，旧密码错误"); @@ -119,7 +119,7 @@ public class Sys2ProfileController extends BaseController { if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) { return R.fail("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式"); } - Sys2OssVo oss = ossService.upload(avatarfile); + SysSaasOssVo oss = ossService.upload(avatarfile); String avatar = oss.getUrl(); if (userService.updateUserAvatar(LoginHelper.getUserId(), oss.getOssId())) { TwoAvatarVo twoAvatarVo = new TwoAvatarVo(); diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ClientController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasClientController.java similarity index 79% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ClientController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasClientController.java index cc458a6c3..b664980a0 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ClientController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasClientController.java @@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.system.saas.domain.bo.Sys2ClientBo; +import org.dromara.system.saas.domain.bo.SysSaasClientBo; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -18,8 +18,8 @@ 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.Sys2ClientVo; -import org.dromara.system.saas.service.ISys2ClientService; +import org.dromara.system.saas.domain.vo.SysSaasClientVo; +import org.dromara.system.saas.service.ISysSaasClientService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** @@ -32,16 +32,16 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @RequiredArgsConstructor @RestController @RequestMapping("/system2/client") -public class Sys2ClientController extends BaseController { +public class SysSaasClientController extends BaseController { - private final ISys2ClientService sysClientService; + private final ISysSaasClientService sysClientService; /** * 查询客户端管理列表 */ @SaCheckPermission("system:client:list") @GetMapping("/list") - public TableDataInfo list(Sys2ClientBo bo, PageQuery pageQuery) { + public TableDataInfo list(SysSaasClientBo bo, PageQuery pageQuery) { return sysClientService.queryPageList(bo, pageQuery); } @@ -51,9 +51,9 @@ public class Sys2ClientController extends BaseController { @SaCheckPermission("system:client:export") @Log(title = "客户端管理", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(Sys2ClientBo bo, HttpServletResponse response) { - List list = sysClientService.queryList(bo); - ExcelUtil.exportExcel(list, "客户端管理", Sys2ClientVo.class, response); + public void export(SysSaasClientBo bo, HttpServletResponse response) { + List list = sysClientService.queryList(bo); + ExcelUtil.exportExcel(list, "客户端管理", SysSaasClientVo.class, response); } /** @@ -63,7 +63,7 @@ public class Sys2ClientController extends BaseController { */ @SaCheckPermission("system:client:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(sysClientService.queryById(id)); } @@ -75,7 +75,7 @@ public class Sys2ClientController extends BaseController { @Log(title = "客户端管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody Sys2ClientBo bo) { + public R add(@Validated(AddGroup.class) @RequestBody SysSaasClientBo bo) { return toAjax(sysClientService.insertByBo(bo)); } @@ -86,7 +86,7 @@ public class Sys2ClientController extends BaseController { @Log(title = "客户端管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody Sys2ClientBo bo) { + public R edit(@Validated(EditGroup.class) @RequestBody SysSaasClientBo bo) { return toAjax(sysClientService.updateByBo(bo)); } @@ -96,7 +96,7 @@ public class Sys2ClientController extends BaseController { @SaCheckPermission("system:client:edit") @Log(title = "客户端管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public R changeStatus(@RequestBody Sys2ClientBo bo) { + public R changeStatus(@RequestBody SysSaasClientBo bo) { return toAjax(sysClientService.updateUserStatus(bo.getClientId(), bo.getStatus())); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ConfigController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasConfigController.java similarity index 79% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ConfigController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasConfigController.java index c7f4a2895..3e8cf4306 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ConfigController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasConfigController.java @@ -8,9 +8,9 @@ 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.Sys2ConfigBo; -import org.dromara.system.saas.domain.vo.Sys2ConfigVo; -import org.dromara.system.saas.service.ISys2ConfigService; +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; @@ -27,16 +27,16 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/system2/config") -public class Sys2ConfigController extends BaseController { +public class SysSaasConfigController extends BaseController { - private final ISys2ConfigService configService; + private final ISysSaasConfigService configService; /** * 获取参数配置列表 */ @SaCheckPermission("system:config:list") @GetMapping("/list") - public TableDataInfo list(Sys2ConfigBo config, PageQuery pageQuery) { + public TableDataInfo list(SysSaasConfigBo config, PageQuery pageQuery) { return configService.selectPageConfigList(config, pageQuery); } @@ -46,9 +46,9 @@ public class Sys2ConfigController extends BaseController { @Log(title = "参数管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:config:export") @PostMapping("/export") - public void export(Sys2ConfigBo config, HttpServletResponse response) { - List list = configService.selectConfigList(config); - ExcelUtil.exportExcel(list, "参数数据", Sys2ConfigVo.class, response); + public void export(SysSaasConfigBo config, HttpServletResponse response) { + List list = configService.selectConfigList(config); + ExcelUtil.exportExcel(list, "参数数据", SysSaasConfigVo.class, response); } /** @@ -58,7 +58,7 @@ public class Sys2ConfigController extends BaseController { */ @SaCheckPermission("system:config:query") @GetMapping(value = "/{configId}") - public R getInfo(@PathVariable Long configId) { + public R getInfo(@PathVariable Long configId) { return R.ok(configService.selectConfigById(configId)); } @@ -78,7 +78,7 @@ public class Sys2ConfigController extends BaseController { @SaCheckPermission("system:config:add") @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody Sys2ConfigBo config) { + public R add(@Validated @RequestBody SysSaasConfigBo config) { if (!configService.checkConfigKeyUnique(config)) { return R.fail("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); } @@ -92,7 +92,7 @@ public class Sys2ConfigController extends BaseController { @SaCheckPermission("system:config:edit") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody Sys2ConfigBo config) { + public R edit(@Validated @RequestBody SysSaasConfigBo config) { if (!configService.checkConfigKeyUnique(config)) { return R.fail("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); } @@ -106,7 +106,7 @@ public class Sys2ConfigController extends BaseController { @SaCheckPermission("system:config:edit") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping("/updateByKey") - public R updateByKey(@RequestBody Sys2ConfigBo config) { + public R updateByKey(@RequestBody SysSaasConfigBo config) { configService.updateConfig(config); return R.ok(); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DeptController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasDeptController.java similarity index 72% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DeptController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasDeptController.java index acc314456..ad668e91f 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DeptController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasDeptController.java @@ -9,10 +9,10 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; -import org.dromara.system.saas.domain.bo.Sys2DeptBo; -import org.dromara.system.saas.domain.vo.Sys2DeptVo; -import org.dromara.system.saas.service.ISys2DeptService; -import org.dromara.system.saas.service.ISys2PostService; +import org.dromara.system.saas.domain.bo.SysSaasDeptBo; +import org.dromara.system.saas.domain.vo.SysSaasDeptVo; +import org.dromara.system.saas.service.ISysSaasDeptService; +import org.dromara.system.saas.service.ISysSaasPostService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -26,19 +26,19 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system2/dept") -public class Sys2DeptController extends BaseController { +@RequestMapping("/system/saasDept") +public class SysSaasDeptController extends BaseController { - private final ISys2DeptService deptService; - private final ISys2PostService postService; + private final ISysSaasDeptService deptService; + private final ISysSaasPostService postService; /** * 获取部门列表 */ - @SaCheckPermission("system:dept:list") + @SaCheckPermission("system:saasDept:list") @GetMapping("/list") - public R> list(Sys2DeptBo dept) { - List depts = deptService.selectDeptList(dept); + public R> list(SysSaasDeptBo dept) { + List depts = deptService.selectDeptList(dept); return R.ok(depts); } @@ -47,10 +47,10 @@ public class Sys2DeptController extends BaseController { * * @param deptId 部门ID */ - @SaCheckPermission("system:dept:list") + @SaCheckPermission("system:saasDept:list") @GetMapping("/list/exclude/{deptId}") - public R> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) { - List depts = deptService.selectDeptList(new Sys2DeptBo()); + public R> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) { + List depts = deptService.selectDeptList(new SysSaasDeptBo()); depts.removeIf(d -> d.getDeptId().equals(deptId) || StringUtils.splitList(d.getAncestors()).contains(Convert.toStr(deptId))); return R.ok(depts); @@ -61,9 +61,9 @@ public class Sys2DeptController extends BaseController { * * @param deptId 部门ID */ - @SaCheckPermission("system:dept:query") + @SaCheckPermission("system:saasDept:query") @GetMapping(value = "/{deptId}") - public R getInfo(@PathVariable Long deptId) { + public R getInfo(@PathVariable Long deptId) { deptService.checkDeptDataScope(deptId); return R.ok(deptService.selectDeptById(deptId)); } @@ -71,10 +71,10 @@ public class Sys2DeptController extends BaseController { /** * 新增部门 */ - @SaCheckPermission("system:dept:add") + @SaCheckPermission("system:saasDept:add") @Log(title = "部门管理", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody Sys2DeptBo dept) { + public R add(@Validated @RequestBody SysSaasDeptBo dept) { if (!deptService.checkDeptNameUnique(dept)) { return R.fail("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在"); } @@ -84,10 +84,10 @@ public class Sys2DeptController extends BaseController { /** * 修改部门 */ - @SaCheckPermission("system:dept:edit") + @SaCheckPermission("system:saasDept:edit") @Log(title = "部门管理", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody Sys2DeptBo dept) { + public R edit(@Validated @RequestBody SysSaasDeptBo dept) { Long deptId = dept.getDeptId(); deptService.checkDeptDataScope(deptId); if (!deptService.checkDeptNameUnique(dept)) { @@ -109,7 +109,7 @@ public class Sys2DeptController extends BaseController { * * @param deptId 部门ID */ - @SaCheckPermission("system:dept:remove") + @SaCheckPermission("system:saasDept:remove") @Log(title = "部门管理", businessType = BusinessType.DELETE) @DeleteMapping("/{deptId}") public R remove(@PathVariable Long deptId) { @@ -131,9 +131,9 @@ public class Sys2DeptController extends BaseController { * * @param deptIds 部门ID串 */ - @SaCheckPermission("system:dept:query") + @SaCheckPermission("system:saasDept:query") @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] deptIds) { + public R> optionselect(@RequestParam(required = false) Long[] deptIds) { return R.ok(deptService.selectDeptByIds(deptIds == null ? null : List.of(deptIds))); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DictDataController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasDictDataController.java similarity index 72% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DictDataController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasDictDataController.java index 05c6e2a28..5c71681db 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DictDataController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasDictDataController.java @@ -9,10 +9,10 @@ import org.dromara.common.core.domain.R; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.system.saas.domain.bo.Sys2DictDataBo; -import org.dromara.system.saas.domain.vo.Sys2DictDataVo; -import org.dromara.system.saas.service.ISys2DictDataService; -import org.dromara.system.saas.service.ISys2DictTypeService; +import org.dromara.system.saas.domain.bo.SysSaasDictDataBo; +import org.dromara.system.saas.domain.vo.SysSaasDictDataVo; +import org.dromara.system.saas.service.ISysSaasDictDataService; +import org.dromara.system.saas.service.ISysSaasDictTypeService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -30,17 +30,17 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/system2/dict/data") -public class Sys2DictDataController extends BaseController { +public class SysSaasDictDataController extends BaseController { - private final ISys2DictDataService dictDataService; - private final ISys2DictTypeService dictTypeService; + private final ISysSaasDictDataService dictDataService; + private final ISysSaasDictTypeService dictTypeService; /** * 查询字典数据列表 */ @SaCheckPermission("system:dict:list") @GetMapping("/list") - public TableDataInfo list(Sys2DictDataBo dictData, PageQuery pageQuery) { + public TableDataInfo list(SysSaasDictDataBo dictData, PageQuery pageQuery) { return dictDataService.selectPageDictDataList(dictData, pageQuery); } @@ -50,9 +50,9 @@ public class Sys2DictDataController extends BaseController { @Log(title = "字典数据", businessType = BusinessType.EXPORT) @SaCheckPermission("system:dict:export") @PostMapping("/export") - public void export(Sys2DictDataBo dictData, HttpServletResponse response) { - List list = dictDataService.selectDictDataList(dictData); - ExcelUtil.exportExcel(list, "字典数据", Sys2DictDataVo.class, response); + public void export(SysSaasDictDataBo dictData, HttpServletResponse response) { + List list = dictDataService.selectDictDataList(dictData); + ExcelUtil.exportExcel(list, "字典数据", SysSaasDictDataVo.class, response); } /** @@ -62,7 +62,7 @@ public class Sys2DictDataController extends BaseController { */ @SaCheckPermission("system:dict:query") @GetMapping(value = "/{dictCode}") - public R getInfo(@PathVariable Long dictCode) { + public R getInfo(@PathVariable Long dictCode) { return R.ok(dictDataService.selectDictDataById(dictCode)); } @@ -72,8 +72,8 @@ public class Sys2DictDataController extends BaseController { * @param dictType 字典类型 */ @GetMapping(value = "/type/{dictType}") - public R> dictType(@PathVariable String dictType) { - List data = dictTypeService.selectDictDataByType(dictType); + public R> dictType(@PathVariable String dictType) { + List data = dictTypeService.selectDictDataByType(dictType); if (ObjectUtil.isNull(data)) { data = new ArrayList<>(); } @@ -86,7 +86,7 @@ public class Sys2DictDataController extends BaseController { @SaCheckPermission("system:dict:add") @Log(title = "字典数据", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody Sys2DictDataBo dict) { + public R add(@Validated @RequestBody SysSaasDictDataBo dict) { if (!dictDataService.checkDictDataUnique(dict)) { return R.fail("新增字典数据'" + dict.getDictValue() + "'失败，字典键值已存在"); } @@ -100,7 +100,7 @@ public class Sys2DictDataController extends BaseController { @SaCheckPermission("system:dict:edit") @Log(title = "字典数据", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody Sys2DictDataBo dict) { + public R edit(@Validated @RequestBody SysSaasDictDataBo dict) { if (!dictDataService.checkDictDataUnique(dict)) { return R.fail("修改字典数据'" + dict.getDictValue() + "'失败，字典键值已存在"); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DictTypeController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasDictTypeController.java similarity index 75% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DictTypeController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasDictTypeController.java index c620c8469..3e54556a5 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DictTypeController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasDictTypeController.java @@ -8,9 +8,9 @@ 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.Sys2DictTypeBo; -import org.dromara.system.saas.domain.vo.Sys2DictTypeVo; -import org.dromara.system.saas.service.ISys2DictTypeService; +import org.dromara.system.saas.domain.bo.SysSaasDictTypeBo; +import org.dromara.system.saas.domain.vo.SysSaasDictTypeVo; +import org.dromara.system.saas.service.ISysSaasDictTypeService; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -27,16 +27,16 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/system2/dict/type") -public class Sys2DictTypeController extends BaseController { +public class SysSaasDictTypeController extends BaseController { - private final ISys2DictTypeService dictTypeService; + private final ISysSaasDictTypeService dictTypeService; /** * 查询字典类型列表 */ @SaCheckPermission("system:dict:list") @GetMapping("/list") - public TableDataInfo list(Sys2DictTypeBo dictType, PageQuery pageQuery) { + public TableDataInfo list(SysSaasDictTypeBo dictType, PageQuery pageQuery) { return dictTypeService.selectPageDictTypeList(dictType, pageQuery); } @@ -46,9 +46,9 @@ public class Sys2DictTypeController extends BaseController { @Log(title = "字典类型", businessType = BusinessType.EXPORT) @SaCheckPermission("system:dict:export") @PostMapping("/export") - public void export(Sys2DictTypeBo dictType, HttpServletResponse response) { - List list = dictTypeService.selectDictTypeList(dictType); - ExcelUtil.exportExcel(list, "字典类型", Sys2DictTypeVo.class, response); + public void export(SysSaasDictTypeBo dictType, HttpServletResponse response) { + List list = dictTypeService.selectDictTypeList(dictType); + ExcelUtil.exportExcel(list, "字典类型", SysSaasDictTypeVo.class, response); } /** @@ -58,7 +58,7 @@ public class Sys2DictTypeController extends BaseController { */ @SaCheckPermission("system:dict:query") @GetMapping(value = "/{dictId}") - public R getInfo(@PathVariable Long dictId) { + public R getInfo(@PathVariable Long dictId) { return R.ok(dictTypeService.selectDictTypeById(dictId)); } @@ -68,7 +68,7 @@ public class Sys2DictTypeController extends BaseController { @SaCheckPermission("system:dict:add") @Log(title = "字典类型", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody Sys2DictTypeBo dict) { + public R add(@Validated @RequestBody SysSaasDictTypeBo dict) { if (!dictTypeService.checkDictTypeUnique(dict)) { return R.fail("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); } @@ -82,7 +82,7 @@ public class Sys2DictTypeController extends BaseController { @SaCheckPermission("system:dict:edit") @Log(title = "字典类型", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody Sys2DictTypeBo dict) { + public R edit(@Validated @RequestBody SysSaasDictTypeBo dict) { if (!dictTypeService.checkDictTypeUnique(dict)) { return R.fail("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); } @@ -118,8 +118,8 @@ public class Sys2DictTypeController extends BaseController { * 获取字典选择框列表 */ @GetMapping("/optionselect") - public R> optionselect() { - List dictTypes = dictTypeService.selectDictTypeAll(); + public R> optionselect() { + List dictTypes = dictTypeService.selectDictTypeAll(); return R.ok(dictTypes); } } 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/SysSaasNoticeController.java similarity index 80% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2NoticeController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasNoticeController.java index 7f347ab5d..998909138 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/SysSaasNoticeController.java @@ -10,9 +10,9 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.sse.utils.SseMessageUtils; import org.dromara.common.web.core.BaseController; -import org.dromara.system.saas.domain.bo.Sys2NoticeBo; -import org.dromara.system.saas.domain.vo.Sys2NoticeVo; -import org.dromara.system.saas.service.ISys2NoticeService; +import org.dromara.system.saas.domain.bo.SysSaasNoticeBo; +import org.dromara.system.saas.domain.vo.SysSaasNoticeVo; +import org.dromara.system.saas.service.ISysSaasNoticeService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -25,9 +25,9 @@ import org.springframework.web.bind.annotation.*; @RequiredArgsConstructor @RestController @RequestMapping("/system2/notice") -public class Sys2NoticeController extends BaseController { +public class SysSaasNoticeController extends BaseController { - private final ISys2NoticeService noticeService; + private final ISysSaasNoticeService noticeService; private final SaasDictService dictService; /** @@ -35,7 +35,7 @@ public class Sys2NoticeController extends BaseController { */ @SaCheckPermission("system:notice:list") @GetMapping("/list") - public TableDataInfo list(Sys2NoticeBo notice, PageQuery pageQuery) { + public TableDataInfo list(SysSaasNoticeBo notice, PageQuery pageQuery) { return noticeService.selectPageNoticeList(notice, pageQuery); } @@ -46,7 +46,7 @@ public class Sys2NoticeController extends BaseController { */ @SaCheckPermission("system:notice:query") @GetMapping(value = "/{noticeId}") - public R getInfo(@PathVariable Long noticeId) { + public R getInfo(@PathVariable Long noticeId) { return R.ok(noticeService.selectNoticeById(noticeId)); } @@ -56,7 +56,7 @@ public class Sys2NoticeController extends BaseController { @SaCheckPermission("system:notice:add") @Log(title = "通知公告", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody Sys2NoticeBo notice) { + public R add(@Validated @RequestBody SysSaasNoticeBo notice) { int rows = noticeService.insertNotice(notice); if (rows <= 0) { return R.fail(); @@ -72,7 +72,7 @@ public class Sys2NoticeController extends BaseController { @SaCheckPermission("system:notice:edit") @Log(title = "通知公告", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody Sys2NoticeBo notice) { + public R edit(@Validated @RequestBody SysSaasNoticeBo notice) { return toAjax(noticeService.updateNotice(notice)); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2OssConfigController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasOssConfigController.java similarity index 82% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2OssConfigController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasOssConfigController.java index bba31e630..28e3bdca0 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2OssConfigController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasOssConfigController.java @@ -11,9 +11,9 @@ 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.Sys2OssConfigBo; -import org.dromara.system.saas.domain.vo.Sys2OssConfigVo; -import org.dromara.system.saas.service.ISys2OssConfigService; +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; @@ -33,16 +33,16 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/resource2/oss/config") -public class Sys2OssConfigController extends BaseController { +public class SysSaasOssConfigController extends BaseController { - private final ISys2OssConfigService ossConfigService; + private final ISysSaasOssConfigService ossConfigService; /** * 查询对象存储配置列表 */ @SaCheckPermission("system:ossConfig:list") @GetMapping("/list") - public TableDataInfo list(@Validated(QueryGroup.class) Sys2OssConfigBo bo, PageQuery pageQuery) { + public TableDataInfo list(@Validated(QueryGroup.class) SysSaasOssConfigBo bo, PageQuery pageQuery) { return ossConfigService.queryPageList(bo, pageQuery); } @@ -53,7 +53,7 @@ public class Sys2OssConfigController extends BaseController { */ @SaCheckPermission("system:ossConfig:list") @GetMapping("/{ossConfigId}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long ossConfigId) { return R.ok(ossConfigService.queryById(ossConfigId)); } @@ -65,7 +65,7 @@ public class Sys2OssConfigController extends BaseController { @Log(title = "对象存储配置", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody Sys2OssConfigBo bo) { + public R add(@Validated(AddGroup.class) @RequestBody SysSaasOssConfigBo bo) { return toAjax(ossConfigService.insertByBo(bo)); } @@ -76,7 +76,7 @@ public class Sys2OssConfigController extends BaseController { @Log(title = "对象存储配置", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody Sys2OssConfigBo bo) { + public R edit(@Validated(EditGroup.class) @RequestBody SysSaasOssConfigBo bo) { return toAjax(ossConfigService.updateByBo(bo)); } @@ -99,7 +99,7 @@ public class Sys2OssConfigController extends BaseController { @SaCheckPermission("system:ossConfig:edit") @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public R changeStatus(@RequestBody Sys2OssConfigBo bo) { + public R changeStatus(@RequestBody SysSaasOssConfigBo bo) { return toAjax(ossConfigService.updateOssConfigStatus(bo)); } } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2OssController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasOssController.java similarity index 77% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2OssController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasOssController.java index d46055ea5..8ba517979 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2OssController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasOssController.java @@ -10,10 +10,10 @@ 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.Sys2OssBo; -import org.dromara.system.saas.domain.vo.Sys2OssUploadVo; -import org.dromara.system.saas.domain.vo.Sys2OssVo; -import org.dromara.system.saas.service.ISys2OssService; +import org.dromara.system.saas.domain.bo.SysSaasOssBo; +import org.dromara.system.saas.domain.vo.SysSaasOssUploadVo; +import org.dromara.system.saas.domain.vo.SysSaasOssVo; +import org.dromara.system.saas.service.ISysSaasOssService; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; @@ -35,16 +35,16 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/resource2/oss") -public class Sys2OssController extends BaseController { +public class SysSaasOssController extends BaseController { - private final ISys2OssService ossService; + private final ISysSaasOssService ossService; /** * 查询OSS对象存储列表 */ @SaCheckPermission("system:oss:list") @GetMapping("/list") - public TableDataInfo list(@Validated(QueryGroup.class) Sys2OssBo bo, PageQuery pageQuery) { + public TableDataInfo list(@Validated(QueryGroup.class) SysSaasOssBo bo, PageQuery pageQuery) { return ossService.queryPageList(bo, pageQuery); } @@ -55,9 +55,9 @@ public class Sys2OssController extends BaseController { */ @SaCheckPermission("system:oss:list") @GetMapping("/listByIds/{ossIds}") - public R> listByIds(@NotEmpty(message = "主键不能为空") + public R> listByIds(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) { - List list = ossService.listByIds(Arrays.asList(ossIds)); + List list = ossService.listByIds(Arrays.asList(ossIds)); return R.ok(list); } @@ -69,12 +69,12 @@ public class Sys2OssController extends BaseController { @SaCheckPermission("system:oss:upload") @Log(title = "OSS对象存储", businessType = BusinessType.INSERT) @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public R upload(@RequestPart("file") MultipartFile file) { + public R upload(@RequestPart("file") MultipartFile file) { if (ObjectUtil.isNull(file)) { return R.fail("上传文件不能为空"); } - Sys2OssVo oss = ossService.upload(file); - Sys2OssUploadVo uploadVo = new Sys2OssUploadVo(); + SysSaasOssVo oss = ossService.upload(file); + SysSaasOssUploadVo uploadVo = new SysSaasOssUploadVo(); uploadVo.setUrl(oss.getUrl()); uploadVo.setFileName(oss.getOriginalName()); uploadVo.setOssId(oss.getOssId().toString()); diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2PostController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasPostController.java similarity index 77% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2PostController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasPostController.java index 836b293ae..597266b1a 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2PostController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasPostController.java @@ -12,9 +12,9 @@ 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.Sys2PostBo; -import org.dromara.system.saas.domain.vo.Sys2PostVo; -import org.dromara.system.saas.service.ISys2PostService; +import org.dromara.system.saas.domain.bo.SysSaasPostBo; +import org.dromara.system.saas.domain.vo.SysSaasPostVo; +import org.dromara.system.saas.service.ISysSaasPostService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -30,16 +30,16 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/system2/post") -public class Sys2PostController extends BaseController { +public class SysSaasPostController extends BaseController { - private final ISys2PostService postService; + private final ISysSaasPostService postService; /** * 获取岗位列表 */ @SaCheckPermission("system:post:list") @GetMapping("/list") - public TableDataInfo list(Sys2PostBo post, PageQuery pageQuery) { + public TableDataInfo list(SysSaasPostBo post, PageQuery pageQuery) { return postService.selectPagePostList(post, pageQuery); } @@ -49,9 +49,9 @@ public class Sys2PostController extends BaseController { @Log(title = "岗位管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:post:export") @PostMapping("/export") - public void export(Sys2PostBo post, HttpServletResponse response) { - List list = postService.selectPostList(post); - ExcelUtil.exportExcel(list, "岗位数据", Sys2PostVo.class, response); + public void export(SysSaasPostBo post, HttpServletResponse response) { + List list = postService.selectPostList(post); + ExcelUtil.exportExcel(list, "岗位数据", SysSaasPostVo.class, response); } /** @@ -61,7 +61,7 @@ public class Sys2PostController extends BaseController { */ @SaCheckPermission("system:post:query") @GetMapping(value = "/{postId}") - public R getInfo(@PathVariable Long postId) { + public R getInfo(@PathVariable Long postId) { return R.ok(postService.selectPostById(postId)); } @@ -71,7 +71,7 @@ public class Sys2PostController extends BaseController { @SaCheckPermission("system:post:add") @Log(title = "岗位管理", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody Sys2PostBo post) { + public R add(@Validated @RequestBody SysSaasPostBo post) { if (!postService.checkPostNameUnique(post)) { return R.fail("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在"); } else if (!postService.checkPostCodeUnique(post)) { @@ -86,7 +86,7 @@ public class Sys2PostController extends BaseController { @SaCheckPermission("system:post:edit") @Log(title = "岗位管理", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody Sys2PostBo post) { + public R edit(@Validated @RequestBody SysSaasPostBo post) { if (!postService.checkPostNameUnique(post)) { return R.fail("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在"); } else if (!postService.checkPostCodeUnique(post)) { @@ -118,10 +118,10 @@ public class Sys2PostController extends BaseController { */ @SaCheckPermission("system:post:query") @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) { - List list = new ArrayList<>(); + public R> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) { + List list = new ArrayList<>(); if (ObjectUtil.isNotNull(deptId)) { - Sys2PostBo post = new Sys2PostBo(); + SysSaasPostBo post = new SysSaasPostBo(); post.setDeptId(deptId); list = postService.selectPostList(post); } else if (postIds != null) { diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2RoleController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasRoleController.java similarity index 78% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2RoleController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasRoleController.java index 89cd85517..3cc22e1ab 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2RoleController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasRoleController.java @@ -10,16 +10,16 @@ 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.Sys2UserRole; -import org.dromara.system.saas.domain.bo.Sys2DeptBo; -import org.dromara.system.saas.domain.bo.Sys2RoleBo; -import org.dromara.system.saas.domain.bo.Sys2UserBo; +import org.dromara.system.saas.domain.SysSaasUserRole; +import org.dromara.system.saas.domain.bo.SysSaasDeptBo; +import org.dromara.system.saas.domain.bo.SysSaasRoleBo; +import org.dromara.system.saas.domain.bo.SysSaasUserBo; import org.dromara.system.saas.domain.vo.TwoDeptTreeSelectVo; -import org.dromara.system.saas.domain.vo.Sys2RoleVo; -import org.dromara.system.saas.domain.vo.Sys2UserVo; -import org.dromara.system.saas.service.ISys2DeptService; -import org.dromara.system.saas.service.ISys2RoleService; -import org.dromara.system.saas.service.ISys2UserService; +import org.dromara.system.saas.domain.vo.SysSaasRoleVo; +import org.dromara.system.saas.domain.vo.SysSaasUserVo; +import org.dromara.system.saas.service.ISysSaasDeptService; +import org.dromara.system.saas.service.ISysSaasRoleService; +import org.dromara.system.saas.service.ISysSaasUserService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -34,18 +34,18 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/system2/role") -public class Sys2RoleController extends BaseController { +public class SysSaasRoleController extends BaseController { - private final ISys2RoleService roleService; - private final ISys2UserService userService; - private final ISys2DeptService deptService; + private final ISysSaasRoleService roleService; + private final ISysSaasUserService userService; + private final ISysSaasDeptService deptService; /** * 获取角色信息列表 */ @SaCheckPermission("system:role:list") @GetMapping("/list") - public TableDataInfo list(Sys2RoleBo role, PageQuery pageQuery) { + public TableDataInfo list(SysSaasRoleBo role, PageQuery pageQuery) { return roleService.selectPageRoleList(role, pageQuery); } @@ -55,9 +55,9 @@ public class Sys2RoleController extends BaseController { @Log(title = "角色管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:role:export") @PostMapping("/export") - public void export(Sys2RoleBo role, HttpServletResponse response) { - List list = roleService.selectRoleList(role); - ExcelUtil.exportExcel(list, "角色数据", Sys2RoleVo.class, response); + public void export(SysSaasRoleBo role, HttpServletResponse response) { + List list = roleService.selectRoleList(role); + ExcelUtil.exportExcel(list, "角色数据", SysSaasRoleVo.class, response); } /** @@ -67,7 +67,7 @@ public class Sys2RoleController extends BaseController { */ @SaCheckPermission("system:role:query") @GetMapping(value = "/{roleId}") - public R getInfo(@PathVariable Long roleId) { + public R getInfo(@PathVariable Long roleId) { roleService.checkRoleDataScope(roleId); return R.ok(roleService.selectRoleById(roleId)); } @@ -78,7 +78,7 @@ public class Sys2RoleController extends BaseController { @SaCheckPermission("system:role:add") @Log(title = "角色管理", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody Sys2RoleBo role) { + public R add(@Validated @RequestBody SysSaasRoleBo role) { roleService.checkRoleAllowed(role); if (!roleService.checkRoleNameUnique(role)) { return R.fail("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); @@ -95,7 +95,7 @@ public class Sys2RoleController extends BaseController { @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody Sys2RoleBo role) { + public R edit(@Validated @RequestBody SysSaasRoleBo role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); if (!roleService.checkRoleNameUnique(role)) { @@ -117,7 +117,7 @@ public class Sys2RoleController extends BaseController { @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/dataScope") - public R dataScope(@RequestBody Sys2RoleBo role) { + public R dataScope(@RequestBody SysSaasRoleBo role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); return toAjax(roleService.authDataScope(role)); @@ -129,7 +129,7 @@ public class Sys2RoleController extends BaseController { @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public R changeStatus(@RequestBody Sys2RoleBo role) { + public R changeStatus(@RequestBody SysSaasRoleBo role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); return toAjax(roleService.updateRoleStatus(role.getRoleId(), role.getStatus())); @@ -154,7 +154,7 @@ public class Sys2RoleController extends BaseController { */ @SaCheckPermission("system:role:query") @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] roleIds) { + public R> optionselect(@RequestParam(required = false) Long[] roleIds) { return R.ok(roleService.selectRoleByIds(roleIds == null ? null : List.of(roleIds))); } @@ -163,7 +163,7 @@ public class Sys2RoleController extends BaseController { */ @SaCheckPermission("system:role:list") @GetMapping("/authUser/allocatedList") - public TableDataInfo allocatedList(Sys2UserBo user, PageQuery pageQuery) { + public TableDataInfo allocatedList(SysSaasUserBo user, PageQuery pageQuery) { return userService.selectAllocatedList(user, pageQuery); } @@ -172,7 +172,7 @@ public class Sys2RoleController extends BaseController { */ @SaCheckPermission("system:role:list") @GetMapping("/authUser/unallocatedList") - public TableDataInfo unallocatedList(Sys2UserBo user, PageQuery pageQuery) { + public TableDataInfo unallocatedList(SysSaasUserBo user, PageQuery pageQuery) { return userService.selectUnallocatedList(user, pageQuery); } @@ -182,7 +182,7 @@ public class Sys2RoleController extends BaseController { @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancel") - public R cancelAuthUser(@RequestBody Sys2UserRole userRole) { + public R cancelAuthUser(@RequestBody SysSaasUserRole userRole) { return toAjax(roleService.deleteAuthUser(userRole)); } @@ -223,7 +223,7 @@ public class Sys2RoleController extends BaseController { public R roleDeptTreeselect(@PathVariable("roleId") Long roleId) { TwoDeptTreeSelectVo selectVo = new TwoDeptTreeSelectVo(); selectVo.setCheckedKeys(deptService.selectDeptListByRoleId(roleId)); - selectVo.setDepts(deptService.selectDeptTreeList(new Sys2DeptBo())); + selectVo.setDepts(deptService.selectDeptTreeList(new SysSaasDeptBo())); return R.ok(selectVo); } } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2SocialController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasSocialController.java similarity index 74% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2SocialController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasSocialController.java index f81a7cdca..c3c682806 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2SocialController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasSocialController.java @@ -4,8 +4,8 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; -import org.dromara.system.saas.domain.vo.Sys2SocialVo; -import org.dromara.system.saas.service.ISys2SocialService; +import org.dromara.system.saas.domain.vo.SysSaasSocialVo; +import org.dromara.system.saas.service.ISysSaasSocialService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -23,15 +23,15 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/system2/social") -public class Sys2SocialController extends BaseController { +public class SysSaasSocialController extends BaseController { - private final ISys2SocialService socialUserService; + private final ISysSaasSocialService socialUserService; /** * 查询社会化关系列表 */ @GetMapping("/list") - public R> list() { + public R> list() { return R.ok(socialUserService.queryListByUserId(LoginHelper.getUserId())); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2TenantController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantController.java similarity index 87% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2TenantController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantController.java index df71785b0..c46252515 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2TenantController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantController.java @@ -21,9 +21,9 @@ 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.Sys2TenantBo; -import org.dromara.system.saas.domain.vo.Sys2TenantVo; -import org.dromara.system.saas.service.ISys2TenantService; +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.*; @@ -40,9 +40,9 @@ import java.util.List; @RestController @RequestMapping("/system2/tenant") @ConditionalOnProperty(value = "tenant.enable", havingValue = "true") -public class Sys2TenantController extends BaseController { +public class SysSaasTenantController extends BaseController { - private final ISys2TenantService tenantService; + private final ISysSaasTenantService tenantService; /** * 查询租户列表 @@ -50,7 +50,7 @@ public class Sys2TenantController extends BaseController { @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:tenant:list") @GetMapping("/list") - public TableDataInfo list(Sys2TenantBo bo, PageQuery pageQuery) { + public TableDataInfo list(SysSaasTenantBo bo, PageQuery pageQuery) { return tenantService.queryPageList(bo, pageQuery); } @@ -61,9 +61,9 @@ public class Sys2TenantController extends BaseController { @SaCheckPermission("system:tenant:export") @Log(title = "租户", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(Sys2TenantBo bo, HttpServletResponse response) { - List list = tenantService.queryList(bo); - ExcelUtil.exportExcel(list, "租户", Sys2TenantVo.class, response); + public void export(SysSaasTenantBo bo, HttpServletResponse response) { + List list = tenantService.queryList(bo); + ExcelUtil.exportExcel(list, "租户", SysSaasTenantVo.class, response); } /** @@ -74,7 +74,7 @@ public class Sys2TenantController extends BaseController { @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:tenant:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(tenantService.queryById(id)); } @@ -89,7 +89,7 @@ public class Sys2TenantController extends BaseController { @Lock4j @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody Sys2TenantBo bo) { + public R add(@Validated(AddGroup.class) @RequestBody SysSaasTenantBo bo) { if (!tenantService.checkCompanyNameUnique(bo)) { return R.fail("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在"); } @@ -104,7 +104,7 @@ public class Sys2TenantController extends BaseController { @Log(title = "租户", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody Sys2TenantBo bo) { + public R edit(@Validated(EditGroup.class) @RequestBody SysSaasTenantBo bo) { tenantService.checkTenantAllowed(bo.getTenantId()); if (!tenantService.checkCompanyNameUnique(bo)) { return R.fail("修改租户'" + bo.getCompanyName() + "'失败，公司名称已存在"); @@ -119,7 +119,7 @@ public class Sys2TenantController extends BaseController { @SaCheckPermission("system:tenant:edit") @Log(title = "租户", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public R changeStatus(@RequestBody Sys2TenantBo bo) { + public R changeStatus(@RequestBody SysSaasTenantBo bo) { tenantService.checkTenantAllowed(bo.getTenantId()); return toAjax(tenantService.updateTenantStatus(bo)); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2TenantPackageController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantPackageController.java similarity index 82% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2TenantPackageController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantPackageController.java index 764fc9b94..f201a4ead 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2TenantPackageController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantPackageController.java @@ -13,9 +13,9 @@ 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.Sys2TenantPackageBo; -import org.dromara.system.saas.domain.vo.Sys2TenantPackageVo; -import org.dromara.system.saas.service.ISys2TenantPackageService; +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; @@ -36,9 +36,9 @@ import java.util.List; @RestController @RequestMapping("/system2/tenant/package") @ConditionalOnProperty(value = "tenant.enable", havingValue = "true") -public class Sys2TenantPackageController extends BaseController { +public class SysSaasTenantPackageController extends BaseController { - private final ISys2TenantPackageService tenantPackageService; + private final ISysSaasTenantPackageService tenantPackageService; /** * 查询租户套餐列表 @@ -46,7 +46,7 @@ public class Sys2TenantPackageController extends BaseController { @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:tenantPackage:list") @GetMapping("/list") - public TableDataInfo list(Sys2TenantPackageBo bo, PageQuery pageQuery) { + public TableDataInfo list(SysSaasTenantPackageBo bo, PageQuery pageQuery) { return tenantPackageService.queryPageList(bo, pageQuery); } @@ -56,7 +56,7 @@ public class Sys2TenantPackageController extends BaseController { @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:tenantPackage:list") @GetMapping("/selectList") - public R> selectList() { + public R> selectList() { return R.ok(tenantPackageService.selectList()); } @@ -67,9 +67,9 @@ public class Sys2TenantPackageController extends BaseController { @SaCheckPermission("system:tenantPackage:export") @Log(title = "租户套餐", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(Sys2TenantPackageBo bo, HttpServletResponse response) { - List list = tenantPackageService.queryList(bo); - ExcelUtil.exportExcel(list, "租户套餐", Sys2TenantPackageVo.class, response); + public void export(SysSaasTenantPackageBo bo, HttpServletResponse response) { + List list = tenantPackageService.queryList(bo); + ExcelUtil.exportExcel(list, "租户套餐", SysSaasTenantPackageVo.class, response); } /** @@ -80,7 +80,7 @@ public class Sys2TenantPackageController extends BaseController { @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:tenantPackage:query") @GetMapping("/{packageId}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long packageId) { return R.ok(tenantPackageService.queryById(packageId)); } @@ -93,7 +93,7 @@ public class Sys2TenantPackageController extends BaseController { @Log(title = "租户套餐", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody Sys2TenantPackageBo bo) { + public R add(@Validated(AddGroup.class) @RequestBody SysSaasTenantPackageBo bo) { if (!tenantPackageService.checkPackageNameUnique(bo)) { return R.fail("新增套餐'" + bo.getPackageName() + "'失败，套餐名称已存在"); } @@ -108,7 +108,7 @@ public class Sys2TenantPackageController extends BaseController { @Log(title = "租户套餐", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody Sys2TenantPackageBo bo) { + public R edit(@Validated(EditGroup.class) @RequestBody SysSaasTenantPackageBo bo) { if (!tenantPackageService.checkPackageNameUnique(bo)) { return R.fail("修改套餐'" + bo.getPackageName() + "'失败，套餐名称已存在"); } @@ -122,7 +122,7 @@ public class Sys2TenantPackageController extends BaseController { @SaCheckPermission("system:tenantPackage:edit") @Log(title = "租户套餐", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public R changeStatus(@RequestBody Sys2TenantPackageBo bo) { + public R changeStatus(@RequestBody SysSaasTenantPackageBo bo) { return toAjax(tenantPackageService.updatePackageStatus(bo)); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2UserController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasUserController.java similarity index 79% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2UserController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasUserController.java index 7563236c4..a708a6849 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2UserController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasUserController.java @@ -23,10 +23,10 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.web.core.BaseController; -import org.dromara.system.saas.domain.bo.Sys2DeptBo; -import org.dromara.system.saas.domain.bo.Sys2PostBo; -import org.dromara.system.saas.domain.bo.Sys2RoleBo; -import org.dromara.system.saas.domain.bo.Sys2UserBo; +import org.dromara.system.saas.domain.bo.SysSaasDeptBo; +import org.dromara.system.saas.domain.bo.SysSaasPostBo; +import org.dromara.system.saas.domain.bo.SysSaasRoleBo; +import org.dromara.system.saas.domain.bo.SysSaasUserBo; import org.dromara.system.saas.domain.vo.*; import org.dromara.system.saas.listener.SysUserImportListener; import org.dromara.system.saas.service.*; @@ -47,20 +47,20 @@ import java.util.List; @RequiredArgsConstructor @RestController @RequestMapping("/system2/user") -public class Sys2UserController extends BaseController { +public class SysSaasUserController extends BaseController { - private final ISys2UserService userService; - private final ISys2RoleService roleService; - private final ISys2PostService postService; - private final ISys2DeptService deptService; - private final ISys2TenantService tenantService; + private final ISysSaasUserService userService; + private final ISysSaasRoleService roleService; + private final ISysSaasPostService postService; + private final ISysSaasDeptService deptService; + private final ISysSaasTenantService tenantService; /** * 获取用户列表 */ @SaCheckPermission("system:user:list") @GetMapping("/list") - public TableDataInfo list(Sys2UserBo user, PageQuery pageQuery) { + public TableDataInfo list(SysSaasUserBo user, PageQuery pageQuery) { return userService.selectPageUserList(user, pageQuery); } @@ -70,9 +70,9 @@ public class Sys2UserController extends BaseController { @Log(title = "用户管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:user:export") @PostMapping("/export") - public void export(Sys2UserBo user, HttpServletResponse response) { - List list = userService.selectUserExportList(user); - ExcelUtil.exportExcel(list, "用户数据", Sys2UserExportVo.class, response); + public void export(SysSaasUserBo user, HttpServletResponse response) { + List list = userService.selectUserExportList(user); + ExcelUtil.exportExcel(list, "用户数据", SysSaasUserExportVo.class, response); } /** @@ -85,7 +85,7 @@ public class Sys2UserController extends BaseController { @SaCheckPermission("system:user:import") @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception { - ExcelResult result = ExcelUtil.importExcel(file.getInputStream(), Sys2UserImportVo.class, new SysUserImportListener(updateSupport)); + ExcelResult result = ExcelUtil.importExcel(file.getInputStream(), SysSaasUserImportVo.class, new SysUserImportListener(updateSupport)); return R.ok(result.getAnalysis()); } @@ -94,7 +94,7 @@ public class Sys2UserController extends BaseController { */ @PostMapping("/importTemplate") public void importTemplate(HttpServletResponse response) { - ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", Sys2UserImportVo.class, response); + ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysSaasUserImportVo.class, response); } /** @@ -110,7 +110,7 @@ public class Sys2UserController extends BaseController { // 超级管理员 如果重新加载用户信息需清除动态租户 TenantHelper.clearDynamic(); } - Sys2UserVo user = userService.selectUserById(loginUser.getUserId()); + SysSaasUserVo user = userService.selectUserById(loginUser.getUserId()); if (ObjectUtil.isNull(user)) { return R.fail("没有权限访问用户数据!"); } @@ -127,20 +127,20 @@ public class Sys2UserController extends BaseController { */ @SaCheckPermission("system:user:query") @GetMapping(value = {"/", "/{userId}"}) - public R getInfo(@PathVariable(value = "userId", required = false) Long userId) { + public R getInfo(@PathVariable(value = "userId", required = false) Long userId) { userService.checkUserDataScope(userId); - Sys2UserInfoVo userInfoVo = new Sys2UserInfoVo(); - Sys2RoleBo roleBo = new Sys2RoleBo(); + SysSaasUserInfoVo userInfoVo = new SysSaasUserInfoVo(); + SysSaasRoleBo roleBo = new SysSaasRoleBo(); roleBo.setStatus(UserConstants.ROLE_NORMAL); - List roles = roleService.selectRoleList(roleBo); + List roles = roleService.selectRoleList(roleBo); userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin())); if (ObjectUtil.isNotNull(userId)) { - Sys2UserVo sysUser = userService.selectUserById(userId); + SysSaasUserVo sysUser = userService.selectUserById(userId); userInfoVo.setUser(sysUser); userInfoVo.setRoleIds(roleService.selectRoleListByUserId(userId)); Long deptId = sysUser.getDeptId(); if (ObjectUtil.isNotNull(deptId)) { - Sys2PostBo postBo = new Sys2PostBo(); + SysSaasPostBo postBo = new SysSaasPostBo(); postBo.setDeptId(deptId); userInfoVo.setPosts(postService.selectPostList(postBo)); userInfoVo.setPostIds(postService.selectPostListByUserId(userId)); @@ -155,7 +155,7 @@ public class Sys2UserController extends BaseController { @SaCheckPermission("system:user:add") @Log(title = "用户管理", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody Sys2UserBo user) { + public R add(@Validated @RequestBody SysSaasUserBo user) { deptService.checkDeptDataScope(user.getDeptId()); if (!userService.checkUserNameUnique(user)) { return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); @@ -179,7 +179,7 @@ public class Sys2UserController extends BaseController { @SaCheckPermission("system:user:edit") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody Sys2UserBo user) { + public R edit(@Validated @RequestBody SysSaasUserBo user) { userService.checkUserAllowed(user.getUserId()); userService.checkUserDataScope(user.getUserId()); deptService.checkDeptDataScope(user.getDeptId()); @@ -216,8 +216,8 @@ public class Sys2UserController extends BaseController { */ @SaCheckPermission("system:user:query") @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] userIds, - @RequestParam(required = false) Long deptId) { + public R> optionselect(@RequestParam(required = false) Long[] userIds, + @RequestParam(required = false) Long deptId) { return R.ok(userService.selectUserByIds(userIds == null ? null : List.of(userIds), deptId)); } @@ -228,7 +228,7 @@ public class Sys2UserController extends BaseController { @SaCheckPermission("system:user:resetPwd") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/resetPwd") - public R resetPwd(@RequestBody Sys2UserBo user) { + public R resetPwd(@RequestBody SysSaasUserBo user) { userService.checkUserAllowed(user.getUserId()); userService.checkUserDataScope(user.getUserId()); user.setPassword(BCrypt.hashpw(user.getPassword())); @@ -241,7 +241,7 @@ public class Sys2UserController extends BaseController { @SaCheckPermission("system:user:edit") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public R changeStatus(@RequestBody Sys2UserBo user) { + public R changeStatus(@RequestBody SysSaasUserBo user) { userService.checkUserAllowed(user.getUserId()); userService.checkUserDataScope(user.getUserId()); return toAjax(userService.updateUserStatus(user.getUserId(), user.getStatus())); @@ -254,11 +254,11 @@ public class Sys2UserController extends BaseController { */ @SaCheckPermission("system:user:query") @GetMapping("/authRole/{userId}") - public R authRole(@PathVariable Long userId) { + public R authRole(@PathVariable Long userId) { userService.checkUserDataScope(userId); - Sys2UserVo user = userService.selectUserById(userId); - List roles = roleService.selectRolesAuthByUserId(userId); - Sys2UserInfoVo userInfoVo = new Sys2UserInfoVo(); + SysSaasUserVo user = userService.selectUserById(userId); + List roles = roleService.selectRolesAuthByUserId(userId); + SysSaasUserInfoVo userInfoVo = new SysSaasUserInfoVo(); userInfoVo.setUser(user); userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin())); return R.ok(userInfoVo); @@ -284,7 +284,7 @@ public class Sys2UserController extends BaseController { */ @SaCheckPermission("system:user:list") @GetMapping("/deptTree") - public R>> deptTree(Sys2DeptBo dept) { + public R>> deptTree(SysSaasDeptBo dept) { return R.ok(deptService.selectDeptTreeList(dept)); } @@ -293,7 +293,7 @@ public class Sys2UserController extends BaseController { */ @SaCheckPermission("system:user:list") @GetMapping("/list/dept/{deptId}") - public R> listByDept(@PathVariable @NotNull Long deptId) { + public R> listByDept(@PathVariable @NotNull Long deptId) { return R.ok(userService.selectUserListByDept(deptId)); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Cache.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasCache.java similarity index 81% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Cache.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasCache.java index 297e8b973..afdb3276d 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Cache.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasCache.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; */ @Data @NoArgsConstructor -public class Sys2Cache { +public class SysSaasCache { /** * 缓存名称 @@ -33,12 +33,12 @@ public class Sys2Cache { */ private String remark = ""; - public Sys2Cache(String cacheName, String remark) { + public SysSaasCache(String cacheName, String remark) { this.cacheName = cacheName; this.remark = remark; } - public Sys2Cache(String cacheName, String cacheKey, String cacheValue) { + public SysSaasCache(String cacheName, String cacheKey, String cacheValue) { this.cacheName = StringUtils.replace(cacheName, ":", ""); this.cacheKey = StringUtils.replace(cacheKey, cacheName, ""); this.cacheValue = cacheValue; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Client.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasClient.java similarity index 96% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Client.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasClient.java index 46fadb82e..886b7f663 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Client.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasClient.java @@ -16,7 +16,7 @@ import java.io.Serial; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys2_client") -public class Sys2Client extends BaseEntity { +public class SysSaasClient extends BaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Config.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasConfig.java similarity index 94% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Config.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasConfig.java index 6d756de07..d83aa0916 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Config.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasConfig.java @@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys2_config") -public class Sys2Config extends TenantEntity { +public class SysSaasConfig extends TenantEntity { /** * 参数主键 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Dept.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasDept.java similarity index 92% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Dept.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasDept.java index f38ca5e55..20497f95e 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Dept.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasDept.java @@ -10,15 +10,15 @@ import org.dromara.common.tenant.core.TenantEntity; import java.io.Serial; /** - * 部门表 sys2_dept + * 部门表 sys_saas_dept * * @author Lion Li */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys2_dept") -public class Sys2Dept extends TenantEntity { +@TableName("sys_saas_dept") +public class SysSaasDept extends TenantEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2DictData.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasDictData.java similarity index 95% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2DictData.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasDictData.java index d1dfb1e80..770284c1f 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2DictData.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasDictData.java @@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys2_dict_data") -public class Sys2DictData extends TenantEntity { +public class SysSaasDictData extends TenantEntity { /** * 字典编码 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2DictType.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasDictType.java similarity index 92% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2DictType.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasDictType.java index c3475ee25..b9df9858d 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2DictType.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasDictType.java @@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys2_dict_type") -public class Sys2DictType extends TenantEntity { +public class SysSaasDictType extends TenantEntity { /** * 字典主键 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Logininfor.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasLogininfor.java similarity index 95% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Logininfor.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasLogininfor.java index 0e780673e..8626c86fc 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Logininfor.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasLogininfor.java @@ -16,7 +16,7 @@ import java.util.Date; @Data @TableName("sys2_logininfor") -public class Sys2Logininfor implements Serializable { +public class SysSaasLogininfor implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Notice.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasNotice.java similarity index 94% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Notice.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasNotice.java index 048966fe0..23cb7654b 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Notice.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasNotice.java @@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys2_notice") -public class Sys2Notice extends TenantEntity { +public class SysSaasNotice extends TenantEntity { /** * 公告ID diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2OperLog.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOperLog.java similarity index 96% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2OperLog.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOperLog.java index 29b874b09..ad42319ba 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2OperLog.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOperLog.java @@ -16,7 +16,7 @@ import java.util.Date; @Data @TableName("sys2_oper_log") -public class Sys2OperLog implements Serializable { +public class SysSaasOperLog implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Oss.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOss.java similarity index 94% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Oss.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOss.java index 23e7db46e..e8977b587 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Oss.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOss.java @@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys2_oss") -public class Sys2Oss extends TenantEntity { +public class SysSaasOss extends TenantEntity { /** * 对象存储主键 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2OssConfig.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOssConfig.java similarity index 96% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2OssConfig.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOssConfig.java index b0151895b..20a5c2056 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2OssConfig.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasOssConfig.java @@ -14,7 +14,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys2_oss_config") -public class Sys2OssConfig extends BaseEntity { +public class SysSaasOssConfig extends BaseEntity { /** * 主键 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Post.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasPost.java similarity index 95% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Post.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasPost.java index f0e75bbc3..adaad75e3 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Post.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasPost.java @@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys2_post") -public class Sys2Post extends TenantEntity { +public class SysSaasPost extends TenantEntity { /** * 岗位序号 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Role.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasRole.java similarity index 94% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Role.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasRole.java index 8bdd4f642..748a1f6b1 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Role.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasRole.java @@ -18,7 +18,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName("sys2_role") -public class Sys2Role extends TenantEntity { +public class SysSaasRole extends TenantEntity { /** * 角色ID @@ -72,7 +72,7 @@ public class Sys2Role extends TenantEntity { */ private String remark; - public Sys2Role(Long roleId) { + public SysSaasRole(Long roleId) { this.roleId = roleId; } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2RoleDept.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasRoleDept.java similarity index 79% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2RoleDept.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasRoleDept.java index 4c943f87a..948631e18 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2RoleDept.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasRoleDept.java @@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; /** - * 角色和部门关联 sys2_role_dept + * 角色和部门关联 sys_saas_role_dept * * @author Lion Li */ @Data -@TableName("sys2_role_dept") -public class Sys2RoleDept { +@TableName("sys_saas_role_dept") +public class SysSaasRoleDept { /** * 角色ID diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2RoleMenu.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasRoleMenu.java similarity index 93% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2RoleMenu.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasRoleMenu.java index 168875d85..4dc5f5ef0 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2RoleMenu.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasRoleMenu.java @@ -13,7 +13,7 @@ import lombok.Data; @Data @TableName("sys2_role_menu") -public class Sys2RoleMenu { +public class SysSaasRoleMenu { /** * 角色ID diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Social.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasSocial.java similarity index 97% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Social.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasSocial.java index 7e6d20841..17149aae3 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Social.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasSocial.java @@ -16,7 +16,7 @@ import java.io.Serial; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys2_social") -public class Sys2Social extends TenantEntity { +public class SysSaasSocial extends TenantEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Tenant.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasTenant.java similarity index 97% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Tenant.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasTenant.java index d90533f8c..8cee3dac5 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Tenant.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasTenant.java @@ -18,7 +18,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys2_tenant") -public class Sys2Tenant extends BaseEntity { +public class SysSaasTenant extends BaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2TenantApplication.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasTenantApplication.java similarity index 89% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2TenantApplication.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasTenantApplication.java index 1ce038915..eae809d95 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2TenantApplication.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasTenantApplication.java @@ -14,7 +14,7 @@ import java.io.Serializable; */ @Data @TableName("sys2_tenant_application") -public class Sys2TenantApplication implements Serializable { +public class SysSaasTenantApplication implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2TenantPackage.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasTenantPackage.java similarity index 95% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2TenantPackage.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasTenantPackage.java index d3e4c94ed..ae70d7b57 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2TenantPackage.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasTenantPackage.java @@ -15,7 +15,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys2_tenant_package") -public class Sys2TenantPackage extends BaseEntity { +public class SysSaasTenantPackage extends BaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2User.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasUser.java similarity index 95% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2User.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasUser.java index 642c2f0a6..44d84a459 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2User.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasUser.java @@ -19,7 +19,7 @@ import java.util.Date; @NoArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName("sys2_user") -public class Sys2User extends TenantEntity { +public class SysSaasUser extends TenantEntity { /** * 用户ID @@ -104,7 +104,7 @@ public class Sys2User extends TenantEntity { private String remark; - public Sys2User(Long userId) { + public SysSaasUser(Long userId) { this.userId = userId; } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserOnline.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasUserOnline.java similarity index 95% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserOnline.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasUserOnline.java index 7ab8bca64..20f3f0c5a 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserOnline.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasUserOnline.java @@ -8,7 +8,7 @@ import lombok.Data; * @author Lion Li */ @Data -public class Sys2UserOnline { +public class SysSaasUserOnline { /** * 会话编号 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserPost.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasUserPost.java similarity index 93% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserPost.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasUserPost.java index 5502f807f..ce0fef436 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserPost.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasUserPost.java @@ -13,7 +13,7 @@ import lombok.Data; @Data @TableName("sys2_user_post") -public class Sys2UserPost { +public class SysSaasUserPost { /** * 用户ID diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserRole.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasUserRole.java similarity index 93% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserRole.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasUserRole.java index cd7d26faf..1f0973cfa 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserRole.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasUserRole.java @@ -13,7 +13,7 @@ import lombok.Data; @Data @TableName("sys2_user_role") -public class Sys2UserRole { +public class SysSaasUserRole { /** * 用户ID diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ClientBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasClientBo.java similarity index 89% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ClientBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasClientBo.java index 751c28a13..ae4232be2 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ClientBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasClientBo.java @@ -1,6 +1,6 @@ package org.dromara.system.saas.domain.bo; -import org.dromara.system.saas.domain.Sys2Client; +import org.dromara.system.saas.domain.SysSaasClient; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; @@ -19,8 +19,8 @@ import java.util.List; */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = Sys2Client.class, reverseConvertGenerate = false) -public class Sys2ClientBo extends BaseEntity { +@AutoMapper(target = SysSaasClient.class, reverseConvertGenerate = false) +public class SysSaasClientBo extends BaseEntity { /** * id diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ConfigBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasConfigBo.java similarity index 87% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ConfigBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasConfigBo.java index ed5483d0d..bce18399a 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ConfigBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasConfigBo.java @@ -6,7 +6,7 @@ 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.Sys2Config; +import org.dromara.system.saas.domain.SysSaasConfig; /** * 参数配置业务对象 sys2_config @@ -16,8 +16,8 @@ import org.dromara.system.saas.domain.Sys2Config; @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = Sys2Config.class, reverseConvertGenerate = false) -public class Sys2ConfigBo extends BaseEntity { +@AutoMapper(target = SysSaasConfig.class, reverseConvertGenerate = false) +public class SysSaasConfigBo extends BaseEntity { /** * 参数主键 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DeptBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasDeptBo.java similarity index 88% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DeptBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasDeptBo.java index 47c7767c0..897dd0084 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DeptBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasDeptBo.java @@ -8,18 +8,18 @@ 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.Sys2Dept; +import org.dromara.system.saas.domain.SysSaasDept; /** - * 部门业务对象 sys2_dept + * 部门业务对象 sys_saas_dept * * @author Michelle.Chung */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = Sys2Dept.class, reverseConvertGenerate = false) -public class Sys2DeptBo extends BaseEntity { +@AutoMapper(target = SysSaasDept.class, reverseConvertGenerate = false) +public class SysSaasDeptBo extends BaseEntity { /** * 部门id diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DictDataBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasDictDataBo.java similarity index 89% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DictDataBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasDictDataBo.java index 84aeba191..869122bbd 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DictDataBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasDictDataBo.java @@ -6,7 +6,7 @@ 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.Sys2DictData; +import org.dromara.system.saas.domain.SysSaasDictData; /** * 字典数据业务对象 sys2_dict_data @@ -16,8 +16,8 @@ import org.dromara.system.saas.domain.Sys2DictData; @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = Sys2DictData.class, reverseConvertGenerate = false) -public class Sys2DictDataBo extends BaseEntity { +@AutoMapper(target = SysSaasDictData.class, reverseConvertGenerate = false) +public class SysSaasDictDataBo extends BaseEntity { /** * 字典编码 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DictTypeBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasDictTypeBo.java similarity index 87% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DictTypeBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasDictTypeBo.java index d29785b2c..43923f6c8 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DictTypeBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasDictTypeBo.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.core.constant.RegexConstants; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.saas.domain.Sys2DictType; +import org.dromara.system.saas.domain.SysSaasDictType; /** * 字典类型业务对象 sys2_dict_type @@ -18,8 +18,8 @@ import org.dromara.system.saas.domain.Sys2DictType; @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = Sys2DictType.class, reverseConvertGenerate = false) -public class Sys2DictTypeBo extends BaseEntity { +@AutoMapper(target = SysSaasDictType.class, reverseConvertGenerate = false) +public class SysSaasDictTypeBo extends BaseEntity { /** * 字典主键 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2LogininforBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasLogininforBo.java similarity index 87% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2LogininforBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasLogininforBo.java index 335bd608b..3a0d622b4 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2LogininforBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasLogininforBo.java @@ -1,6 +1,6 @@ package org.dromara.system.saas.domain.bo; -import org.dromara.system.saas.domain.Sys2Logininfor; +import org.dromara.system.saas.domain.SysSaasLogininfor; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -15,8 +15,8 @@ import java.util.Map; */ @Data -@AutoMapper(target = Sys2Logininfor.class, reverseConvertGenerate = false) -public class Sys2LogininforBo { +@AutoMapper(target = SysSaasLogininfor.class, reverseConvertGenerate = false) +public class SysSaasLogininforBo { /** * 访问ID diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2NoticeBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasNoticeBo.java similarity index 86% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2NoticeBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasNoticeBo.java index 14268a07f..fe910d555 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2NoticeBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasNoticeBo.java @@ -7,7 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.core.xss.Xss; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.saas.domain.Sys2Notice; +import org.dromara.system.saas.domain.SysSaasNotice; /** * 通知公告业务对象 sys2_notice @@ -17,8 +17,8 @@ import org.dromara.system.saas.domain.Sys2Notice; @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = Sys2Notice.class, reverseConvertGenerate = false) -public class Sys2NoticeBo extends BaseEntity { +@AutoMapper(target = SysSaasNotice.class, reverseConvertGenerate = false) +public class SysSaasNoticeBo extends BaseEntity { /** * 公告ID diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OperLogBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOperLogBo.java similarity index 92% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OperLogBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOperLogBo.java index 7496b0f54..1dd33ff1a 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OperLogBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOperLogBo.java @@ -1,7 +1,7 @@ package org.dromara.system.saas.domain.bo; import org.dromara.common.log.event.OperLogEvent; -import org.dromara.system.saas.domain.Sys2OperLog; +import org.dromara.system.saas.domain.SysSaasOperLog; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMappers; import lombok.Data; @@ -19,10 +19,10 @@ import java.util.Map; @Data @AutoMappers({ - @AutoMapper(target = Sys2OperLog.class, reverseConvertGenerate = false), + @AutoMapper(target = SysSaasOperLog.class, reverseConvertGenerate = false), @AutoMapper(target = OperLogEvent.class) }) -public class Sys2OperLogBo { +public class SysSaasOperLogBo { /** * 日志主键 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OssBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssBo.java similarity index 80% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OssBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssBo.java index 9c3680001..c9aba77bd 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OssBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssBo.java @@ -1,7 +1,7 @@ package org.dromara.system.saas.domain.bo; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.saas.domain.Sys2Oss; +import org.dromara.system.saas.domain.SysSaasOss; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,8 +13,8 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = Sys2Oss.class, reverseConvertGenerate = false) -public class Sys2OssBo extends BaseEntity { +@AutoMapper(target = SysSaasOss.class, reverseConvertGenerate = false) +public class SysSaasOssBo extends BaseEntity { /** * ossId diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OssConfigBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssConfigBo.java similarity index 93% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OssConfigBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssConfigBo.java index dce191b31..13d3db058 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OssConfigBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssConfigBo.java @@ -3,7 +3,7 @@ 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.Sys2OssConfig; +import org.dromara.system.saas.domain.SysSaasOssConfig; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -21,8 +21,8 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = Sys2OssConfig.class, reverseConvertGenerate = false) -public class Sys2OssConfigBo extends BaseEntity { +@AutoMapper(target = SysSaasOssConfig.class, reverseConvertGenerate = false) +public class SysSaasOssConfigBo extends BaseEntity { /** * 主键 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2PostBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasPostBo.java similarity index 90% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2PostBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasPostBo.java index 7e9628533..4f91bd594 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2PostBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasPostBo.java @@ -7,7 +7,7 @@ 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.Sys2Post; +import org.dromara.system.saas.domain.SysSaasPost; /** * 岗位信息业务对象 sys2_post @@ -17,8 +17,8 @@ import org.dromara.system.saas.domain.Sys2Post; @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = Sys2Post.class, reverseConvertGenerate = false) -public class Sys2PostBo extends BaseEntity { +@AutoMapper(target = SysSaasPost.class, reverseConvertGenerate = false) +public class SysSaasPostBo extends BaseEntity { /** * 岗位ID diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2RoleBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasRoleBo.java similarity index 90% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2RoleBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasRoleBo.java index c37ea65de..194060402 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2RoleBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasRoleBo.java @@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.dromara.common.core.constant.UserConstants; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.saas.domain.Sys2Role; +import org.dromara.system.saas.domain.SysSaasRole; /** * 角色信息业务对象 sys2_role @@ -20,8 +20,8 @@ import org.dromara.system.saas.domain.Sys2Role; @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = Sys2Role.class, reverseConvertGenerate = false) -public class Sys2RoleBo extends BaseEntity { +@AutoMapper(target = SysSaasRole.class, reverseConvertGenerate = false) +public class SysSaasRoleBo extends BaseEntity { /** * 角色ID @@ -83,7 +83,7 @@ public class Sys2RoleBo extends BaseEntity { */ private Long[] deptIds; - public Sys2RoleBo(Long roleId) { + public SysSaasRoleBo(Long roleId) { this.roleId = roleId; } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2SocialBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasSocialBo.java similarity index 94% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2SocialBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasSocialBo.java index 72f1e0c0a..868391a88 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2SocialBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasSocialBo.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.tenant.core.TenantEntity; -import org.dromara.system.saas.domain.Sys2Social; +import org.dromara.system.saas.domain.SysSaasSocial; /** * 社会化关系业务对象 sys2_social @@ -19,8 +19,8 @@ import org.dromara.system.saas.domain.Sys2Social; @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = Sys2Social.class, reverseConvertGenerate = false) -public class Sys2SocialBo extends TenantEntity { +@AutoMapper(target = SysSaasSocial.class, reverseConvertGenerate = false) +public class SysSaasSocialBo extends TenantEntity { /** * 主键 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantApplicationBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantApplicationBo.java similarity index 76% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantApplicationBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantApplicationBo.java index 5a14a7881..2d9155f68 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantApplicationBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantApplicationBo.java @@ -1,6 +1,6 @@ package org.dromara.system.saas.domain.bo; -import org.dromara.system.saas.domain.Sys2TenantApplication; +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; @@ -16,8 +16,8 @@ import jakarta.validation.constraints.*; */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = Sys2TenantApplication.class, reverseConvertGenerate = false) -public class Sys2TenantApplicationBo extends BaseEntity { +@AutoMapper(target = SysSaasTenantApplication.class, reverseConvertGenerate = false) +public class SysSaasTenantApplicationBo extends BaseEntity { @NotNull(message = "租户ID不能为空", groups = {EditGroup.class}) private Long tenantId; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantBo.java similarity index 92% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantBo.java index 19a1456b6..4f5fe7178 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantBo.java @@ -2,7 +2,7 @@ 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.Sys2Tenant; +import org.dromara.system.saas.domain.SysSaasTenant; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; @@ -20,8 +20,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = Sys2Tenant.class, reverseConvertGenerate = false) -public class Sys2TenantBo extends BaseEntity { +@AutoMapper(target = SysSaasTenant.class, reverseConvertGenerate = false) +public class SysSaasTenantBo extends BaseEntity { /** * id diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantPackageBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantPackageBo.java similarity index 86% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantPackageBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantPackageBo.java index 3f9b81205..1e35014cc 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantPackageBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantPackageBo.java @@ -2,7 +2,7 @@ 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.Sys2TenantPackage; +import org.dromara.system.saas.domain.SysSaasTenantPackage; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapping; import lombok.Data; @@ -19,8 +19,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = Sys2TenantPackage.class, reverseConvertGenerate = false) -public class Sys2TenantPackageBo extends BaseEntity { +@AutoMapper(target = SysSaasTenantPackage.class, reverseConvertGenerate = false) +public class SysSaasTenantPackageBo extends BaseEntity { /** * 租户套餐id diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasUserBo.java similarity index 92% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasUserBo.java index c4db816bd..1e322fcae 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasUserBo.java @@ -10,7 +10,7 @@ import lombok.NoArgsConstructor; import org.dromara.common.core.constant.UserConstants; import org.dromara.common.core.xss.Xss; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.saas.domain.Sys2User; +import org.dromara.system.saas.domain.SysSaasUser; /** * 用户信息业务对象 sys2_user @@ -21,8 +21,8 @@ import org.dromara.system.saas.domain.Sys2User; @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = Sys2User.class, reverseConvertGenerate = false) -public class Sys2UserBo extends BaseEntity { +@AutoMapper(target = SysSaasUser.class, reverseConvertGenerate = false) +public class SysSaasUserBo extends BaseEntity { /** * 应用id @@ -114,7 +114,7 @@ public class Sys2UserBo extends BaseEntity { */ private String excludeUserIds; - public Sys2UserBo(Long userId) { + public SysSaasUserBo(Long userId) { this.userId = userId; } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserPasswordBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasUserPasswordBo.java similarity index 89% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserPasswordBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasUserPasswordBo.java index 2eae6017d..82c60c89b 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserPasswordBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasUserPasswordBo.java @@ -10,7 +10,7 @@ import java.io.Serializable; * 用户密码修改bo */ @Data -public class Sys2UserPasswordBo implements Serializable { +public class SysSaasUserPasswordBo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserProfileBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasUserProfileBo.java similarity index 96% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserProfileBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasUserProfileBo.java index d799d9ff0..3221bfb63 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserProfileBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasUserProfileBo.java @@ -21,7 +21,7 @@ import org.dromara.common.sensitive.core.SensitiveStrategy; @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class Sys2UserProfileBo extends BaseEntity { +public class SysSaasUserProfileBo extends BaseEntity { /** * 用户昵称 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ClientVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasClientVo.java similarity index 92% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ClientVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasClientVo.java index 5d5b35616..cf51a61b4 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ClientVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasClientVo.java @@ -1,6 +1,6 @@ package org.dromara.system.saas.domain.vo; -import org.dromara.system.saas.domain.Sys2Client; +import org.dromara.system.saas.domain.SysSaasClient; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; @@ -21,8 +21,8 @@ import java.util.List; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = Sys2Client.class) -public class Sys2ClientVo implements Serializable { +@AutoMapper(target = SysSaasClient.class) +public class SysSaasClientVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ConfigVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasConfigVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ConfigVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasConfigVo.java index 0c2a644ef..7744615e2 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ConfigVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasConfigVo.java @@ -4,7 +4,7 @@ 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.Sys2Config; +import org.dromara.system.saas.domain.SysSaasConfig; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -20,8 +20,8 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = Sys2Config.class) -public class Sys2ConfigVo implements Serializable { +@AutoMapper(target = SysSaasConfig.class) +public class SysSaasConfigVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DeptVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasDeptVo.java similarity index 91% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DeptVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasDeptVo.java index c84d315b1..56956ee4b 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DeptVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasDeptVo.java @@ -4,7 +4,7 @@ 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.Sys2Dept; +import org.dromara.system.saas.domain.SysSaasDept; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -13,14 +13,14 @@ import java.io.Serializable; import java.util.Date; /** - * 部门视图对象 sys2_dept + * 部门视图对象 sys_saas_dept * * @author Michelle.Chung */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = Sys2Dept.class) -public class Sys2DeptVo implements Serializable { +@AutoMapper(target = SysSaasDept.class) +public class SysSaasDeptVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DictDataVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasDictDataVo.java similarity index 91% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DictDataVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasDictDataVo.java index c79c58be1..c09514d20 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DictDataVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasDictDataVo.java @@ -4,7 +4,7 @@ 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.Sys2DictData; +import org.dromara.system.saas.domain.SysSaasDictData; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -20,8 +20,8 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = Sys2DictData.class) -public class Sys2DictDataVo implements Serializable { +@AutoMapper(target = SysSaasDictData.class) +public class SysSaasDictDataVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DictTypeVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasDictTypeVo.java similarity index 86% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DictTypeVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasDictTypeVo.java index e0ad7cc09..2ee9745be 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DictTypeVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasDictTypeVo.java @@ -2,7 +2,7 @@ package org.dromara.system.saas.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.system.saas.domain.Sys2DictType; +import org.dromara.system.saas.domain.SysSaasDictType; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -18,8 +18,8 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = Sys2DictType.class) -public class Sys2DictTypeVo implements Serializable { +@AutoMapper(target = SysSaasDictType.class) +public class SysSaasDictTypeVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2LogininforVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasLogininforVo.java similarity index 92% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2LogininforVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasLogininforVo.java index f3c5ed2fc..e0d331234 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2LogininforVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasLogininforVo.java @@ -5,7 +5,7 @@ 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.Sys2Logininfor; +import org.dromara.system.saas.domain.SysSaasLogininfor; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -22,8 +22,8 @@ import java.io.Serializable; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = Sys2Logininfor.class) -public class Sys2LogininforVo implements Serializable { +@AutoMapper(target = SysSaasLogininfor.class) +public class SysSaasLogininforVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2NoticeVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasNoticeVo.java similarity index 88% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2NoticeVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasNoticeVo.java index dd334ebd4..c38960d33 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2NoticeVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasNoticeVo.java @@ -2,7 +2,7 @@ package org.dromara.system.saas.domain.vo; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.saas.domain.Sys2Notice; +import org.dromara.system.saas.domain.SysSaasNotice; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -18,8 +18,8 @@ import java.util.Date; * @author Michelle.Chung */ @Data -@AutoMapper(target = Sys2Notice.class) -public class Sys2NoticeVo implements Serializable { +@AutoMapper(target = SysSaasNotice.class) +public class SysSaasNoticeVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OperLogVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOperLogVo.java similarity index 95% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OperLogVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOperLogVo.java index 607cc0b1d..cf56b69e5 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OperLogVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOperLogVo.java @@ -4,7 +4,7 @@ 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.Sys2OperLog; +import org.dromara.system.saas.domain.SysSaasOperLog; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -21,8 +21,8 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = Sys2OperLog.class) -public class Sys2OperLogVo implements Serializable { +@AutoMapper(target = SysSaasOperLog.class) +public class SysSaasOperLogVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssConfigVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssConfigVo.java similarity index 89% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssConfigVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssConfigVo.java index 137f3f3e0..bc9f89454 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssConfigVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssConfigVo.java @@ -1,7 +1,7 @@ package org.dromara.system.saas.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import org.dromara.system.saas.domain.Sys2OssConfig; +import org.dromara.system.saas.domain.SysSaasOssConfig; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -18,8 +18,8 @@ import java.io.Serializable; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = Sys2OssConfig.class) -public class Sys2OssConfigVo implements Serializable { +@AutoMapper(target = SysSaasOssConfig.class) +public class SysSaasOssConfigVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssUploadVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssUploadVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssUploadVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssUploadVo.java index 82d40d872..fa735b20e 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssUploadVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssUploadVo.java @@ -8,7 +8,7 @@ import lombok.Data; * @author Michelle.Chung */ @Data -public class Sys2OssUploadVo { +public class SysSaasOssUploadVo { /** * URL地址 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssVo.java similarity index 88% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssVo.java index ce3d24973..175be4249 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssVo.java @@ -2,7 +2,7 @@ package org.dromara.system.saas.domain.vo; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.saas.domain.Sys2Oss; +import org.dromara.system.saas.domain.SysSaasOss; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -16,8 +16,8 @@ import java.util.Date; * @author Lion Li */ @Data -@AutoMapper(target = Sys2Oss.class) -public class Sys2OssVo implements Serializable { +@AutoMapper(target = SysSaasOss.class) +public class SysSaasOssVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2PostVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasPostVo.java similarity index 92% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2PostVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasPostVo.java index dfbde3cbd..dc6a81e92 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2PostVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasPostVo.java @@ -8,7 +8,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.saas.domain.Sys2Post; +import org.dromara.system.saas.domain.SysSaasPost; import java.io.Serial; import java.io.Serializable; @@ -21,8 +21,8 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = Sys2Post.class) -public class Sys2PostVo implements Serializable { +@AutoMapper(target = SysSaasPost.class) +public class SysSaasPostVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2RoleVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasRoleVo.java similarity index 94% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2RoleVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasRoleVo.java index 80cbc4e75..d83d673d3 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2RoleVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasRoleVo.java @@ -5,7 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import org.dromara.common.core.constant.UserConstants; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.saas.domain.Sys2Role; +import org.dromara.system.saas.domain.SysSaasRole; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -20,8 +20,8 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = Sys2Role.class) -public class Sys2RoleVo implements Serializable { +@AutoMapper(target = SysSaasRole.class) +public class SysSaasRoleVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2SocialVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasSocialVo.java similarity index 94% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2SocialVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasSocialVo.java index fe62c83d6..6da4739fc 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2SocialVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasSocialVo.java @@ -2,7 +2,7 @@ package org.dromara.system.saas.domain.vo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.system.saas.domain.Sys2Social; +import org.dromara.system.saas.domain.SysSaasSocial; import java.io.Serial; import java.io.Serializable; @@ -15,8 +15,8 @@ import java.util.Date; * @author thiszhc */ @Data -@AutoMapper(target = Sys2Social.class) -public class Sys2SocialVo implements Serializable { +@AutoMapper(target = SysSaasSocial.class) +public class SysSaasSocialVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantApplicationVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantApplicationVo.java similarity index 78% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantApplicationVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantApplicationVo.java index 71e8532e0..99d28b029 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantApplicationVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantApplicationVo.java @@ -1,6 +1,6 @@ package org.dromara.system.saas.domain.vo; -import org.dromara.system.saas.domain.Sys2TenantApplication; +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; @@ -18,8 +18,8 @@ import java.io.Serializable; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = Sys2TenantApplication.class) -public class Sys2TenantApplicationVo implements Serializable { +@AutoMapper(target = SysSaasTenantApplication.class) +public class SysSaasTenantApplicationVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantPackageVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantPackageVo.java similarity index 89% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantPackageVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantPackageVo.java index bc842253e..715083625 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantPackageVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantPackageVo.java @@ -4,7 +4,7 @@ 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.Sys2TenantPackage; +import org.dromara.system.saas.domain.SysSaasTenantPackage; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -19,8 +19,8 @@ import java.io.Serializable; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = Sys2TenantPackage.class) -public class Sys2TenantPackageVo implements Serializable { +@AutoMapper(target = SysSaasTenantPackage.class) +public class SysSaasTenantPackageVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantVo.java similarity index 93% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantVo.java index 75c373a6a..71e0fe0f4 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantVo.java @@ -5,7 +5,7 @@ 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.Sys2Tenant; +import org.dromara.system.saas.domain.SysSaasTenant; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -20,8 +20,8 @@ import java.io.Serializable; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = Sys2Tenant.class) -public class Sys2TenantVo implements Serializable { +@AutoMapper(target = SysSaasTenant.class) +public class SysSaasTenantVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserExportVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasUserExportVo.java similarity index 96% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserExportVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasUserExportVo.java index 4d32efa28..50268fa03 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserExportVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasUserExportVo.java @@ -18,7 +18,7 @@ import java.util.Date; @Data @NoArgsConstructor -public class Sys2UserExportVo implements Serializable { +public class SysSaasUserExportVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserImportVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasUserImportVo.java similarity index 96% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserImportVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasUserImportVo.java index e6a888bd3..afc7b3fed 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserImportVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasUserImportVo.java @@ -18,7 +18,7 @@ import java.io.Serializable; @Data @NoArgsConstructor // @Accessors(chain = true) // 导入不允许使用 会找不到set方法 -public class Sys2UserImportVo implements Serializable { +public class SysSaasUserImportVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserInfoVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasUserInfoVo.java similarity index 73% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserInfoVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasUserInfoVo.java index 674c5b04b..d97f9be7f 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserInfoVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasUserInfoVo.java @@ -10,12 +10,12 @@ import java.util.List; * @author Michelle.Chung */ @Data -public class Sys2UserInfoVo { +public class SysSaasUserInfoVo { /** * 用户信息 */ - private Sys2UserVo user; + private SysSaasUserVo user; /** * 角色ID列表 @@ -25,7 +25,7 @@ public class Sys2UserInfoVo { /** * 角色列表 */ - private List roles; + private List roles; /** * 岗位ID列表 @@ -35,6 +35,6 @@ public class Sys2UserInfoVo { /** * 岗位列表 */ - private List posts; + private List posts; } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasUserVo.java similarity index 92% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasUserVo.java index 4af26ca59..759e86a99 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasUserVo.java @@ -6,7 +6,7 @@ import org.dromara.common.sensitive.annotation.Sensitive; import org.dromara.common.sensitive.core.SensitiveStrategy; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; -import org.dromara.system.saas.domain.Sys2User; +import org.dromara.system.saas.domain.SysSaasUser; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -22,8 +22,8 @@ import java.util.List; * @author Michelle.Chung */ @Data -@AutoMapper(target = Sys2User.class) -public class Sys2UserVo implements Serializable { +@AutoMapper(target = SysSaasUser.class) +public class SysSaasUserVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -122,7 +122,7 @@ public class Sys2UserVo implements Serializable { /** * 角色对象 */ - private List roles; + private List roles; /** * 角色组 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoProfileVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoProfileVo.java index 8ee64a465..848d9cca2 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoProfileVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoProfileVo.java @@ -13,7 +13,7 @@ public class TwoProfileVo { /** * 用户信息 */ - private Sys2UserVo user; + private SysSaasUserVo user; /** * 用户所属角色组 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoUserInfoVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoUserInfoVo.java index 3993779d8..34b63d25b 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoUserInfoVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoUserInfoVo.java @@ -15,7 +15,7 @@ public class TwoUserInfoVo { /** * 用户基本信息 */ - private Sys2UserVo user; + private SysSaasUserVo user; /** * 菜单权限 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/listener/SysUserImportListener.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/listener/SysUserImportListener.java index 7ab5e932d..0ca6bf771 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/listener/SysUserImportListener.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/listener/SysUserImportListener.java @@ -11,11 +11,11 @@ import org.dromara.common.core.utils.ValidatorUtils; import org.dromara.common.excel.core.ExcelListener; import org.dromara.common.excel.core.ExcelResult; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.saas.domain.bo.Sys2UserBo; -import org.dromara.system.saas.domain.vo.Sys2UserImportVo; -import org.dromara.system.saas.domain.vo.Sys2UserVo; -import org.dromara.system.saas.service.ISys2ConfigService; -import org.dromara.system.saas.service.ISys2UserService; +import org.dromara.system.saas.domain.bo.SysSaasUserBo; +import org.dromara.system.saas.domain.vo.SysSaasUserImportVo; +import org.dromara.system.saas.domain.vo.SysSaasUserVo; +import org.dromara.system.saas.service.ISysSaasConfigService; +import org.dromara.system.saas.service.ISysSaasUserService; import lombok.extern.slf4j.Slf4j; import java.util.List; @@ -26,9 +26,9 @@ import java.util.List; * @author Lion Li */ @Slf4j -public class SysUserImportListener extends AnalysisEventListener implements ExcelListener { +public class SysUserImportListener extends AnalysisEventListener implements ExcelListener { - private final ISys2UserService userService; + private final ISysSaasUserService userService; private final String password; @@ -42,20 +42,20 @@ public class SysUserImportListener extends AnalysisEventListener").append(successNum).append("、账号 ").append(user.getUserName()).append(" 导入成功"); } else if (isUpdateSupport) { Long userId = sysUser.getUserId(); - Sys2UserBo user = BeanUtil.toBean(userVo, Sys2UserBo.class); + SysSaasUserBo user = BeanUtil.toBean(userVo, SysSaasUserBo.class); user.setUserId(userId); ValidatorUtils.validate(user); userService.checkUserAllowed(user.getUserId()); @@ -91,7 +91,7 @@ public class SysUserImportListener extends AnalysisEventListener getExcelResult() { + public ExcelResult getExcelResult() { return new ExcelResult<>() { @Override @@ -106,7 +106,7 @@ public class SysUserImportListener extends AnalysisEventListener getList() { + public List getList() { return null; } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DictDataMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DictDataMapper.java deleted file mode 100644 index 15fb19cc4..000000000 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DictDataMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.dromara.system.saas.mapper; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.apache.ibatis.annotations.Mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.saas.domain.Sys2DictData; -import org.dromara.system.saas.domain.vo.Sys2DictDataVo; - -import java.util.List; - -/** - * 字典表 数据层 - * - * @author Lion Li - */ -@Mapper -public interface Sys2DictDataMapper extends BaseMapperPlus { - - default List selectDictDataByType(String dictType) { - return selectVoList( - new LambdaQueryWrapper() - .eq(Sys2DictData::getDictType, dictType) - .orderByAsc(Sys2DictData::getDictSort)); - } -} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DictTypeMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DictTypeMapper.java deleted file mode 100644 index 9f9c6f3bd..000000000 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DictTypeMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.system.saas.mapper; - -import org.apache.ibatis.annotations.Mapper; -import org.dromara.system.saas.domain.Sys2DictType; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.saas.domain.vo.Sys2DictTypeVo; - -/** - * 字典表 数据层 - * - * @author Lion Li - */ -@Mapper -public interface Sys2DictTypeMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantApplicationMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantApplicationMapper.java deleted file mode 100644 index 5a4954c15..000000000 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantApplicationMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.dromara.system.saas.mapper; - -import org.apache.ibatis.annotations.Mapper; -import org.dromara.system.saas.domain.Sys2TenantApplication; -import org.dromara.system.saas.domain.vo.Sys2TenantApplicationVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 租户和应用关联Mapper接口 - * - * @author Lion Li - * @date 2024-09-22 - */ -@Mapper -public interface Sys2TenantApplicationMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantPackageMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantPackageMapper.java deleted file mode 100644 index ca45d1076..000000000 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantPackageMapper.java +++ /dev/null @@ -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.Sys2TenantPackage; -import org.dromara.system.saas.domain.vo.Sys2TenantPackageVo; - -/** - * 租户套餐Mapper接口 - * - * @author Michelle.Chung - */ -@Mapper -public interface Sys2TenantPackageMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ClientMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasClientMapper.java similarity index 54% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ClientMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasClientMapper.java index ade939bb1..68f1a17a7 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ClientMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasClientMapper.java @@ -1,8 +1,8 @@ package org.dromara.system.saas.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.system.saas.domain.Sys2Client; -import org.dromara.system.saas.domain.vo.Sys2ClientVo; +import org.dromara.system.saas.domain.SysSaasClient; +import org.dromara.system.saas.domain.vo.SysSaasClientVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** @@ -12,6 +12,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @date 2023-05-15 */ @Mapper -public interface Sys2ClientMapper extends BaseMapperPlus { +public interface SysSaasClientMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ConfigMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasConfigMapper.java similarity index 51% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ConfigMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasConfigMapper.java index 9d473880c..b7def68b8 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ConfigMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasConfigMapper.java @@ -2,8 +2,8 @@ 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.Sys2Config; -import org.dromara.system.saas.domain.vo.Sys2ConfigVo; +import org.dromara.system.saas.domain.SysSaasConfig; +import org.dromara.system.saas.domain.vo.SysSaasConfigVo; /** * 参数配置 数据层 @@ -11,6 +11,6 @@ import org.dromara.system.saas.domain.vo.Sys2ConfigVo; * @author Lion Li */ @Mapper -public interface Sys2ConfigMapper extends BaseMapperPlus { +public interface SysSaasConfigMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DeptMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasDeptMapper.java similarity index 80% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DeptMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasDeptMapper.java index 27d2b5550..e65cf4df6 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DeptMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasDeptMapper.java @@ -6,8 +6,8 @@ import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.annotation.DataColumn; import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.saas.domain.Sys2Dept; -import org.dromara.system.saas.domain.vo.Sys2DeptVo; +import org.dromara.system.saas.domain.SysSaasDept; +import org.dromara.system.saas.domain.vo.SysSaasDeptVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,7 +18,7 @@ import java.util.List; * @author Lion Li */ @Mapper -public interface Sys2DeptMapper extends BaseMapperPlus { +public interface SysSaasDeptMapper extends BaseMapperPlus { /** * 查询部门管理数据 @@ -29,7 +29,7 @@ public interface Sys2DeptMapper extends BaseMapperPlus { @DataPermission({ @DataColumn(key = "deptName", value = "dept_id") }) - List selectDeptList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + List selectDeptList(@Param(Constants.WRAPPER) Wrapper queryWrapper); @DataPermission({ @DataColumn(key = "deptName", value = "dept_id") diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasDictDataMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasDictDataMapper.java new file mode 100644 index 000000000..6a584b319 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasDictDataMapper.java @@ -0,0 +1,25 @@ +package org.dromara.system.saas.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.apache.ibatis.annotations.Mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.saas.domain.SysSaasDictData; +import org.dromara.system.saas.domain.vo.SysSaasDictDataVo; + +import java.util.List; + +/** + * 字典表 数据层 + * + * @author Lion Li + */ +@Mapper +public interface SysSaasDictDataMapper extends BaseMapperPlus { + + default List selectDictDataByType(String dictType) { + return selectVoList( + new LambdaQueryWrapper() + .eq(SysSaasDictData::getDictType, dictType) + .orderByAsc(SysSaasDictData::getDictSort)); + } +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasDictTypeMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasDictTypeMapper.java new file mode 100644 index 000000000..45e1f5dab --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasDictTypeMapper.java @@ -0,0 +1,16 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.system.saas.domain.SysSaasDictType; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.saas.domain.vo.SysSaasDictTypeVo; + +/** + * 字典表 数据层 + * + * @author Lion Li + */ +@Mapper +public interface SysSaasDictTypeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2LogininforMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasLogininforMapper.java similarity index 50% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2LogininforMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasLogininforMapper.java index 4305f40c1..71c52dfe5 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2LogininforMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasLogininforMapper.java @@ -2,8 +2,8 @@ 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.Sys2Logininfor; -import org.dromara.system.saas.domain.vo.Sys2LogininforVo; +import org.dromara.system.saas.domain.SysSaasLogininfor; +import org.dromara.system.saas.domain.vo.SysSaasLogininforVo; /** * 系统访问日志情况信息 数据层 @@ -11,6 +11,6 @@ import org.dromara.system.saas.domain.vo.Sys2LogininforVo; * @author Lion Li */ @Mapper -public interface Sys2LogininforMapper extends BaseMapperPlus { +public interface SysSaasLogininforMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2NoticeMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasNoticeMapper.java similarity index 51% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2NoticeMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasNoticeMapper.java index baf540158..45494df80 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2NoticeMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasNoticeMapper.java @@ -2,8 +2,8 @@ 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.Sys2Notice; -import org.dromara.system.saas.domain.vo.Sys2NoticeVo; +import org.dromara.system.saas.domain.SysSaasNotice; +import org.dromara.system.saas.domain.vo.SysSaasNoticeVo; /** * 通知公告表 数据层 @@ -11,6 +11,6 @@ import org.dromara.system.saas.domain.vo.Sys2NoticeVo; * @author Lion Li */ @Mapper -public interface Sys2NoticeMapper extends BaseMapperPlus { +public interface SysSaasNoticeMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OperLogMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasOperLogMapper.java similarity index 50% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OperLogMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasOperLogMapper.java index 60011fbe6..d09f673b6 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OperLogMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasOperLogMapper.java @@ -2,8 +2,8 @@ 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.Sys2OperLog; -import org.dromara.system.saas.domain.vo.Sys2OperLogVo; +import org.dromara.system.saas.domain.SysSaasOperLog; +import org.dromara.system.saas.domain.vo.SysSaasOperLogVo; /** * 操作日志 数据层 @@ -11,6 +11,6 @@ import org.dromara.system.saas.domain.vo.Sys2OperLogVo; * @author Lion Li */ @Mapper -public interface Sys2OperLogMapper extends BaseMapperPlus { +public interface SysSaasOperLogMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OssConfigMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasOssConfigMapper.java similarity index 54% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OssConfigMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasOssConfigMapper.java index 7541c0fcb..3944e117c 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OssConfigMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasOssConfigMapper.java @@ -2,8 +2,8 @@ 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.Sys2OssConfig; -import org.dromara.system.saas.domain.vo.Sys2OssConfigVo; +import org.dromara.system.saas.domain.SysSaasOssConfig; +import org.dromara.system.saas.domain.vo.SysSaasOssConfigVo; /** * 对象存储配置Mapper接口 @@ -13,6 +13,6 @@ import org.dromara.system.saas.domain.vo.Sys2OssConfigVo; * @date 2021-08-13 */ @Mapper -public interface Sys2OssConfigMapper extends BaseMapperPlus { +public interface SysSaasOssConfigMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OssMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasOssMapper.java similarity index 53% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OssMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasOssMapper.java index db809ab7d..671cfc54c 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OssMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasOssMapper.java @@ -2,8 +2,8 @@ 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.Sys2Oss; -import org.dromara.system.saas.domain.vo.Sys2OssVo; +import org.dromara.system.saas.domain.SysSaasOss; +import org.dromara.system.saas.domain.vo.SysSaasOssVo; /** * 文件上传 数据层 @@ -11,5 +11,5 @@ import org.dromara.system.saas.domain.vo.Sys2OssVo; * @author Lion Li */ @Mapper -public interface Sys2OssMapper extends BaseMapperPlus { +public interface SysSaasOssMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2PostMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasPostMapper.java similarity index 67% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2PostMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasPostMapper.java index db92fb6ca..c96d21a95 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2PostMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasPostMapper.java @@ -8,8 +8,8 @@ import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.annotation.DataColumn; import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.saas.domain.Sys2Post; -import org.dromara.system.saas.domain.vo.Sys2PostVo; +import org.dromara.system.saas.domain.SysSaasPost; +import org.dromara.system.saas.domain.vo.SysSaasPostVo; import java.util.List; @@ -19,13 +19,13 @@ import java.util.List; * @author Lion Li */ @Mapper -public interface Sys2PostMapper extends BaseMapperPlus { +public interface SysSaasPostMapper extends BaseMapperPlus { @DataPermission({ @DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "userName", value = "create_by") }) - Page selectPagePostList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + Page selectPagePostList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); /** * 查询用户所属岗位组 @@ -33,6 +33,6 @@ public interface Sys2PostMapper extends BaseMapperPlus { * @param userId 用户ID * @return 结果 */ - List selectPostsByUserId(Long userId); + List selectPostsByUserId(Long userId); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleDeptMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasRoleDeptMapper.java similarity index 59% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleDeptMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasRoleDeptMapper.java index 2eaaeb345..06225cf94 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleDeptMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasRoleDeptMapper.java @@ -2,7 +2,7 @@ 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.Sys2RoleDept; +import org.dromara.system.saas.domain.SysSaasRoleDept; /** * 角色与部门关联表 数据层 @@ -10,6 +10,6 @@ import org.dromara.system.saas.domain.Sys2RoleDept; * @author Lion Li */ @Mapper -public interface Sys2RoleDeptMapper extends BaseMapperPlus { +public interface SysSaasRoleDeptMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasRoleMapper.java similarity index 69% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasRoleMapper.java index 82e961f2b..cc92496d9 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasRoleMapper.java @@ -8,8 +8,8 @@ import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.annotation.DataColumn; import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.saas.domain.Sys2Role; -import org.dromara.system.saas.domain.vo.Sys2RoleVo; +import org.dromara.system.saas.domain.SysSaasRole; +import org.dromara.system.saas.domain.vo.SysSaasRoleVo; import java.util.List; @@ -19,13 +19,13 @@ import java.util.List; * @author Lion Li */ @Mapper -public interface Sys2RoleMapper extends BaseMapperPlus { +public interface SysSaasRoleMapper extends BaseMapperPlus { @DataPermission({ @DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "userName", value = "r.create_by") }) - Page selectPageRoleList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + Page selectPageRoleList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); /** * 根据条件分页查询角色数据 @@ -37,13 +37,13 @@ public interface Sys2RoleMapper extends BaseMapperPlus { @DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "userName", value = "r.create_by") }) - List selectRoleList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + List selectRoleList(@Param(Constants.WRAPPER) Wrapper queryWrapper); @DataPermission({ @DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "userName", value = "r.create_by") }) - Sys2RoleVo selectRoleById(Long roleId); + SysSaasRoleVo selectRoleById(Long roleId); /** * 根据用户ID查询角色 @@ -51,7 +51,7 @@ public interface Sys2RoleMapper extends BaseMapperPlus { * @param userId 用户ID * @return 角色列表 */ - List selectRolePermissionByUserId(Long userId); + List selectRolePermissionByUserId(Long userId); /** * 根据用户ID查询角色 @@ -59,6 +59,6 @@ public interface Sys2RoleMapper extends BaseMapperPlus { * @param userId 用户ID * @return 角色列表 */ - List selectRolesByUserId(Long userId); + List selectRolesByUserId(Long userId); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleMenuMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasRoleMenuMapper.java similarity index 59% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleMenuMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasRoleMenuMapper.java index 7141d50a8..f9a036427 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleMenuMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasRoleMenuMapper.java @@ -2,7 +2,7 @@ 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.Sys2RoleMenu; +import org.dromara.system.saas.domain.SysSaasRoleMenu; /** * 角色与菜单关联表 数据层 @@ -10,6 +10,6 @@ import org.dromara.system.saas.domain.Sys2RoleMenu; * @author Lion Li */ @Mapper -public interface Sys2RoleMenuMapper extends BaseMapperPlus { +public interface SysSaasRoleMenuMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2SocialMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasSocialMapper.java similarity index 51% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2SocialMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasSocialMapper.java index 9713dbee1..99fa63b5b 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2SocialMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasSocialMapper.java @@ -2,8 +2,8 @@ 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.Sys2Social; -import org.dromara.system.saas.domain.vo.Sys2SocialVo; +import org.dromara.system.saas.domain.SysSaasSocial; +import org.dromara.system.saas.domain.vo.SysSaasSocialVo; /** * 社会化关系Mapper接口 @@ -11,6 +11,6 @@ import org.dromara.system.saas.domain.vo.Sys2SocialVo; * @author thiszhc */ @Mapper -public interface Sys2SocialMapper extends BaseMapperPlus { +public interface SysSaasSocialMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantApplicationMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantApplicationMapper.java new file mode 100644 index 000000000..10d8b9c6e --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantApplicationMapper.java @@ -0,0 +1,17 @@ +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 { + +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantMapper.java similarity index 51% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantMapper.java index 7c665b91e..dc734bfb6 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantMapper.java @@ -1,8 +1,8 @@ package org.dromara.system.saas.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.system.saas.domain.Sys2Tenant; -import org.dromara.system.saas.domain.vo.Sys2TenantVo; +import org.dromara.system.saas.domain.SysSaasTenant; +import org.dromara.system.saas.domain.vo.SysSaasTenantVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** @@ -11,6 +11,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author Michelle.Chung */ @Mapper -public interface Sys2TenantMapper extends BaseMapperPlus { +public interface SysSaasTenantMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantPackageMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantPackageMapper.java new file mode 100644 index 000000000..a18d24e51 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantPackageMapper.java @@ -0,0 +1,16 @@ +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 { + +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasUserMapper.java similarity index 67% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasUserMapper.java index 137cea34e..f228d9008 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasUserMapper.java @@ -8,9 +8,9 @@ import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.annotation.DataColumn; import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.saas.domain.Sys2User; -import org.dromara.system.saas.domain.vo.Sys2UserExportVo; -import org.dromara.system.saas.domain.vo.Sys2UserVo; +import org.dromara.system.saas.domain.SysSaasUser; +import org.dromara.system.saas.domain.vo.SysSaasUserExportVo; +import org.dromara.system.saas.domain.vo.SysSaasUserVo; import java.util.List; @@ -20,19 +20,19 @@ import java.util.List; * @author Lion Li */ @Mapper -public interface Sys2UserMapper extends BaseMapperPlus { +public interface SysSaasUserMapper extends BaseMapperPlus { @DataPermission({ @DataColumn(key = "deptName", value = "u.dept_id"), @DataColumn(key = "userName", value = "u.user_id") }) - Page selectPageUserList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + Page selectPageUserList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); @DataPermission({ @DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "userName", value = "user_id") }) - List selectUserList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + List selectUserList(@Param(Constants.WRAPPER) Wrapper queryWrapper); /** * 根据条件分页查询用户列表 @@ -44,7 +44,7 @@ public interface Sys2UserMapper extends BaseMapperPlus { @DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "userName", value = "u.user_id") }) - List selectUserExportList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + List selectUserExportList(@Param(Constants.WRAPPER) Wrapper queryWrapper); /** * 根据条件分页查询已配用户角色列表 @@ -56,7 +56,7 @@ public interface Sys2UserMapper extends BaseMapperPlus { @DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "userName", value = "u.user_id") }) - Page selectAllocatedList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + Page selectAllocatedList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); /** * 根据条件分页查询未分配用户角色列表 @@ -68,7 +68,7 @@ public interface Sys2UserMapper extends BaseMapperPlus { @DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "userName", value = "u.user_id") }) - Page selectUnallocatedList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + Page selectUnallocatedList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); @DataPermission({ @DataColumn(key = "deptName", value = "dept_id"), @@ -81,13 +81,13 @@ public interface Sys2UserMapper extends BaseMapperPlus { @DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "userName", value = "user_id") }) - int update(@Param(Constants.ENTITY) Sys2User user, @Param(Constants.WRAPPER) Wrapper updateWrapper); + int update(@Param(Constants.ENTITY) SysSaasUser user, @Param(Constants.WRAPPER) Wrapper updateWrapper); @Override @DataPermission({ @DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "userName", value = "user_id") }) - int updateById(@Param(Constants.ENTITY) Sys2User user); + int updateById(@Param(Constants.ENTITY) SysSaasUser user); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserPostMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasUserPostMapper.java similarity index 59% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserPostMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasUserPostMapper.java index 340a850d1..7bef87cfc 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserPostMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasUserPostMapper.java @@ -2,7 +2,7 @@ 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.Sys2UserPost; +import org.dromara.system.saas.domain.SysSaasUserPost; /** * 用户与岗位关联表 数据层 @@ -10,6 +10,6 @@ import org.dromara.system.saas.domain.Sys2UserPost; * @author Lion Li */ @Mapper -public interface Sys2UserPostMapper extends BaseMapperPlus { +public interface SysSaasUserPostMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserRoleMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasUserRoleMapper.java similarity index 66% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserRoleMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasUserRoleMapper.java index 257367276..ad4a6ae3b 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserRoleMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasUserRoleMapper.java @@ -2,7 +2,7 @@ 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.Sys2UserRole; +import org.dromara.system.saas.domain.SysSaasUserRole; import java.util.List; @@ -12,7 +12,7 @@ import java.util.List; * @author Lion Li */ @Mapper -public interface Sys2UserRoleMapper extends BaseMapperPlus { +public interface SysSaasUserRoleMapper extends BaseMapperPlus { List selectUserIdsByRoleId(Long roleId); diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/runner/System2ApplicationRunner.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/runner/System2ApplicationRunner.java index 94f5e373e..d7ad24ae9 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/runner/System2ApplicationRunner.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/runner/System2ApplicationRunner.java @@ -1,6 +1,6 @@ package org.dromara.system.saas.runner; -import org.dromara.system.saas.service.ISys2OssConfigService; +import org.dromara.system.saas.service.ISysSaasOssConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; @@ -17,7 +17,7 @@ import org.springframework.stereotype.Component; @Component public class System2ApplicationRunner implements ApplicationRunner { - private final ISys2OssConfigService ossConfigService; + private final ISysSaasOssConfigService ossConfigService; @Override public void run(ApplicationArguments args) throws Exception { diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ClientService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasClientService.java similarity index 63% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ClientService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasClientService.java index dd59b3bce..f1902cdb0 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ClientService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasClientService.java @@ -1,7 +1,7 @@ package org.dromara.system.saas.service; -import org.dromara.system.saas.domain.bo.Sys2ClientBo; -import org.dromara.system.saas.domain.vo.Sys2ClientVo; +import org.dromara.system.saas.domain.bo.SysSaasClientBo; +import org.dromara.system.saas.domain.vo.SysSaasClientVo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -14,37 +14,37 @@ import java.util.List; * @author Michelle.Chung * @date 2023-06-18 */ -public interface ISys2ClientService { +public interface ISysSaasClientService { /** * 查询客户端管理 */ - Sys2ClientVo queryById(Long id); + SysSaasClientVo queryById(Long id); /** * 查询客户端信息基于客户端id */ - Sys2ClientVo queryByClientId(String clientId); + SysSaasClientVo queryByClientId(String clientId); /** * 查询客户端管理列表 */ - TableDataInfo queryPageList(Sys2ClientBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(SysSaasClientBo bo, PageQuery pageQuery); /** * 查询客户端管理列表 */ - List queryList(Sys2ClientBo bo); + List queryList(SysSaasClientBo bo); /** * 新增客户端管理 */ - Boolean insertByBo(Sys2ClientBo bo); + Boolean insertByBo(SysSaasClientBo bo); /** * 修改客户端管理 */ - Boolean updateByBo(Sys2ClientBo bo); + Boolean updateByBo(SysSaasClientBo bo); /** * 修改状态 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ConfigService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasConfigService.java similarity index 72% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ConfigService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasConfigService.java index d4a8457ae..700e9161a 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ConfigService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasConfigService.java @@ -2,8 +2,8 @@ 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.Sys2ConfigBo; -import org.dromara.system.saas.domain.vo.Sys2ConfigVo; +import org.dromara.system.saas.domain.bo.SysSaasConfigBo; +import org.dromara.system.saas.domain.vo.SysSaasConfigVo; import java.util.List; @@ -12,10 +12,10 @@ import java.util.List; * * @author Lion Li */ -public interface ISys2ConfigService { +public interface ISysSaasConfigService { - TableDataInfo selectPageConfigList(Sys2ConfigBo config, PageQuery pageQuery); + TableDataInfo selectPageConfigList(SysSaasConfigBo config, PageQuery pageQuery); /** * 查询参数配置信息 @@ -23,7 +23,7 @@ public interface ISys2ConfigService { * @param configId 参数配置ID * @return 参数配置信息 */ - Sys2ConfigVo selectConfigById(Long configId); + SysSaasConfigVo selectConfigById(Long configId); /** * 根据键名查询参数配置信息 @@ -46,7 +46,7 @@ public interface ISys2ConfigService { * @param config 参数配置信息 * @return 参数配置集合 */ - List selectConfigList(Sys2ConfigBo config); + List selectConfigList(SysSaasConfigBo config); /** * 新增参数配置 @@ -54,7 +54,7 @@ public interface ISys2ConfigService { * @param bo 参数配置信息 * @return 结果 */ - String insertConfig(Sys2ConfigBo bo); + String insertConfig(SysSaasConfigBo bo); /** * 修改参数配置 @@ -62,7 +62,7 @@ public interface ISys2ConfigService { * @param bo 参数配置信息 * @return 结果 */ - String updateConfig(Sys2ConfigBo bo); + String updateConfig(SysSaasConfigBo bo); /** * 批量删除参数信息 @@ -82,6 +82,6 @@ public interface ISys2ConfigService { * @param config 参数信息 * @return 结果 */ - boolean checkConfigKeyUnique(Sys2ConfigBo config); + boolean checkConfigKeyUnique(SysSaasConfigBo config); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DataScopeService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasDataScopeService.java similarity index 90% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DataScopeService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasDataScopeService.java index f99581948..eb42398bf 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DataScopeService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasDataScopeService.java @@ -5,7 +5,7 @@ package org.dromara.system.saas.service; * * @author Lion Li */ -public interface ISys2DataScopeService { +public interface ISysSaasDataScopeService { /** * 获取角色自定义权限 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DeptService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasDeptService.java similarity index 78% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DeptService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasDeptService.java index 9b58ccd93..183ce9195 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DeptService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasDeptService.java @@ -1,8 +1,8 @@ package org.dromara.system.saas.service; import cn.hutool.core.lang.tree.Tree; -import org.dromara.system.saas.domain.bo.Sys2DeptBo; -import org.dromara.system.saas.domain.vo.Sys2DeptVo; +import org.dromara.system.saas.domain.bo.SysSaasDeptBo; +import org.dromara.system.saas.domain.vo.SysSaasDeptVo; import java.util.List; @@ -11,14 +11,14 @@ import java.util.List; * * @author Lion Li */ -public interface ISys2DeptService { +public interface ISysSaasDeptService { /** * 查询部门管理数据 * * @param dept 部门信息 * @return 部门信息集合 */ - List selectDeptList(Sys2DeptBo dept); + List selectDeptList(SysSaasDeptBo dept); /** * 查询部门树结构信息 @@ -26,7 +26,7 @@ public interface ISys2DeptService { * @param dept 部门信息 * @return 部门树信息集合 */ - List> selectDeptTreeList(Sys2DeptBo dept); + List> selectDeptTreeList(SysSaasDeptBo dept); /** * 构建前端所需要下拉树结构 @@ -34,7 +34,7 @@ public interface ISys2DeptService { * @param depts 部门列表 * @return 下拉树结构列表 */ - List> buildDeptTreeSelect(List depts); + List> buildDeptTreeSelect(List depts); /** * 根据角色ID查询部门树信息 @@ -50,7 +50,7 @@ public interface ISys2DeptService { * @param deptId 部门ID * @return 部门信息 */ - Sys2DeptVo selectDeptById(Long deptId); + SysSaasDeptVo selectDeptById(Long deptId); /** * 通过部门ID串查询部门 @@ -58,7 +58,7 @@ public interface ISys2DeptService { * @param deptIds 部门id串 * @return 部门列表信息 */ - List selectDeptByIds(List deptIds); + List selectDeptByIds(List deptIds); /** * 根据ID查询所有子部门数（正常状态） @@ -90,7 +90,7 @@ public interface ISys2DeptService { * @param dept 部门信息 * @return 结果 */ - boolean checkDeptNameUnique(Sys2DeptBo dept); + boolean checkDeptNameUnique(SysSaasDeptBo dept); /** * 校验部门是否有数据权限 @@ -105,7 +105,7 @@ public interface ISys2DeptService { * @param bo 部门信息 * @return 结果 */ - int insertDept(Sys2DeptBo bo); + int insertDept(SysSaasDeptBo bo); /** * 修改保存部门信息 @@ -113,7 +113,7 @@ public interface ISys2DeptService { * @param bo 部门信息 * @return 结果 */ - int updateDept(Sys2DeptBo bo); + int updateDept(SysSaasDeptBo bo); /** * 删除部门管理信息 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DictDataService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasDictDataService.java similarity index 68% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DictDataService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasDictDataService.java index d0bfaf84d..506a6a3b0 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DictDataService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasDictDataService.java @@ -2,8 +2,8 @@ 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.Sys2DictDataBo; -import org.dromara.system.saas.domain.vo.Sys2DictDataVo; +import org.dromara.system.saas.domain.bo.SysSaasDictDataBo; +import org.dromara.system.saas.domain.vo.SysSaasDictDataVo; import java.util.List; @@ -12,10 +12,10 @@ import java.util.List; * * @author Lion Li */ -public interface ISys2DictDataService { +public interface ISysSaasDictDataService { - TableDataInfo selectPageDictDataList(Sys2DictDataBo dictData, PageQuery pageQuery); + TableDataInfo selectPageDictDataList(SysSaasDictDataBo dictData, PageQuery pageQuery); /** * 根据条件分页查询字典数据 @@ -23,7 +23,7 @@ public interface ISys2DictDataService { * @param dictData 字典数据信息 * @return 字典数据集合信息 */ - List selectDictDataList(Sys2DictDataBo dictData); + List selectDictDataList(SysSaasDictDataBo dictData); /** * 根据字典类型和字典键值查询字典数据信息 @@ -40,7 +40,7 @@ public interface ISys2DictDataService { * @param dictCode 字典数据ID * @return 字典数据 */ - Sys2DictDataVo selectDictDataById(Long dictCode); + SysSaasDictDataVo selectDictDataById(Long dictCode); /** * 批量删除字典数据信息 @@ -55,7 +55,7 @@ public interface ISys2DictDataService { * @param bo 字典数据信息 * @return 结果 */ - List insertDictData(Sys2DictDataBo bo); + List insertDictData(SysSaasDictDataBo bo); /** * 修改保存字典数据信息 @@ -63,7 +63,7 @@ public interface ISys2DictDataService { * @param bo 字典数据信息 * @return 结果 */ - List updateDictData(Sys2DictDataBo bo); + List updateDictData(SysSaasDictDataBo bo); /** * 校验字典键值是否唯一 @@ -71,6 +71,6 @@ public interface ISys2DictDataService { * @param dict 字典数据 * @return 结果 */ - boolean checkDictDataUnique(Sys2DictDataBo dict); + boolean checkDictDataUnique(SysSaasDictDataBo dict); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DictTypeService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasDictTypeService.java similarity index 63% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DictTypeService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasDictTypeService.java index 465e6a2a8..0edd6b859 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DictTypeService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasDictTypeService.java @@ -2,9 +2,9 @@ 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.Sys2DictTypeBo; -import org.dromara.system.saas.domain.vo.Sys2DictDataVo; -import org.dromara.system.saas.domain.vo.Sys2DictTypeVo; +import org.dromara.system.saas.domain.bo.SysSaasDictTypeBo; +import org.dromara.system.saas.domain.vo.SysSaasDictDataVo; +import org.dromara.system.saas.domain.vo.SysSaasDictTypeVo; import java.util.List; @@ -13,10 +13,10 @@ import java.util.List; * * @author Lion Li */ -public interface ISys2DictTypeService { +public interface ISysSaasDictTypeService { - TableDataInfo selectPageDictTypeList(Sys2DictTypeBo dictType, PageQuery pageQuery); + TableDataInfo selectPageDictTypeList(SysSaasDictTypeBo dictType, PageQuery pageQuery); /** * 根据条件分页查询字典类型 @@ -24,14 +24,14 @@ public interface ISys2DictTypeService { * @param dictType 字典类型信息 * @return 字典类型集合信息 */ - List selectDictTypeList(Sys2DictTypeBo dictType); + List selectDictTypeList(SysSaasDictTypeBo dictType); /** * 根据所有字典类型 * * @return 字典类型集合信息 */ - List selectDictTypeAll(); + List selectDictTypeAll(); /** * 根据字典类型查询字典数据 @@ -39,7 +39,7 @@ public interface ISys2DictTypeService { * @param dictType 字典类型 * @return 字典数据集合信息 */ - List selectDictDataByType(String dictType); + List selectDictDataByType(String dictType); /** * 根据字典类型ID查询信息 @@ -47,7 +47,7 @@ public interface ISys2DictTypeService { * @param dictId 字典类型ID * @return 字典类型 */ - Sys2DictTypeVo selectDictTypeById(Long dictId); + SysSaasDictTypeVo selectDictTypeById(Long dictId); /** * 根据字典类型查询信息 @@ -55,7 +55,7 @@ public interface ISys2DictTypeService { * @param dictType 字典类型 * @return 字典类型 */ - Sys2DictTypeVo selectDictTypeByType(String dictType); + SysSaasDictTypeVo selectDictTypeByType(String dictType); /** * 批量删除字典信息 @@ -75,7 +75,7 @@ public interface ISys2DictTypeService { * @param bo 字典类型信息 * @return 结果 */ - List insertDictType(Sys2DictTypeBo bo); + List insertDictType(SysSaasDictTypeBo bo); /** * 修改保存字典类型信息 @@ -83,7 +83,7 @@ public interface ISys2DictTypeService { * @param bo 字典类型信息 * @return 结果 */ - List updateDictType(Sys2DictTypeBo bo); + List updateDictType(SysSaasDictTypeBo bo); /** * 校验字典类型称是否唯一 @@ -91,5 +91,5 @@ public interface ISys2DictTypeService { * @param dictType 字典类型 * @return 结果 */ - boolean checkDictTypeUnique(Sys2DictTypeBo dictType); + boolean checkDictTypeUnique(SysSaasDictTypeBo dictType); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2LogininforService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasLogininforService.java similarity index 64% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2LogininforService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasLogininforService.java index 6ad498cba..3b6b34931 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2LogininforService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasLogininforService.java @@ -2,8 +2,8 @@ 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.Sys2LogininforBo; -import org.dromara.system.saas.domain.vo.Sys2LogininforVo; +import org.dromara.system.saas.domain.bo.SysSaasLogininforBo; +import org.dromara.system.saas.domain.vo.SysSaasLogininforVo; import java.util.List; @@ -12,17 +12,17 @@ import java.util.List; * * @author Lion Li */ -public interface ISys2LogininforService { +public interface ISysSaasLogininforService { - TableDataInfo selectPageLogininforList(Sys2LogininforBo logininfor, PageQuery pageQuery); + TableDataInfo selectPageLogininforList(SysSaasLogininforBo logininfor, PageQuery pageQuery); /** * 新增系统登录日志 * * @param bo 访问日志对象 */ - void insertLogininfor(Sys2LogininforBo bo); + void insertLogininfor(SysSaasLogininforBo bo); /** * 查询系统登录日志集合 @@ -30,7 +30,7 @@ public interface ISys2LogininforService { * @param logininfor 访问日志对象 * @return 登录记录集合 */ - List selectLogininforList(Sys2LogininforBo logininfor); + List selectLogininforList(SysSaasLogininforBo logininfor); /** * 批量删除系统登录日志 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2NoticeService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasNoticeService.java similarity index 67% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2NoticeService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasNoticeService.java index 057a255f9..0a682e165 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2NoticeService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasNoticeService.java @@ -2,8 +2,8 @@ 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.Sys2NoticeBo; -import org.dromara.system.saas.domain.vo.Sys2NoticeVo; +import org.dromara.system.saas.domain.bo.SysSaasNoticeBo; +import org.dromara.system.saas.domain.vo.SysSaasNoticeVo; import java.util.List; @@ -12,10 +12,10 @@ import java.util.List; * * @author Lion Li */ -public interface ISys2NoticeService { +public interface ISysSaasNoticeService { - TableDataInfo selectPageNoticeList(Sys2NoticeBo notice, PageQuery pageQuery); + TableDataInfo selectPageNoticeList(SysSaasNoticeBo notice, PageQuery pageQuery); /** * 查询公告信息 @@ -23,7 +23,7 @@ public interface ISys2NoticeService { * @param noticeId 公告ID * @return 公告信息 */ - Sys2NoticeVo selectNoticeById(Long noticeId); + SysSaasNoticeVo selectNoticeById(Long noticeId); /** * 查询公告列表 @@ -31,7 +31,7 @@ public interface ISys2NoticeService { * @param notice 公告信息 * @return 公告集合 */ - List selectNoticeList(Sys2NoticeBo notice); + List selectNoticeList(SysSaasNoticeBo notice); /** * 新增公告 @@ -39,7 +39,7 @@ public interface ISys2NoticeService { * @param bo 公告信息 * @return 结果 */ - int insertNotice(Sys2NoticeBo bo); + int insertNotice(SysSaasNoticeBo bo); /** * 修改公告 @@ -47,7 +47,7 @@ public interface ISys2NoticeService { * @param bo 公告信息 * @return 结果 */ - int updateNotice(Sys2NoticeBo bo); + int updateNotice(SysSaasNoticeBo bo); /** * 删除公告信息 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OperLogService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasOperLogService.java similarity index 65% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OperLogService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasOperLogService.java index 0081ad23e..329f542cc 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OperLogService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasOperLogService.java @@ -2,8 +2,8 @@ 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.Sys2OperLogBo; -import org.dromara.system.saas.domain.vo.Sys2OperLogVo; +import org.dromara.system.saas.domain.bo.SysSaasOperLogBo; +import org.dromara.system.saas.domain.vo.SysSaasOperLogVo; import java.util.List; @@ -12,16 +12,16 @@ import java.util.List; * * @author Lion Li */ -public interface ISys2OperLogService { +public interface ISysSaasOperLogService { - TableDataInfo selectPageOperLogList(Sys2OperLogBo operLog, PageQuery pageQuery); + TableDataInfo selectPageOperLogList(SysSaasOperLogBo operLog, PageQuery pageQuery); /** * 新增操作日志 * * @param bo 操作日志对象 */ - void insertOperlog(Sys2OperLogBo bo); + void insertOperlog(SysSaasOperLogBo bo); /** * 查询系统操作日志集合 @@ -29,7 +29,7 @@ public interface ISys2OperLogService { * @param operLog 操作日志对象 * @return 操作日志集合 */ - List selectOperLogList(Sys2OperLogBo operLog); + List selectOperLogList(SysSaasOperLogBo operLog); /** * 批量删除系统操作日志 @@ -45,7 +45,7 @@ public interface ISys2OperLogService { * @param operId 操作ID * @return 操作日志对象 */ - Sys2OperLogVo selectOperLogById(Long operId); + SysSaasOperLogVo selectOperLogById(Long operId); /** * 清空操作日志 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OssConfigService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasOssConfigService.java similarity index 69% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OssConfigService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasOssConfigService.java index 961d498d4..591c8412f 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OssConfigService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasOssConfigService.java @@ -2,8 +2,8 @@ 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.Sys2OssConfigBo; -import org.dromara.system.saas.domain.vo.Sys2OssConfigVo; +import org.dromara.system.saas.domain.bo.SysSaasOssConfigBo; +import org.dromara.system.saas.domain.vo.SysSaasOssConfigVo; import java.util.Collection; @@ -14,7 +14,7 @@ import java.util.Collection; * @author 孤舟烟雨 * @date 2021-08-13 */ -public interface ISys2OssConfigService { +public interface ISysSaasOssConfigService { /** * 初始化OSS配置 @@ -24,12 +24,12 @@ public interface ISys2OssConfigService { /** * 查询单个 */ - Sys2OssConfigVo queryById(Long ossConfigId); + SysSaasOssConfigVo queryById(Long ossConfigId); /** * 查询列表 */ - TableDataInfo queryPageList(Sys2OssConfigBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(SysSaasOssConfigBo bo, PageQuery pageQuery); /** * 根据新增业务对象插入对象存储配置 @@ -37,7 +37,7 @@ public interface ISys2OssConfigService { * @param bo 对象存储配置新增业务对象 * @return 结果 */ - Boolean insertByBo(Sys2OssConfigBo bo); + Boolean insertByBo(SysSaasOssConfigBo bo); /** * 根据编辑业务对象修改对象存储配置 @@ -45,7 +45,7 @@ public interface ISys2OssConfigService { * @param bo 对象存储配置编辑业务对象 * @return 结果 */ - Boolean updateByBo(Sys2OssConfigBo bo); + Boolean updateByBo(SysSaasOssConfigBo bo); /** * 校验并删除数据 @@ -59,6 +59,6 @@ public interface ISys2OssConfigService { /** * 启用停用状态 */ - int updateOssConfigStatus(Sys2OssConfigBo bo); + int updateOssConfigStatus(SysSaasOssConfigBo bo); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OssService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasOssService.java similarity index 66% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OssService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasOssService.java index b36fdb5d7..01a978525 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OssService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasOssService.java @@ -2,9 +2,9 @@ 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.Sys2OssBo; +import org.dromara.system.saas.domain.bo.SysSaasOssBo; import jakarta.servlet.http.HttpServletResponse; -import org.dromara.system.saas.domain.vo.Sys2OssVo; +import org.dromara.system.saas.domain.vo.SysSaasOssVo; import org.springframework.web.multipart.MultipartFile; import java.io.File; @@ -17,7 +17,7 @@ import java.util.List; * * @author Lion Li */ -public interface ISys2OssService { +public interface ISysSaasOssService { /** * 查询OSS对象存储列表 @@ -26,39 +26,39 @@ public interface ISys2OssService { * @param pageQuery 分页查询实体类 * @return 结果 */ - TableDataInfo queryPageList(Sys2OssBo sysOss, PageQuery pageQuery); + TableDataInfo queryPageList(SysSaasOssBo sysOss, PageQuery pageQuery); /** - * 根据一组 ossIds 获取对应的 Sys2OssVo 列表 + * 根据一组 ossIds 获取对应的 SysSaasOssVo 列表 * * @param ossIds 一组文件在数据库中的唯一标识集合 - * @return 包含 Sys2OssVo 对象的列表 + * @return 包含 SysSaasOssVo 对象的列表 */ - List listByIds(Collection ossIds); + List listByIds(Collection ossIds); /** - * 根据 ossId 从缓存或数据库中获取 Sys2OssVo 对象 + * 根据 ossId 从缓存或数据库中获取 SysSaasOssVo 对象 * * @param ossId 文件在数据库中的唯一标识 - * @return Sys2OssVo 对象，包含文件信息 + * @return SysSaasOssVo 对象，包含文件信息 */ - Sys2OssVo getById(Long ossId); + SysSaasOssVo getById(Long ossId); /** * 上传 MultipartFile 到对象存储服务，并保存文件信息到数据库 * * @param file 要上传的 MultipartFile 对象 - * @return 上传成功后的 Sys2OssVo 对象，包含文件信息 + * @return 上传成功后的 SysSaasOssVo 对象，包含文件信息 */ - Sys2OssVo upload(MultipartFile file); + SysSaasOssVo upload(MultipartFile file); /** * 上传文件到对象存储服务，并保存文件信息到数据库 * * @param file 要上传的文件对象 - * @return 上传成功后的 Sys2OssVo 对象，包含文件信息 + * @return 上传成功后的 SysSaasOssVo 对象，包含文件信息 */ - Sys2OssVo upload(File file); + SysSaasOssVo upload(File file); /** * 文件下载方法，支持一次性下载完整文件 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2PermissionService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasPermissionService.java similarity index 91% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2PermissionService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasPermissionService.java index dbedab0d4..e299c11ce 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2PermissionService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasPermissionService.java @@ -7,7 +7,7 @@ import java.util.Set; * * @author Lion Li */ -public interface ISys2PermissionService { +public interface ISysSaasPermissionService { /** * 获取角色数据权限 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2PostService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasPostService.java similarity index 75% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2PostService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasPostService.java index f9bd90867..31d47419f 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2PostService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasPostService.java @@ -2,8 +2,8 @@ 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.Sys2PostBo; -import org.dromara.system.saas.domain.vo.Sys2PostVo; +import org.dromara.system.saas.domain.bo.SysSaasPostBo; +import org.dromara.system.saas.domain.vo.SysSaasPostVo; import java.util.List; @@ -12,10 +12,10 @@ import java.util.List; * * @author Lion Li */ -public interface ISys2PostService { +public interface ISysSaasPostService { - TableDataInfo selectPagePostList(Sys2PostBo post, PageQuery pageQuery); + TableDataInfo selectPagePostList(SysSaasPostBo post, PageQuery pageQuery); /** * 查询岗位信息集合 @@ -23,14 +23,14 @@ public interface ISys2PostService { * @param post 岗位信息 * @return 岗位列表 */ - List selectPostList(Sys2PostBo post); + List selectPostList(SysSaasPostBo post); /** * 查询所有岗位 * * @return 岗位列表 */ - List selectPostAll(); + List selectPostAll(); /** * 通过岗位ID查询岗位信息 @@ -38,7 +38,7 @@ public interface ISys2PostService { * @param postId 岗位ID * @return 角色对象信息 */ - Sys2PostVo selectPostById(Long postId); + SysSaasPostVo selectPostById(Long postId); /** * 根据用户ID获取岗位选择框列表 @@ -54,7 +54,7 @@ public interface ISys2PostService { * @param postIds 岗位id串 * @return 岗位列表信息 */ - List selectPostByIds(List postIds); + List selectPostByIds(List postIds); /** * 校验岗位名称 @@ -62,7 +62,7 @@ public interface ISys2PostService { * @param post 岗位信息 * @return 结果 */ - boolean checkPostNameUnique(Sys2PostBo post); + boolean checkPostNameUnique(SysSaasPostBo post); /** * 校验岗位编码 @@ -70,7 +70,7 @@ public interface ISys2PostService { * @param post 岗位信息 * @return 结果 */ - boolean checkPostCodeUnique(Sys2PostBo post); + boolean checkPostCodeUnique(SysSaasPostBo post); /** * 通过岗位ID查询岗位使用数量 @@ -110,7 +110,7 @@ public interface ISys2PostService { * @param bo 岗位信息 * @return 结果 */ - int insertPost(Sys2PostBo bo); + int insertPost(SysSaasPostBo bo); /** * 修改保存岗位信息 @@ -118,5 +118,5 @@ public interface ISys2PostService { * @param bo 岗位信息 * @return 结果 */ - int updatePost(Sys2PostBo bo); + int updatePost(SysSaasPostBo bo); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2RoleService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasRoleService.java similarity index 78% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2RoleService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasRoleService.java index 2a4c4f0d2..02c42f0fd 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2RoleService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasRoleService.java @@ -2,9 +2,9 @@ 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.Sys2UserRole; -import org.dromara.system.saas.domain.bo.Sys2RoleBo; -import org.dromara.system.saas.domain.vo.Sys2RoleVo; +import org.dromara.system.saas.domain.SysSaasUserRole; +import org.dromara.system.saas.domain.bo.SysSaasRoleBo; +import org.dromara.system.saas.domain.vo.SysSaasRoleVo; import java.util.List; import java.util.Set; @@ -14,10 +14,10 @@ import java.util.Set; * * @author Lion Li */ -public interface ISys2RoleService { +public interface ISysSaasRoleService { - TableDataInfo selectPageRoleList(Sys2RoleBo role, PageQuery pageQuery); + TableDataInfo selectPageRoleList(SysSaasRoleBo role, PageQuery pageQuery); /** * 根据条件分页查询角色数据 @@ -25,7 +25,7 @@ public interface ISys2RoleService { * @param role 角色信息 * @return 角色数据集合信息 */ - List selectRoleList(Sys2RoleBo role); + List selectRoleList(SysSaasRoleBo role); /** * 根据用户ID查询角色列表 @@ -33,7 +33,7 @@ public interface ISys2RoleService { * @param userId 用户ID * @return 角色列表 */ - List selectRolesByUserId(Long userId); + List selectRolesByUserId(Long userId); /** * 根据用户ID查询角色列表(包含被授权状态) @@ -41,7 +41,7 @@ public interface ISys2RoleService { * @param userId 用户ID * @return 角色列表 */ - List selectRolesAuthByUserId(Long userId); + List selectRolesAuthByUserId(Long userId); /** * 根据用户ID查询角色权限 @@ -56,7 +56,7 @@ public interface ISys2RoleService { * * @return 角色列表 */ - List selectRoleAll(); + List selectRoleAll(); /** * 根据用户ID获取角色选择框列表 @@ -72,7 +72,7 @@ public interface ISys2RoleService { * @param roleId 角色ID * @return 角色对象信息 */ - Sys2RoleVo selectRoleById(Long roleId); + SysSaasRoleVo selectRoleById(Long roleId); /** * 通过角色ID串查询角色 @@ -80,7 +80,7 @@ public interface ISys2RoleService { * @param roleIds 角色ID串 * @return 角色列表信息 */ - List selectRoleByIds(List roleIds); + List selectRoleByIds(List roleIds); /** * 校验角色名称是否唯一 @@ -88,7 +88,7 @@ public interface ISys2RoleService { * @param role 角色信息 * @return 结果 */ - boolean checkRoleNameUnique(Sys2RoleBo role); + boolean checkRoleNameUnique(SysSaasRoleBo role); /** * 校验角色权限是否唯一 @@ -96,14 +96,14 @@ public interface ISys2RoleService { * @param role 角色信息 * @return 结果 */ - boolean checkRoleKeyUnique(Sys2RoleBo role); + boolean checkRoleKeyUnique(SysSaasRoleBo role); /** * 校验角色是否允许操作 * * @param role 角色信息 */ - void checkRoleAllowed(Sys2RoleBo role); + void checkRoleAllowed(SysSaasRoleBo role); /** * 校验角色是否有数据权限 @@ -126,7 +126,7 @@ public interface ISys2RoleService { * @param bo 角色信息 * @return 结果 */ - int insertRole(Sys2RoleBo bo); + int insertRole(SysSaasRoleBo bo); /** * 修改保存角色信息 @@ -134,7 +134,7 @@ public interface ISys2RoleService { * @param bo 角色信息 * @return 结果 */ - int updateRole(Sys2RoleBo bo); + int updateRole(SysSaasRoleBo bo); /** * 修改角色状态 @@ -151,7 +151,7 @@ public interface ISys2RoleService { * @param bo 角色信息 * @return 结果 */ - int authDataScope(Sys2RoleBo bo); + int authDataScope(SysSaasRoleBo bo); /** * 通过角色ID删除角色 @@ -175,7 +175,7 @@ public interface ISys2RoleService { * @param userRole 用户和角色关联信息 * @return 结果 */ - int deleteAuthUser(Sys2UserRole userRole); + int deleteAuthUser(SysSaasUserRole userRole); /** * 批量取消授权用户角色 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2SocialService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasSocialService.java similarity index 52% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2SocialService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasSocialService.java index acf5bba8a..b72cf6951 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2SocialService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasSocialService.java @@ -1,7 +1,7 @@ package org.dromara.system.saas.service; -import org.dromara.system.saas.domain.bo.Sys2SocialBo; -import org.dromara.system.saas.domain.vo.Sys2SocialVo; +import org.dromara.system.saas.domain.bo.SysSaasSocialBo; +import org.dromara.system.saas.domain.vo.SysSaasSocialVo; import java.util.List; @@ -10,33 +10,33 @@ import java.util.List; * * @author thiszhc */ -public interface ISys2SocialService { +public interface ISysSaasSocialService { /** * 查询社会化关系 */ - Sys2SocialVo queryById(String id); + SysSaasSocialVo queryById(String id); /** * 查询社会化关系列表 */ - List queryList(Sys2SocialBo bo); + List queryList(SysSaasSocialBo bo); /** * 查询社会化关系列表 */ - List queryListByUserId(Long userId); + List queryListByUserId(Long userId); /** * 新增授权关系 */ - Boolean insertByBo(Sys2SocialBo bo); + Boolean insertByBo(SysSaasSocialBo bo); /** * 更新社会化关系 */ - Boolean updateByBo(Sys2SocialBo bo); + Boolean updateByBo(SysSaasSocialBo bo); /** * 删除社会化关系信息 @@ -47,7 +47,7 @@ public interface ISys2SocialService { /** * 根据 authId 查询 */ - List selectByAuthId(String authId); + List selectByAuthId(String authId); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantApplicationService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasTenantApplicationService.java similarity index 70% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantApplicationService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasTenantApplicationService.java index c5d7487e8..9145efe5e 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantApplicationService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasTenantApplicationService.java @@ -1,7 +1,7 @@ package org.dromara.system.saas.service; -import org.dromara.system.saas.domain.vo.Sys2TenantApplicationVo; -import org.dromara.system.saas.domain.bo.Sys2TenantApplicationBo; +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; @@ -14,7 +14,7 @@ import java.util.List; * @author Lion Li * @date 2024-09-22 */ -public interface ISys2TenantApplicationService { +public interface ISysSaasTenantApplicationService { /** * 查询租户和应用关联 @@ -22,7 +22,7 @@ public interface ISys2TenantApplicationService { * @param tenantId 主键 * @return 租户和应用关联 */ - Sys2TenantApplicationVo queryById(Long tenantId); + SysSaasTenantApplicationVo queryById(Long tenantId); /** * 分页查询租户和应用关联列表 @@ -31,7 +31,7 @@ public interface ISys2TenantApplicationService { * @param pageQuery 分页参数 * @return 租户和应用关联分页列表 */ - TableDataInfo queryPageList(Sys2TenantApplicationBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(SysSaasTenantApplicationBo bo, PageQuery pageQuery); /** * 查询符合条件的租户和应用关联列表 @@ -39,7 +39,7 @@ public interface ISys2TenantApplicationService { * @param bo 查询条件 * @return 租户和应用关联列表 */ - List queryList(Sys2TenantApplicationBo bo); + List queryList(SysSaasTenantApplicationBo bo); /** * 新增租户和应用关联 @@ -47,7 +47,7 @@ public interface ISys2TenantApplicationService { * @param bo 租户和应用关联 * @return 是否新增成功 */ - Boolean insertByBo(Sys2TenantApplicationBo bo); + Boolean insertByBo(SysSaasTenantApplicationBo bo); /** * 修改租户和应用关联 @@ -55,7 +55,7 @@ public interface ISys2TenantApplicationService { * @param bo 租户和应用关联 * @return 是否修改成功 */ - Boolean updateByBo(Sys2TenantApplicationBo bo); + Boolean updateByBo(SysSaasTenantApplicationBo bo); /** * 校验并批量删除租户和应用关联信息 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantPackageService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasTenantPackageService.java similarity index 54% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantPackageService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasTenantPackageService.java index 5e607b6e0..54537e4fa 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantPackageService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasTenantPackageService.java @@ -2,8 +2,8 @@ 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.Sys2TenantPackageBo; -import org.dromara.system.saas.domain.vo.Sys2TenantPackageVo; +import org.dromara.system.saas.domain.bo.SysSaasTenantPackageBo; +import org.dromara.system.saas.domain.vo.SysSaasTenantPackageVo; import java.util.Collection; import java.util.List; @@ -13,47 +13,47 @@ import java.util.List; * * @author Michelle.Chung */ -public interface ISys2TenantPackageService { +public interface ISysSaasTenantPackageService { /** * 查询租户套餐 */ - Sys2TenantPackageVo queryById(Long packageId); + SysSaasTenantPackageVo queryById(Long packageId); /** * 查询租户套餐列表 */ - TableDataInfo queryPageList(Sys2TenantPackageBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(SysSaasTenantPackageBo bo, PageQuery pageQuery); /** * 查询租户套餐已启用列表 */ - List selectList(); + List selectList(); /** * 查询租户套餐列表 */ - List queryList(Sys2TenantPackageBo bo); + List queryList(SysSaasTenantPackageBo bo); /** * 新增租户套餐 */ - Boolean insertByBo(Sys2TenantPackageBo bo); + Boolean insertByBo(SysSaasTenantPackageBo bo); /** * 修改租户套餐 */ - Boolean updateByBo(Sys2TenantPackageBo bo); + Boolean updateByBo(SysSaasTenantPackageBo bo); /** * 校验套餐名称是否唯一 */ - boolean checkPackageNameUnique(Sys2TenantPackageBo bo); + boolean checkPackageNameUnique(SysSaasTenantPackageBo bo); /** * 修改套餐状态 */ - int updatePackageStatus(Sys2TenantPackageBo bo); + int updatePackageStatus(SysSaasTenantPackageBo bo); /** * 校验并批量删除租户套餐信息 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasTenantService.java similarity index 65% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasTenantService.java index a2b4f45bf..de7fedf16 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasTenantService.java @@ -1,7 +1,7 @@ package org.dromara.system.saas.service; -import org.dromara.system.saas.domain.vo.Sys2TenantVo; -import org.dromara.system.saas.domain.bo.Sys2TenantBo; +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; @@ -13,42 +13,42 @@ import java.util.List; * * @author Michelle.Chung */ -public interface ISys2TenantService { +public interface ISysSaasTenantService { /** * 查询租户 */ - Sys2TenantVo queryById(Long id); + SysSaasTenantVo queryById(Long id); /** * 基于租户ID查询租户 */ - Sys2TenantVo queryByTenantId(String tenantId); + SysSaasTenantVo queryByTenantId(String tenantId); /** * 查询租户列表 */ - TableDataInfo queryPageList(Sys2TenantBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(SysSaasTenantBo bo, PageQuery pageQuery); /** * 查询租户列表 */ - List queryList(Sys2TenantBo bo); + List queryList(SysSaasTenantBo bo); /** * 新增租户 */ - Boolean insertByBo(Sys2TenantBo bo); + Boolean insertByBo(SysSaasTenantBo bo); /** * 修改租户 */ - Boolean updateByBo(Sys2TenantBo bo); + Boolean updateByBo(SysSaasTenantBo bo); /** * 修改租户状态 */ - int updateTenantStatus(Sys2TenantBo bo); + int updateTenantStatus(SysSaasTenantBo bo); /** * 校验租户是否允许操作 @@ -63,7 +63,7 @@ public interface ISys2TenantService { /** * 校验企业名称是否唯一 */ - boolean checkCompanyNameUnique(Sys2TenantBo bo); + boolean checkCompanyNameUnique(SysSaasTenantBo bo); /** * 校验账号余额 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2UserService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasUserService.java similarity index 75% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2UserService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasUserService.java index 8936232c4..9abbe9e0e 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2UserService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasUserService.java @@ -2,9 +2,9 @@ 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.Sys2UserBo; -import org.dromara.system.saas.domain.vo.Sys2UserExportVo; -import org.dromara.system.saas.domain.vo.Sys2UserVo; +import org.dromara.system.saas.domain.bo.SysSaasUserBo; +import org.dromara.system.saas.domain.vo.SysSaasUserExportVo; +import org.dromara.system.saas.domain.vo.SysSaasUserVo; import java.util.List; @@ -13,10 +13,10 @@ import java.util.List; * * @author Lion Li */ -public interface ISys2UserService { +public interface ISysSaasUserService { - TableDataInfo selectPageUserList(Sys2UserBo user, PageQuery pageQuery); + TableDataInfo selectPageUserList(SysSaasUserBo user, PageQuery pageQuery); /** * 根据条件分页查询用户列表 @@ -24,7 +24,7 @@ public interface ISys2UserService { * @param user 用户信息 * @return 用户信息集合信息 */ - List selectUserExportList(Sys2UserBo user); + List selectUserExportList(SysSaasUserBo user); /** * 根据条件分页查询已分配用户角色列表 @@ -32,7 +32,7 @@ public interface ISys2UserService { * @param user 用户信息 * @return 用户信息集合信息 */ - TableDataInfo selectAllocatedList(Sys2UserBo user, PageQuery pageQuery); + TableDataInfo selectAllocatedList(SysSaasUserBo user, PageQuery pageQuery); /** * 根据条件分页查询未分配用户角色列表 @@ -40,7 +40,7 @@ public interface ISys2UserService { * @param user 用户信息 * @return 用户信息集合信息 */ - TableDataInfo selectUnallocatedList(Sys2UserBo user, PageQuery pageQuery); + TableDataInfo selectUnallocatedList(SysSaasUserBo user, PageQuery pageQuery); /** * 通过用户名查询用户 @@ -48,7 +48,7 @@ public interface ISys2UserService { * @param userName 用户名 * @return 用户对象信息 */ - Sys2UserVo selectUserByUserName(String userName); + SysSaasUserVo selectUserByUserName(String userName); /** * 通过手机号查询用户 @@ -56,7 +56,7 @@ public interface ISys2UserService { * @param phonenumber 手机号 * @return 用户对象信息 */ - Sys2UserVo selectUserByPhonenumber(String phonenumber); + SysSaasUserVo selectUserByPhonenumber(String phonenumber); /** * 通过用户ID查询用户 @@ -64,7 +64,7 @@ public interface ISys2UserService { * @param userId 用户ID * @return 用户对象信息 */ - Sys2UserVo selectUserById(Long userId); + SysSaasUserVo selectUserById(Long userId); /** * 通过用户ID串查询用户 @@ -73,7 +73,7 @@ public interface ISys2UserService { * @param deptId 部门id * @return 用户列表信息 */ - List selectUserByIds(List userIds, Long deptId); + List selectUserByIds(List userIds, Long deptId); /** * 根据用户ID查询用户所属角色组 @@ -97,7 +97,7 @@ public interface ISys2UserService { * @param user 用户信息 * @return 结果 */ - boolean checkUserNameUnique(Sys2UserBo user); + boolean checkUserNameUnique(SysSaasUserBo user); /** * 校验手机号码是否唯一 @@ -105,7 +105,7 @@ public interface ISys2UserService { * @param user 用户信息 * @return 结果 */ - boolean checkPhoneUnique(Sys2UserBo user); + boolean checkPhoneUnique(SysSaasUserBo user); /** * 校验email是否唯一 @@ -113,7 +113,7 @@ public interface ISys2UserService { * @param user 用户信息 * @return 结果 */ - boolean checkEmailUnique(Sys2UserBo user); + boolean checkEmailUnique(SysSaasUserBo user); /** * 校验用户是否允许操作 @@ -135,7 +135,7 @@ public interface ISys2UserService { * @param user 用户信息 * @return 结果 */ - int insertUser(Sys2UserBo user); + int insertUser(SysSaasUserBo user); /** * 注册用户信息 @@ -143,7 +143,7 @@ public interface ISys2UserService { * @param user 用户信息 * @return 结果 */ - boolean registerUser(Sys2UserBo user, String tenantId); + boolean registerUser(SysSaasUserBo user, String tenantId); /** * 修改用户信息 @@ -151,7 +151,7 @@ public interface ISys2UserService { * @param user 用户信息 * @return 结果 */ - int updateUser(Sys2UserBo user); + int updateUser(SysSaasUserBo user); /** * 用户授权角色 @@ -176,7 +176,7 @@ public interface ISys2UserService { * @param user 用户信息 * @return 结果 */ - int updateUserProfile(Sys2UserBo user); + int updateUserProfile(SysSaasUserBo user); /** * 修改用户头像 @@ -218,5 +218,5 @@ public interface ISys2UserService { * @param deptId 部门id * @return 结果 */ - List selectUserListByDept(Long deptId); + List selectUserListByDept(Long deptId); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ClientServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasClientServiceImpl.java similarity index 61% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ClientServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasClientServiceImpl.java index e6f095472..b9b20aa70 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ClientServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasClientServiceImpl.java @@ -12,11 +12,11 @@ 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.Sys2Client; -import org.dromara.system.saas.domain.bo.Sys2ClientBo; -import org.dromara.system.saas.domain.vo.Sys2ClientVo; -import org.dromara.system.saas.mapper.Sys2ClientMapper; -import org.dromara.system.saas.service.ISys2ClientService; +import org.dromara.system.saas.domain.SysSaasClient; +import org.dromara.system.saas.domain.bo.SysSaasClientBo; +import org.dromara.system.saas.domain.vo.SysSaasClientVo; +import org.dromara.system.saas.mapper.SysSaasClientMapper; +import org.dromara.system.saas.service.ISysSaasClientService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -33,16 +33,16 @@ import java.util.List; @Slf4j @RequiredArgsConstructor @Service -public class Sys2ClientServiceImpl implements ISys2ClientService { +public class SysSaasClientServiceImpl implements ISysSaasClientService { - private final Sys2ClientMapper baseMapper; + private final SysSaasClientMapper baseMapper; /** * 查询客户端管理 */ @Override - public Sys2ClientVo queryById(Long id) { - Sys2ClientVo vo = baseMapper.selectVoById(id); + public SysSaasClientVo queryById(Long id) { + SysSaasClientVo vo = baseMapper.selectVoById(id); vo.setGrantTypeList(List.of(vo.getGrantType().split(","))); return vo; } @@ -53,17 +53,17 @@ public class Sys2ClientServiceImpl implements ISys2ClientService { */ @Cacheable(cacheNames = CacheNames.SYS_CLIENT, key = "#clientId") @Override - public Sys2ClientVo queryByClientId(String clientId) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(Sys2Client::getClientId, clientId)); + public SysSaasClientVo queryByClientId(String clientId) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysSaasClient::getClientId, clientId)); } /** * 查询客户端管理列表 */ @Override - public TableDataInfo queryPageList(Sys2ClientBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo queryPageList(SysSaasClientBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); result.getRecords().forEach(r -> r.setGrantTypeList(List.of(r.getGrantType().split(",")))); return TableDataInfo.build(result); } @@ -72,18 +72,18 @@ public class Sys2ClientServiceImpl implements ISys2ClientService { * 查询客户端管理列表 */ @Override - public List queryList(Sys2ClientBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List queryList(SysSaasClientBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(Sys2ClientBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getClientId()), Sys2Client::getClientId, bo.getClientId()); - lqw.eq(StringUtils.isNotBlank(bo.getClientKey()), Sys2Client::getClientKey, bo.getClientKey()); - lqw.eq(StringUtils.isNotBlank(bo.getClientSecret()), Sys2Client::getClientSecret, bo.getClientSecret()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Sys2Client::getStatus, bo.getStatus()); - lqw.orderByAsc(Sys2Client::getId); + private LambdaQueryWrapper buildQueryWrapper(SysSaasClientBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getClientId()), SysSaasClient::getClientId, bo.getClientId()); + lqw.eq(StringUtils.isNotBlank(bo.getClientKey()), SysSaasClient::getClientKey, bo.getClientKey()); + lqw.eq(StringUtils.isNotBlank(bo.getClientSecret()), SysSaasClient::getClientSecret, bo.getClientSecret()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysSaasClient::getStatus, bo.getStatus()); + lqw.orderByAsc(SysSaasClient::getId); return lqw; } @@ -91,8 +91,8 @@ public class Sys2ClientServiceImpl implements ISys2ClientService { * 新增客户端管理 */ @Override - public Boolean insertByBo(Sys2ClientBo bo) { - Sys2Client add = MapstructUtils.convert(bo, Sys2Client.class); + public Boolean insertByBo(SysSaasClientBo bo) { + SysSaasClient add = MapstructUtils.convert(bo, SysSaasClient.class); validEntityBeforeSave(add); add.setGrantType(String.join(",", bo.getGrantTypeList())); // 生成clientid @@ -111,8 +111,8 @@ public class Sys2ClientServiceImpl implements ISys2ClientService { */ @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, key = "#bo.clientId") @Override - public Boolean updateByBo(Sys2ClientBo bo) { - Sys2Client update = MapstructUtils.convert(bo, Sys2Client.class); + public Boolean updateByBo(SysSaasClientBo bo) { + SysSaasClient update = MapstructUtils.convert(bo, SysSaasClient.class); validEntityBeforeSave(update); update.setGrantType(String.join(",", bo.getGrantTypeList())); return baseMapper.updateById(update) > 0; @@ -125,15 +125,15 @@ public class Sys2ClientServiceImpl implements ISys2ClientService { @Override public int updateUserStatus(String clientId, String status) { return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(Sys2Client::getStatus, status) - .eq(Sys2Client::getClientId, clientId)); + new LambdaUpdateWrapper() + .set(SysSaasClient::getStatus, status) + .eq(SysSaasClient::getClientId, clientId)); } /** * 保存前的数据校验 */ - private void validEntityBeforeSave(Sys2Client entity) { + private void validEntityBeforeSave(SysSaasClient entity) { //TODO 做一些数据校验,如唯一约束 } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ConfigServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasConfigServiceImpl.java similarity index 68% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ConfigServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasConfigServiceImpl.java index 48b3f1ac7..cf100db80 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasConfigServiceImpl.java @@ -17,11 +17,11 @@ 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.Sys2Config; -import org.dromara.system.saas.domain.bo.Sys2ConfigBo; -import org.dromara.system.saas.domain.vo.Sys2ConfigVo; -import org.dromara.system.saas.mapper.Sys2ConfigMapper; -import org.dromara.system.saas.service.ISys2ConfigService; +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; @@ -38,14 +38,14 @@ import java.util.Map; */ @RequiredArgsConstructor @Service -public class Sys2ConfigServiceImpl implements ISys2ConfigService, ConfigService { +public class SysSaasConfigServiceImpl implements ISysSaasConfigService, ConfigService { - private final Sys2ConfigMapper baseMapper; + private final SysSaasConfigMapper baseMapper; @Override - public TableDataInfo selectPageConfigList(Sys2ConfigBo config, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(config); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo selectPageConfigList(SysSaasConfigBo config, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(config); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -57,7 +57,7 @@ public class Sys2ConfigServiceImpl implements ISys2ConfigService, ConfigService */ @Override @DS("master") - public Sys2ConfigVo selectConfigById(Long configId) { + public SysSaasConfigVo selectConfigById(Long configId) { return baseMapper.selectVoById(configId); } @@ -70,8 +70,8 @@ public class Sys2ConfigServiceImpl implements ISys2ConfigService, ConfigService @Cacheable(cacheNames = CacheNames.SYS_CONFIG, key = "#configKey") @Override public String selectConfigByKey(String configKey) { - Sys2Config retConfig = baseMapper.selectOne(new LambdaQueryWrapper() - .eq(Sys2Config::getConfigKey, configKey)); + SysSaasConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper() + .eq(SysSaasConfig::getConfigKey, configKey)); if (ObjectUtil.isNotNull(retConfig)) { return retConfig.getConfigValue(); } @@ -85,9 +85,9 @@ public class Sys2ConfigServiceImpl implements ISys2ConfigService, ConfigService */ @Override public boolean selectRegisterEnabled(String tenantId) { - Sys2Config retConfig = TenantHelper.dynamic(tenantId, () -> { - return baseMapper.selectOne(new LambdaQueryWrapper() - .eq(Sys2Config::getConfigKey, "sys.account.registerUser")); + SysSaasConfig retConfig = TenantHelper.dynamic(tenantId, () -> { + return baseMapper.selectOne(new LambdaQueryWrapper() + .eq(SysSaasConfig::getConfigKey, "sys.account.registerUser")); }); if (ObjectUtil.isNull(retConfig)) { return false; @@ -102,20 +102,20 @@ public class Sys2ConfigServiceImpl implements ISys2ConfigService, ConfigService * @return 参数配置集合 */ @Override - public List selectConfigList(Sys2ConfigBo config) { - LambdaQueryWrapper lqw = buildQueryWrapper(config); + public List selectConfigList(SysSaasConfigBo config) { + LambdaQueryWrapper lqw = buildQueryWrapper(config); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(Sys2ConfigBo bo) { + private LambdaQueryWrapper buildQueryWrapper(SysSaasConfigBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getConfigName()), Sys2Config::getConfigName, bo.getConfigName()); - lqw.eq(StringUtils.isNotBlank(bo.getConfigType()), Sys2Config::getConfigType, bo.getConfigType()); - lqw.like(StringUtils.isNotBlank(bo.getConfigKey()), Sys2Config::getConfigKey, bo.getConfigKey()); + LambdaQueryWrapper 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, - Sys2Config::getCreateTime, params.get("beginTime"), params.get("endTime")); - lqw.orderByAsc(Sys2Config::getConfigId); + SysSaasConfig::getCreateTime, params.get("beginTime"), params.get("endTime")); + lqw.orderByAsc(SysSaasConfig::getConfigId); return lqw; } @@ -127,8 +127,8 @@ public class Sys2ConfigServiceImpl implements ISys2ConfigService, ConfigService */ @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey") @Override - public String insertConfig(Sys2ConfigBo bo) { - Sys2Config config = MapstructUtils.convert(bo, Sys2Config.class); + public String insertConfig(SysSaasConfigBo bo) { + SysSaasConfig config = MapstructUtils.convert(bo, SysSaasConfig.class); int row = baseMapper.insert(config); if (row > 0) { return config.getConfigValue(); @@ -144,19 +144,19 @@ public class Sys2ConfigServiceImpl implements ISys2ConfigService, ConfigService */ @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey") @Override - public String updateConfig(Sys2ConfigBo bo) { + public String updateConfig(SysSaasConfigBo bo) { int row = 0; - Sys2Config config = MapstructUtils.convert(bo, Sys2Config.class); + SysSaasConfig config = MapstructUtils.convert(bo, SysSaasConfig.class); if (config.getConfigId() != null) { - Sys2Config temp = baseMapper.selectById(config.getConfigId()); + 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() - .eq(Sys2Config::getConfigKey, config.getConfigKey())); + row = baseMapper.update(config, new LambdaQueryWrapper() + .eq(SysSaasConfig::getConfigKey, config.getConfigKey())); } if (row > 0) { return config.getConfigValue(); @@ -172,7 +172,7 @@ public class Sys2ConfigServiceImpl implements ISys2ConfigService, ConfigService @Override public void deleteConfigByIds(Long[] configIds) { for (Long configId : configIds) { - Sys2Config config = baseMapper.selectById(configId); + SysSaasConfig config = baseMapper.selectById(configId); if (StringUtils.equals(UserConstants.YES, config.getConfigType())) { throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey())); } @@ -196,9 +196,9 @@ public class Sys2ConfigServiceImpl implements ISys2ConfigService, ConfigService * @return 结果 */ @Override - public boolean checkConfigKeyUnique(Sys2ConfigBo config) { + public boolean checkConfigKeyUnique(SysSaasConfigBo config) { long configId = ObjectUtil.isNull(config.getConfigId()) ? -1L : config.getConfigId(); - Sys2Config info = baseMapper.selectOne(new LambdaQueryWrapper().eq(Sys2Config::getConfigKey, config.getConfigKey())); + SysSaasConfig info = baseMapper.selectOne(new LambdaQueryWrapper().eq(SysSaasConfig::getConfigKey, config.getConfigKey())); if (ObjectUtil.isNotNull(info) && info.getConfigId() != configId) { return false; } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DataScopeServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasDataScopeServiceImpl.java similarity index 64% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DataScopeServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasDataScopeServiceImpl.java index 3aa833d74..d76af4119 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DataScopeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasDataScopeServiceImpl.java @@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.system.saas.domain.Sys2Dept; -import org.dromara.system.saas.domain.Sys2RoleDept; -import org.dromara.system.saas.mapper.Sys2DeptMapper; -import org.dromara.system.saas.mapper.Sys2RoleDeptMapper; -import org.dromara.system.saas.service.ISys2DataScopeService; +import org.dromara.system.saas.domain.SysSaasDept; +import org.dromara.system.saas.domain.SysSaasRoleDept; +import org.dromara.system.saas.mapper.SysSaasDeptMapper; +import org.dromara.system.saas.mapper.SysSaasRoleDeptMapper; +import org.dromara.system.saas.service.ISysSaasDataScopeService; import java.util.List; @@ -25,10 +25,10 @@ import java.util.List; */ @RequiredArgsConstructor //@Service("sdss") 目前数据权限注解没有用，所以不需要用 -public class Sys2DataScopeServiceImpl implements ISys2DataScopeService { +public class SysSaasDataScopeServiceImpl implements ISysSaasDataScopeService { - private final Sys2RoleDeptMapper roleDeptMapper; - private final Sys2DeptMapper deptMapper; + private final SysSaasRoleDeptMapper roleDeptMapper; + private final SysSaasDeptMapper deptMapper; /** * 获取角色自定义权限 @@ -41,10 +41,10 @@ public class Sys2DataScopeServiceImpl implements ISys2DataScopeService { if (ObjectUtil.isNull(roleId)) { return "-1"; } - List list = roleDeptMapper.selectList( - new LambdaQueryWrapper() - .select(Sys2RoleDept::getDeptId) - .eq(Sys2RoleDept::getRoleId, roleId)); + List list = roleDeptMapper.selectList( + new LambdaQueryWrapper() + .select(SysSaasRoleDept::getDeptId) + .eq(SysSaasRoleDept::getRoleId, roleId)); if (CollUtil.isNotEmpty(list)) { return StreamUtils.join(list, rd -> Convert.toStr(rd.getDeptId())); } @@ -62,10 +62,10 @@ public class Sys2DataScopeServiceImpl implements ISys2DataScopeService { if (ObjectUtil.isNull(deptId)) { return "-1"; } - List deptList = deptMapper.selectList(new LambdaQueryWrapper() - .select(Sys2Dept::getDeptId) + List deptList = deptMapper.selectList(new LambdaQueryWrapper() + .select(SysSaasDept::getDeptId) .apply(DataBaseHelper.findInSet(deptId, "ancestors"))); - List ids = StreamUtils.toList(deptList, Sys2Dept::getDeptId); + List ids = StreamUtils.toList(deptList, SysSaasDept::getDeptId); ids.add(deptId); if (CollUtil.isNotEmpty(ids)) { return StreamUtils.join(ids, Convert::toStr); 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/SysSaasDeptServiceImpl.java similarity index 64% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DeptServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasDeptServiceImpl.java index af9dec210..62b1bf8ae 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/SysSaasDeptServiceImpl.java @@ -19,15 +19,15 @@ import org.dromara.common.core.utils.TreeBuildUtils; import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.saas.domain.Sys2Dept; -import org.dromara.system.saas.domain.Sys2Role; -import org.dromara.system.saas.domain.Sys2User; -import org.dromara.system.saas.domain.bo.Sys2DeptBo; -import org.dromara.system.saas.domain.vo.Sys2DeptVo; -import org.dromara.system.saas.mapper.Sys2DeptMapper; -import org.dromara.system.saas.mapper.Sys2RoleMapper; -import org.dromara.system.saas.mapper.Sys2UserMapper; -import org.dromara.system.saas.service.ISys2DeptService; +import org.dromara.system.saas.domain.SysSaasDept; +import org.dromara.system.saas.domain.SysSaasRole; +import org.dromara.system.saas.domain.SysSaasUser; +import org.dromara.system.saas.domain.bo.SysSaasDeptBo; +import org.dromara.system.saas.domain.vo.SysSaasDeptVo; +import org.dromara.system.saas.mapper.SysSaasDeptMapper; +import org.dromara.system.saas.mapper.SysSaasRoleMapper; +import org.dromara.system.saas.mapper.SysSaasUserMapper; +import org.dromara.system.saas.service.ISysSaasDeptService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -43,11 +43,11 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class Sys2DeptServiceImpl implements ISys2DeptService, SaasDeptService { +public class SysSaasDeptServiceImpl implements ISysSaasDeptService, SaasDeptService { - private final Sys2DeptMapper baseMapper; - private final Sys2RoleMapper roleMapper; - private final Sys2UserMapper userMapper; + private final SysSaasDeptMapper baseMapper; + private final SysSaasRoleMapper roleMapper; + private final SysSaasUserMapper userMapper; /** * 查询部门管理数据 @@ -56,8 +56,8 @@ public class Sys2DeptServiceImpl implements ISys2DeptService, SaasDeptService { * @return 部门信息集合 */ @Override - public List selectDeptList(Sys2DeptBo dept) { - LambdaQueryWrapper lqw = buildQueryWrapper(dept); + public List selectDeptList(SysSaasDeptBo dept) { + LambdaQueryWrapper lqw = buildQueryWrapper(dept); return baseMapper.selectDeptList(lqw); } @@ -68,26 +68,26 @@ public class Sys2DeptServiceImpl implements ISys2DeptService, SaasDeptService { * @return 部门树信息集合 */ @Override - public List> selectDeptTreeList(Sys2DeptBo bo) { + public List> selectDeptTreeList(SysSaasDeptBo bo) { // 只查询未禁用部门 bo.setStatus(UserConstants.DEPT_NORMAL); - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - List depts = baseMapper.selectDeptList(lqw); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + List depts = baseMapper.selectDeptList(lqw); return buildDeptTreeSelect(depts); } - private LambdaQueryWrapper buildQueryWrapper(Sys2DeptBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(Sys2Dept::getDelFlag, UserConstants.DEL_FLAG_NORMAL); - lqw.eq(ObjectUtil.isNotNull(bo.getDeptId()), Sys2Dept::getDeptId, bo.getDeptId()); - lqw.eq(ObjectUtil.isNotNull(bo.getParentId()), Sys2Dept::getParentId, bo.getParentId()); - lqw.like(StringUtils.isNotBlank(bo.getDeptName()), Sys2Dept::getDeptName, bo.getDeptName()); - lqw.like(StringUtils.isNotBlank(bo.getDeptCategory()), Sys2Dept::getDeptCategory, bo.getDeptCategory()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Sys2Dept::getStatus, bo.getStatus()); - lqw.orderByAsc(Sys2Dept::getAncestors); - lqw.orderByAsc(Sys2Dept::getParentId); - lqw.orderByAsc(Sys2Dept::getOrderNum); - lqw.orderByAsc(Sys2Dept::getDeptId); + private LambdaQueryWrapper buildQueryWrapper(SysSaasDeptBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(SysSaasDept::getDelFlag, UserConstants.DEL_FLAG_NORMAL); + lqw.eq(ObjectUtil.isNotNull(bo.getDeptId()), SysSaasDept::getDeptId, bo.getDeptId()); + lqw.eq(ObjectUtil.isNotNull(bo.getParentId()), SysSaasDept::getParentId, bo.getParentId()); + lqw.like(StringUtils.isNotBlank(bo.getDeptName()), SysSaasDept::getDeptName, bo.getDeptName()); + lqw.like(StringUtils.isNotBlank(bo.getDeptCategory()), SysSaasDept::getDeptCategory, bo.getDeptCategory()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysSaasDept::getStatus, bo.getStatus()); + lqw.orderByAsc(SysSaasDept::getAncestors); + lqw.orderByAsc(SysSaasDept::getParentId); + lqw.orderByAsc(SysSaasDept::getOrderNum); + lqw.orderByAsc(SysSaasDept::getDeptId); return lqw; } @@ -98,7 +98,7 @@ public class Sys2DeptServiceImpl implements ISys2DeptService, SaasDeptService { * @return 下拉树结构列表 */ @Override - public List> buildDeptTreeSelect(List depts) { + public List> buildDeptTreeSelect(List depts) { if (CollUtil.isEmpty(depts)) { return CollUtil.newArrayList(); } @@ -117,7 +117,7 @@ public class Sys2DeptServiceImpl implements ISys2DeptService, SaasDeptService { */ @Override public List selectDeptListByRoleId(Long roleId) { - Sys2Role role = roleMapper.selectById(roleId); + SysSaasRole role = roleMapper.selectById(roleId); return baseMapper.selectDeptListByRoleId(roleId, role.getDeptCheckStrictly()); } @@ -129,23 +129,23 @@ public class Sys2DeptServiceImpl implements ISys2DeptService, SaasDeptService { */ @Cacheable(cacheNames = CacheNames.SYS_DEPT, key = "#deptId") @Override - public Sys2DeptVo selectDeptById(Long deptId) { - Sys2DeptVo dept = baseMapper.selectVoById(deptId); + public SysSaasDeptVo selectDeptById(Long deptId) { + SysSaasDeptVo dept = baseMapper.selectVoById(deptId); if (ObjectUtil.isNull(dept)) { return null; } - Sys2DeptVo parentDept = baseMapper.selectVoOne(new LambdaQueryWrapper() - .select(Sys2Dept::getDeptName).eq(Sys2Dept::getDeptId, dept.getParentId())); + SysSaasDeptVo parentDept = baseMapper.selectVoOne(new LambdaQueryWrapper() + .select(SysSaasDept::getDeptName).eq(SysSaasDept::getDeptId, dept.getParentId())); dept.setParentName(ObjectUtil.isNotNull(parentDept) ? parentDept.getDeptName() : null); return dept; } @Override - public List selectDeptByIds(List deptIds) { - return baseMapper.selectDeptList(new LambdaQueryWrapper() - .select(Sys2Dept::getDeptId, Sys2Dept::getDeptName, Sys2Dept::getLeader) - .eq(Sys2Dept::getStatus, UserConstants.DEPT_NORMAL) - .in(CollUtil.isNotEmpty(deptIds), Sys2Dept::getDeptId, deptIds)); + public List selectDeptByIds(List deptIds) { + return baseMapper.selectDeptList(new LambdaQueryWrapper() + .select(SysSaasDept::getDeptId, SysSaasDept::getDeptName, SysSaasDept::getLeader) + .eq(SysSaasDept::getStatus, UserConstants.DEPT_NORMAL) + .in(CollUtil.isNotEmpty(deptIds), SysSaasDept::getDeptId, deptIds)); } /** @@ -158,7 +158,7 @@ public class Sys2DeptServiceImpl implements ISys2DeptService, SaasDeptService { public String selectDeptNameByIds(String deptIds) { List list = new ArrayList<>(); for (Long id : StringUtils.splitTo(deptIds, Convert::toLong)) { - Sys2DeptVo vo = SpringUtils.getAopProxy(this).selectDeptById(id); + SysSaasDeptVo vo = SpringUtils.getAopProxy(this).selectDeptById(id); if (ObjectUtil.isNotNull(vo)) { list.add(vo.getDeptName()); } @@ -174,8 +174,8 @@ public class Sys2DeptServiceImpl implements ISys2DeptService, SaasDeptService { */ @Override public long selectNormalChildrenDeptById(Long deptId) { - return baseMapper.selectCount(new LambdaQueryWrapper() - .eq(Sys2Dept::getStatus, UserConstants.DEPT_NORMAL) + return baseMapper.selectCount(new LambdaQueryWrapper() + .eq(SysSaasDept::getStatus, UserConstants.DEPT_NORMAL) .apply(DataBaseHelper.findInSet(deptId, "ancestors"))); } @@ -187,8 +187,8 @@ public class Sys2DeptServiceImpl implements ISys2DeptService, SaasDeptService { */ @Override public boolean hasChildByDeptId(Long deptId) { - return baseMapper.exists(new LambdaQueryWrapper() - .eq(Sys2Dept::getParentId, deptId)); + return baseMapper.exists(new LambdaQueryWrapper() + .eq(SysSaasDept::getParentId, deptId)); } /** @@ -199,8 +199,8 @@ public class Sys2DeptServiceImpl implements ISys2DeptService, SaasDeptService { */ @Override public boolean checkDeptExistUser(Long deptId) { - return userMapper.exists(new LambdaQueryWrapper() - .eq(Sys2User::getDeptId, deptId)); + return userMapper.exists(new LambdaQueryWrapper() + .eq(SysSaasUser::getDeptId, deptId)); } /** @@ -210,11 +210,11 @@ public class Sys2DeptServiceImpl implements ISys2DeptService, SaasDeptService { * @return 结果 */ @Override - public boolean checkDeptNameUnique(Sys2DeptBo dept) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(Sys2Dept::getDeptName, dept.getDeptName()) - .eq(Sys2Dept::getParentId, dept.getParentId()) - .ne(ObjectUtil.isNotNull(dept.getDeptId()), Sys2Dept::getDeptId, dept.getDeptId())); + public boolean checkDeptNameUnique(SysSaasDeptBo dept) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysSaasDept::getDeptName, dept.getDeptName()) + .eq(SysSaasDept::getParentId, dept.getParentId()) + .ne(ObjectUtil.isNotNull(dept.getDeptId()), SysSaasDept::getDeptId, dept.getDeptId())); return !exist; } @@ -243,13 +243,13 @@ public class Sys2DeptServiceImpl implements ISys2DeptService, SaasDeptService { * @return 结果 */ @Override - public int insertDept(Sys2DeptBo bo) { - Sys2Dept info = baseMapper.selectById(bo.getParentId()); + public int insertDept(SysSaasDeptBo bo) { + SysSaasDept info = baseMapper.selectById(bo.getParentId()); // 如果父节点不为正常状态,则不允许新增子节点 if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) { throw new ServiceException("部门停用，不允许新增"); } - Sys2Dept dept = MapstructUtils.convert(bo, Sys2Dept.class); + SysSaasDept dept = MapstructUtils.convert(bo, SysSaasDept.class); dept.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + dept.getParentId()); return baseMapper.insert(dept); } @@ -262,13 +262,13 @@ public class Sys2DeptServiceImpl implements ISys2DeptService, SaasDeptService { */ @CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#bo.deptId") @Override - public int updateDept(Sys2DeptBo bo) { - Sys2Dept dept = MapstructUtils.convert(bo, Sys2Dept.class); - Sys2Dept oldDept = baseMapper.selectById(dept.getDeptId()); + public int updateDept(SysSaasDeptBo bo) { + SysSaasDept dept = MapstructUtils.convert(bo, SysSaasDept.class); + SysSaasDept oldDept = baseMapper.selectById(dept.getDeptId()); if (!oldDept.getParentId().equals(dept.getParentId())) { // 如果是新父部门 则校验是否具有新父部门权限 避免越权 this.checkDeptDataScope(dept.getParentId()); - Sys2Dept newParentDept = baseMapper.selectById(dept.getParentId()); + SysSaasDept newParentDept = baseMapper.selectById(dept.getParentId()); if (ObjectUtil.isNotNull(newParentDept) && ObjectUtil.isNotNull(oldDept)) { String newAncestors = newParentDept.getAncestors() + StringUtils.SEPARATOR + newParentDept.getDeptId(); String oldAncestors = oldDept.getAncestors(); @@ -290,12 +290,12 @@ public class Sys2DeptServiceImpl implements ISys2DeptService, SaasDeptService { * * @param dept 当前部门 */ - private void updateParentDeptStatusNormal(Sys2Dept dept) { + private void updateParentDeptStatusNormal(SysSaasDept dept) { String ancestors = dept.getAncestors(); Long[] deptIds = Convert.toLongArray(ancestors); - baseMapper.update(null, new LambdaUpdateWrapper() - .set(Sys2Dept::getStatus, UserConstants.DEPT_NORMAL) - .in(Sys2Dept::getDeptId, Arrays.asList(deptIds))); + baseMapper.update(null, new LambdaUpdateWrapper() + .set(SysSaasDept::getStatus, UserConstants.DEPT_NORMAL) + .in(SysSaasDept::getDeptId, Arrays.asList(deptIds))); } /** @@ -306,11 +306,11 @@ public class Sys2DeptServiceImpl implements ISys2DeptService, SaasDeptService { * @param oldAncestors 旧的父ID集合 */ private void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) { - List children = baseMapper.selectList(new LambdaQueryWrapper() + List children = baseMapper.selectList(new LambdaQueryWrapper() .apply(DataBaseHelper.findInSet(deptId, "ancestors"))); - List list = new ArrayList<>(); - for (Sys2Dept child : children) { - Sys2Dept dept = new Sys2Dept(); + List list = new ArrayList<>(); + for (SysSaasDept child : children) { + SysSaasDept dept = new SysSaasDept(); dept.setDeptId(child.getDeptId()); dept.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors)); list.add(dept); diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DictDataServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasDictDataServiceImpl.java similarity index 57% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DictDataServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasDictDataServiceImpl.java index a254fed2c..805f2fd69 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DictDataServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasDictDataServiceImpl.java @@ -7,15 +7,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.system.saas.domain.Sys2DictData; +import org.dromara.system.saas.domain.SysSaasDictData; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.system.saas.domain.bo.Sys2DictDataBo; -import org.dromara.system.saas.domain.vo.Sys2DictDataVo; -import org.dromara.system.saas.mapper.Sys2DictDataMapper; -import org.dromara.system.saas.service.ISys2DictDataService; +import org.dromara.system.saas.domain.bo.SysSaasDictDataBo; +import org.dromara.system.saas.domain.vo.SysSaasDictDataVo; +import org.dromara.system.saas.mapper.SysSaasDictDataMapper; +import org.dromara.system.saas.service.ISysSaasDictDataService; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CachePut; import org.springframework.stereotype.Service; @@ -29,14 +29,14 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class Sys2DictDataServiceImpl implements ISys2DictDataService { +public class SysSaasDictDataServiceImpl implements ISysSaasDictDataService { - private final Sys2DictDataMapper baseMapper; + private final SysSaasDictDataMapper baseMapper; @Override - public TableDataInfo selectPageDictDataList(Sys2DictDataBo dictData, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(dictData); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo selectPageDictDataList(SysSaasDictDataBo dictData, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(dictData); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -47,17 +47,17 @@ public class Sys2DictDataServiceImpl implements ISys2DictDataService { * @return 字典数据集合信息 */ @Override - public List selectDictDataList(Sys2DictDataBo dictData) { - LambdaQueryWrapper lqw = buildQueryWrapper(dictData); + public List selectDictDataList(SysSaasDictDataBo dictData) { + LambdaQueryWrapper lqw = buildQueryWrapper(dictData); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(Sys2DictDataBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getDictSort() != null, Sys2DictData::getDictSort, bo.getDictSort()); - lqw.like(StringUtils.isNotBlank(bo.getDictLabel()), Sys2DictData::getDictLabel, bo.getDictLabel()); - lqw.eq(StringUtils.isNotBlank(bo.getDictType()), Sys2DictData::getDictType, bo.getDictType()); - lqw.orderByAsc(Sys2DictData::getDictSort); + private LambdaQueryWrapper buildQueryWrapper(SysSaasDictDataBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getDictSort() != null, SysSaasDictData::getDictSort, bo.getDictSort()); + lqw.like(StringUtils.isNotBlank(bo.getDictLabel()), SysSaasDictData::getDictLabel, bo.getDictLabel()); + lqw.eq(StringUtils.isNotBlank(bo.getDictType()), SysSaasDictData::getDictType, bo.getDictType()); + lqw.orderByAsc(SysSaasDictData::getDictSort); return lqw; } @@ -70,10 +70,10 @@ public class Sys2DictDataServiceImpl implements ISys2DictDataService { */ @Override public String selectDictLabel(String dictType, String dictValue) { - return baseMapper.selectOne(new LambdaQueryWrapper() - .select(Sys2DictData::getDictLabel) - .eq(Sys2DictData::getDictType, dictType) - .eq(Sys2DictData::getDictValue, dictValue)) + return baseMapper.selectOne(new LambdaQueryWrapper() + .select(SysSaasDictData::getDictLabel) + .eq(SysSaasDictData::getDictType, dictType) + .eq(SysSaasDictData::getDictValue, dictValue)) .getDictLabel(); } @@ -84,7 +84,7 @@ public class Sys2DictDataServiceImpl implements ISys2DictDataService { * @return 字典数据 */ @Override - public Sys2DictDataVo selectDictDataById(Long dictCode) { + public SysSaasDictDataVo selectDictDataById(Long dictCode) { return baseMapper.selectVoById(dictCode); } @@ -96,7 +96,7 @@ public class Sys2DictDataServiceImpl implements ISys2DictDataService { @Override public void deleteDictDataByIds(Long[] dictCodes) { for (Long dictCode : dictCodes) { - Sys2DictData data = baseMapper.selectById(dictCode); + SysSaasDictData data = baseMapper.selectById(dictCode); baseMapper.deleteById(dictCode); CacheUtils.evict(CacheNames.SYS_DICT, data.getDictType()); } @@ -110,8 +110,8 @@ public class Sys2DictDataServiceImpl implements ISys2DictDataService { */ @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") @Override - public List insertDictData(Sys2DictDataBo bo) { - Sys2DictData data = MapstructUtils.convert(bo, Sys2DictData.class); + public List insertDictData(SysSaasDictDataBo bo) { + SysSaasDictData data = MapstructUtils.convert(bo, SysSaasDictData.class); int row = baseMapper.insert(data); if (row > 0) { return baseMapper.selectDictDataByType(data.getDictType()); @@ -127,8 +127,8 @@ public class Sys2DictDataServiceImpl implements ISys2DictDataService { */ @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") @Override - public List updateDictData(Sys2DictDataBo bo) { - Sys2DictData data = MapstructUtils.convert(bo, Sys2DictData.class); + public List updateDictData(SysSaasDictDataBo bo) { + SysSaasDictData data = MapstructUtils.convert(bo, SysSaasDictData.class); int row = baseMapper.updateById(data); if (row > 0) { return baseMapper.selectDictDataByType(data.getDictType()); @@ -143,10 +143,10 @@ public class Sys2DictDataServiceImpl implements ISys2DictDataService { * @return 结果 */ @Override - public boolean checkDictDataUnique(Sys2DictDataBo dict) { + public boolean checkDictDataUnique(SysSaasDictDataBo dict) { Long dictCode = ObjectUtil.isNull(dict.getDictCode()) ? -1L : dict.getDictCode(); - Sys2DictData entity = baseMapper.selectOne(new LambdaQueryWrapper() - .eq(Sys2DictData::getDictType, dict.getDictType()).eq(Sys2DictData::getDictValue, dict.getDictValue())); + SysSaasDictData entity = baseMapper.selectOne(new LambdaQueryWrapper() + .eq(SysSaasDictData::getDictType, dict.getDictType()).eq(SysSaasDictData::getDictValue, dict.getDictValue())); if (ObjectUtil.isNotNull(entity) && !dictCode.equals(entity.getDictCode())) { return false; } 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/SysSaasDictTypeServiceImpl.java similarity index 62% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DictTypeServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasDictTypeServiceImpl.java index 5ecff7fcc..cf355b507 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/SysSaasDictTypeServiceImpl.java @@ -17,14 +17,14 @@ 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.system.saas.domain.Sys2DictData; -import org.dromara.system.saas.domain.Sys2DictType; -import org.dromara.system.saas.domain.bo.Sys2DictTypeBo; -import org.dromara.system.saas.domain.vo.Sys2DictDataVo; -import org.dromara.system.saas.domain.vo.Sys2DictTypeVo; -import org.dromara.system.saas.mapper.Sys2DictDataMapper; -import org.dromara.system.saas.mapper.Sys2DictTypeMapper; -import org.dromara.system.saas.service.ISys2DictTypeService; +import org.dromara.system.saas.domain.SysSaasDictData; +import org.dromara.system.saas.domain.SysSaasDictType; +import org.dromara.system.saas.domain.bo.SysSaasDictTypeBo; +import org.dromara.system.saas.domain.vo.SysSaasDictDataVo; +import org.dromara.system.saas.domain.vo.SysSaasDictTypeVo; +import org.dromara.system.saas.mapper.SysSaasDictDataMapper; +import org.dromara.system.saas.mapper.SysSaasDictTypeMapper; +import org.dromara.system.saas.service.ISysSaasDictTypeService; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -43,15 +43,15 @@ import java.util.stream.Collectors; */ @RequiredArgsConstructor @Service -public class Sys2DictTypeServiceImpl implements ISys2DictTypeService, SaasDictService { +public class SysSaasDictTypeServiceImpl implements ISysSaasDictTypeService, SaasDictService { - private final Sys2DictTypeMapper baseMapper; - private final Sys2DictDataMapper dictDataMapper; + private final SysSaasDictTypeMapper baseMapper; + private final SysSaasDictDataMapper dictDataMapper; @Override - public TableDataInfo selectPageDictTypeList(Sys2DictTypeBo dictType, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(dictType); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo selectPageDictTypeList(SysSaasDictTypeBo dictType, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(dictType); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -62,19 +62,19 @@ public class Sys2DictTypeServiceImpl implements ISys2DictTypeService, SaasDictSe * @return 字典类型集合信息 */ @Override - public List selectDictTypeList(Sys2DictTypeBo dictType) { - LambdaQueryWrapper lqw = buildQueryWrapper(dictType); + public List selectDictTypeList(SysSaasDictTypeBo dictType) { + LambdaQueryWrapper lqw = buildQueryWrapper(dictType); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(Sys2DictTypeBo bo) { + private LambdaQueryWrapper buildQueryWrapper(SysSaasDictTypeBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getDictName()), Sys2DictType::getDictName, bo.getDictName()); - lqw.like(StringUtils.isNotBlank(bo.getDictType()), Sys2DictType::getDictType, bo.getDictType()); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getDictName()), SysSaasDictType::getDictName, bo.getDictName()); + lqw.like(StringUtils.isNotBlank(bo.getDictType()), SysSaasDictType::getDictType, bo.getDictType()); lqw.between(params.get("beginTime") != null && params.get("endTime") != null, - Sys2DictType::getCreateTime, params.get("beginTime"), params.get("endTime")); - lqw.orderByAsc(Sys2DictType::getDictId); + SysSaasDictType::getCreateTime, params.get("beginTime"), params.get("endTime")); + lqw.orderByAsc(SysSaasDictType::getDictId); return lqw; } @@ -84,7 +84,7 @@ public class Sys2DictTypeServiceImpl implements ISys2DictTypeService, SaasDictSe * @return 字典类型集合信息 */ @Override - public List selectDictTypeAll() { + public List selectDictTypeAll() { return baseMapper.selectVoList(); } @@ -96,8 +96,8 @@ public class Sys2DictTypeServiceImpl implements ISys2DictTypeService, SaasDictSe */ @Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType") @Override - public List selectDictDataByType(String dictType) { - List dictDatas = dictDataMapper.selectDictDataByType(dictType); + public List selectDictDataByType(String dictType) { + List dictDatas = dictDataMapper.selectDictDataByType(dictType); if (CollUtil.isNotEmpty(dictDatas)) { return dictDatas; } @@ -111,7 +111,7 @@ public class Sys2DictTypeServiceImpl implements ISys2DictTypeService, SaasDictSe * @return 字典类型 */ @Override - public Sys2DictTypeVo selectDictTypeById(Long dictId) { + public SysSaasDictTypeVo selectDictTypeById(Long dictId) { return baseMapper.selectVoById(dictId); } @@ -122,8 +122,8 @@ public class Sys2DictTypeServiceImpl implements ISys2DictTypeService, SaasDictSe * @return 字典类型 */ @Override - public Sys2DictTypeVo selectDictTypeByType(String dictType) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(Sys2DictType::getDictType, dictType)); + public SysSaasDictTypeVo selectDictTypeByType(String dictType) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysSaasDictType::getDictType, dictType)); } /** @@ -134,9 +134,9 @@ public class Sys2DictTypeServiceImpl implements ISys2DictTypeService, SaasDictSe @Override public void deleteDictTypeByIds(Long[] dictIds) { for (Long dictId : dictIds) { - Sys2DictType dictType = baseMapper.selectById(dictId); - if (dictDataMapper.exists(new LambdaQueryWrapper() - .eq(Sys2DictData::getDictType, dictType.getDictType()))) { + SysSaasDictType dictType = baseMapper.selectById(dictId); + if (dictDataMapper.exists(new LambdaQueryWrapper() + .eq(SysSaasDictData::getDictType, dictType.getDictType()))) { throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName())); } CacheUtils.evict(CacheNames.SYS_DICT, dictType.getDictType()); @@ -160,8 +160,8 @@ public class Sys2DictTypeServiceImpl implements ISys2DictTypeService, SaasDictSe */ @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") @Override - public List insertDictType(Sys2DictTypeBo bo) { - Sys2DictType dict = MapstructUtils.convert(bo, Sys2DictType.class); + public List insertDictType(SysSaasDictTypeBo bo) { + SysSaasDictType dict = MapstructUtils.convert(bo, SysSaasDictType.class); int row = baseMapper.insert(dict); if (row > 0) { // 新增 type 下无 data 数据 返回空防止缓存穿透 @@ -179,12 +179,12 @@ public class Sys2DictTypeServiceImpl implements ISys2DictTypeService, SaasDictSe @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") @Override @Transactional(rollbackFor = Exception.class) - public List updateDictType(Sys2DictTypeBo bo) { - Sys2DictType dict = MapstructUtils.convert(bo, Sys2DictType.class); - Sys2DictType oldDict = baseMapper.selectById(dict.getDictId()); - dictDataMapper.update(null, new LambdaUpdateWrapper() - .set(Sys2DictData::getDictType, dict.getDictType()) - .eq(Sys2DictData::getDictType, oldDict.getDictType())); + public List updateDictType(SysSaasDictTypeBo bo) { + SysSaasDictType dict = MapstructUtils.convert(bo, SysSaasDictType.class); + SysSaasDictType oldDict = baseMapper.selectById(dict.getDictId()); + dictDataMapper.update(null, new LambdaUpdateWrapper() + .set(SysSaasDictData::getDictType, dict.getDictType()) + .eq(SysSaasDictData::getDictType, oldDict.getDictType())); int row = baseMapper.updateById(dict); if (row > 0) { CacheUtils.evict(CacheNames.SYS_DICT, oldDict.getDictType()); @@ -200,10 +200,10 @@ public class Sys2DictTypeServiceImpl implements ISys2DictTypeService, SaasDictSe * @return 结果 */ @Override - public boolean checkDictTypeUnique(Sys2DictTypeBo dictType) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(Sys2DictType::getDictType, dictType.getDictType()) - .ne(ObjectUtil.isNotNull(dictType.getDictId()), Sys2DictType::getDictId, dictType.getDictId())); + public boolean checkDictTypeUnique(SysSaasDictTypeBo dictType) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysSaasDictType::getDictType, dictType.getDictType()) + .ne(ObjectUtil.isNotNull(dictType.getDictId()), SysSaasDictType::getDictId, dictType.getDictId())); return !exist; } @@ -217,8 +217,8 @@ public class Sys2DictTypeServiceImpl implements ISys2DictTypeService, SaasDictSe */ @Override public String getDictLabel(String dictType, String dictValue, String separator) { - List datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); - Map map = StreamUtils.toMap(datas, Sys2DictDataVo::getDictValue, Sys2DictDataVo::getDictLabel); + List datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); + Map map = StreamUtils.toMap(datas, SysSaasDictDataVo::getDictValue, SysSaasDictDataVo::getDictLabel); if (StringUtils.containsAny(dictValue, separator)) { return Arrays.stream(dictValue.split(separator)) .map(v -> map.getOrDefault(v, StringUtils.EMPTY)) @@ -238,8 +238,8 @@ public class Sys2DictTypeServiceImpl implements ISys2DictTypeService, SaasDictSe */ @Override public String getDictValue(String dictType, String dictLabel, String separator) { - List datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); - Map map = StreamUtils.toMap(datas, Sys2DictDataVo::getDictLabel, Sys2DictDataVo::getDictValue); + List datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); + Map map = StreamUtils.toMap(datas, SysSaasDictDataVo::getDictLabel, SysSaasDictDataVo::getDictValue); if (StringUtils.containsAny(dictLabel, separator)) { return Arrays.stream(dictLabel.split(separator)) .map(l -> map.getOrDefault(l, StringUtils.EMPTY)) @@ -251,8 +251,8 @@ public class Sys2DictTypeServiceImpl implements ISys2DictTypeService, SaasDictSe @Override public Map getAllDictByDictType(String dictType) { - List list = selectDictDataByType(dictType); - return StreamUtils.toMap(list, Sys2DictDataVo::getDictValue, Sys2DictDataVo::getDictLabel); + List list = selectDictDataByType(dictType); + return StreamUtils.toMap(list, SysSaasDictDataVo::getDictValue, SysSaasDictDataVo::getDictLabel); } } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2LogininforServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasLogininforServiceImpl.java similarity index 73% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2LogininforServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasLogininforServiceImpl.java index 2771ee243..9cee0755d 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2LogininforServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasLogininforServiceImpl.java @@ -17,13 +17,13 @@ import org.dromara.common.log.event.LogininforEvent; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.saas.domain.Sys2Logininfor; -import org.dromara.system.saas.domain.bo.Sys2LogininforBo; -import org.dromara.system.saas.domain.vo.Sys2ClientVo; -import org.dromara.system.saas.domain.vo.Sys2LogininforVo; -import org.dromara.system.saas.mapper.Sys2LogininforMapper; -import org.dromara.system.saas.service.ISys2ClientService; -import org.dromara.system.saas.service.ISys2LogininforService; +import org.dromara.system.saas.domain.SysSaasLogininfor; +import org.dromara.system.saas.domain.bo.SysSaasLogininforBo; +import org.dromara.system.saas.domain.vo.SysSaasClientVo; +import org.dromara.system.saas.domain.vo.SysSaasLogininforVo; +import org.dromara.system.saas.mapper.SysSaasLogininforMapper; +import org.dromara.system.saas.service.ISysSaasClientService; +import org.dromara.system.saas.service.ISysSaasLogininforService; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -41,11 +41,11 @@ import java.util.Map; @RequiredArgsConstructor @Slf4j @Service -public class Sys2LogininforServiceImpl implements ISys2LogininforService { +public class SysSaasLogininforServiceImpl implements ISysSaasLogininforService { - private final Sys2LogininforMapper baseMapper; + private final SysSaasLogininforMapper baseMapper; - private final ISys2ClientService clientService; + private final ISysSaasClientService clientService; /** * 记录登录信息 @@ -60,7 +60,7 @@ public class Sys2LogininforServiceImpl implements ISys2LogininforService { final String ip = ServletUtils.getClientIP(request); // 客户端信息 String clientId = request.getHeader(LoginHelper.CLIENT_KEY); - Sys2ClientVo client = null; + SysSaasClientVo client = null; if (StringUtils.isNotBlank(clientId)) { client = clientService.queryByClientId(clientId); } @@ -79,7 +79,7 @@ public class Sys2LogininforServiceImpl implements ISys2LogininforService { // 获取客户端浏览器 String browser = userAgent.getBrowser().getName(); // 封装对象 - Sys2LogininforBo logininfor = new Sys2LogininforBo(); + SysSaasLogininforBo logininfor = new SysSaasLogininforBo(); logininfor.setTenantId(logininforEvent.getTenantId()); logininfor.setUserName(logininforEvent.getUsername()); if (ObjectUtil.isNotNull(client)) { @@ -109,19 +109,19 @@ public class Sys2LogininforServiceImpl implements ISys2LogininforService { } @Override - public TableDataInfo selectPageLogininforList(Sys2LogininforBo logininfor, PageQuery pageQuery) { + public TableDataInfo selectPageLogininforList(SysSaasLogininforBo logininfor, PageQuery pageQuery) { Map params = logininfor.getParams(); - LambdaQueryWrapper lqw = new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(logininfor.getIpaddr()), Sys2Logininfor::getIpaddr, logininfor.getIpaddr()) - .eq(StringUtils.isNotBlank(logininfor.getStatus()), Sys2Logininfor::getStatus, logininfor.getStatus()) - .like(StringUtils.isNotBlank(logininfor.getUserName()), Sys2Logininfor::getUserName, logininfor.getUserName()) + LambdaQueryWrapper lqw = new LambdaQueryWrapper() + .like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysSaasLogininfor::getIpaddr, logininfor.getIpaddr()) + .eq(StringUtils.isNotBlank(logininfor.getStatus()), SysSaasLogininfor::getStatus, logininfor.getStatus()) + .like(StringUtils.isNotBlank(logininfor.getUserName()), SysSaasLogininfor::getUserName, logininfor.getUserName()) .between(params.get("beginTime") != null && params.get("endTime") != null, - Sys2Logininfor::getLoginTime, params.get("beginTime"), params.get("endTime")); + SysSaasLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime")); if (StringUtils.isBlank(pageQuery.getOrderByColumn())) { pageQuery.setOrderByColumn("info_id"); pageQuery.setIsAsc("desc"); } - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -131,8 +131,8 @@ public class Sys2LogininforServiceImpl implements ISys2LogininforService { * @param bo 访问日志对象 */ @Override - public void insertLogininfor(Sys2LogininforBo bo) { - Sys2Logininfor logininfor = MapstructUtils.convert(bo, Sys2Logininfor.class); + public void insertLogininfor(SysSaasLogininforBo bo) { + SysSaasLogininfor logininfor = MapstructUtils.convert(bo, SysSaasLogininfor.class); logininfor.setLoginTime(new Date()); baseMapper.insert(logininfor); } @@ -144,15 +144,15 @@ public class Sys2LogininforServiceImpl implements ISys2LogininforService { * @return 登录记录集合 */ @Override - public List selectLogininforList(Sys2LogininforBo logininfor) { + public List selectLogininforList(SysSaasLogininforBo logininfor) { Map params = logininfor.getParams(); - return baseMapper.selectVoList(new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(logininfor.getIpaddr()), Sys2Logininfor::getIpaddr, logininfor.getIpaddr()) - .eq(StringUtils.isNotBlank(logininfor.getStatus()), Sys2Logininfor::getStatus, logininfor.getStatus()) - .like(StringUtils.isNotBlank(logininfor.getUserName()), Sys2Logininfor::getUserName, logininfor.getUserName()) + return baseMapper.selectVoList(new LambdaQueryWrapper() + .like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysSaasLogininfor::getIpaddr, logininfor.getIpaddr()) + .eq(StringUtils.isNotBlank(logininfor.getStatus()), SysSaasLogininfor::getStatus, logininfor.getStatus()) + .like(StringUtils.isNotBlank(logininfor.getUserName()), SysSaasLogininfor::getUserName, logininfor.getUserName()) .between(params.get("beginTime") != null && params.get("endTime") != null, - Sys2Logininfor::getLoginTime, params.get("beginTime"), params.get("endTime")) - .orderByDesc(Sys2Logininfor::getInfoId)); + SysSaasLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime")) + .orderByDesc(SysSaasLogininfor::getInfoId)); } /** diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java index 537c56449..530cc3173 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java @@ -35,9 +35,9 @@ import java.util.*; public class SysSaasMenuServiceImpl implements ISysSaasMenuService { private final SysSaasMenuMapper baseMapper; - private final Sys2RoleMapper roleMapper; - private final Sys2RoleMenuMapper roleMenuMapper; - private final Sys2TenantPackageMapper tenantPackageMapper; + private final SysSaasRoleMapper roleMapper; + private final SysSaasRoleMenuMapper roleMenuMapper; + private final SysSaasTenantPackageMapper tenantPackageMapper; /** * 根据用户查询系统菜单列表 @@ -143,7 +143,7 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService { */ @Override public List selectMenuListByRoleId(Long roleId) { - Sys2Role role = roleMapper.selectById(roleId); + SysSaasRole role = roleMapper.selectById(roleId); return baseMapper.selectMenuListByRoleId(roleId, role.getMenuCheckStrictly()); } @@ -155,7 +155,7 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService { */ @Override public List selectMenuListByPackageId(Long packageId) { - Sys2TenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); + SysSaasTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); if (CollUtil.isEmpty(menuIds)) { return List.of(); @@ -274,7 +274,7 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService { */ @Override public boolean checkMenuExistRole(Long menuId) { - return roleMenuMapper.exists(new LambdaQueryWrapper().eq(Sys2RoleMenu::getMenuId, menuId)); + return roleMenuMapper.exists(new LambdaQueryWrapper().eq(SysSaasRoleMenu::getMenuId, menuId)); } /** diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2NoticeServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasNoticeServiceImpl.java similarity index 51% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2NoticeServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasNoticeServiceImpl.java index fdddf906d..2a1fb3b05 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2NoticeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasNoticeServiceImpl.java @@ -8,14 +8,14 @@ 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.Sys2Notice; -import org.dromara.system.saas.domain.Sys2User; -import org.dromara.system.saas.domain.bo.Sys2NoticeBo; -import org.dromara.system.saas.domain.vo.Sys2NoticeVo; -import org.dromara.system.saas.domain.vo.Sys2UserVo; -import org.dromara.system.saas.mapper.Sys2NoticeMapper; -import org.dromara.system.saas.mapper.Sys2UserMapper; -import org.dromara.system.saas.service.ISys2NoticeService; +import org.dromara.system.saas.domain.SysSaasNotice; +import org.dromara.system.saas.domain.SysSaasUser; +import org.dromara.system.saas.domain.bo.SysSaasNoticeBo; +import org.dromara.system.saas.domain.vo.SysSaasNoticeVo; +import org.dromara.system.saas.domain.vo.SysSaasUserVo; +import org.dromara.system.saas.mapper.SysSaasNoticeMapper; +import org.dromara.system.saas.mapper.SysSaasUserMapper; +import org.dromara.system.saas.service.ISysSaasNoticeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -29,15 +29,15 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class Sys2NoticeServiceImpl implements ISys2NoticeService { +public class SysSaasNoticeServiceImpl implements ISysSaasNoticeService { - private final Sys2NoticeMapper baseMapper; - private final Sys2UserMapper userMapper; + private final SysSaasNoticeMapper baseMapper; + private final SysSaasUserMapper userMapper; @Override - public TableDataInfo selectPageNoticeList(Sys2NoticeBo notice, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(notice); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo selectPageNoticeList(SysSaasNoticeBo notice, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(notice); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -48,7 +48,7 @@ public class Sys2NoticeServiceImpl implements ISys2NoticeService { * @return 公告信息 */ @Override - public Sys2NoticeVo selectNoticeById(Long noticeId) { + public SysSaasNoticeVo selectNoticeById(Long noticeId) { return baseMapper.selectVoById(noticeId); } @@ -59,20 +59,20 @@ public class Sys2NoticeServiceImpl implements ISys2NoticeService { * @return 公告集合 */ @Override - public List selectNoticeList(Sys2NoticeBo notice) { - LambdaQueryWrapper lqw = buildQueryWrapper(notice); + public List selectNoticeList(SysSaasNoticeBo notice) { + LambdaQueryWrapper lqw = buildQueryWrapper(notice); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(Sys2NoticeBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getNoticeTitle()), Sys2Notice::getNoticeTitle, bo.getNoticeTitle()); - lqw.eq(StringUtils.isNotBlank(bo.getNoticeType()), Sys2Notice::getNoticeType, bo.getNoticeType()); + private LambdaQueryWrapper buildQueryWrapper(SysSaasNoticeBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getNoticeTitle()), SysSaasNotice::getNoticeTitle, bo.getNoticeTitle()); + lqw.eq(StringUtils.isNotBlank(bo.getNoticeType()), SysSaasNotice::getNoticeType, bo.getNoticeType()); if (StringUtils.isNotBlank(bo.getCreateByName())) { - Sys2UserVo sysUser = userMapper.selectVoOne(new LambdaQueryWrapper().eq(Sys2User::getUserName, bo.getCreateByName())); - lqw.eq(Sys2Notice::getCreateBy, ObjectUtil.isNotNull(sysUser) ? sysUser.getUserId() : null); + SysSaasUserVo sysUser = userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysSaasUser::getUserName, bo.getCreateByName())); + lqw.eq(SysSaasNotice::getCreateBy, ObjectUtil.isNotNull(sysUser) ? sysUser.getUserId() : null); } - lqw.orderByAsc(Sys2Notice::getNoticeId); + lqw.orderByAsc(SysSaasNotice::getNoticeId); return lqw; } @@ -83,8 +83,8 @@ public class Sys2NoticeServiceImpl implements ISys2NoticeService { * @return 结果 */ @Override - public int insertNotice(Sys2NoticeBo bo) { - Sys2Notice notice = MapstructUtils.convert(bo, Sys2Notice.class); + public int insertNotice(SysSaasNoticeBo bo) { + SysSaasNotice notice = MapstructUtils.convert(bo, SysSaasNotice.class); return baseMapper.insert(notice); } @@ -95,8 +95,8 @@ public class Sys2NoticeServiceImpl implements ISys2NoticeService { * @return 结果 */ @Override - public int updateNotice(Sys2NoticeBo bo) { - Sys2Notice notice = MapstructUtils.convert(bo, Sys2Notice.class); + public int updateNotice(SysSaasNoticeBo bo) { + SysSaasNotice notice = MapstructUtils.convert(bo, SysSaasNotice.class); return baseMapper.updateById(notice); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OperLogServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasOperLogServiceImpl.java similarity index 63% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OperLogServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasOperLogServiceImpl.java index a22f8b680..ed796497b 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OperLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasOperLogServiceImpl.java @@ -9,11 +9,11 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.ip.AddressUtils; import org.dromara.common.log.event.OperLogEvent; -import org.dromara.system.saas.domain.Sys2OperLog; -import org.dromara.system.saas.domain.bo.Sys2OperLogBo; -import org.dromara.system.saas.domain.vo.Sys2OperLogVo; -import org.dromara.system.saas.mapper.Sys2OperLogMapper; -import org.dromara.system.saas.service.ISys2OperLogService; +import org.dromara.system.saas.domain.SysSaasOperLog; +import org.dromara.system.saas.domain.bo.SysSaasOperLogBo; +import org.dromara.system.saas.domain.vo.SysSaasOperLogVo; +import org.dromara.system.saas.mapper.SysSaasOperLogMapper; +import org.dromara.system.saas.service.ISysSaasOperLogService; import lombok.RequiredArgsConstructor; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; @@ -31,9 +31,9 @@ import java.util.Map; */ @RequiredArgsConstructor @Service -public class Sys2OperLogServiceImpl implements ISys2OperLogService { +public class SysSaasOperLogServiceImpl implements ISysSaasOperLogService { - private final Sys2OperLogMapper baseMapper; + private final SysSaasOperLogMapper baseMapper; /** * 操作日志记录 @@ -43,35 +43,35 @@ public class Sys2OperLogServiceImpl implements ISys2OperLogService { @Async @EventListener public void recordOper(OperLogEvent operLogEvent) { - Sys2OperLogBo operLog = MapstructUtils.convert(operLogEvent, Sys2OperLogBo.class); + SysSaasOperLogBo operLog = MapstructUtils.convert(operLogEvent, SysSaasOperLogBo.class); // 远程查询操作地点 operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp())); insertOperlog(operLog); } @Override - public TableDataInfo selectPageOperLogList(Sys2OperLogBo operLog, PageQuery pageQuery) { + public TableDataInfo selectPageOperLogList(SysSaasOperLogBo operLog, PageQuery pageQuery) { Map params = operLog.getParams(); - LambdaQueryWrapper lqw = new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(operLog.getOperIp()), Sys2OperLog::getOperIp, operLog.getOperIp()) - .like(StringUtils.isNotBlank(operLog.getTitle()), Sys2OperLog::getTitle, operLog.getTitle()) + LambdaQueryWrapper lqw = new LambdaQueryWrapper() + .like(StringUtils.isNotBlank(operLog.getOperIp()), SysSaasOperLog::getOperIp, operLog.getOperIp()) + .like(StringUtils.isNotBlank(operLog.getTitle()), SysSaasOperLog::getTitle, operLog.getTitle()) .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0, - Sys2OperLog::getBusinessType, operLog.getBusinessType()) + SysSaasOperLog::getBusinessType, operLog.getBusinessType()) .func(f -> { if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())) { - f.in(Sys2OperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes())); + f.in(SysSaasOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes())); } }) .eq(operLog.getStatus() != null, - Sys2OperLog::getStatus, operLog.getStatus()) - .like(StringUtils.isNotBlank(operLog.getOperName()), Sys2OperLog::getOperName, operLog.getOperName()) + SysSaasOperLog::getStatus, operLog.getStatus()) + .like(StringUtils.isNotBlank(operLog.getOperName()), SysSaasOperLog::getOperName, operLog.getOperName()) .between(params.get("beginTime") != null && params.get("endTime") != null, - Sys2OperLog::getOperTime, params.get("beginTime"), params.get("endTime")); + SysSaasOperLog::getOperTime, params.get("beginTime"), params.get("endTime")); if (StringUtils.isBlank(pageQuery.getOrderByColumn())) { pageQuery.setOrderByColumn("oper_id"); pageQuery.setIsAsc("desc"); } - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -81,8 +81,8 @@ public class Sys2OperLogServiceImpl implements ISys2OperLogService { * @param bo 操作日志对象 */ @Override - public void insertOperlog(Sys2OperLogBo bo) { - Sys2OperLog operLog = MapstructUtils.convert(bo, Sys2OperLog.class); + public void insertOperlog(SysSaasOperLogBo bo) { + SysSaasOperLog operLog = MapstructUtils.convert(bo, SysSaasOperLog.class); operLog.setOperTime(new Date()); baseMapper.insert(operLog); } @@ -94,24 +94,24 @@ public class Sys2OperLogServiceImpl implements ISys2OperLogService { * @return 操作日志集合 */ @Override - public List selectOperLogList(Sys2OperLogBo operLog) { + public List selectOperLogList(SysSaasOperLogBo operLog) { Map params = operLog.getParams(); - return baseMapper.selectVoList(new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(operLog.getOperIp()), Sys2OperLog::getOperIp, operLog.getOperIp()) - .like(StringUtils.isNotBlank(operLog.getTitle()), Sys2OperLog::getTitle, operLog.getTitle()) + return baseMapper.selectVoList(new LambdaQueryWrapper() + .like(StringUtils.isNotBlank(operLog.getOperIp()), SysSaasOperLog::getOperIp, operLog.getOperIp()) + .like(StringUtils.isNotBlank(operLog.getTitle()), SysSaasOperLog::getTitle, operLog.getTitle()) .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0, - Sys2OperLog::getBusinessType, operLog.getBusinessType()) + SysSaasOperLog::getBusinessType, operLog.getBusinessType()) .func(f -> { if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())) { - f.in(Sys2OperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes())); + f.in(SysSaasOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes())); } }) .eq(operLog.getStatus() != null && operLog.getStatus() > 0, - Sys2OperLog::getStatus, operLog.getStatus()) - .like(StringUtils.isNotBlank(operLog.getOperName()), Sys2OperLog::getOperName, operLog.getOperName()) + SysSaasOperLog::getStatus, operLog.getStatus()) + .like(StringUtils.isNotBlank(operLog.getOperName()), SysSaasOperLog::getOperName, operLog.getOperName()) .between(params.get("beginTime") != null && params.get("endTime") != null, - Sys2OperLog::getOperTime, params.get("beginTime"), params.get("endTime")) - .orderByDesc(Sys2OperLog::getOperId)); + SysSaasOperLog::getOperTime, params.get("beginTime"), params.get("endTime")) + .orderByDesc(SysSaasOperLog::getOperId)); } /** @@ -132,7 +132,7 @@ public class Sys2OperLogServiceImpl implements ISys2OperLogService { * @return 操作日志对象 */ @Override - public Sys2OperLogVo selectOperLogById(Long operId) { + public SysSaasOperLogVo selectOperLogById(Long operId) { return baseMapper.selectVoById(operId); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OssConfigServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasOssConfigServiceImpl.java similarity index 55% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OssConfigServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasOssConfigServiceImpl.java index b5ea8da69..0e77e6120 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OssConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasOssConfigServiceImpl.java @@ -18,11 +18,11 @@ 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.Sys2OssConfig; -import org.dromara.system.saas.domain.bo.Sys2OssConfigBo; -import org.dromara.system.saas.domain.vo.Sys2OssConfigVo; -import org.dromara.system.saas.mapper.Sys2OssConfigMapper; -import org.dromara.system.saas.service.ISys2OssConfigService; +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; @@ -39,18 +39,18 @@ import java.util.List; @Slf4j @RequiredArgsConstructor @Service -public class Sys2OssConfigServiceImpl implements ISys2OssConfigService { +public class SysSaasOssConfigServiceImpl implements ISysSaasOssConfigService { - private final Sys2OssConfigMapper baseMapper; + private final SysSaasOssConfigMapper baseMapper; /** * 项目启动时，初始化参数到缓存，加载配置类 */ @Override public void init() { - List list = baseMapper.selectList(); + List list = baseMapper.selectList(); // 加载OSS初始化配置 - for (Sys2OssConfig config : list) { + for (SysSaasOssConfig config : list) { String configKey = config.getConfigKey(); if ("0".equals(config.getStatus())) { RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, configKey); @@ -60,30 +60,30 @@ public class Sys2OssConfigServiceImpl implements ISys2OssConfigService { } @Override - public Sys2OssConfigVo queryById(Long ossConfigId) { + public SysSaasOssConfigVo queryById(Long ossConfigId) { return baseMapper.selectVoById(ossConfigId); } @Override - public TableDataInfo queryPageList(Sys2OssConfigBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo queryPageList(SysSaasOssConfigBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } - private LambdaQueryWrapper buildQueryWrapper(Sys2OssConfigBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getConfigKey()), Sys2OssConfig::getConfigKey, bo.getConfigKey()); - lqw.like(StringUtils.isNotBlank(bo.getBucketName()), Sys2OssConfig::getBucketName, bo.getBucketName()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Sys2OssConfig::getStatus, bo.getStatus()); - lqw.orderByAsc(Sys2OssConfig::getOssConfigId); + private LambdaQueryWrapper buildQueryWrapper(SysSaasOssConfigBo bo) { + LambdaQueryWrapper 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(Sys2OssConfigBo bo) { - Sys2OssConfig config = MapstructUtils.convert(bo, Sys2OssConfig.class); + public Boolean insertByBo(SysSaasOssConfigBo bo) { + SysSaasOssConfig config = MapstructUtils.convert(bo, SysSaasOssConfig.class); validEntityBeforeSave(config); boolean flag = baseMapper.insert(config) > 0; if (flag) { @@ -95,15 +95,15 @@ public class Sys2OssConfigServiceImpl implements ISys2OssConfigService { } @Override - public Boolean updateByBo(Sys2OssConfigBo bo) { - Sys2OssConfig config = MapstructUtils.convert(bo, Sys2OssConfig.class); + public Boolean updateByBo(SysSaasOssConfigBo bo) { + SysSaasOssConfig config = MapstructUtils.convert(bo, SysSaasOssConfig.class); validEntityBeforeSave(config); - LambdaUpdateWrapper luw = new LambdaUpdateWrapper<>(); - luw.set(ObjectUtil.isNull(config.getPrefix()), Sys2OssConfig::getPrefix, ""); - luw.set(ObjectUtil.isNull(config.getRegion()), Sys2OssConfig::getRegion, ""); - luw.set(ObjectUtil.isNull(config.getExt1()), Sys2OssConfig::getExt1, ""); - luw.set(ObjectUtil.isNull(config.getRemark()), Sys2OssConfig::getRemark, ""); - luw.eq(Sys2OssConfig::getOssConfigId, config.getOssConfigId()); + LambdaUpdateWrapper 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) { // 从数据库查询完整的数据做缓存 @@ -116,7 +116,7 @@ public class Sys2OssConfigServiceImpl implements ISys2OssConfigService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(Sys2OssConfig entity) { + private void validEntityBeforeSave(SysSaasOssConfig entity) { if (StringUtils.isNotEmpty(entity.getConfigKey()) && !checkConfigKeyUnique(entity)) { throw new ServiceException("操作配置'" + entity.getConfigKey() + "'失败, 配置key已存在!"); @@ -130,15 +130,15 @@ public class Sys2OssConfigServiceImpl implements ISys2OssConfigService { throw new ServiceException("系统内置, 不可删除!"); } } - List list = CollUtil.newArrayList(); + List list = CollUtil.newArrayList(); for (Long configId : ids) { - Sys2OssConfig config = baseMapper.selectById(configId); + SysSaasOssConfig config = baseMapper.selectById(configId); list.add(config); } boolean flag = baseMapper.deleteByIds(ids) > 0; if (flag) { - list.forEach(sys2OssConfig -> - CacheUtils.evict(CacheNames.SYS_OSS_CONFIG, sys2OssConfig.getConfigKey())); + list.forEach(sysSaasOssConfig -> + CacheUtils.evict(CacheNames.SYS_OSS_CONFIG, sysSaasOssConfig.getConfigKey())); } return flag; } @@ -146,11 +146,11 @@ public class Sys2OssConfigServiceImpl implements ISys2OssConfigService { /** * 判断configKey是否唯一 */ - private boolean checkConfigKeyUnique(Sys2OssConfig sys2OssConfig) { - long ossConfigId = ObjectUtil.isNull(sys2OssConfig.getOssConfigId()) ? -1L : sys2OssConfig.getOssConfigId(); - Sys2OssConfig info = baseMapper.selectOne(new LambdaQueryWrapper() - .select(Sys2OssConfig::getOssConfigId, Sys2OssConfig::getConfigKey) - .eq(Sys2OssConfig::getConfigKey, sys2OssConfig.getConfigKey())); + private boolean checkConfigKeyUnique(SysSaasOssConfig sysSaasOssConfig) { + long ossConfigId = ObjectUtil.isNull(sysSaasOssConfig.getOssConfigId()) ? -1L : sysSaasOssConfig.getOssConfigId(); + SysSaasOssConfig info = baseMapper.selectOne(new LambdaQueryWrapper() + .select(SysSaasOssConfig::getOssConfigId, SysSaasOssConfig::getConfigKey) + .eq(SysSaasOssConfig::getConfigKey, sysSaasOssConfig.getConfigKey())); if (ObjectUtil.isNotNull(info) && info.getOssConfigId() != ossConfigId) { return false; } @@ -162,13 +162,13 @@ public class Sys2OssConfigServiceImpl implements ISys2OssConfigService { */ @Override @Transactional(rollbackFor = Exception.class) - public int updateOssConfigStatus(Sys2OssConfigBo bo) { - Sys2OssConfig sys2OssConfig = MapstructUtils.convert(bo, Sys2OssConfig.class); - int row = baseMapper.update(null, new LambdaUpdateWrapper() - .set(Sys2OssConfig::getStatus, "1")); - row += baseMapper.updateById(sys2OssConfig); + public int updateOssConfigStatus(SysSaasOssConfigBo bo) { + SysSaasOssConfig sysSaasOssConfig = MapstructUtils.convert(bo, SysSaasOssConfig.class); + int row = baseMapper.update(null, new LambdaUpdateWrapper() + .set(SysSaasOssConfig::getStatus, "1")); + row += baseMapper.updateById(sysSaasOssConfig); if (row > 0) { - RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, sys2OssConfig.getConfigKey()); + RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, sysSaasOssConfig.getConfigKey()); } return row; } 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/SysSaasOssServiceImpl.java similarity index 70% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OssServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasOssServiceImpl.java index e5a635a71..90b0ed6c1 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/SysSaasOssServiceImpl.java @@ -23,11 +23,11 @@ import org.dromara.common.oss.core.OssClient; import org.dromara.common.oss.entity.UploadResult; import org.dromara.common.oss.enumd.AccessPolicyType; import org.dromara.common.oss.factory.OssFactory; -import org.dromara.system.saas.domain.Sys2Oss; -import org.dromara.system.saas.domain.bo.Sys2OssBo; -import org.dromara.system.saas.domain.vo.Sys2OssVo; -import org.dromara.system.saas.mapper.Sys2OssMapper; -import org.dromara.system.saas.service.ISys2OssService; +import org.dromara.system.saas.domain.SysSaasOss; +import org.dromara.system.saas.domain.bo.SysSaasOssBo; +import org.dromara.system.saas.domain.vo.SysSaasOssVo; +import org.dromara.system.saas.mapper.SysSaasOssMapper; +import org.dromara.system.saas.service.ISysSaasOssService; import org.jetbrains.annotations.NotNull; import org.springframework.cache.annotation.Cacheable; import org.springframework.http.MediaType; @@ -48,9 +48,9 @@ import java.util.Map; */ @RequiredArgsConstructor @Service -public class Sys2OssServiceImpl implements ISys2OssService, SaasOssService { +public class SysSaasOssServiceImpl implements ISysSaasOssService, SaasOssService { - private final Sys2OssMapper baseMapper; + private final SysSaasOssMapper baseMapper; /** * 查询OSS对象存储列表 @@ -60,26 +60,26 @@ public class Sys2OssServiceImpl implements ISys2OssService, SaasOssService { * @return 结果 */ @Override - public TableDataInfo queryPageList(Sys2OssBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - List filterResult = StreamUtils.toList(result.getRecords(), this::matchingUrl); + public TableDataInfo queryPageList(SysSaasOssBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + List filterResult = StreamUtils.toList(result.getRecords(), this::matchingUrl); result.setRecords(filterResult); return TableDataInfo.build(result); } /** - * 根据一组 ossIds 获取对应的 Sys2OssVo 列表 + * 根据一组 ossIds 获取对应的 SysSaasOssVo 列表 * * @param ossIds 一组文件在数据库中的唯一标识集合 - * @return 包含 Sys2OssVo 对象的列表 + * @return 包含 SysSaasOssVo 对象的列表 */ @Override - public List listByIds(Collection ossIds) { - List list = new ArrayList<>(); - Sys2OssServiceImpl ossService = SpringUtils.getAopProxy(this); + public List listByIds(Collection ossIds) { + List list = new ArrayList<>(); + SysSaasOssServiceImpl ossService = SpringUtils.getAopProxy(this); for (Long id : ossIds) { - Sys2OssVo vo = ossService.getById(id); + SysSaasOssVo vo = ossService.getById(id); if (ObjectUtil.isNotNull(vo)) { try { list.add(this.matchingUrl(vo)); @@ -101,9 +101,9 @@ public class Sys2OssServiceImpl implements ISys2OssService, SaasOssService { @Override public String selectUrlByIds(String ossIds) { List list = new ArrayList<>(); - Sys2OssServiceImpl ossService = SpringUtils.getAopProxy(this); + SysSaasOssServiceImpl ossService = SpringUtils.getAopProxy(this); for (Long id : StringUtils.splitTo(ossIds, Convert::toLong)) { - Sys2OssVo vo = ossService.getById(id); + SysSaasOssVo vo = ossService.getById(id); if (ObjectUtil.isNotNull(vo)) { try { list.add(this.matchingUrl(vo).getUrl()); @@ -120,7 +120,7 @@ public class Sys2OssServiceImpl implements ISys2OssService, SaasOssService { public List selectByIds(String ossIds) { List list = new ArrayList<>(); for (Long id : StringUtils.splitTo(ossIds, Convert::toLong)) { - Sys2OssVo vo = SpringUtils.getAopProxy(this).getById(id); + SysSaasOssVo vo = SpringUtils.getAopProxy(this).getById(id); if (ObjectUtil.isNotNull(vo)) { try { vo.setUrl(this.matchingUrl(vo).getUrl()); @@ -134,30 +134,30 @@ public class Sys2OssServiceImpl implements ISys2OssService, SaasOssService { return list; } - private LambdaQueryWrapper buildQueryWrapper(Sys2OssBo bo) { + private LambdaQueryWrapper buildQueryWrapper(SysSaasOssBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getFileName()), Sys2Oss::getFileName, bo.getFileName()); - lqw.like(StringUtils.isNotBlank(bo.getOriginalName()), Sys2Oss::getOriginalName, bo.getOriginalName()); - lqw.eq(StringUtils.isNotBlank(bo.getFileSuffix()), Sys2Oss::getFileSuffix, bo.getFileSuffix()); - lqw.eq(StringUtils.isNotBlank(bo.getUrl()), Sys2Oss::getUrl, bo.getUrl()); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getFileName()), SysSaasOss::getFileName, bo.getFileName()); + lqw.like(StringUtils.isNotBlank(bo.getOriginalName()), SysSaasOss::getOriginalName, bo.getOriginalName()); + lqw.eq(StringUtils.isNotBlank(bo.getFileSuffix()), SysSaasOss::getFileSuffix, bo.getFileSuffix()); + lqw.eq(StringUtils.isNotBlank(bo.getUrl()), SysSaasOss::getUrl, bo.getUrl()); lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, - Sys2Oss::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); - lqw.eq(ObjectUtil.isNotNull(bo.getCreateBy()), Sys2Oss::getCreateBy, bo.getCreateBy()); - lqw.eq(StringUtils.isNotBlank(bo.getService()), Sys2Oss::getService, bo.getService()); - lqw.orderByAsc(Sys2Oss::getOssId); + SysSaasOss::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); + lqw.eq(ObjectUtil.isNotNull(bo.getCreateBy()), SysSaasOss::getCreateBy, bo.getCreateBy()); + lqw.eq(StringUtils.isNotBlank(bo.getService()), SysSaasOss::getService, bo.getService()); + lqw.orderByAsc(SysSaasOss::getOssId); return lqw; } /** - * 根据 ossId 从缓存或数据库中获取 Sys2OssVo 对象 + * 根据 ossId 从缓存或数据库中获取 SysSaasOssVo 对象 * * @param ossId 文件在数据库中的唯一标识 - * @return Sys2OssVo 对象，包含文件信息 + * @return SysSaasOssVo 对象，包含文件信息 */ @Cacheable(cacheNames = CacheNames.SYS_OSS, key = "#ossId") @Override - public Sys2OssVo getById(Long ossId) { + public SysSaasOssVo getById(Long ossId) { return baseMapper.selectVoById(ossId); } @@ -170,7 +170,7 @@ public class Sys2OssServiceImpl implements ISys2OssService, SaasOssService { */ @Override public void download(Long ossId, HttpServletResponse response) throws IOException { - Sys2OssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId); + SysSaasOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId); if (ObjectUtil.isNull(sysOss)) { throw new ServiceException("文件数据不存在!"); } @@ -185,11 +185,11 @@ public class Sys2OssServiceImpl implements ISys2OssService, SaasOssService { * 上传 MultipartFile 到对象存储服务，并保存文件信息到数据库 * * @param file 要上传的 MultipartFile 对象 - * @return 上传成功后的 Sys2OssVo 对象，包含文件信息 + * @return 上传成功后的 SysSaasOssVo 对象，包含文件信息 * @throws ServiceException 如果上传过程中发生异常，则抛出 ServiceException 异常 */ @Override - public Sys2OssVo upload(MultipartFile file) { + public SysSaasOssVo upload(MultipartFile file) { String originalfileName = file.getOriginalFilename(); String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length()); OssClient storage = OssFactory.instance(); @@ -207,10 +207,10 @@ public class Sys2OssServiceImpl implements ISys2OssService, SaasOssService { * 上传文件到对象存储服务，并保存文件信息到数据库 * * @param file 要上传的文件对象 - * @return 上传成功后的 Sys2OssVo 对象，包含文件信息 + * @return 上传成功后的 SysSaasOssVo 对象，包含文件信息 */ @Override - public Sys2OssVo upload(File file) { + public SysSaasOssVo upload(File file) { String originalfileName = file.getName(); String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length()); OssClient storage = OssFactory.instance(); @@ -220,16 +220,16 @@ public class Sys2OssServiceImpl implements ISys2OssService, SaasOssService { } @NotNull - private Sys2OssVo buildResultEntity(String originalfileName, String suffix, String configKey, UploadResult uploadResult) { - Sys2Oss oss = new Sys2Oss(); + private SysSaasOssVo buildResultEntity(String originalfileName, String suffix, String configKey, UploadResult uploadResult) { + SysSaasOss oss = new SysSaasOss(); oss.setUrl(uploadResult.getUrl()); oss.setFileSuffix(suffix); oss.setFileName(uploadResult.getFilename()); oss.setOriginalName(originalfileName); oss.setService(configKey); baseMapper.insert(oss); - Sys2OssVo sys2OssVo = MapstructUtils.convert(oss, Sys2OssVo.class); - return this.matchingUrl(sys2OssVo); + SysSaasOssVo sysSaasOssVo = MapstructUtils.convert(oss, SysSaasOssVo.class); + return this.matchingUrl(sysSaasOssVo); } /** @@ -244,10 +244,10 @@ public class Sys2OssServiceImpl implements ISys2OssService, SaasOssService { if (isValid) { // 做一些业务上的校验,判断是否需要校验 } - List list = baseMapper.selectBatchIds(ids); - for (Sys2Oss sys2Oss : list) { - OssClient storage = OssFactory.instance(sys2Oss.getService()); - storage.delete(sys2Oss.getUrl()); + List list = baseMapper.selectBatchIds(ids); + for (SysSaasOss sysSaasOss : list) { + OssClient storage = OssFactory.instance(sysSaasOss.getService()); + storage.delete(sysSaasOss.getUrl()); } return baseMapper.deleteByIds(ids) > 0; } @@ -258,7 +258,7 @@ public class Sys2OssServiceImpl implements ISys2OssService, SaasOssService { * @param oss OSS对象 * @return oss 匹配Url的OSS对象 */ - private Sys2OssVo matchingUrl(Sys2OssVo oss) { + private SysSaasOssVo matchingUrl(SysSaasOssVo oss) { OssClient storage = OssFactory.instance(oss.getService()); // 仅修改桶类型为 private 的URL，临时URL时长为120s if (AccessPolicyType.PRIVATE == storage.getAccessPolicy()) { diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2PermissionServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasPermissionServiceImpl.java similarity index 85% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2PermissionServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasPermissionServiceImpl.java index c755b7bf3..0d02aad1d 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2PermissionServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasPermissionServiceImpl.java @@ -3,8 +3,8 @@ package org.dromara.system.saas.service.impl; import org.dromara.common.core.constant.TenantConstants; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.saas.service.ISysSaasMenuService; -import org.dromara.system.saas.service.ISys2PermissionService; -import org.dromara.system.saas.service.ISys2RoleService; +import org.dromara.system.saas.service.ISysSaasPermissionService; +import org.dromara.system.saas.service.ISysSaasRoleService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -18,9 +18,9 @@ import java.util.Set; */ @RequiredArgsConstructor @Service -public class Sys2PermissionServiceImpl implements ISys2PermissionService { +public class SysSaasPermissionServiceImpl implements ISysSaasPermissionService { - private final ISys2RoleService roleService; + private final ISysSaasRoleService roleService; private final ISysSaasMenuService menuService; /** diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2PostServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasPostServiceImpl.java similarity index 60% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2PostServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasPostServiceImpl.java index bba23b324..3753858c4 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2PostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasPostServiceImpl.java @@ -14,15 +14,15 @@ 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.mybatis.helper.DataBaseHelper; -import org.dromara.system.saas.domain.Sys2Dept; -import org.dromara.system.saas.domain.Sys2Post; -import org.dromara.system.saas.domain.Sys2UserPost; -import org.dromara.system.saas.domain.bo.Sys2PostBo; -import org.dromara.system.saas.domain.vo.Sys2PostVo; -import org.dromara.system.saas.mapper.Sys2DeptMapper; -import org.dromara.system.saas.mapper.Sys2PostMapper; -import org.dromara.system.saas.mapper.Sys2UserPostMapper; -import org.dromara.system.saas.service.ISys2PostService; +import org.dromara.system.saas.domain.SysSaasDept; +import org.dromara.system.saas.domain.SysSaasPost; +import org.dromara.system.saas.domain.SysSaasUserPost; +import org.dromara.system.saas.domain.bo.SysSaasPostBo; +import org.dromara.system.saas.domain.vo.SysSaasPostVo; +import org.dromara.system.saas.mapper.SysSaasDeptMapper; +import org.dromara.system.saas.mapper.SysSaasPostMapper; +import org.dromara.system.saas.mapper.SysSaasUserPostMapper; +import org.dromara.system.saas.service.ISysSaasPostService; import org.springframework.stereotype.Service; import java.util.Arrays; @@ -36,15 +36,15 @@ import java.util.stream.Collectors; */ @RequiredArgsConstructor @Service -public class Sys2PostServiceImpl implements ISys2PostService { +public class SysSaasPostServiceImpl implements ISysSaasPostService { - private final Sys2PostMapper baseMapper; - private final Sys2DeptMapper deptMapper; - private final Sys2UserPostMapper userPostMapper; + private final SysSaasPostMapper baseMapper; + private final SysSaasDeptMapper deptMapper; + private final SysSaasUserPostMapper userPostMapper; @Override - public TableDataInfo selectPagePostList(Sys2PostBo post, PageQuery pageQuery) { - Page page = baseMapper.selectPagePostList(pageQuery.build(), buildQueryWrapper(post)); + public TableDataInfo selectPagePostList(SysSaasPostBo post, PageQuery pageQuery) { + Page page = baseMapper.selectPagePostList(pageQuery.build(), buildQueryWrapper(post)); return TableDataInfo.build(page); } @@ -55,7 +55,7 @@ public class Sys2PostServiceImpl implements ISys2PostService { * @return 岗位信息集合 */ @Override - public List selectPostList(Sys2PostBo post) { + public List selectPostList(SysSaasPostBo post) { return baseMapper.selectVoList(buildQueryWrapper(post)); } @@ -65,27 +65,27 @@ public class Sys2PostServiceImpl implements ISys2PostService { * @param bo 查询条件对象 * @return 构建好的查询包装器 */ - private LambdaQueryWrapper buildQueryWrapper(Sys2PostBo bo) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.like(StringUtils.isNotBlank(bo.getPostCode()), Sys2Post::getPostCode, bo.getPostCode()) - .like(StringUtils.isNotBlank(bo.getPostCategory()), Sys2Post::getPostCategory, bo.getPostCategory()) - .like(StringUtils.isNotBlank(bo.getPostName()), Sys2Post::getPostName, bo.getPostName()) - .eq(StringUtils.isNotBlank(bo.getStatus()), Sys2Post::getStatus, bo.getStatus()) - .orderByAsc(Sys2Post::getPostSort); + private LambdaQueryWrapper buildQueryWrapper(SysSaasPostBo bo) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.like(StringUtils.isNotBlank(bo.getPostCode()), SysSaasPost::getPostCode, bo.getPostCode()) + .like(StringUtils.isNotBlank(bo.getPostCategory()), SysSaasPost::getPostCategory, bo.getPostCategory()) + .like(StringUtils.isNotBlank(bo.getPostName()), SysSaasPost::getPostName, bo.getPostName()) + .eq(StringUtils.isNotBlank(bo.getStatus()), SysSaasPost::getStatus, bo.getStatus()) + .orderByAsc(SysSaasPost::getPostSort); if (ObjectUtil.isNotNull(bo.getDeptId())) { //优先单部门搜索 - wrapper.eq(Sys2Post::getDeptId, bo.getDeptId()); + wrapper.eq(SysSaasPost::getDeptId, bo.getDeptId()); } else if (ObjectUtil.isNotNull(bo.getBelongDeptId())) { //部门树搜索 wrapper.and(x -> { - List deptIds = deptMapper.selectList(new LambdaQueryWrapper() - .select(Sys2Dept::getDeptId) + List deptIds = deptMapper.selectList(new LambdaQueryWrapper() + .select(SysSaasDept::getDeptId) .apply(DataBaseHelper.findInSet(bo.getBelongDeptId(), "ancestors"))) .stream() - .map(Sys2Dept::getDeptId) + .map(SysSaasDept::getDeptId) .collect(Collectors.toList()); deptIds.add(bo.getBelongDeptId()); - x.in(Sys2Post::getDeptId, deptIds); + x.in(SysSaasPost::getDeptId, deptIds); }); } return wrapper; @@ -97,7 +97,7 @@ public class Sys2PostServiceImpl implements ISys2PostService { * @return 岗位列表 */ @Override - public List selectPostAll() { + public List selectPostAll() { return baseMapper.selectVoList(new QueryWrapper<>()); } @@ -108,7 +108,7 @@ public class Sys2PostServiceImpl implements ISys2PostService { * @return 角色对象信息 */ @Override - public Sys2PostVo selectPostById(Long postId) { + public SysSaasPostVo selectPostById(Long postId) { return baseMapper.selectVoById(postId); } @@ -120,8 +120,8 @@ public class Sys2PostServiceImpl implements ISys2PostService { */ @Override public List selectPostListByUserId(Long userId) { - List list = baseMapper.selectPostsByUserId(userId); - return StreamUtils.toList(list, Sys2PostVo::getPostId); + List list = baseMapper.selectPostsByUserId(userId); + return StreamUtils.toList(list, SysSaasPostVo::getPostId); } /** @@ -131,11 +131,11 @@ public class Sys2PostServiceImpl implements ISys2PostService { * @return 岗位列表信息 */ @Override - public List selectPostByIds(List postIds) { - return baseMapper.selectVoList(new LambdaQueryWrapper() - .select(Sys2Post::getPostId, Sys2Post::getPostName, Sys2Post::getPostCode) - .eq(Sys2Post::getStatus, UserConstants.POST_NORMAL) - .in(CollUtil.isNotEmpty(postIds), Sys2Post::getPostId, postIds)); + public List selectPostByIds(List postIds) { + return baseMapper.selectVoList(new LambdaQueryWrapper() + .select(SysSaasPost::getPostId, SysSaasPost::getPostName, SysSaasPost::getPostCode) + .eq(SysSaasPost::getStatus, UserConstants.POST_NORMAL) + .in(CollUtil.isNotEmpty(postIds), SysSaasPost::getPostId, postIds)); } /** @@ -145,10 +145,10 @@ public class Sys2PostServiceImpl implements ISys2PostService { * @return 结果 */ @Override - public boolean checkPostNameUnique(Sys2PostBo post) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(Sys2Post::getPostName, post.getPostName()) - .ne(ObjectUtil.isNotNull(post.getPostId()), Sys2Post::getPostId, post.getPostId())); + public boolean checkPostNameUnique(SysSaasPostBo post) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysSaasPost::getPostName, post.getPostName()) + .ne(ObjectUtil.isNotNull(post.getPostId()), SysSaasPost::getPostId, post.getPostId())); return !exist; } @@ -159,10 +159,10 @@ public class Sys2PostServiceImpl implements ISys2PostService { * @return 结果 */ @Override - public boolean checkPostCodeUnique(Sys2PostBo post) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(Sys2Post::getPostCode, post.getPostCode()) - .ne(ObjectUtil.isNotNull(post.getPostId()), Sys2Post::getPostId, post.getPostId())); + public boolean checkPostCodeUnique(SysSaasPostBo post) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysSaasPost::getPostCode, post.getPostCode()) + .ne(ObjectUtil.isNotNull(post.getPostId()), SysSaasPost::getPostId, post.getPostId())); return !exist; } @@ -174,7 +174,7 @@ public class Sys2PostServiceImpl implements ISys2PostService { */ @Override public long countUserPostById(Long postId) { - return userPostMapper.selectCount(new LambdaQueryWrapper().eq(Sys2UserPost::getPostId, postId)); + return userPostMapper.selectCount(new LambdaQueryWrapper().eq(SysSaasUserPost::getPostId, postId)); } /** @@ -185,7 +185,7 @@ public class Sys2PostServiceImpl implements ISys2PostService { */ @Override public long countPostByDeptId(Long deptId) { - return baseMapper.selectCount(new LambdaQueryWrapper().eq(Sys2Post::getDeptId, deptId)); + return baseMapper.selectCount(new LambdaQueryWrapper().eq(SysSaasPost::getDeptId, deptId)); } /** @@ -208,7 +208,7 @@ public class Sys2PostServiceImpl implements ISys2PostService { @Override public int deletePostByIds(Long[] postIds) { for (Long postId : postIds) { - Sys2Post post = baseMapper.selectById(postId); + SysSaasPost post = baseMapper.selectById(postId); if (countUserPostById(postId) > 0) { throw new ServiceException(String.format("%1$s已分配，不能删除!", post.getPostName())); } @@ -223,8 +223,8 @@ public class Sys2PostServiceImpl implements ISys2PostService { * @return 结果 */ @Override - public int insertPost(Sys2PostBo bo) { - Sys2Post post = MapstructUtils.convert(bo, Sys2Post.class); + public int insertPost(SysSaasPostBo bo) { + SysSaasPost post = MapstructUtils.convert(bo, SysSaasPost.class); return baseMapper.insert(post); } @@ -235,8 +235,8 @@ public class Sys2PostServiceImpl implements ISys2PostService { * @return 结果 */ @Override - public int updatePost(Sys2PostBo bo) { - Sys2Post post = MapstructUtils.convert(bo, Sys2Post.class); + public int updatePost(SysSaasPostBo bo) { + SysSaasPost post = MapstructUtils.convert(bo, SysSaasPost.class); return baseMapper.updateById(post); } } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2RoleServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasRoleServiceImpl.java similarity index 70% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2RoleServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasRoleServiceImpl.java index f33dbd0ea..0f756ebb5 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2RoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasRoleServiceImpl.java @@ -22,17 +22,17 @@ 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.satoken.utils.LoginHelper; -import org.dromara.system.saas.domain.Sys2Role; -import org.dromara.system.saas.domain.Sys2RoleDept; -import org.dromara.system.saas.domain.Sys2RoleMenu; -import org.dromara.system.saas.domain.Sys2UserRole; -import org.dromara.system.saas.domain.bo.Sys2RoleBo; -import org.dromara.system.saas.domain.vo.Sys2RoleVo; -import org.dromara.system.saas.mapper.Sys2RoleDeptMapper; -import org.dromara.system.saas.mapper.Sys2RoleMapper; -import org.dromara.system.saas.mapper.Sys2RoleMenuMapper; -import org.dromara.system.saas.mapper.Sys2UserRoleMapper; -import org.dromara.system.saas.service.ISys2RoleService; +import org.dromara.system.saas.domain.SysSaasRole; +import org.dromara.system.saas.domain.SysSaasRoleDept; +import org.dromara.system.saas.domain.SysSaasRoleMenu; +import org.dromara.system.saas.domain.SysSaasUserRole; +import org.dromara.system.saas.domain.bo.SysSaasRoleBo; +import org.dromara.system.saas.domain.vo.SysSaasRoleVo; +import org.dromara.system.saas.mapper.SysSaasRoleDeptMapper; +import org.dromara.system.saas.mapper.SysSaasRoleMapper; +import org.dromara.system.saas.mapper.SysSaasRoleMenuMapper; +import org.dromara.system.saas.mapper.SysSaasUserRoleMapper; +import org.dromara.system.saas.service.ISysSaasRoleService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,16 +45,16 @@ import java.util.*; */ @RequiredArgsConstructor @Service -public class Sys2RoleServiceImpl implements ISys2RoleService { +public class SysSaasRoleServiceImpl implements ISysSaasRoleService { - private final Sys2RoleMapper baseMapper; - private final Sys2RoleMenuMapper roleMenuMapper; - private final Sys2UserRoleMapper userRoleMapper; - private final Sys2RoleDeptMapper roleDeptMapper; + private final SysSaasRoleMapper baseMapper; + private final SysSaasRoleMenuMapper roleMenuMapper; + private final SysSaasUserRoleMapper userRoleMapper; + private final SysSaasRoleDeptMapper roleDeptMapper; @Override - public TableDataInfo selectPageRoleList(Sys2RoleBo role, PageQuery pageQuery) { - Page page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role)); + public TableDataInfo selectPageRoleList(SysSaasRoleBo role, PageQuery pageQuery) { + Page page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role)); return TableDataInfo.build(page); } @@ -65,13 +65,13 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { * @return 角色数据集合信息 */ @Override - public List selectRoleList(Sys2RoleBo role) { + public List selectRoleList(SysSaasRoleBo role) { return baseMapper.selectRoleList(this.buildQueryWrapper(role)); } - private Wrapper buildQueryWrapper(Sys2RoleBo bo) { + private Wrapper buildQueryWrapper(SysSaasRoleBo bo) { Map params = bo.getParams(); - QueryWrapper wrapper = Wrappers.query(); + QueryWrapper wrapper = Wrappers.query(); wrapper.eq("r.del_flag", UserConstants.ROLE_NORMAL) .eq(ObjectUtil.isNotNull(bo.getRoleId()), "r.role_id", bo.getRoleId()) .like(StringUtils.isNotBlank(bo.getRoleName()), "r.role_name", bo.getRoleName()) @@ -90,7 +90,7 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { * @return 角色列表 */ @Override - public List selectRolesByUserId(Long userId) { + public List selectRolesByUserId(Long userId) { return baseMapper.selectRolesByUserId(userId); } @@ -101,12 +101,12 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { * @return 角色列表 */ @Override - public List selectRolesAuthByUserId(Long userId) { - List userRoles = baseMapper.selectRolesByUserId(userId); - List roles = selectRoleAll(); + public List selectRolesAuthByUserId(Long userId) { + List userRoles = baseMapper.selectRolesByUserId(userId); + List roles = selectRoleAll(); // 使用HashSet提高查找效率 - Set userRoleIds = StreamUtils.toSet(userRoles, Sys2RoleVo::getRoleId); - for (Sys2RoleVo role : roles) { + Set userRoleIds = StreamUtils.toSet(userRoles, SysSaasRoleVo::getRoleId); + for (SysSaasRoleVo role : roles) { if (userRoleIds.contains(role.getRoleId())) { role.setFlag(true); } @@ -122,9 +122,9 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { */ @Override public Set selectRolePermissionByUserId(Long userId) { - List perms = baseMapper.selectRolesByUserId(userId); + List perms = baseMapper.selectRolesByUserId(userId); Set permsSet = new HashSet<>(); - for (Sys2RoleVo perm : perms) { + for (SysSaasRoleVo perm : perms) { if (ObjectUtil.isNotNull(perm)) { permsSet.addAll(StringUtils.splitList(perm.getRoleKey().trim())); } @@ -138,8 +138,8 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { * @return 角色列表 */ @Override - public List selectRoleAll() { - return this.selectRoleList(new Sys2RoleBo()); + public List selectRoleAll() { + return this.selectRoleList(new SysSaasRoleBo()); } /** @@ -150,8 +150,8 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { */ @Override public List selectRoleListByUserId(Long userId) { - List list = baseMapper.selectRolesByUserId(userId); - return StreamUtils.toList(list, Sys2RoleVo::getRoleId); + List list = baseMapper.selectRolesByUserId(userId); + return StreamUtils.toList(list, SysSaasRoleVo::getRoleId); } /** @@ -161,7 +161,7 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { * @return 角色对象信息 */ @Override - public Sys2RoleVo selectRoleById(Long roleId) { + public SysSaasRoleVo selectRoleById(Long roleId) { return baseMapper.selectRoleById(roleId); } @@ -172,8 +172,8 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { * @return 角色列表信息 */ @Override - public List selectRoleByIds(List roleIds) { - return baseMapper.selectRoleList(new QueryWrapper() + public List selectRoleByIds(List roleIds) { + return baseMapper.selectRoleList(new QueryWrapper() .eq("r.status", UserConstants.ROLE_NORMAL) .in(CollUtil.isNotEmpty(roleIds), "r.role_id", roleIds)); } @@ -185,10 +185,10 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { * @return 结果 */ @Override - public boolean checkRoleNameUnique(Sys2RoleBo role) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(Sys2Role::getRoleName, role.getRoleName()) - .ne(ObjectUtil.isNotNull(role.getRoleId()), Sys2Role::getRoleId, role.getRoleId())); + public boolean checkRoleNameUnique(SysSaasRoleBo role) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysSaasRole::getRoleName, role.getRoleName()) + .ne(ObjectUtil.isNotNull(role.getRoleId()), SysSaasRole::getRoleId, role.getRoleId())); return !exist; } @@ -199,10 +199,10 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { * @return 结果 */ @Override - public boolean checkRoleKeyUnique(Sys2RoleBo role) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(Sys2Role::getRoleKey, role.getRoleKey()) - .ne(ObjectUtil.isNotNull(role.getRoleId()), Sys2Role::getRoleId, role.getRoleId())); + public boolean checkRoleKeyUnique(SysSaasRoleBo role) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysSaasRole::getRoleKey, role.getRoleKey()) + .ne(ObjectUtil.isNotNull(role.getRoleId()), SysSaasRole::getRoleId, role.getRoleId())); return !exist; } @@ -212,7 +212,7 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { * @param role 角色信息 */ @Override - public void checkRoleAllowed(Sys2RoleBo role) { + public void checkRoleAllowed(SysSaasRoleBo role) { if (ObjectUtil.isNotNull(role.getRoleId()) && LoginHelper.isSuperAdmin(role.getRoleId())) { throw new ServiceException("不允许操作超级管理员角色"); } @@ -224,10 +224,10 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { } // 修改不允许修改 管理员标识符 if (ObjectUtil.isNotNull(role.getRoleId())) { - Sys2Role sys2Role = baseMapper.selectById(role.getRoleId()); + SysSaasRole sysSaasRole = baseMapper.selectById(role.getRoleId()); // 如果标识符不相等 判断为修改了管理员标识符 - if (!StringUtils.equals(sys2Role.getRoleKey(), role.getRoleKey())) { - if (StringUtils.equalsAny(sys2Role.getRoleKey(), keys)) { + if (!StringUtils.equals(sysSaasRole.getRoleKey(), role.getRoleKey())) { + if (StringUtils.equalsAny(sysSaasRole.getRoleKey(), keys)) { throw new ServiceException("不允许修改系统内置管理员角色标识符!"); } else if (StringUtils.equalsAny(role.getRoleKey(), keys)) { throw new ServiceException("不允许使用系统内置管理员角色标识符!"); @@ -249,7 +249,7 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { if (LoginHelper.isSuperAdmin()) { return; } - List roles = this.selectRoleList(new Sys2RoleBo(roleId)); + List roles = this.selectRoleList(new SysSaasRoleBo(roleId)); if (CollUtil.isEmpty(roles)) { throw new ServiceException("没有权限访问角色数据！"); } @@ -264,7 +264,7 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { */ @Override public long countUserRoleByRoleId(Long roleId) { - return userRoleMapper.selectCount(new LambdaQueryWrapper().eq(Sys2UserRole::getRoleId, roleId)); + return userRoleMapper.selectCount(new LambdaQueryWrapper().eq(SysSaasUserRole::getRoleId, roleId)); } /** @@ -275,8 +275,8 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { */ @Override @Transactional(rollbackFor = Exception.class) - public int insertRole(Sys2RoleBo bo) { - Sys2Role role = MapstructUtils.convert(bo, Sys2Role.class); + public int insertRole(SysSaasRoleBo bo) { + SysSaasRole role = MapstructUtils.convert(bo, SysSaasRole.class); // 新增角色信息 baseMapper.insert(role); bo.setRoleId(role.getRoleId()); @@ -291,8 +291,8 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { */ @Override @Transactional(rollbackFor = Exception.class) - public int updateRole(Sys2RoleBo bo) { - Sys2Role role = MapstructUtils.convert(bo, Sys2Role.class); + public int updateRole(SysSaasRoleBo bo) { + SysSaasRole role = MapstructUtils.convert(bo, SysSaasRole.class); if (UserConstants.ROLE_DISABLE.equals(role.getStatus()) && this.countUserRoleByRoleId(role.getRoleId()) > 0) { throw new ServiceException("角色已分配，不能禁用!"); @@ -300,7 +300,7 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { // 修改角色信息 baseMapper.updateById(role); // 删除角色与菜单关联 - roleMenuMapper.delete(new LambdaQueryWrapper().eq(Sys2RoleMenu::getRoleId, role.getRoleId())); + roleMenuMapper.delete(new LambdaQueryWrapper().eq(SysSaasRoleMenu::getRoleId, role.getRoleId())); return insertRoleMenu(bo); } @@ -317,9 +317,9 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { throw new ServiceException("角色已分配，不能禁用!"); } return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(Sys2Role::getStatus, status) - .eq(Sys2Role::getRoleId, roleId)); + new LambdaUpdateWrapper() + .set(SysSaasRole::getStatus, status) + .eq(SysSaasRole::getRoleId, roleId)); } /** @@ -330,12 +330,12 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { */ @Override @Transactional(rollbackFor = Exception.class) - public int authDataScope(Sys2RoleBo bo) { - Sys2Role role = MapstructUtils.convert(bo, Sys2Role.class); + public int authDataScope(SysSaasRoleBo bo) { + SysSaasRole role = MapstructUtils.convert(bo, SysSaasRole.class); // 修改角色信息 baseMapper.updateById(role); // 删除角色与部门关联 - roleDeptMapper.delete(new LambdaQueryWrapper().eq(Sys2RoleDept::getRoleId, role.getRoleId())); + roleDeptMapper.delete(new LambdaQueryWrapper().eq(SysSaasRoleDept::getRoleId, role.getRoleId())); // 新增角色和部门信息（数据权限） return insertRoleDept(bo); } @@ -345,12 +345,12 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { * * @param role 角色对象 */ - private int insertRoleMenu(Sys2RoleBo role) { + private int insertRoleMenu(SysSaasRoleBo role) { int rows = 1; // 新增用户与角色管理 - List list = new ArrayList(); + List list = new ArrayList(); for (Long menuId : role.getMenuIds()) { - Sys2RoleMenu rm = new Sys2RoleMenu(); + SysSaasRoleMenu rm = new SysSaasRoleMenu(); rm.setRoleId(role.getRoleId()); rm.setMenuId(menuId); list.add(rm); @@ -366,12 +366,12 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { * * @param role 角色对象 */ - private int insertRoleDept(Sys2RoleBo role) { + private int insertRoleDept(SysSaasRoleBo role) { int rows = 1; // 新增角色与部门（数据权限）管理 - List list = new ArrayList(); + List list = new ArrayList(); for (Long deptId : role.getDeptIds()) { - Sys2RoleDept rd = new Sys2RoleDept(); + SysSaasRoleDept rd = new SysSaasRoleDept(); rd.setRoleId(role.getRoleId()); rd.setDeptId(deptId); list.add(rd); @@ -392,9 +392,9 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { @Transactional(rollbackFor = Exception.class) public int deleteRoleById(Long roleId) { // 删除角色与菜单关联 - roleMenuMapper.delete(new LambdaQueryWrapper().eq(Sys2RoleMenu::getRoleId, roleId)); + roleMenuMapper.delete(new LambdaQueryWrapper().eq(SysSaasRoleMenu::getRoleId, roleId)); // 删除角色与部门关联 - roleDeptMapper.delete(new LambdaQueryWrapper().eq(Sys2RoleDept::getRoleId, roleId)); + roleDeptMapper.delete(new LambdaQueryWrapper().eq(SysSaasRoleDept::getRoleId, roleId)); return baseMapper.deleteById(roleId); } @@ -408,8 +408,8 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { @Transactional(rollbackFor = Exception.class) public int deleteRoleByIds(Long[] roleIds) { for (Long roleId : roleIds) { - Sys2Role role = baseMapper.selectById(roleId); - checkRoleAllowed(BeanUtil.toBean(role, Sys2RoleBo.class)); + SysSaasRole role = baseMapper.selectById(roleId); + checkRoleAllowed(BeanUtil.toBean(role, SysSaasRoleBo.class)); checkRoleDataScope(roleId); if (countUserRoleByRoleId(roleId) > 0) { throw new ServiceException(String.format("%1$s已分配，不能删除!", role.getRoleName())); @@ -417,9 +417,9 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { } List ids = Arrays.asList(roleIds); // 删除角色与菜单关联 - roleMenuMapper.delete(new LambdaQueryWrapper().in(Sys2RoleMenu::getRoleId, ids)); + roleMenuMapper.delete(new LambdaQueryWrapper().in(SysSaasRoleMenu::getRoleId, ids)); // 删除角色与部门关联 - roleDeptMapper.delete(new LambdaQueryWrapper().in(Sys2RoleDept::getRoleId, ids)); + roleDeptMapper.delete(new LambdaQueryWrapper().in(SysSaasRoleDept::getRoleId, ids)); return baseMapper.deleteByIds(ids); } @@ -430,10 +430,10 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { * @return 结果 */ @Override - public int deleteAuthUser(Sys2UserRole userRole) { - int rows = userRoleMapper.delete(new LambdaQueryWrapper() - .eq(Sys2UserRole::getRoleId, userRole.getRoleId()) - .eq(Sys2UserRole::getUserId, userRole.getUserId())); + public int deleteAuthUser(SysSaasUserRole userRole) { + int rows = userRoleMapper.delete(new LambdaQueryWrapper() + .eq(SysSaasUserRole::getRoleId, userRole.getRoleId()) + .eq(SysSaasUserRole::getUserId, userRole.getUserId())); if (rows > 0) { cleanOnlineUserByRole(userRole.getRoleId()); } @@ -449,9 +449,9 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { */ @Override public int deleteAuthUsers(Long roleId, Long[] userIds) { - int rows = userRoleMapper.delete(new LambdaQueryWrapper() - .eq(Sys2UserRole::getRoleId, roleId) - .in(Sys2UserRole::getUserId, Arrays.asList(userIds))); + int rows = userRoleMapper.delete(new LambdaQueryWrapper() + .eq(SysSaasUserRole::getRoleId, roleId) + .in(SysSaasUserRole::getUserId, Arrays.asList(userIds))); if (rows > 0) { cleanOnlineUserByRole(roleId); } @@ -469,8 +469,8 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { public int insertAuthUsers(Long roleId, Long[] userIds) { // 新增用户与角色管理 int rows = 1; - List list = StreamUtils.toList(List.of(userIds), userId -> { - Sys2UserRole ur = new Sys2UserRole(); + List list = StreamUtils.toList(List.of(userIds), userId -> { + SysSaasUserRole ur = new SysSaasUserRole(); ur.setUserId(userId); ur.setRoleId(roleId); return ur; @@ -487,7 +487,7 @@ public class Sys2RoleServiceImpl implements ISys2RoleService { @Override public void cleanOnlineUserByRole(Long roleId) { // 如果角色未绑定用户 直接返回 - Long num = userRoleMapper.selectCount(new LambdaQueryWrapper().eq(Sys2UserRole::getRoleId, roleId)); + Long num = userRoleMapper.selectCount(new LambdaQueryWrapper().eq(SysSaasUserRole::getRoleId, roleId)); if (num == 0) { return; } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2SensitiveServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasSensitiveServiceImpl.java similarity index 94% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2SensitiveServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasSensitiveServiceImpl.java index 0e7793aba..a7b878d22 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2SensitiveServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasSensitiveServiceImpl.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; * @version 3.6.0 */ @Service -public class Sys2SensitiveServiceImpl implements SensitiveService { +public class SysSaasSensitiveServiceImpl implements SensitiveService { /** * 是否脱敏 diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2SocialServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasSocialServiceImpl.java similarity index 54% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2SocialServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasSocialServiceImpl.java index dc884fcac..3f55528bf 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2SocialServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasSocialServiceImpl.java @@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.system.saas.domain.Sys2Social; -import org.dromara.system.saas.domain.bo.Sys2SocialBo; -import org.dromara.system.saas.domain.vo.Sys2SocialVo; -import org.dromara.system.saas.mapper.Sys2SocialMapper; -import org.dromara.system.saas.service.ISys2SocialService; +import org.dromara.system.saas.domain.SysSaasSocial; +import org.dromara.system.saas.domain.bo.SysSaasSocialBo; +import org.dromara.system.saas.domain.vo.SysSaasSocialVo; +import org.dromara.system.saas.mapper.SysSaasSocialMapper; +import org.dromara.system.saas.service.ISysSaasSocialService; import org.springframework.stereotype.Service; import java.util.List; @@ -22,16 +22,16 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class Sys2SocialServiceImpl implements ISys2SocialService { +public class SysSaasSocialServiceImpl implements ISysSaasSocialService { - private final Sys2SocialMapper baseMapper; + private final SysSaasSocialMapper baseMapper; /** * 查询社会化关系 */ @Override - public Sys2SocialVo queryById(String id) { + public SysSaasSocialVo queryById(String id) { return baseMapper.selectVoById(id); } @@ -39,17 +39,17 @@ public class Sys2SocialServiceImpl implements ISys2SocialService { * 授权列表 */ @Override - public List queryList(Sys2SocialBo bo) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper() - .eq(ObjectUtil.isNotNull(bo.getUserId()), Sys2Social::getUserId, bo.getUserId()) - .eq(StringUtils.isNotBlank(bo.getAuthId()), Sys2Social::getAuthId, bo.getAuthId()) - .eq(StringUtils.isNotBlank(bo.getSource()), Sys2Social::getSource, bo.getSource()); + public List queryList(SysSaasSocialBo bo) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper() + .eq(ObjectUtil.isNotNull(bo.getUserId()), SysSaasSocial::getUserId, bo.getUserId()) + .eq(StringUtils.isNotBlank(bo.getAuthId()), SysSaasSocial::getAuthId, bo.getAuthId()) + .eq(StringUtils.isNotBlank(bo.getSource()), SysSaasSocial::getSource, bo.getSource()); return baseMapper.selectVoList(lqw); } @Override - public List queryListByUserId(Long userId) { - return baseMapper.selectVoList(new LambdaQueryWrapper().eq(Sys2Social::getUserId, userId)); + public List queryListByUserId(Long userId) { + return baseMapper.selectVoList(new LambdaQueryWrapper().eq(SysSaasSocial::getUserId, userId)); } @@ -57,8 +57,8 @@ public class Sys2SocialServiceImpl implements ISys2SocialService { * 新增社会化关系 */ @Override - public Boolean insertByBo(Sys2SocialBo bo) { - Sys2Social add = MapstructUtils.convert(bo, Sys2Social.class); + public Boolean insertByBo(SysSaasSocialBo bo) { + SysSaasSocial add = MapstructUtils.convert(bo, SysSaasSocial.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -75,8 +75,8 @@ public class Sys2SocialServiceImpl implements ISys2SocialService { * 更新社会化关系 */ @Override - public Boolean updateByBo(Sys2SocialBo bo) { - Sys2Social update = MapstructUtils.convert(bo, Sys2Social.class); + public Boolean updateByBo(SysSaasSocialBo bo) { + SysSaasSocial update = MapstructUtils.convert(bo, SysSaasSocial.class); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } @@ -84,7 +84,7 @@ public class Sys2SocialServiceImpl implements ISys2SocialService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(Sys2Social entity) { + private void validEntityBeforeSave(SysSaasSocial entity) { //TODO 做一些数据校验,如唯一约束 } @@ -105,8 +105,8 @@ public class Sys2SocialServiceImpl implements ISys2SocialService { * @return 授权信息 */ @Override - public List selectByAuthId(String authId) { - return baseMapper.selectVoList(new LambdaQueryWrapper().eq(Sys2Social::getAuthId, authId)); + public List selectByAuthId(String authId) { + return baseMapper.selectVoList(new LambdaQueryWrapper().eq(SysSaasSocial::getAuthId, authId)); } } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantApplicationServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantApplicationServiceImpl.java similarity index 61% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantApplicationServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantApplicationServiceImpl.java index df00dc2b0..4bbd37c25 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantApplicationServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantApplicationServiceImpl.java @@ -7,11 +7,11 @@ 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.Sys2TenantApplication; -import org.dromara.system.saas.domain.bo.Sys2TenantApplicationBo; -import org.dromara.system.saas.domain.vo.Sys2TenantApplicationVo; -import org.dromara.system.saas.mapper.Sys2TenantApplicationMapper; -import org.dromara.system.saas.service.ISys2TenantApplicationService; +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; @@ -26,9 +26,9 @@ import java.util.Collection; */ @RequiredArgsConstructor @Service -public class Sys2TenantApplicationServiceImpl implements ISys2TenantApplicationService { +public class SysSaasTenantApplicationServiceImpl implements ISysSaasTenantApplicationService { - private final Sys2TenantApplicationMapper baseMapper; + private final SysSaasTenantApplicationMapper baseMapper; /** * 查询租户和应用关联 @@ -37,7 +37,7 @@ public class Sys2TenantApplicationServiceImpl implements ISys2TenantApplicationS * @return 租户和应用关联 */ @Override - public Sys2TenantApplicationVo queryById(Long tenantId){ + public SysSaasTenantApplicationVo queryById(Long tenantId){ return baseMapper.selectVoById(tenantId); } @@ -49,9 +49,9 @@ public class Sys2TenantApplicationServiceImpl implements ISys2TenantApplicationS * @return 租户和应用关联分页列表 */ @Override - public TableDataInfo queryPageList(Sys2TenantApplicationBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo queryPageList(SysSaasTenantApplicationBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -62,14 +62,14 @@ public class Sys2TenantApplicationServiceImpl implements ISys2TenantApplicationS * @return 租户和应用关联列表 */ @Override - public List queryList(Sys2TenantApplicationBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List queryList(SysSaasTenantApplicationBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(Sys2TenantApplicationBo bo) { + private LambdaQueryWrapper buildQueryWrapper(SysSaasTenantApplicationBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); return lqw; } @@ -80,8 +80,8 @@ public class Sys2TenantApplicationServiceImpl implements ISys2TenantApplicationS * @return 是否新增成功 */ @Override - public Boolean insertByBo(Sys2TenantApplicationBo bo) { - Sys2TenantApplication add = MapstructUtils.convert(bo, Sys2TenantApplication.class); + public Boolean insertByBo(SysSaasTenantApplicationBo bo) { + SysSaasTenantApplication add = MapstructUtils.convert(bo, SysSaasTenantApplication.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -97,8 +97,8 @@ public class Sys2TenantApplicationServiceImpl implements ISys2TenantApplicationS * @return 是否修改成功 */ @Override - public Boolean updateByBo(Sys2TenantApplicationBo bo) { - Sys2TenantApplication update = MapstructUtils.convert(bo, Sys2TenantApplication.class); + public Boolean updateByBo(SysSaasTenantApplicationBo bo) { + SysSaasTenantApplication update = MapstructUtils.convert(bo, SysSaasTenantApplication.class); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } @@ -106,7 +106,7 @@ public class Sys2TenantApplicationServiceImpl implements ISys2TenantApplicationS /** * 保存前的数据校验 */ - private void validEntityBeforeSave(Sys2TenantApplication entity){ + private void validEntityBeforeSave(SysSaasTenantApplication entity){ //TODO 做一些数据校验,如唯一约束 } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantPackageServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantPackageServiceImpl.java similarity index 56% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantPackageServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantPackageServiceImpl.java index 1c3777d6a..41cab0236 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantPackageServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantPackageServiceImpl.java @@ -12,13 +12,13 @@ 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.Sys2Tenant; -import org.dromara.system.saas.domain.Sys2TenantPackage; -import org.dromara.system.saas.domain.bo.Sys2TenantPackageBo; -import org.dromara.system.saas.domain.vo.Sys2TenantPackageVo; -import org.dromara.system.saas.mapper.Sys2TenantMapper; -import org.dromara.system.saas.mapper.Sys2TenantPackageMapper; -import org.dromara.system.saas.service.ISys2TenantPackageService; +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; @@ -33,16 +33,16 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class Sys2TenantPackageServiceImpl implements ISys2TenantPackageService { +public class SysSaasTenantPackageServiceImpl implements ISysSaasTenantPackageService { - private final Sys2TenantPackageMapper baseMapper; - private final Sys2TenantMapper tenantMapper; + private final SysSaasTenantPackageMapper baseMapper; + private final SysSaasTenantMapper tenantMapper; /** * 查询租户套餐 */ @Override - public Sys2TenantPackageVo queryById(Long packageId){ + public SysSaasTenantPackageVo queryById(Long packageId){ return baseMapper.selectVoById(packageId); } @@ -50,32 +50,32 @@ public class Sys2TenantPackageServiceImpl implements ISys2TenantPackageService { * 查询租户套餐列表 */ @Override - public TableDataInfo queryPageList(Sys2TenantPackageBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo queryPageList(SysSaasTenantPackageBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @Override - public List selectList() { - return baseMapper.selectVoList(new LambdaQueryWrapper() - .eq(Sys2TenantPackage::getStatus, TenantConstants.NORMAL)); + public List selectList() { + return baseMapper.selectVoList(new LambdaQueryWrapper() + .eq(SysSaasTenantPackage::getStatus, TenantConstants.NORMAL)); } /** * 查询租户套餐列表 */ @Override - public List queryList(Sys2TenantPackageBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List queryList(SysSaasTenantPackageBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(Sys2TenantPackageBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getPackageName()), Sys2TenantPackage::getPackageName, bo.getPackageName()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Sys2TenantPackage::getStatus, bo.getStatus()); - lqw.orderByAsc(Sys2TenantPackage::getPackageId); + private LambdaQueryWrapper buildQueryWrapper(SysSaasTenantPackageBo bo) { + LambdaQueryWrapper 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; } @@ -84,8 +84,8 @@ public class Sys2TenantPackageServiceImpl implements ISys2TenantPackageService { */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean insertByBo(Sys2TenantPackageBo bo) { - Sys2TenantPackage add = MapstructUtils.convert(bo, Sys2TenantPackage.class); + public Boolean insertByBo(SysSaasTenantPackageBo bo) { + SysSaasTenantPackage add = MapstructUtils.convert(bo, SysSaasTenantPackage.class); // 保存菜单id List menuIds = Arrays.asList(bo.getMenuIds()); if (CollUtil.isNotEmpty(menuIds)) { @@ -105,8 +105,8 @@ public class Sys2TenantPackageServiceImpl implements ISys2TenantPackageService { */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean updateByBo(Sys2TenantPackageBo bo) { - Sys2TenantPackage update = MapstructUtils.convert(bo, Sys2TenantPackage.class); + public Boolean updateByBo(SysSaasTenantPackageBo bo) { + SysSaasTenantPackage update = MapstructUtils.convert(bo, SysSaasTenantPackage.class); // 保存菜单id List menuIds = Arrays.asList(bo.getMenuIds()); if (CollUtil.isNotEmpty(menuIds)) { @@ -121,10 +121,10 @@ public class Sys2TenantPackageServiceImpl implements ISys2TenantPackageService { * 校验套餐名称是否唯一 */ @Override - public boolean checkPackageNameUnique(Sys2TenantPackageBo bo) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(Sys2TenantPackage::getPackageName, bo.getPackageName()) - .ne(ObjectUtil.isNotNull(bo.getPackageId()), Sys2TenantPackage::getPackageId, bo.getPackageId())); + public boolean checkPackageNameUnique(SysSaasTenantPackageBo bo) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysSaasTenantPackage::getPackageName, bo.getPackageName()) + .ne(ObjectUtil.isNotNull(bo.getPackageId()), SysSaasTenantPackage::getPackageId, bo.getPackageId())); return !exist; } @@ -135,8 +135,8 @@ public class Sys2TenantPackageServiceImpl implements ISys2TenantPackageService { * @return 结果 */ @Override - public int updatePackageStatus(Sys2TenantPackageBo bo) { - Sys2TenantPackage tenantPackage = MapstructUtils.convert(bo, Sys2TenantPackage.class); + public int updatePackageStatus(SysSaasTenantPackageBo bo) { + SysSaasTenantPackage tenantPackage = MapstructUtils.convert(bo, SysSaasTenantPackage.class); return baseMapper.updateById(tenantPackage); } @@ -147,7 +147,7 @@ public class Sys2TenantPackageServiceImpl implements ISys2TenantPackageService { @Transactional(rollbackFor = Exception.class) public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ - boolean exists = tenantMapper.exists(new LambdaQueryWrapper().in(Sys2Tenant::getPackageId, ids)); + boolean exists = tenantMapper.exists(new LambdaQueryWrapper().in(SysSaasTenant::getPackageId, ids)); if (exists) { throw new ServiceException("租户套餐已被使用"); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantServiceImpl.java similarity index 62% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantServiceImpl.java index e3961557f..43ab3b81a 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantServiceImpl.java @@ -17,9 +17,9 @@ 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.Sys2TenantBo; -import org.dromara.system.saas.domain.vo.Sys2TenantVo; -import org.dromara.system.saas.service.ISys2TenantService; +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; @@ -39,25 +39,25 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class Sys2TenantServiceImpl implements ISys2TenantService { +public class SysSaasTenantServiceImpl implements ISysSaasTenantService { - private final Sys2TenantMapper baseMapper; - private final Sys2TenantPackageMapper tenantPackageMapper; - private final Sys2UserMapper userMapper; - private final Sys2DeptMapper deptMapper; - private final Sys2RoleMapper roleMapper; - private final Sys2RoleMenuMapper roleMenuMapper; - private final Sys2RoleDeptMapper roleDeptMapper; - private final Sys2UserRoleMapper userRoleMapper; - private final Sys2DictTypeMapper dictTypeMapper; - private final Sys2DictDataMapper dictDataMapper; - private final Sys2ConfigMapper configMapper; + 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 Sys2TenantVo queryById(Long id) { + public SysSaasTenantVo queryById(Long id) { return baseMapper.selectVoById(id); } @@ -66,17 +66,17 @@ public class Sys2TenantServiceImpl implements ISys2TenantService { */ @Cacheable(cacheNames = CacheNames.SYS_TENANT, key = "#tenantId") @Override - public Sys2TenantVo queryByTenantId(String tenantId) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(Sys2Tenant::getTenantId, tenantId)); + public SysSaasTenantVo queryByTenantId(String tenantId) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysSaasTenant::getTenantId, tenantId)); } /** * 查询租户列表 */ @Override - public TableDataInfo queryPageList(Sys2TenantBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo queryPageList(SysSaasTenantBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -84,26 +84,26 @@ public class Sys2TenantServiceImpl implements ISys2TenantService { * 查询租户列表 */ @Override - public List queryList(Sys2TenantBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List queryList(SysSaasTenantBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(Sys2TenantBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), Sys2Tenant::getTenantId, bo.getTenantId()); - lqw.like(StringUtils.isNotBlank(bo.getContactUserName()), Sys2Tenant::getContactUserName, bo.getContactUserName()); - lqw.eq(StringUtils.isNotBlank(bo.getContactPhone()), Sys2Tenant::getContactPhone, bo.getContactPhone()); - lqw.like(StringUtils.isNotBlank(bo.getCompanyName()), Sys2Tenant::getCompanyName, bo.getCompanyName()); - lqw.eq(StringUtils.isNotBlank(bo.getLicenseNumber()), Sys2Tenant::getLicenseNumber, bo.getLicenseNumber()); - lqw.eq(StringUtils.isNotBlank(bo.getAddress()), Sys2Tenant::getAddress, bo.getAddress()); - lqw.eq(StringUtils.isNotBlank(bo.getIntro()), Sys2Tenant::getIntro, bo.getIntro()); - lqw.like(StringUtils.isNotBlank(bo.getDomain()), Sys2Tenant::getDomain, bo.getDomain()); - lqw.eq(bo.getPackageId() != null, Sys2Tenant::getPackageId, bo.getPackageId()); - lqw.eq(bo.getExpireTime() != null, Sys2Tenant::getExpireTime, bo.getExpireTime()); - lqw.eq(bo.getAccountCount() != null, Sys2Tenant::getAccountCount, bo.getAccountCount()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Sys2Tenant::getStatus, bo.getStatus()); - lqw.orderByAsc(Sys2Tenant::getId); + private LambdaQueryWrapper buildQueryWrapper(SysSaasTenantBo bo) { + LambdaQueryWrapper 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; } @@ -112,12 +112,12 @@ public class Sys2TenantServiceImpl implements ISys2TenantService { */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean insertByBo(Sys2TenantBo bo) { - Sys2Tenant add = MapstructUtils.convert(bo, Sys2Tenant.class); + public Boolean insertByBo(SysSaasTenantBo bo) { + SysSaasTenant add = MapstructUtils.convert(bo, SysSaasTenant.class); // 获取所有租户编号 List tenantIds = baseMapper.selectObjs( - new LambdaQueryWrapper().select(Sys2Tenant::getTenantId), x -> {return Convert.toStr(x);}); + new LambdaQueryWrapper().select(SysSaasTenant::getTenantId), x -> {return Convert.toStr(x);}); String tenantId = generateTenantId(tenantIds); add.setTenantId(tenantId); boolean flag = baseMapper.insert(add) > 0; @@ -130,7 +130,7 @@ public class Sys2TenantServiceImpl implements ISys2TenantService { Long roleId = createTenantRole(tenantId, bo.getPackageId()); // 创建部门: 公司名是部门名称 - Sys2Dept dept = new Sys2Dept(); + SysSaasDept dept = new SysSaasDept(); dept.setTenantId(tenantId); dept.setDeptName(bo.getCompanyName()); dept.setParentId(Constants.TOP_PARENT_ID); @@ -139,13 +139,13 @@ public class Sys2TenantServiceImpl implements ISys2TenantService { Long deptId = dept.getDeptId(); // 角色和部门关联表 - Sys2RoleDept roleDept = new Sys2RoleDept(); + SysSaasRoleDept roleDept = new SysSaasRoleDept(); roleDept.setRoleId(roleId); roleDept.setDeptId(deptId); roleDeptMapper.insert(roleDept); // 创建系统用户 - Sys2User user = new Sys2User(); + SysSaasUser user = new SysSaasUser(); user.setTenantId(tenantId); user.setUserName(bo.getUsername()); user.setNickName(bo.getUsername()); @@ -153,40 +153,40 @@ public class Sys2TenantServiceImpl implements ISys2TenantService { user.setDeptId(deptId); userMapper.insert(user); //新增系统用户后，默认当前用户为部门的负责人 - Sys2Dept sd = new Sys2Dept(); + SysSaasDept sd = new SysSaasDept(); sd.setLeader(user.getUserId()); sd.setDeptId(deptId); deptMapper.updateById(sd); // 用户和角色关联表 - Sys2UserRole userRole = new Sys2UserRole(); + SysSaasUserRole userRole = new SysSaasUserRole(); userRole.setUserId(user.getUserId()); userRole.setRoleId(roleId); userRoleMapper.insert(userRole); String defaultTenantId = TenantConstants.DEFAULT_TENANT_ID; - List dictTypeList = dictTypeMapper.selectList( - new LambdaQueryWrapper().eq(Sys2DictType::getTenantId, defaultTenantId)); - List dictDataList = dictDataMapper.selectList( - new LambdaQueryWrapper().eq(Sys2DictData::getTenantId, defaultTenantId)); - for (Sys2DictType dictType : dictTypeList) { + List dictTypeList = dictTypeMapper.selectList( + new LambdaQueryWrapper().eq(SysSaasDictType::getTenantId, defaultTenantId)); + List dictDataList = dictDataMapper.selectList( + new LambdaQueryWrapper().eq(SysSaasDictData::getTenantId, defaultTenantId)); + for (SysSaasDictType dictType : dictTypeList) { dictType.setDictId(null); dictType.setTenantId(tenantId); } - for (Sys2DictData dictData : dictDataList) { + for (SysSaasDictData dictData : dictDataList) { dictData.setDictCode(null); dictData.setTenantId(tenantId); } dictTypeMapper.insertBatch(dictTypeList); dictDataMapper.insertBatch(dictDataList); - List sys2ConfigList = configMapper.selectList( - new LambdaQueryWrapper().eq(Sys2Config::getTenantId, defaultTenantId)); - for (Sys2Config config : sys2ConfigList) { + List sysSaasConfigList = configMapper.selectList( + new LambdaQueryWrapper().eq(SysSaasConfig::getTenantId, defaultTenantId)); + for (SysSaasConfig config : sysSaasConfigList) { config.setConfigId(null); config.setTenantId(tenantId); } - configMapper.insertBatch(sys2ConfigList); + configMapper.insertBatch(sysSaasConfigList); return true; } @@ -215,7 +215,7 @@ public class Sys2TenantServiceImpl implements ISys2TenantService { */ private Long createTenantRole(String tenantId, Long packageId) { // 获取租户套餐 - Sys2TenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); + SysSaasTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); if (ObjectUtil.isNull(tenantPackage)) { throw new ServiceException("套餐不存在"); } @@ -223,7 +223,7 @@ public class Sys2TenantServiceImpl implements ISys2TenantService { List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); // 创建角色 - Sys2Role role = new Sys2Role(); + SysSaasRole role = new SysSaasRole(); role.setTenantId(tenantId); role.setRoleName(TenantConstants.TENANT_ADMIN_ROLE_NAME); role.setRoleKey(TenantConstants.TENANT_ADMIN_ROLE_KEY); @@ -233,9 +233,9 @@ public class Sys2TenantServiceImpl implements ISys2TenantService { Long roleId = role.getRoleId(); // 创建角色菜单 - List roleMenus = new ArrayList<>(menuIds.size()); + List roleMenus = new ArrayList<>(menuIds.size()); menuIds.forEach(menuId -> { - Sys2RoleMenu roleMenu = new Sys2RoleMenu(); + SysSaasRoleMenu roleMenu = new SysSaasRoleMenu(); roleMenu.setRoleId(roleId); roleMenu.setMenuId(menuId); roleMenus.add(roleMenu); @@ -250,8 +250,8 @@ public class Sys2TenantServiceImpl implements ISys2TenantService { */ @CacheEvict(cacheNames = CacheNames.SYS_TENANT, key = "#bo.tenantId") @Override - public Boolean updateByBo(Sys2TenantBo bo) { - Sys2Tenant tenant = MapstructUtils.convert(bo, Sys2Tenant.class); + public Boolean updateByBo(SysSaasTenantBo bo) { + SysSaasTenant tenant = MapstructUtils.convert(bo, SysSaasTenant.class); tenant.setTenantId(null); tenant.setPackageId(null); return baseMapper.updateById(tenant) > 0; @@ -265,8 +265,8 @@ public class Sys2TenantServiceImpl implements ISys2TenantService { */ @CacheEvict(cacheNames = CacheNames.SYS_TENANT, key = "#bo.tenantId") @Override - public int updateTenantStatus(Sys2TenantBo bo) { - Sys2Tenant tenant = MapstructUtils.convert(bo, Sys2Tenant.class); + public int updateTenantStatus(SysSaasTenantBo bo) { + SysSaasTenant tenant = MapstructUtils.convert(bo, SysSaasTenant.class); return baseMapper.updateById(tenant); } @@ -301,10 +301,10 @@ public class Sys2TenantServiceImpl implements ISys2TenantService { * 校验企业名称是否唯一 */ @Override - public boolean checkCompanyNameUnique(Sys2TenantBo bo) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(Sys2Tenant::getCompanyName, bo.getCompanyName()) - .ne(ObjectUtil.isNotNull(bo.getTenantId()), Sys2Tenant::getTenantId, bo.getTenantId())); + public boolean checkCompanyNameUnique(SysSaasTenantBo bo) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysSaasTenant::getCompanyName, bo.getCompanyName()) + .ne(ObjectUtil.isNotNull(bo.getTenantId()), SysSaasTenant::getTenantId, bo.getTenantId())); return !exist; } @@ -313,7 +313,7 @@ public class Sys2TenantServiceImpl implements ISys2TenantService { */ @Override public boolean checkAccountBalance(String tenantId) { - Sys2TenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId); + SysSaasTenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId); // 如果余额为-1代表不限制 if (tenant.getAccountCount() == -1) { return true; @@ -328,7 +328,7 @@ public class Sys2TenantServiceImpl implements ISys2TenantService { */ @Override public boolean checkExpireTime(String tenantId) { - Sys2TenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId); + SysSaasTenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId); // 如果未设置过期时间代表不限制 if (ObjectUtil.isNull(tenant.getExpireTime())) { return true; @@ -343,21 +343,21 @@ public class Sys2TenantServiceImpl implements ISys2TenantService { @Override @Transactional(rollbackFor = Exception.class) public Boolean syncTenantPackage(String tenantId, Long packageId) { - Sys2TenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); - List roles = roleMapper.selectList( - new LambdaQueryWrapper().eq(Sys2Role::getTenantId, tenantId)); + SysSaasTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); + List roles = roleMapper.selectList( + new LambdaQueryWrapper().eq(SysSaasRole::getTenantId, tenantId)); List roleIds = new ArrayList<>(roles.size() - 1); List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); roles.forEach(item -> { if (TenantConstants.TENANT_ADMIN_ROLE_KEY.equals(item.getRoleKey())) { - List roleMenus = new ArrayList<>(menuIds.size()); + List roleMenus = new ArrayList<>(menuIds.size()); menuIds.forEach(menuId -> { - Sys2RoleMenu roleMenu = new Sys2RoleMenu(); + SysSaasRoleMenu roleMenu = new SysSaasRoleMenu(); roleMenu.setRoleId(item.getRoleId()); roleMenu.setMenuId(menuId); roleMenus.add(roleMenu); }); - roleMenuMapper.delete(new LambdaQueryWrapper().eq(Sys2RoleMenu::getRoleId, item.getRoleId())); + roleMenuMapper.delete(new LambdaQueryWrapper().eq(SysSaasRoleMenu::getRoleId, item.getRoleId())); roleMenuMapper.insertBatch(roleMenus); } else { roleIds.add(item.getRoleId()); @@ -365,7 +365,7 @@ public class Sys2TenantServiceImpl implements ISys2TenantService { }); if (!roleIds.isEmpty()) { roleMenuMapper.delete( - new LambdaQueryWrapper().in(Sys2RoleMenu::getRoleId, roleIds).notIn(!menuIds.isEmpty(), Sys2RoleMenu::getMenuId, menuIds)); + new LambdaQueryWrapper().in(SysSaasRoleMenu::getRoleId, roleIds).notIn(!menuIds.isEmpty(), SysSaasRoleMenu::getMenuId, menuIds)); } return true; } 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/SysSaasUserServiceImpl.java similarity index 64% rename from ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2UserServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasUserServiceImpl.java index 4ce1f24ae..bac05e352 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/SysSaasUserServiceImpl.java @@ -26,12 +26,12 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.saas.domain.bo.Sys2UserBo; -import org.dromara.system.saas.domain.vo.Sys2PostVo; -import org.dromara.system.saas.domain.vo.Sys2RoleVo; -import org.dromara.system.saas.domain.vo.Sys2UserExportVo; -import org.dromara.system.saas.domain.vo.Sys2UserVo; -import org.dromara.system.saas.service.ISys2UserService; +import org.dromara.system.saas.domain.bo.SysSaasUserBo; +import org.dromara.system.saas.domain.vo.SysSaasPostVo; +import org.dromara.system.saas.domain.vo.SysSaasRoleVo; +import org.dromara.system.saas.domain.vo.SysSaasUserExportVo; +import org.dromara.system.saas.domain.vo.SysSaasUserVo; +import org.dromara.system.saas.service.ISysSaasUserService; import org.dromara.system.saas.domain.*; import org.dromara.system.saas.mapper.*; import org.springframework.cache.annotation.CacheEvict; @@ -51,18 +51,18 @@ import java.util.Map; @Slf4j @RequiredArgsConstructor @Service -public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { +public class SysSaasUserServiceImpl implements ISysSaasUserService, SaasUserService { - private final Sys2UserMapper baseMapper; - private final Sys2DeptMapper deptMapper; - private final Sys2RoleMapper roleMapper; - private final Sys2PostMapper postMapper; - private final Sys2UserRoleMapper userRoleMapper; - private final Sys2UserPostMapper userPostMapper; + private final SysSaasUserMapper baseMapper; + private final SysSaasDeptMapper deptMapper; + private final SysSaasRoleMapper roleMapper; + private final SysSaasPostMapper postMapper; + private final SysSaasUserRoleMapper userRoleMapper; + private final SysSaasUserPostMapper userPostMapper; @Override - public TableDataInfo selectPageUserList(Sys2UserBo user, PageQuery pageQuery) { - Page page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user)); + public TableDataInfo selectPageUserList(SysSaasUserBo user, PageQuery pageQuery) { + Page page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user)); return TableDataInfo.build(page); } @@ -74,13 +74,13 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { * @return 用户信息集合信息 */ @Override - public List selectUserExportList(Sys2UserBo user) { + public List selectUserExportList(SysSaasUserBo user) { return baseMapper.selectUserExportList(this.buildQueryWrapper(user)); } - private Wrapper buildQueryWrapper(Sys2UserBo user) { + private Wrapper buildQueryWrapper(SysSaasUserBo user) { Map params = user.getParams(); - QueryWrapper wrapper = Wrappers.query(); + QueryWrapper wrapper = Wrappers.query(); wrapper.eq("u.del_flag", UserConstants.USER_NORMAL) .eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId()) .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName()) @@ -89,10 +89,10 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { .between(params.get("beginTime") != null && params.get("endTime") != null, "u.create_time", params.get("beginTime"), params.get("endTime")) .and(ObjectUtil.isNotNull(user.getDeptId()), w -> { - List deptList = deptMapper.selectList(new LambdaQueryWrapper() - .select(Sys2Dept::getDeptId) + List deptList = deptMapper.selectList(new LambdaQueryWrapper() + .select(SysSaasDept::getDeptId) .apply(DataBaseHelper.findInSet(user.getDeptId(), "ancestors"))); - List ids = StreamUtils.toList(deptList, Sys2Dept::getDeptId); + List ids = StreamUtils.toList(deptList, SysSaasDept::getDeptId); ids.add(user.getDeptId()); w.in("u.dept_id", ids); }).orderByAsc("u.user_id"); @@ -109,15 +109,15 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { * @return 用户信息集合信息 */ @Override - public TableDataInfo selectAllocatedList(Sys2UserBo user, PageQuery pageQuery) { - QueryWrapper wrapper = Wrappers.query(); + public TableDataInfo selectAllocatedList(SysSaasUserBo user, PageQuery pageQuery) { + QueryWrapper wrapper = Wrappers.query(); wrapper.eq("u.del_flag", UserConstants.USER_NORMAL) .eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId()) .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName()) .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus()) .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber()) .orderByAsc("u.user_id"); - Page page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper); + Page page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper); return TableDataInfo.build(page); } @@ -128,16 +128,16 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { * @return 用户信息集合信息 */ @Override - public TableDataInfo selectUnallocatedList(Sys2UserBo user, PageQuery pageQuery) { + public TableDataInfo selectUnallocatedList(SysSaasUserBo user, PageQuery pageQuery) { List userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId()); - QueryWrapper wrapper = Wrappers.query(); + QueryWrapper wrapper = Wrappers.query(); wrapper.eq("u.del_flag", UserConstants.USER_NORMAL) .and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id")) .notIn(CollUtil.isNotEmpty(userIds), "u.user_id", userIds) .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName()) .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber()) .orderByAsc("u.user_id"); - Page page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper); + Page page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper); return TableDataInfo.build(page); } @@ -148,8 +148,8 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { * @return 用户对象信息 */ @Override - public Sys2UserVo selectUserByUserName(String userName) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(Sys2User::getUserName, userName)); + public SysSaasUserVo selectUserByUserName(String userName) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysSaasUser::getUserName, userName)); } /** @@ -159,8 +159,8 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { * @return 用户对象信息 */ @Override - public Sys2UserVo selectUserByPhonenumber(String phonenumber) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(Sys2User::getPhonenumber, phonenumber)); + public SysSaasUserVo selectUserByPhonenumber(String phonenumber) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysSaasUser::getPhonenumber, phonenumber)); } /** @@ -170,8 +170,8 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { * @return 用户对象信息 */ @Override - public Sys2UserVo selectUserById(Long userId) { - Sys2UserVo user = baseMapper.selectVoById(userId); + public SysSaasUserVo selectUserById(Long userId) { + SysSaasUserVo user = baseMapper.selectVoById(userId); if (ObjectUtil.isNull(user)) { return user; } @@ -187,12 +187,12 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { * @return 用户列表信息 */ @Override - public List selectUserByIds(List userIds, Long deptId) { - return baseMapper.selectUserList(new LambdaQueryWrapper() - .select(Sys2User::getUserId, Sys2User::getUserName, Sys2User::getNickName) - .eq(Sys2User::getStatus, UserConstants.USER_NORMAL) - .eq(ObjectUtil.isNotNull(deptId), Sys2User::getDeptId, deptId) - .in(CollUtil.isNotEmpty(userIds), Sys2User::getUserId, userIds)); + public List selectUserByIds(List userIds, Long deptId) { + return baseMapper.selectUserList(new LambdaQueryWrapper() + .select(SysSaasUser::getUserId, SysSaasUser::getUserName, SysSaasUser::getNickName) + .eq(SysSaasUser::getStatus, UserConstants.USER_NORMAL) + .eq(ObjectUtil.isNotNull(deptId), SysSaasUser::getDeptId, deptId) + .in(CollUtil.isNotEmpty(userIds), SysSaasUser::getUserId, userIds)); } /** @@ -203,11 +203,11 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { */ @Override public String selectUserRoleGroup(Long userId) { - List list = roleMapper.selectRolesByUserId(userId); + List list = roleMapper.selectRolesByUserId(userId); if (CollUtil.isEmpty(list)) { return StringUtils.EMPTY; } - return StreamUtils.join(list, Sys2RoleVo::getRoleName); + return StreamUtils.join(list, SysSaasRoleVo::getRoleName); } /** @@ -218,11 +218,11 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { */ @Override public String selectUserPostGroup(Long userId) { - List list = postMapper.selectPostsByUserId(userId); + List list = postMapper.selectPostsByUserId(userId); if (CollUtil.isEmpty(list)) { return StringUtils.EMPTY; } - return StreamUtils.join(list, Sys2PostVo::getPostName); + return StreamUtils.join(list, SysSaasPostVo::getPostName); } /** @@ -232,10 +232,10 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { * @return 结果 */ @Override - public boolean checkUserNameUnique(Sys2UserBo user) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(Sys2User::getUserName, user.getUserName()) - .ne(ObjectUtil.isNotNull(user.getUserId()), Sys2User::getUserId, user.getUserId())); + public boolean checkUserNameUnique(SysSaasUserBo user) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysSaasUser::getUserName, user.getUserName()) + .ne(ObjectUtil.isNotNull(user.getUserId()), SysSaasUser::getUserId, user.getUserId())); return !exist; } @@ -245,10 +245,10 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { * @param user 用户信息 */ @Override - public boolean checkPhoneUnique(Sys2UserBo user) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(Sys2User::getPhonenumber, user.getPhonenumber()) - .ne(ObjectUtil.isNotNull(user.getUserId()), Sys2User::getUserId, user.getUserId())); + public boolean checkPhoneUnique(SysSaasUserBo user) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysSaasUser::getPhonenumber, user.getPhonenumber()) + .ne(ObjectUtil.isNotNull(user.getUserId()), SysSaasUser::getUserId, user.getUserId())); return !exist; } @@ -258,10 +258,10 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { * @param user 用户信息 */ @Override - public boolean checkEmailUnique(Sys2UserBo user) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(Sys2User::getEmail, user.getEmail()) - .ne(ObjectUtil.isNotNull(user.getUserId()), Sys2User::getUserId, user.getUserId())); + public boolean checkEmailUnique(SysSaasUserBo user) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysSaasUser::getEmail, user.getEmail()) + .ne(ObjectUtil.isNotNull(user.getUserId()), SysSaasUser::getUserId, user.getUserId())); return !exist; } @@ -303,11 +303,11 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { */ @Override @Transactional(rollbackFor = Exception.class) - public int insertUser(Sys2UserBo user) { - Sys2User sys2User = MapstructUtils.convert(user, Sys2User.class); + public int insertUser(SysSaasUserBo user) { + SysSaasUser sysSaasUser = MapstructUtils.convert(user, SysSaasUser.class); // 新增用户信息 - int rows = baseMapper.insert(sys2User); - user.setUserId(sys2User.getUserId()); + int rows = baseMapper.insert(sysSaasUser); + user.setUserId(sysSaasUser.getUserId()); // 新增用户岗位关联 insertUserPost(user, false); // 新增用户与角色管理 @@ -322,12 +322,12 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { * @return 结果 */ @Override - public boolean registerUser(Sys2UserBo user, String tenantId) { + public boolean registerUser(SysSaasUserBo user, String tenantId) { user.setCreateBy(0L); user.setUpdateBy(0L); - Sys2User sys2User = MapstructUtils.convert(user, Sys2User.class); - sys2User.setTenantId(tenantId); - return baseMapper.insert(sys2User) > 0; + SysSaasUser sysSaasUser = MapstructUtils.convert(user, SysSaasUser.class); + sysSaasUser.setTenantId(tenantId); + return baseMapper.insert(sysSaasUser) > 0; } /** @@ -339,14 +339,14 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { @Override @CacheEvict(cacheNames = CacheNames.SYS_NICKNAME, key = "#user.userId") @Transactional(rollbackFor = Exception.class) - public int updateUser(Sys2UserBo user) { + public int updateUser(SysSaasUserBo user) { // 新增用户与角色管理 insertUserRole(user, true); // 新增用户与岗位管理 insertUserPost(user, true); - Sys2User sys2User = MapstructUtils.convert(user, Sys2User.class); + SysSaasUser sysSaasUser = MapstructUtils.convert(user, SysSaasUser.class); // 防止错误更新后导致的数据误删除 - int flag = baseMapper.updateById(sys2User); + int flag = baseMapper.updateById(sysSaasUser); if (flag < 1) { throw new ServiceException("修改用户" + user.getUserName() + "信息失败"); } @@ -375,9 +375,9 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { @Override public int updateUserStatus(Long userId, String status) { return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(Sys2User::getStatus, status) - .eq(Sys2User::getUserId, userId)); + new LambdaUpdateWrapper() + .set(SysSaasUser::getStatus, status) + .eq(SysSaasUser::getUserId, userId)); } /** @@ -388,14 +388,14 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { */ @CacheEvict(cacheNames = CacheNames.SYS_NICKNAME, key = "#user.userId") @Override - public int updateUserProfile(Sys2UserBo user) { + public int updateUserProfile(SysSaasUserBo user) { return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(ObjectUtil.isNotNull(user.getNickName()), Sys2User::getNickName, user.getNickName()) - .set(Sys2User::getPhonenumber, user.getPhonenumber()) - .set(Sys2User::getEmail, user.getEmail()) - .set(Sys2User::getSex, user.getSex()) - .eq(Sys2User::getUserId, user.getUserId())); + new LambdaUpdateWrapper() + .set(ObjectUtil.isNotNull(user.getNickName()), SysSaasUser::getNickName, user.getNickName()) + .set(SysSaasUser::getPhonenumber, user.getPhonenumber()) + .set(SysSaasUser::getEmail, user.getEmail()) + .set(SysSaasUser::getSex, user.getSex()) + .eq(SysSaasUser::getUserId, user.getUserId())); } /** @@ -408,9 +408,9 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { @Override public boolean updateUserAvatar(Long userId, Long avatar) { return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(Sys2User::getAvatar, avatar) - .eq(Sys2User::getUserId, userId)) > 0; + new LambdaUpdateWrapper() + .set(SysSaasUser::getAvatar, avatar) + .eq(SysSaasUser::getUserId, userId)) > 0; } /** @@ -423,9 +423,9 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { @Override public int resetUserPwd(Long userId, String password) { return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(Sys2User::getPassword, password) - .eq(Sys2User::getUserId, userId)); + new LambdaUpdateWrapper() + .set(SysSaasUser::getPassword, password) + .eq(SysSaasUser::getUserId, userId)); } /** @@ -434,7 +434,7 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { * @param user 用户对象 * @param clear 清除已存在的关联数据 */ - private void insertUserRole(Sys2UserBo user, boolean clear) { + private void insertUserRole(SysSaasUserBo user, boolean clear) { this.insertUserRole(user.getUserId(), user.getRoleIds(), clear); } @@ -444,16 +444,16 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { * @param user 用户对象 * @param clear 清除已存在的关联数据 */ - private void insertUserPost(Sys2UserBo user, boolean clear) { + private void insertUserPost(SysSaasUserBo user, boolean clear) { Long[] posts = user.getPostIds(); if (ArrayUtil.isNotEmpty(posts)) { if (clear) { // 删除用户与岗位关联 - userPostMapper.delete(new LambdaQueryWrapper().eq(Sys2UserPost::getUserId, user.getUserId())); + userPostMapper.delete(new LambdaQueryWrapper().eq(SysSaasUserPost::getUserId, user.getUserId())); } // 新增用户与岗位管理 - List list = StreamUtils.toList(List.of(posts), postId -> { - Sys2UserPost up = new Sys2UserPost(); + List list = StreamUtils.toList(List.of(posts), postId -> { + SysSaasUserPost up = new SysSaasUserPost(); up.setUserId(user.getUserId()); up.setPostId(postId); return up; @@ -476,18 +476,18 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { roleList.remove(UserConstants.SUPER_ADMIN_ID); } // 判断是否具有此角色的操作权限 - List roles = roleMapper.selectRoleList( - new QueryWrapper().in("r.role_id", roleList)); + List roles = roleMapper.selectRoleList( + new QueryWrapper().in("r.role_id", roleList)); if (CollUtil.isEmpty(roles)) { throw new ServiceException("没有权限访问角色的数据"); } if (clear) { // 删除用户与角色关联 - userRoleMapper.delete(new LambdaQueryWrapper().eq(Sys2UserRole::getUserId, userId)); + userRoleMapper.delete(new LambdaQueryWrapper().eq(SysSaasUserRole::getUserId, userId)); } // 新增用户与角色管理 - List list = StreamUtils.toList(roleList, roleId -> { - Sys2UserRole ur = new Sys2UserRole(); + List list = StreamUtils.toList(roleList, roleId -> { + SysSaasUserRole ur = new SysSaasUserRole(); ur.setUserId(userId); ur.setRoleId(roleId); return ur; @@ -506,9 +506,9 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { @Transactional(rollbackFor = Exception.class) public int deleteUserById(Long userId) { // 删除用户与角色关联 - userRoleMapper.delete(new LambdaQueryWrapper().eq(Sys2UserRole::getUserId, userId)); + userRoleMapper.delete(new LambdaQueryWrapper().eq(SysSaasUserRole::getUserId, userId)); // 删除用户与岗位表 - userPostMapper.delete(new LambdaQueryWrapper().eq(Sys2UserPost::getUserId, userId)); + userPostMapper.delete(new LambdaQueryWrapper().eq(SysSaasUserPost::getUserId, userId)); // 防止更新失败导致的数据删除 int flag = baseMapper.deleteById(userId); if (flag < 1) { @@ -532,9 +532,9 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { } List ids = List.of(userIds); // 删除用户与角色关联 - userRoleMapper.delete(new LambdaQueryWrapper().in(Sys2UserRole::getUserId, ids)); + userRoleMapper.delete(new LambdaQueryWrapper().in(SysSaasUserRole::getUserId, ids)); // 删除用户与岗位表 - userPostMapper.delete(new LambdaQueryWrapper().in(Sys2UserPost::getUserId, ids)); + userPostMapper.delete(new LambdaQueryWrapper().in(SysSaasUserPost::getUserId, ids)); // 防止更新失败导致的数据删除 int flag = baseMapper.deleteByIds(ids); if (flag < 1) { @@ -550,10 +550,10 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { * @return 用户信息集合信息 */ @Override - public List selectUserListByDept(Long deptId) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(Sys2User::getDeptId, deptId); - lqw.orderByAsc(Sys2User::getUserId); + public List selectUserListByDept(Long deptId) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(SysSaasUser::getDeptId, deptId); + lqw.orderByAsc(SysSaasUser::getUserId); return baseMapper.selectVoList(lqw); } @@ -566,9 +566,9 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { @Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId") @Override public String selectUserNameById(Long userId) { - Sys2User sys2User = baseMapper.selectOne(new LambdaQueryWrapper() - .select(Sys2User::getUserName).eq(Sys2User::getUserId, userId)); - return ObjectUtil.isNull(sys2User) ? null : sys2User.getUserName(); + SysSaasUser sysSaasUser = baseMapper.selectOne(new LambdaQueryWrapper() + .select(SysSaasUser::getUserName).eq(SysSaasUser::getUserId, userId)); + return ObjectUtil.isNull(sysSaasUser) ? null : sysSaasUser.getUserName(); } /** @@ -580,9 +580,9 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { @Override @Cacheable(cacheNames = CacheNames.SYS_NICKNAME, key = "#userId") public String selectNicknameById(Long userId) { - Sys2User sys2User = baseMapper.selectOne(new LambdaQueryWrapper() - .select(Sys2User::getNickName).eq(Sys2User::getUserId, userId)); - return ObjectUtil.isNull(sys2User) ? null : sys2User.getNickName(); + SysSaasUser sysSaasUser = baseMapper.selectOne(new LambdaQueryWrapper() + .select(SysSaasUser::getNickName).eq(SysSaasUser::getUserId, userId)); + return ObjectUtil.isNull(sysSaasUser) ? null : sysSaasUser.getNickName(); } /** @@ -611,9 +611,9 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { */ @Override public String selectPhonenumberById(Long userId) { - Sys2User sys2User = baseMapper.selectOne(new LambdaQueryWrapper() - .select(Sys2User::getPhonenumber).eq(Sys2User::getUserId, userId)); - return ObjectUtil.isNull(sys2User) ? null : sys2User.getPhonenumber(); + SysSaasUser sysSaasUser = baseMapper.selectOne(new LambdaQueryWrapper() + .select(SysSaasUser::getPhonenumber).eq(SysSaasUser::getUserId, userId)); + return ObjectUtil.isNull(sysSaasUser) ? null : sysSaasUser.getPhonenumber(); } /** @@ -624,9 +624,9 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { */ @Override public String selectEmailById(Long userId) { - Sys2User sys2User = baseMapper.selectOne(new LambdaQueryWrapper() - .select(Sys2User::getEmail).eq(Sys2User::getUserId, userId)); - return ObjectUtil.isNull(sys2User) ? null : sys2User.getEmail(); + SysSaasUser sysSaasUser = baseMapper.selectOne(new LambdaQueryWrapper() + .select(SysSaasUser::getEmail).eq(SysSaasUser::getUserId, userId)); + return ObjectUtil.isNull(sysSaasUser) ? null : sysSaasUser.getEmail(); } @Override @@ -634,18 +634,18 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { if (CollUtil.isEmpty(userIds)) { return List.of(); } - List list = baseMapper.selectVoList(new LambdaQueryWrapper() - .select(Sys2User::getUserId, Sys2User::getUserName, Sys2User::getNickName, Sys2User::getEmail, Sys2User::getPhonenumber) - .eq(Sys2User::getStatus, UserConstants.USER_NORMAL) - .in(CollUtil.isNotEmpty(userIds), Sys2User::getUserId, userIds)); + List list = baseMapper.selectVoList(new LambdaQueryWrapper() + .select(SysSaasUser::getUserId, SysSaasUser::getUserName, SysSaasUser::getNickName, SysSaasUser::getEmail, SysSaasUser::getPhonenumber) + .eq(SysSaasUser::getStatus, UserConstants.USER_NORMAL) + .in(CollUtil.isNotEmpty(userIds), SysSaasUser::getUserId, userIds)); return BeanUtil.copyToList(list, UserDTO.class); } @Override public List selectUserIdsByRoleIds(List roleIds) { - List userRoles = userRoleMapper.selectList( - new LambdaQueryWrapper().in(Sys2UserRole::getRoleId, roleIds)); - return StreamUtils.toList(userRoles, Sys2UserRole::getUserId); + List userRoles = userRoleMapper.selectList( + new LambdaQueryWrapper().in(SysSaasUserRole::getRoleId, roleIds)); + return StreamUtils.toList(userRoles, SysSaasUserRole::getUserId); } @Override @@ -653,9 +653,9 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { if (CollUtil.isEmpty(roleIds)) { return List.of(); } - List userRoles = userRoleMapper.selectList( - new LambdaQueryWrapper().in(Sys2UserRole::getRoleId, roleIds)); - List userIds = StreamUtils.toList(userRoles, Sys2UserRole::getUserId); + List userRoles = userRoleMapper.selectList( + new LambdaQueryWrapper().in(SysSaasUserRole::getRoleId, roleIds)); + List userIds = StreamUtils.toList(userRoles, SysSaasUserRole::getUserId); return selectListByIds(userIds); } @@ -664,10 +664,10 @@ public class Sys2UserServiceImpl implements ISys2UserService, SaasUserService { if (CollUtil.isEmpty(deptIds)) { return List.of(); } - List list = baseMapper.selectVoList(new LambdaQueryWrapper() - .select(Sys2User::getUserId, Sys2User::getUserName, Sys2User::getNickName, Sys2User::getEmail, Sys2User::getPhonenumber) - .eq(Sys2User::getStatus, UserConstants.USER_NORMAL) - .in(CollUtil.isNotEmpty(deptIds), Sys2User::getDeptId, deptIds)); + List list = baseMapper.selectVoList(new LambdaQueryWrapper() + .select(SysSaasUser::getUserId, SysSaasUser::getUserName, SysSaasUser::getNickName, SysSaasUser::getEmail, SysSaasUser::getPhonenumber) + .eq(SysSaasUser::getStatus, UserConstants.USER_NORMAL) + .in(CollUtil.isNotEmpty(deptIds), SysSaasUser::getDeptId, deptIds)); return BeanUtil.copyToList(list, UserDTO.class); } } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOperLogMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOperLogMapper.xml deleted file mode 100644 index e4b225ea8..000000000 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOperLogMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysRoleDeptMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysRoleDeptMapper.xml deleted file mode 100644 index 0baf6593e..000000000 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysRoleDeptMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysRoleMenuMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysRoleMenuMapper.xml deleted file mode 100644 index ad68f4fdd..000000000 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysRoleMenuMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysClientMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasClientMapper.xml similarity index 69% rename from ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysClientMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasClientMapper.xml index 271ec3ee5..d1d33b7fd 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysClientMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasClientMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDictTypeMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasConfigMapper.xml similarity index 70% rename from ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDictTypeMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasConfigMapper.xml index bee9cbddb..4241f006f 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDictTypeMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasDeptMapper.xml similarity index 61% rename from ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDeptMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasDeptMapper.xml index f603daf80..2e0d99f66 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDeptMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasDeptMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysConfigMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasDictDataMapper.xml similarity index 70% rename from ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysConfigMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasDictDataMapper.xml index 525648a6a..6803c94b6 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysConfigMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasDictDataMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDictDataMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasDictTypeMapper.xml similarity index 70% rename from ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDictDataMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasDictTypeMapper.xml index 8fe321028..924ad6dbe 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDictDataMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasDictTypeMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasLogininforMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasLogininforMapper.xml new file mode 100644 index 000000000..877aca682 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasLogininforMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysNoticeMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasNoticeMapper.xml similarity index 70% rename from ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysNoticeMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasNoticeMapper.xml index e66646dc9..d3803c5ae 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysNoticeMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasNoticeMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysLogininforMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasOperLogMapper.xml similarity index 74% rename from ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysLogininforMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasOperLogMapper.xml index bdc476791..7a4b4a67f 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysLogininforMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasOperLogMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasOssConfigMapper.xml similarity index 67% rename from ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasOssConfigMapper.xml index f9288fb45..c932b44fa 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasOssConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOssMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasOssMapper.xml similarity index 69% rename from ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOssMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasOssMapper.xml index 1a502a9d5..d8638a423 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOssMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasOssMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysPostMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasPostMapper.xml similarity index 84% rename from ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysPostMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasPostMapper.xml index 12d428eea..6ca3cdb6a 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysPostMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasPostMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasRoleMenuMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasRoleMenuMapper.xml new file mode 100644 index 000000000..3edfc6514 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasRoleMenuMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOssConfigMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasSocialMapper.xml similarity index 72% rename from ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOssConfigMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasSocialMapper.xml index 009cb8e7b..2638690af 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOssConfigMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasSocialMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantApplicationMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasTenantApplicationMapper.xml similarity index 65% rename from ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantApplicationMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasTenantApplicationMapper.xml index 6b0406090..cb5b8d8e4 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantApplicationMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasTenantApplicationMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSocialMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasTenantMapper.xml similarity index 68% rename from ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSocialMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasTenantMapper.xml index 6ee49bee6..0f79bf363 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSocialMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasTenantMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantPackageMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasTenantPackageMapper.xml similarity index 66% rename from ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantPackageMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasTenantPackageMapper.xml index f4927f0c8..64e9d2b1c 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantPackageMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasTenantPackageMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysUserMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasUserMapper.xml similarity index 85% rename from ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysUserMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasUserMapper.xml index b26db5831..2718eaefd 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasUserMapper.xml @@ -2,12 +2,12 @@ - + - + - + @@ -42,7 +42,7 @@ u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader, u1.user_name as leaderName from sys2_user u - left join sys2_dept d on u.dept_id = d.dept_id + left join sys_saas_dept d on u.dept_id = d.dept_id left join sys2_user u1 on u1.user_id = d.leader ${ew.getCustomSqlSegment} @@ -50,7 +50,7 @@ select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time from sys2_user u - left join sys2_dept d on u.dept_id = d.dept_id + left join sys_saas_dept d on u.dept_id = d.dept_id left join sys2_user_role sur on u.user_id = sur.user_id left join sys2_role r on r.role_id = sur.role_id ${ew.getCustomSqlSegment} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasUserPostMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasUserPostMapper.xml new file mode 100644 index 000000000..78d521a89 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasUserPostMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysUserRoleMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasUserRoleMapper.xml similarity index 84% rename from ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysUserRoleMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasUserRoleMapper.xml index 55c16bfd6..93015c87e 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysUserRoleMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasUserRoleMapper.xml @@ -2,7 +2,7 @@ - +