system-tenant 多应用多租户支持

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.bo.SysSaasLogininforBo;
-import org.dromara.system.saas.domain.vo.Sys2LogininforVo;
+import org.dromara.system.saas.domain.vo.SysSaasLogininforVo;
-import org.dromara.system.saas.service.ISys2LogininforService;
+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<Sys2LogininforVo> list(Sys2LogininforBo logininfor, PageQuery pageQuery) {
+    public TableDataInfo<SysSaasLogininforVo> 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) {
+    public void export(SysSaasLogininforBo logininfor, HttpServletResponse response) {
-        List<Sys2LogininforVo> list = logininforService.selectLogininforList(logininfor);
+        List<SysSaasLogininforVo> list = logininforService.selectLogininforList(logininfor);
-        ExcelUtil.exportExcel(list, "登录日志", Sys2LogininforVo.class, response);
+        ExcelUtil.exportExcel(list, "登录日志", SysSaasLogininforVo.class, response);
     }
 
     /**

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.bo.SysSaasOperLogBo;
-import org.dromara.system.saas.domain.vo.Sys2OperLogVo;
+import org.dromara.system.saas.domain.vo.SysSaasOperLogVo;
-import org.dromara.system.saas.service.ISys2OperLogService;
+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<Sys2OperLogVo> list(Sys2OperLogBo operLog, PageQuery pageQuery) {
+    public TableDataInfo<SysSaasOperLogVo> 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) {
+    public void export(SysSaasOperLogBo operLog, HttpServletResponse response) {
-        List<Sys2OperLogVo> list = operLogService.selectOperLogList(operLog);
+        List<SysSaasOperLogVo> list = operLogService.selectOperLogList(operLog);
-        ExcelUtil.exportExcel(list, "操作日志", Sys2OperLogVo.class, response);
+        ExcelUtil.exportExcel(list, "操作日志", SysSaasOperLogVo.class, response);
     }
 
     /**

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<Sys2UserOnline> list(String ipaddr, String userName) {
+    public TableDataInfo<SysSaasUserOnline> list(String ipaddr, String userName) {
         // 获取所有未过期的 token
         List<String> keys = StpUtil.searchTokenValue("", 0, -1, false);
         List<UserOnlineDTO> userOnlineDTOList = new ArrayList<>();
@@ -69,7 +69,7 @@ public class Sys2UserOnlineController extends BaseController {
         }
         Collections.reverse(userOnlineDTOList);
         userOnlineDTOList.removeAll(Collections.singleton(null));
-        List<Sys2UserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, Sys2UserOnline.class);
+        List<SysSaasUserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysSaasUserOnline.class);
         return TableDataInfo.build(userOnlineList);
     }
 
@@ -93,17 +93,17 @@ public class Sys2UserOnlineController extends BaseController {
      * 获取当前用户登录在线设备
      */
     @GetMapping()
-    public TableDataInfo<Sys2UserOnline> getInfo() {
+    public TableDataInfo<SysSaasUserOnline> getInfo() {
         // 获取指定账号 id 的 token 集合
         List<String> tokenIds = StpUtil.getTokenValueListByLoginId(StpUtil.getLoginIdAsString());
         List<UserOnlineDTO> 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<Sys2UserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, Sys2UserOnline.class);
+        List<SysSaasUserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysSaasUserOnline.class);
         return TableDataInfo.build(userOnlineList);
     }
 

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.SysSaasUserBo;
-import org.dromara.system.saas.domain.bo.Sys2UserPasswordBo;
+import org.dromara.system.saas.domain.bo.SysSaasUserPasswordBo;
-import org.dromara.system.saas.domain.bo.Sys2UserProfileBo;
+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.SysSaasOssVo;
-import org.dromara.system.saas.domain.vo.Sys2UserVo;
+import org.dromara.system.saas.domain.vo.SysSaasUserVo;
-import org.dromara.system.saas.service.ISys2OssService;
+import org.dromara.system.saas.service.ISysSaasOssService;
-import org.dromara.system.saas.service.ISys2UserService;
+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 ISysSaasUserService userService;
-    private final ISys2OssService ossService;
+    private final ISysSaasOssService ossService;
 
     /**
      * 个人信息
      */
     @GetMapping
     public R<TwoProfileVo> 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<Void> updateProfile(@Validated @RequestBody Sys2UserProfileBo profile) {
+    public R<Void> updateProfile(@Validated @RequestBody SysSaasUserProfileBo profile) {
-        Sys2UserBo user = BeanUtil.toBean(profile, Sys2UserBo.class);
+        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<Void> updatePwd(@Validated @RequestBody Sys2UserPasswordBo bo) {
+    public R<Void> updatePwd(@Validated @RequestBody SysSaasUserPasswordBo bo) {
-        Sys2UserVo user = userService.selectUserById(LoginHelper.getUserId());
+        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();

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.domain.vo.SysSaasClientVo;
-import org.dromara.system.saas.service.ISys2ClientService;
+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<Sys2ClientVo> list(Sys2ClientBo bo, PageQuery pageQuery) {
+    public TableDataInfo<SysSaasClientVo> 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) {
+    public void export(SysSaasClientBo bo, HttpServletResponse response) {
-        List<Sys2ClientVo> list = sysClientService.queryList(bo);
+        List<SysSaasClientVo> list = sysClientService.queryList(bo);
-        ExcelUtil.exportExcel(list, "客户端管理", Sys2ClientVo.class, response);
+        ExcelUtil.exportExcel(list, "客户端管理", SysSaasClientVo.class, response);
     }
 
     /**
@@ -63,7 +63,7 @@ public class Sys2ClientController extends BaseController {
      */
     @SaCheckPermission("system:client:query")
     @GetMapping("/{id}")
-    public R<Sys2ClientVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<SysSaasClientVo> 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<Void> add(@Validated(AddGroup.class) @RequestBody Sys2ClientBo bo) {
+    public R<Void> 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<Void> edit(@Validated(EditGroup.class) @RequestBody Sys2ClientBo bo) {
+    public R<Void> 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<Void> changeStatus(@RequestBody Sys2ClientBo bo) {
+    public R<Void> changeStatus(@RequestBody SysSaasClientBo bo) {
         return toAjax(sysClientService.updateUserStatus(bo.getClientId(), bo.getStatus()));
     }
 

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.bo.SysSaasConfigBo;
-import org.dromara.system.saas.domain.vo.Sys2ConfigVo;
+import org.dromara.system.saas.domain.vo.SysSaasConfigVo;
-import org.dromara.system.saas.service.ISys2ConfigService;
+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<Sys2ConfigVo> list(Sys2ConfigBo config, PageQuery pageQuery) {
+    public TableDataInfo<SysSaasConfigVo> 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) {
+    public void export(SysSaasConfigBo config, HttpServletResponse response) {
-        List<Sys2ConfigVo> list = configService.selectConfigList(config);
+        List<SysSaasConfigVo> list = configService.selectConfigList(config);
-        ExcelUtil.exportExcel(list, "参数数据", Sys2ConfigVo.class, response);
+        ExcelUtil.exportExcel(list, "参数数据", SysSaasConfigVo.class, response);
     }
 
     /**
@@ -58,7 +58,7 @@ public class Sys2ConfigController extends BaseController {
      */
     @SaCheckPermission("system:config:query")
     @GetMapping(value = "/{configId}")
-    public R<Sys2ConfigVo> getInfo(@PathVariable Long configId) {
+    public R<SysSaasConfigVo> 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<Void> add(@Validated @RequestBody Sys2ConfigBo config) {
+    public R<Void> 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<Void> edit(@Validated @RequestBody Sys2ConfigBo config) {
+    public R<Void> 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<Void> updateByKey(@RequestBody Sys2ConfigBo config) {
+    public R<Void> updateByKey(@RequestBody SysSaasConfigBo config) {
         configService.updateConfig(config);
         return R.ok();
     }

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.bo.SysSaasDeptBo;
-import org.dromara.system.saas.domain.vo.Sys2DeptVo;
+import org.dromara.system.saas.domain.vo.SysSaasDeptVo;
-import org.dromara.system.saas.service.ISys2DeptService;
+import org.dromara.system.saas.service.ISysSaasDeptService;
-import org.dromara.system.saas.service.ISys2PostService;
+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")
+@RequestMapping("/system/saasDept")
-public class Sys2DeptController extends BaseController {
+public class SysSaasDeptController extends BaseController {
 
-    private final ISys2DeptService deptService;
+    private final ISysSaasDeptService deptService;
-    private final ISys2PostService postService;
+    private final ISysSaasPostService postService;
 
     /**
      * 获取部门列表
      */
-    @SaCheckPermission("system:dept:list")
+    @SaCheckPermission("system:saasDept:list")
     @GetMapping("/list")
-    public R<List<Sys2DeptVo>> list(Sys2DeptBo dept) {
+    public R<List<SysSaasDeptVo>> list(SysSaasDeptBo dept) {
-        List<Sys2DeptVo> depts = deptService.selectDeptList(dept);
+        List<SysSaasDeptVo> 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<List<Sys2DeptVo>> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
+    public R<List<SysSaasDeptVo>> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
-        List<Sys2DeptVo> depts = deptService.selectDeptList(new Sys2DeptBo());
+        List<SysSaasDeptVo> 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<Sys2DeptVo> getInfo(@PathVariable Long deptId) {
+    public R<SysSaasDeptVo> 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<Void> add(@Validated @RequestBody Sys2DeptBo dept) {
+    public R<Void> 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<Void> edit(@Validated @RequestBody Sys2DeptBo dept) {
+    public R<Void> 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<Void> 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<List<Sys2DeptVo>> optionselect(@RequestParam(required = false) Long[] deptIds) {
+    public R<List<SysSaasDeptVo>> optionselect(@RequestParam(required = false) Long[] deptIds) {
         return R.ok(deptService.selectDeptByIds(deptIds == null ? null : List.of(deptIds)));
     }
 

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.bo.SysSaasDictDataBo;
-import org.dromara.system.saas.domain.vo.Sys2DictDataVo;
+import org.dromara.system.saas.domain.vo.SysSaasDictDataVo;
-import org.dromara.system.saas.service.ISys2DictDataService;
+import org.dromara.system.saas.service.ISysSaasDictDataService;
-import org.dromara.system.saas.service.ISys2DictTypeService;
+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 ISysSaasDictDataService dictDataService;
-    private final ISys2DictTypeService dictTypeService;
+    private final ISysSaasDictTypeService dictTypeService;
 
     /**
      * 查询字典数据列表
      */
     @SaCheckPermission("system:dict:list")
     @GetMapping("/list")
-    public TableDataInfo<Sys2DictDataVo> list(Sys2DictDataBo dictData, PageQuery pageQuery) {
+    public TableDataInfo<SysSaasDictDataVo> 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) {
+    public void export(SysSaasDictDataBo dictData, HttpServletResponse response) {
-        List<Sys2DictDataVo> list = dictDataService.selectDictDataList(dictData);
+        List<SysSaasDictDataVo> list = dictDataService.selectDictDataList(dictData);
-        ExcelUtil.exportExcel(list, "字典数据", Sys2DictDataVo.class, response);
+        ExcelUtil.exportExcel(list, "字典数据", SysSaasDictDataVo.class, response);
     }
 
     /**
@@ -62,7 +62,7 @@ public class Sys2DictDataController extends BaseController {
      */
     @SaCheckPermission("system:dict:query")
     @GetMapping(value = "/{dictCode}")
-    public R<Sys2DictDataVo> getInfo(@PathVariable Long dictCode) {
+    public R<SysSaasDictDataVo> 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<List<Sys2DictDataVo>> dictType(@PathVariable String dictType) {
+    public R<List<SysSaasDictDataVo>> dictType(@PathVariable String dictType) {
-        List<Sys2DictDataVo> data = dictTypeService.selectDictDataByType(dictType);
+        List<SysSaasDictDataVo> 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<Void> add(@Validated @RequestBody Sys2DictDataBo dict) {
+    public R<Void> 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<Void> edit(@Validated @RequestBody Sys2DictDataBo dict) {
+    public R<Void> edit(@Validated @RequestBody SysSaasDictDataBo dict) {
         if (!dictDataService.checkDictDataUnique(dict)) {
             return R.fail("修改字典数据'" + dict.getDictValue() + "'失败，字典键值已存在");
         }

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.bo.SysSaasDictTypeBo;
-import org.dromara.system.saas.domain.vo.Sys2DictTypeVo;
+import org.dromara.system.saas.domain.vo.SysSaasDictTypeVo;
-import org.dromara.system.saas.service.ISys2DictTypeService;
+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<Sys2DictTypeVo> list(Sys2DictTypeBo dictType, PageQuery pageQuery) {
+    public TableDataInfo<SysSaasDictTypeVo> 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) {
+    public void export(SysSaasDictTypeBo dictType, HttpServletResponse response) {
-        List<Sys2DictTypeVo> list = dictTypeService.selectDictTypeList(dictType);
+        List<SysSaasDictTypeVo> list = dictTypeService.selectDictTypeList(dictType);
-        ExcelUtil.exportExcel(list, "字典类型", Sys2DictTypeVo.class, response);
+        ExcelUtil.exportExcel(list, "字典类型", SysSaasDictTypeVo.class, response);
     }
 
     /**
@@ -58,7 +58,7 @@ public class Sys2DictTypeController extends BaseController {
      */
     @SaCheckPermission("system:dict:query")
     @GetMapping(value = "/{dictId}")
-    public R<Sys2DictTypeVo> getInfo(@PathVariable Long dictId) {
+    public R<SysSaasDictTypeVo> 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<Void> add(@Validated @RequestBody Sys2DictTypeBo dict) {
+    public R<Void> 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<Void> edit(@Validated @RequestBody Sys2DictTypeBo dict) {
+    public R<Void> 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<List<Sys2DictTypeVo>> optionselect() {
+    public R<List<SysSaasDictTypeVo>> optionselect() {
-        List<Sys2DictTypeVo> dictTypes = dictTypeService.selectDictTypeAll();
+        List<SysSaasDictTypeVo> dictTypes = dictTypeService.selectDictTypeAll();
         return R.ok(dictTypes);
     }
 }

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.bo.SysSaasNoticeBo;
-import org.dromara.system.saas.domain.vo.Sys2NoticeVo;
+import org.dromara.system.saas.domain.vo.SysSaasNoticeVo;
-import org.dromara.system.saas.service.ISys2NoticeService;
+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<Sys2NoticeVo> list(Sys2NoticeBo notice, PageQuery pageQuery) {
+    public TableDataInfo<SysSaasNoticeVo> 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<Sys2NoticeVo> getInfo(@PathVariable Long noticeId) {
+    public R<SysSaasNoticeVo> 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<Void> add(@Validated @RequestBody Sys2NoticeBo notice) {
+    public R<Void> 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<Void> edit(@Validated @RequestBody Sys2NoticeBo notice) {
+    public R<Void> edit(@Validated @RequestBody SysSaasNoticeBo notice) {
         return toAjax(noticeService.updateNotice(notice));
     }
 

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.bo.SysSaasOssConfigBo;
-import org.dromara.system.saas.domain.vo.Sys2OssConfigVo;
+import org.dromara.system.saas.domain.vo.SysSaasOssConfigVo;
-import org.dromara.system.saas.service.ISys2OssConfigService;
+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<Sys2OssConfigVo> list(@Validated(QueryGroup.class) Sys2OssConfigBo bo, PageQuery pageQuery) {
+    public TableDataInfo<SysSaasOssConfigVo> 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<Sys2OssConfigVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<SysSaasOssConfigVo> 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<Void> add(@Validated(AddGroup.class) @RequestBody Sys2OssConfigBo bo) {
+    public R<Void> 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<Void> edit(@Validated(EditGroup.class) @RequestBody Sys2OssConfigBo bo) {
+    public R<Void> 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<Void> changeStatus(@RequestBody Sys2OssConfigBo bo) {
+    public R<Void> changeStatus(@RequestBody SysSaasOssConfigBo bo) {
         return toAjax(ossConfigService.updateOssConfigStatus(bo));
     }
 }

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.bo.SysSaasOssBo;
-import org.dromara.system.saas.domain.vo.Sys2OssUploadVo;
+import org.dromara.system.saas.domain.vo.SysSaasOssUploadVo;
-import org.dromara.system.saas.domain.vo.Sys2OssVo;
+import org.dromara.system.saas.domain.vo.SysSaasOssVo;
-import org.dromara.system.saas.service.ISys2OssService;
+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<Sys2OssVo> list(@Validated(QueryGroup.class) Sys2OssBo bo, PageQuery pageQuery) {
+    public TableDataInfo<SysSaasOssVo> 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<List<Sys2OssVo>> listByIds(@NotEmpty(message = "主键不能为空")
+    public R<List<SysSaasOssVo>> listByIds(@NotEmpty(message = "主键不能为空")
                                        @PathVariable Long[] ossIds) {
-        List<Sys2OssVo> list = ossService.listByIds(Arrays.asList(ossIds));
+        List<SysSaasOssVo> 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<Sys2OssUploadVo> upload(@RequestPart("file") MultipartFile file) {
+    public R<SysSaasOssUploadVo> upload(@RequestPart("file") MultipartFile file) {
         if (ObjectUtil.isNull(file)) {
             return R.fail("上传文件不能为空");
         }
-        Sys2OssVo oss = ossService.upload(file);
+        SysSaasOssVo oss = ossService.upload(file);
-        Sys2OssUploadVo uploadVo = new Sys2OssUploadVo();
+        SysSaasOssUploadVo uploadVo = new SysSaasOssUploadVo();
         uploadVo.setUrl(oss.getUrl());
         uploadVo.setFileName(oss.getOriginalName());
         uploadVo.setOssId(oss.getOssId().toString());

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.bo.SysSaasPostBo;
-import org.dromara.system.saas.domain.vo.Sys2PostVo;
+import org.dromara.system.saas.domain.vo.SysSaasPostVo;
-import org.dromara.system.saas.service.ISys2PostService;
+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<Sys2PostVo> list(Sys2PostBo post, PageQuery pageQuery) {
+    public TableDataInfo<SysSaasPostVo> 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) {
+    public void export(SysSaasPostBo post, HttpServletResponse response) {
-        List<Sys2PostVo> list = postService.selectPostList(post);
+        List<SysSaasPostVo> list = postService.selectPostList(post);
-        ExcelUtil.exportExcel(list, "岗位数据", Sys2PostVo.class, response);
+        ExcelUtil.exportExcel(list, "岗位数据", SysSaasPostVo.class, response);
     }
 
     /**
@@ -61,7 +61,7 @@ public class Sys2PostController extends BaseController {
      */
     @SaCheckPermission("system:post:query")
     @GetMapping(value = "/{postId}")
-    public R<Sys2PostVo> getInfo(@PathVariable Long postId) {
+    public R<SysSaasPostVo> 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<Void> add(@Validated @RequestBody Sys2PostBo post) {
+    public R<Void> 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<Void> edit(@Validated @RequestBody Sys2PostBo post) {
+    public R<Void> 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<List<Sys2PostVo>> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) {
+    public R<List<SysSaasPostVo>> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) {
-        List<Sys2PostVo> list = new ArrayList<>();
+        List<SysSaasPostVo> 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) {

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.SysSaasUserRole;
-import org.dromara.system.saas.domain.bo.Sys2DeptBo;
+import org.dromara.system.saas.domain.bo.SysSaasDeptBo;
-import org.dromara.system.saas.domain.bo.Sys2RoleBo;
+import org.dromara.system.saas.domain.bo.SysSaasRoleBo;
-import org.dromara.system.saas.domain.bo.Sys2UserBo;
+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.SysSaasRoleVo;
-import org.dromara.system.saas.domain.vo.Sys2UserVo;
+import org.dromara.system.saas.domain.vo.SysSaasUserVo;
-import org.dromara.system.saas.service.ISys2DeptService;
+import org.dromara.system.saas.service.ISysSaasDeptService;
-import org.dromara.system.saas.service.ISys2RoleService;
+import org.dromara.system.saas.service.ISysSaasRoleService;
-import org.dromara.system.saas.service.ISys2UserService;
+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 ISysSaasRoleService roleService;
-    private final ISys2UserService userService;
+    private final ISysSaasUserService userService;
-    private final ISys2DeptService deptService;
+    private final ISysSaasDeptService deptService;
 
     /**
      * 获取角色信息列表
      */
     @SaCheckPermission("system:role:list")
     @GetMapping("/list")
-    public TableDataInfo<Sys2RoleVo> list(Sys2RoleBo role, PageQuery pageQuery) {
+    public TableDataInfo<SysSaasRoleVo> 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) {
+    public void export(SysSaasRoleBo role, HttpServletResponse response) {
-        List<Sys2RoleVo> list = roleService.selectRoleList(role);
+        List<SysSaasRoleVo> list = roleService.selectRoleList(role);
-        ExcelUtil.exportExcel(list, "角色数据", Sys2RoleVo.class, response);
+        ExcelUtil.exportExcel(list, "角色数据", SysSaasRoleVo.class, response);
     }
 
     /**
@@ -67,7 +67,7 @@ public class Sys2RoleController extends BaseController {
      */
     @SaCheckPermission("system:role:query")
     @GetMapping(value = "/{roleId}")
-    public R<Sys2RoleVo> getInfo(@PathVariable Long roleId) {
+    public R<SysSaasRoleVo> 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<Void> add(@Validated @RequestBody Sys2RoleBo role) {
+    public R<Void> 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<Void> edit(@Validated @RequestBody Sys2RoleBo role) {
+    public R<Void> 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<Void> dataScope(@RequestBody Sys2RoleBo role) {
+    public R<Void> 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<Void> changeStatus(@RequestBody Sys2RoleBo role) {
+    public R<Void> 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<List<Sys2RoleVo>> optionselect(@RequestParam(required = false) Long[] roleIds) {
+    public R<List<SysSaasRoleVo>> 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<Sys2UserVo> allocatedList(Sys2UserBo user, PageQuery pageQuery) {
+    public TableDataInfo<SysSaasUserVo> 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<Sys2UserVo> unallocatedList(Sys2UserBo user, PageQuery pageQuery) {
+    public TableDataInfo<SysSaasUserVo> 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<Void> cancelAuthUser(@RequestBody Sys2UserRole userRole) {
+    public R<Void> cancelAuthUser(@RequestBody SysSaasUserRole userRole) {
         return toAjax(roleService.deleteAuthUser(userRole));
     }
 
@@ -223,7 +223,7 @@ public class Sys2RoleController extends BaseController {
     public R<TwoDeptTreeSelectVo> 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);
     }
 }

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.domain.vo.SysSaasSocialVo;
-import org.dromara.system.saas.service.ISys2SocialService;
+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<Sys2SocialVo>> list() {
+    public R<List<SysSaasSocialVo>> list() {
         return R.ok(socialUserService.queryListByUserId(LoginHelper.getUserId()));
     }
 

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.bo.SysSaasTenantBo;
-import org.dromara.system.saas.domain.vo.Sys2TenantVo;
+import org.dromara.system.saas.domain.vo.SysSaasTenantVo;
-import org.dromara.system.saas.service.ISys2TenantService;
+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<Sys2TenantVo> list(Sys2TenantBo bo, PageQuery pageQuery) {
+    public TableDataInfo<SysSaasTenantVo> 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) {
+    public void export(SysSaasTenantBo bo, HttpServletResponse response) {
-        List<Sys2TenantVo> list = tenantService.queryList(bo);
+        List<SysSaasTenantVo> list = tenantService.queryList(bo);
-        ExcelUtil.exportExcel(list, "租户", Sys2TenantVo.class, response);
+        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<Sys2TenantVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<SysSaasTenantVo> 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<Void> add(@Validated(AddGroup.class) @RequestBody Sys2TenantBo bo) {
+    public R<Void> 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<Void> edit(@Validated(EditGroup.class) @RequestBody Sys2TenantBo bo) {
+    public R<Void> 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<Void> changeStatus(@RequestBody Sys2TenantBo bo) {
+    public R<Void> changeStatus(@RequestBody SysSaasTenantBo bo) {
         tenantService.checkTenantAllowed(bo.getTenantId());
         return toAjax(tenantService.updateTenantStatus(bo));
     }

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.bo.SysSaasTenantPackageBo;
-import org.dromara.system.saas.domain.vo.Sys2TenantPackageVo;
+import org.dromara.system.saas.domain.vo.SysSaasTenantPackageVo;
-import org.dromara.system.saas.service.ISys2TenantPackageService;
+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<Sys2TenantPackageVo> list(Sys2TenantPackageBo bo, PageQuery pageQuery) {
+    public TableDataInfo<SysSaasTenantPackageVo> 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<List<Sys2TenantPackageVo>> selectList() {
+    public R<List<SysSaasTenantPackageVo>> 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) {
+    public void export(SysSaasTenantPackageBo bo, HttpServletResponse response) {
-        List<Sys2TenantPackageVo> list = tenantPackageService.queryList(bo);
+        List<SysSaasTenantPackageVo> list = tenantPackageService.queryList(bo);
-        ExcelUtil.exportExcel(list, "租户套餐", Sys2TenantPackageVo.class, response);
+        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<Sys2TenantPackageVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<SysSaasTenantPackageVo> 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<Void> add(@Validated(AddGroup.class) @RequestBody Sys2TenantPackageBo bo) {
+    public R<Void> 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<Void> edit(@Validated(EditGroup.class) @RequestBody Sys2TenantPackageBo bo) {
+    public R<Void> 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<Void> changeStatus(@RequestBody Sys2TenantPackageBo bo) {
+    public R<Void> changeStatus(@RequestBody SysSaasTenantPackageBo bo) {
         return toAjax(tenantPackageService.updatePackageStatus(bo));
     }
 

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.SysSaasDeptBo;
-import org.dromara.system.saas.domain.bo.Sys2PostBo;
+import org.dromara.system.saas.domain.bo.SysSaasPostBo;
-import org.dromara.system.saas.domain.bo.Sys2RoleBo;
+import org.dromara.system.saas.domain.bo.SysSaasRoleBo;
-import org.dromara.system.saas.domain.bo.Sys2UserBo;
+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 ISysSaasUserService userService;
-    private final ISys2RoleService roleService;
+    private final ISysSaasRoleService roleService;
-    private final ISys2PostService postService;
+    private final ISysSaasPostService postService;
-    private final ISys2DeptService deptService;
+    private final ISysSaasDeptService deptService;
-    private final ISys2TenantService tenantService;
+    private final ISysSaasTenantService tenantService;
 
     /**
      * 获取用户列表
      */
     @SaCheckPermission("system:user:list")
     @GetMapping("/list")
-    public TableDataInfo<Sys2UserVo> list(Sys2UserBo user, PageQuery pageQuery) {
+    public TableDataInfo<SysSaasUserVo> 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) {
+    public void export(SysSaasUserBo user, HttpServletResponse response) {
-        List<Sys2UserExportVo> list = userService.selectUserExportList(user);
+        List<SysSaasUserExportVo> list = userService.selectUserExportList(user);
-        ExcelUtil.exportExcel(list, "用户数据", Sys2UserExportVo.class, response);
+        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<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
-        ExcelResult<Sys2UserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), Sys2UserImportVo.class, new SysUserImportListener(updateSupport));
+        ExcelResult<SysSaasUserImportVo> 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<Sys2UserInfoVo> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
+    public R<SysSaasUserInfoVo> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
         userService.checkUserDataScope(userId);
-        Sys2UserInfoVo userInfoVo = new Sys2UserInfoVo();
+        SysSaasUserInfoVo userInfoVo = new SysSaasUserInfoVo();
-        Sys2RoleBo roleBo = new Sys2RoleBo();
+        SysSaasRoleBo roleBo = new SysSaasRoleBo();
         roleBo.setStatus(UserConstants.ROLE_NORMAL);
-        List<Sys2RoleVo> roles = roleService.selectRoleList(roleBo);
+        List<SysSaasRoleVo> 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<Void> add(@Validated @RequestBody Sys2UserBo user) {
+    public R<Void> 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<Void> edit(@Validated @RequestBody Sys2UserBo user) {
+    public R<Void> 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<List<Sys2UserVo>> optionselect(@RequestParam(required = false) Long[] userIds,
+    public R<List<SysSaasUserVo>> optionselect(@RequestParam(required = false) Long[] userIds,
-                                            @RequestParam(required = false) Long deptId) {
+                                               @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<Void> resetPwd(@RequestBody Sys2UserBo user) {
+    public R<Void> 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<Void> changeStatus(@RequestBody Sys2UserBo user) {
+    public R<Void> 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<Sys2UserInfoVo> authRole(@PathVariable Long userId) {
+    public R<SysSaasUserInfoVo> authRole(@PathVariable Long userId) {
         userService.checkUserDataScope(userId);
-        Sys2UserVo user = userService.selectUserById(userId);
+        SysSaasUserVo user = userService.selectUserById(userId);
-        List<Sys2RoleVo> roles = roleService.selectRolesAuthByUserId(userId);
+        List<SysSaasRoleVo> roles = roleService.selectRolesAuthByUserId(userId);
-        Sys2UserInfoVo userInfoVo = new Sys2UserInfoVo();
+        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<List<Tree<Long>>> deptTree(Sys2DeptBo dept) {
+    public R<List<Tree<Long>>> 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<List<Sys2UserVo>> listByDept(@PathVariable @NotNull Long deptId) {
+    public R<List<SysSaasUserVo>> listByDept(@PathVariable @NotNull Long deptId) {
         return R.ok(userService.selectUserListByDept(deptId));
     }
 

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;

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;

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 {
 
     /**
      * 参数主键

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")
+@TableName("sys_saas_dept")
-public class Sys2Dept extends TenantEntity {
+public class SysSaasDept extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;

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 {
 
     /**
      * 字典编码

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 {
 
     /**
      * 字典主键

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;

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

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;

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 {
 
     /**
      * 对象存储主键

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 {
 
     /**
      * 主键

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 {
 
     /**
      * 岗位序号

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;
     }
 

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")
+@TableName("sys_saas_role_dept")
-public class Sys2RoleDept {
+public class SysSaasRoleDept {
 
     /**
      * 角色ID

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

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;

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;

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;

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;

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;
     }
 

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 {
 
     /**
      * 会话编号

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

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

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)
+@AutoMapper(target = SysSaasClient.class, reverseConvertGenerate = false)
-public class Sys2ClientBo extends BaseEntity {
+public class SysSaasClientBo extends BaseEntity {
 
     /**
      * id

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)
+@AutoMapper(target = SysSaasConfig.class, reverseConvertGenerate = false)
-public class Sys2ConfigBo extends BaseEntity {
+public class SysSaasConfigBo extends BaseEntity {
 
     /**
      * 参数主键

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)
+@AutoMapper(target = SysSaasDept.class, reverseConvertGenerate = false)
-public class Sys2DeptBo extends BaseEntity {
+public class SysSaasDeptBo extends BaseEntity {
 
     /**
      * 部门id

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)
+@AutoMapper(target = SysSaasDictData.class, reverseConvertGenerate = false)
-public class Sys2DictDataBo extends BaseEntity {
+public class SysSaasDictDataBo extends BaseEntity {
 
     /**
      * 字典编码

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)
+@AutoMapper(target = SysSaasDictType.class, reverseConvertGenerate = false)
-public class Sys2DictTypeBo extends BaseEntity {
+public class SysSaasDictTypeBo extends BaseEntity {
 
     /**
      * 字典主键

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)
+@AutoMapper(target = SysSaasLogininfor.class, reverseConvertGenerate = false)
-public class Sys2LogininforBo {
+public class SysSaasLogininforBo {
 
     /**
      * 访问ID

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)
+@AutoMapper(target = SysSaasNotice.class, reverseConvertGenerate = false)
-public class Sys2NoticeBo extends BaseEntity {
+public class SysSaasNoticeBo extends BaseEntity {
 
     /**
      * 公告ID

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 {
 
     /**
      * 日志主键

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)
+@AutoMapper(target = SysSaasOss.class, reverseConvertGenerate = false)
-public class Sys2OssBo extends BaseEntity {
+public class SysSaasOssBo extends BaseEntity {
 
     /**
      * ossId

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)
+@AutoMapper(target = SysSaasOssConfig.class, reverseConvertGenerate = false)
-public class Sys2OssConfigBo extends BaseEntity {
+public class SysSaasOssConfigBo extends BaseEntity {
 
     /**
      * 主键

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)
+@AutoMapper(target = SysSaasPost.class, reverseConvertGenerate = false)
-public class Sys2PostBo extends BaseEntity {
+public class SysSaasPostBo extends BaseEntity {
 
     /**
      * 岗位ID

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)
+@AutoMapper(target = SysSaasRole.class, reverseConvertGenerate = false)
-public class Sys2RoleBo extends BaseEntity {
+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;
     }
 

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)
+@AutoMapper(target = SysSaasSocial.class, reverseConvertGenerate = false)
-public class Sys2SocialBo extends TenantEntity {
+public class SysSaasSocialBo extends TenantEntity {
 
     /**
      * 主键

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)
+@AutoMapper(target = SysSaasTenantApplication.class, reverseConvertGenerate = false)
-public class Sys2TenantApplicationBo extends BaseEntity {
+public class SysSaasTenantApplicationBo extends BaseEntity {
 
     @NotNull(message = "租户ID不能为空", groups = {EditGroup.class})
     private Long tenantId;

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)
+@AutoMapper(target = SysSaasTenant.class, reverseConvertGenerate = false)
-public class Sys2TenantBo extends BaseEntity {
+public class SysSaasTenantBo extends BaseEntity {
 
     /**
      * id

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)
+@AutoMapper(target = SysSaasTenantPackage.class, reverseConvertGenerate = false)
-public class Sys2TenantPackageBo extends BaseEntity {
+public class SysSaasTenantPackageBo extends BaseEntity {
 
     /**
      * 租户套餐id

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)
+@AutoMapper(target = SysSaasUser.class, reverseConvertGenerate = false)
-public class Sys2UserBo extends BaseEntity {
+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;
     }
 

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;

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 {
 
     /**
      * 用户昵称

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)
+@AutoMapper(target = SysSaasClient.class)
-public class Sys2ClientVo implements Serializable {
+public class SysSaasClientVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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)
+@AutoMapper(target = SysSaasConfig.class)
-public class Sys2ConfigVo implements Serializable {
+public class SysSaasConfigVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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)
+@AutoMapper(target = SysSaasDept.class)
-public class Sys2DeptVo implements Serializable {
+public class SysSaasDeptVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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)
+@AutoMapper(target = SysSaasDictData.class)
-public class Sys2DictDataVo implements Serializable {
+public class SysSaasDictDataVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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)
+@AutoMapper(target = SysSaasDictType.class)
-public class Sys2DictTypeVo implements Serializable {
+public class SysSaasDictTypeVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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)
+@AutoMapper(target = SysSaasLogininfor.class)
-public class Sys2LogininforVo implements Serializable {
+public class SysSaasLogininforVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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)
+@AutoMapper(target = SysSaasNotice.class)
-public class Sys2NoticeVo implements Serializable {
+public class SysSaasNoticeVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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)
+@AutoMapper(target = SysSaasOperLog.class)
-public class Sys2OperLogVo implements Serializable {
+public class SysSaasOperLogVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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)
+@AutoMapper(target = SysSaasOssConfig.class)
-public class Sys2OssConfigVo implements Serializable {
+public class SysSaasOssConfigVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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地址

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)
+@AutoMapper(target = SysSaasOss.class)
-public class Sys2OssVo implements Serializable {
+public class SysSaasOssVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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)
+@AutoMapper(target = SysSaasPost.class)
-public class Sys2PostVo implements Serializable {
+public class SysSaasPostVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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)
+@AutoMapper(target = SysSaasRole.class)
-public class Sys2RoleVo implements Serializable {
+public class SysSaasRoleVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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)
+@AutoMapper(target = SysSaasSocial.class)
-public class Sys2SocialVo implements Serializable {
+public class SysSaasSocialVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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)
+@AutoMapper(target = SysSaasTenantApplication.class)
-public class Sys2TenantApplicationVo implements Serializable {
+public class SysSaasTenantApplicationVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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)
+@AutoMapper(target = SysSaasTenantPackage.class)
-public class Sys2TenantPackageVo implements Serializable {
+public class SysSaasTenantPackageVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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)
+@AutoMapper(target = SysSaasTenant.class)
-public class Sys2TenantVo implements Serializable {
+public class SysSaasTenantVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

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;

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;

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<Sys2RoleVo> roles;
+    private List<SysSaasRoleVo> roles;
 
     /**
      * 岗位ID列表
@@ -35,6 +35,6 @@ public class Sys2UserInfoVo {
     /**
      * 岗位列表
      */
-    private List<Sys2PostVo> posts;
+    private List<SysSaasPostVo> posts;
 
 }

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)
+@AutoMapper(target = SysSaasUser.class)
-public class Sys2UserVo implements Serializable {
+public class SysSaasUserVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -122,7 +122,7 @@ public class Sys2UserVo implements Serializable {
     /**
      * 角色对象
      */
-    private List<Sys2RoleVo> roles;
+    private List<SysSaasRoleVo> roles;
 
     /**
      * 角色组

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;
 
     /**
      * 用户所属角色组

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;
 
     /**
      * 菜单权限

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.bo.SysSaasUserBo;
-import org.dromara.system.saas.domain.vo.Sys2UserImportVo;
+import org.dromara.system.saas.domain.vo.SysSaasUserImportVo;
-import org.dromara.system.saas.domain.vo.Sys2UserVo;
+import org.dromara.system.saas.domain.vo.SysSaasUserVo;
-import org.dromara.system.saas.service.ISys2ConfigService;
+import org.dromara.system.saas.service.ISysSaasConfigService;
-import org.dromara.system.saas.service.ISys2UserService;
+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<Sys2UserImportVo> implements ExcelListener<Sys2UserImportVo> {
+public class SysUserImportListener extends AnalysisEventListener<SysSaasUserImportVo> implements ExcelListener<SysSaasUserImportVo> {
 
-    private final ISys2UserService userService;
+    private final ISysSaasUserService userService;
 
     private final String password;
 
@@ -42,20 +42,20 @@ public class SysUserImportListener extends AnalysisEventListener<Sys2UserImportV
     private final StringBuilder failureMsg = new StringBuilder();
 
     public SysUserImportListener(Boolean isUpdateSupport) {
-        String initPassword = SpringUtils.getBean(ISys2ConfigService.class).selectConfigByKey("sys.user.initPassword");
+        String initPassword = SpringUtils.getBean(ISysSaasConfigService.class).selectConfigByKey("sys.user.initPassword");
-        this.userService = SpringUtils.getBean(ISys2UserService.class);
+        this.userService = SpringUtils.getBean(ISysSaasUserService.class);
         this.password = BCrypt.hashpw(initPassword);
         this.isUpdateSupport = isUpdateSupport;
         this.operUserId = LoginHelper.getUserId();
     }
 
     @Override
-    public void invoke(Sys2UserImportVo userVo, AnalysisContext context) {
+    public void invoke(SysSaasUserImportVo userVo, AnalysisContext context) {
-        Sys2UserVo sysUser = this.userService.selectUserByUserName(userVo.getUserName());
+        SysSaasUserVo sysUser = this.userService.selectUserByUserName(userVo.getUserName());
         try {
             // 验证是否存在这个用户
             if (ObjectUtil.isNull(sysUser)) {
-                Sys2UserBo user = BeanUtil.toBean(userVo, Sys2UserBo.class);
+                SysSaasUserBo user = BeanUtil.toBean(userVo, SysSaasUserBo.class);
                 ValidatorUtils.validate(user);
                 user.setPassword(password);
                 user.setCreateBy(operUserId);
@@ -64,7 +64,7 @@ public class SysUserImportListener extends AnalysisEventListener<Sys2UserImportV
                 successMsg.append("<br/>").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<Sys2UserImportV
     }
 
     @Override
-    public ExcelResult<Sys2UserImportVo> getExcelResult() {
+    public ExcelResult<SysSaasUserImportVo> getExcelResult() {
         return new ExcelResult<>() {
 
             @Override
@@ -106,7 +106,7 @@ public class SysUserImportListener extends AnalysisEventListener<Sys2UserImportV
             }
 
             @Override
-            public List<Sys2UserImportVo> getList() {
+            public List<SysSaasUserImportVo> getList() {
                 return null;
             }
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DictDataMapper.java

@@ -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<Sys2DictData, Sys2DictDataVo> {
-
-    default List<Sys2DictDataVo> selectDictDataByType(String dictType) {
-        return selectVoList(
-            new LambdaQueryWrapper<Sys2DictData>()
-                .eq(Sys2DictData::getDictType, dictType)
-                .orderByAsc(Sys2DictData::getDictSort));
-    }
-}

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DictTypeMapper.java

@@ -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<Sys2DictType, Sys2DictTypeVo> {
-
-}

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantApplicationMapper.java

@@ -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<Sys2TenantApplication, Sys2TenantApplicationVo> {
-
-}

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantPackageMapper.java

@@ -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<Sys2TenantPackage, Sys2TenantPackageVo> {
-
-}

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.SysSaasClient;
-import org.dromara.system.saas.domain.vo.Sys2ClientVo;
+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<Sys2Client, Sys2ClientVo> {
+public interface SysSaasClientMapper extends BaseMapperPlus<SysSaasClient, SysSaasClientVo> {
 
 }

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.SysSaasConfig;
-import org.dromara.system.saas.domain.vo.Sys2ConfigVo;
+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<Sys2Config, Sys2ConfigVo> {
+public interface SysSaasConfigMapper extends BaseMapperPlus<SysSaasConfig, SysSaasConfigVo> {
 
 }

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.SysSaasDept;
-import org.dromara.system.saas.domain.vo.Sys2DeptVo;
+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<Sys2Dept, Sys2DeptVo> {
+public interface SysSaasDeptMapper extends BaseMapperPlus<SysSaasDept, SysSaasDeptVo> {
 
     /**
      * 查询部门管理数据
@@ -29,7 +29,7 @@ public interface Sys2DeptMapper extends BaseMapperPlus<Sys2Dept, Sys2DeptVo> {
     @DataPermission({
         @DataColumn(key = "deptName", value = "dept_id")
     })
-    List<Sys2DeptVo> selectDeptList(@Param(Constants.WRAPPER) Wrapper<Sys2Dept> queryWrapper);
+    List<SysSaasDeptVo> selectDeptList(@Param(Constants.WRAPPER) Wrapper<SysSaasDept> queryWrapper);
 
     @DataPermission({
         @DataColumn(key = "deptName", value = "dept_id")

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<SysSaasDictData, SysSaasDictDataVo> {
+
+    default List<SysSaasDictDataVo> selectDictDataByType(String dictType) {
+        return selectVoList(
+            new LambdaQueryWrapper<SysSaasDictData>()
+                .eq(SysSaasDictData::getDictType, dictType)
+                .orderByAsc(SysSaasDictData::getDictSort));
+    }
+}

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<SysSaasDictType, SysSaasDictTypeVo> {
+
+}

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.SysSaasLogininfor;
-import org.dromara.system.saas.domain.vo.Sys2LogininforVo;
+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<Sys2Logininfor, Sys2LogininforVo> {
+public interface SysSaasLogininforMapper extends BaseMapperPlus<SysSaasLogininfor, SysSaasLogininforVo> {
 
 }

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.SysSaasNotice;
-import org.dromara.system.saas.domain.vo.Sys2NoticeVo;
+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<Sys2Notice, Sys2NoticeVo> {
+public interface SysSaasNoticeMapper extends BaseMapperPlus<SysSaasNotice, SysSaasNoticeVo> {
 
 }

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.SysSaasOperLog;
-import org.dromara.system.saas.domain.vo.Sys2OperLogVo;
+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<Sys2OperLog, Sys2OperLogVo> {
+public interface SysSaasOperLogMapper extends BaseMapperPlus<SysSaasOperLog, SysSaasOperLogVo> {
 
 }

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.SysSaasOssConfig;
-import org.dromara.system.saas.domain.vo.Sys2OssConfigVo;
+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<Sys2OssConfig, Sys2OssConfigVo> {
+public interface SysSaasOssConfigMapper extends BaseMapperPlus<SysSaasOssConfig, SysSaasOssConfigVo> {
 
 }

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.SysSaasOss;
-import org.dromara.system.saas.domain.vo.Sys2OssVo;
+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<Sys2Oss, Sys2OssVo> {
+public interface SysSaasOssMapper extends BaseMapperPlus<SysSaasOss, SysSaasOssVo> {
 }

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.SysSaasPost;
-import org.dromara.system.saas.domain.vo.Sys2PostVo;
+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<Sys2Post, Sys2PostVo> {
+public interface SysSaasPostMapper extends BaseMapperPlus<SysSaasPost, SysSaasPostVo> {
 
     @DataPermission({
         @DataColumn(key = "deptName", value = "dept_id"),
         @DataColumn(key = "userName", value = "create_by")
     })
-    Page<Sys2PostVo> selectPagePostList(@Param("page") Page<Sys2PostVo> page, @Param(Constants.WRAPPER) Wrapper<Sys2Post> queryWrapper);
+    Page<SysSaasPostVo> selectPagePostList(@Param("page") Page<SysSaasPostVo> page, @Param(Constants.WRAPPER) Wrapper<SysSaasPost> queryWrapper);
 
     /**
      * 查询用户所属岗位组
@@ -33,6 +33,6 @@ public interface Sys2PostMapper extends BaseMapperPlus<Sys2Post, Sys2PostVo> {
      * @param userId 用户ID
      * @return 结果
      */
-    List<Sys2PostVo> selectPostsByUserId(Long userId);
+    List<SysSaasPostVo> selectPostsByUserId(Long userId);
 
 }

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<Sys2RoleDept, Sys2RoleDept> {
+public interface SysSaasRoleDeptMapper extends BaseMapperPlus<SysSaasRoleDept, SysSaasRoleDept> {
 
 }