From cf9027c7e932f607e2de0c9edfaca427eedb3d2e Mon Sep 17 00:00:00 2001 From: Github_lizhw <171332584@qq.com> Date: Sun, 13 Oct 2024 23:37:31 +0800 Subject: [PATCH] =?UTF-8?q?system-tenant=20=E5=A4=9A=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 + ruoyi-admin/pom.xml | 5 + ruoyi-modules/pom.xml | 2 +- .../pom.xml | 2 +- .../monitor/Sys2LogininforController.java} | 22 +- .../monitor/Sys2OperlogController.java} | 22 +- .../monitor/Sys2UserOnlineController.java} | 18 +- .../system/Sys2ApplicationController.java} | 28 +- .../system/Sys2ClientController.java} | 30 +- .../system/Sys2ConfigController.java} | 30 +- .../system/Sys2DeptController.java} | 34 +- .../system/Sys2DictDataController.java} | 36 +- .../system/Sys2DictTypeController.java} | 32 +- .../system/Sys2NoticeController.java} | 28 +- .../system/Sys2OssConfigController.java} | 24 +- .../controller/system/Sys2OssController.java} | 28 +- .../system/Sys2PostController.java} | 34 +- .../system/Sys2ProfileController.java} | 60 +- .../system/Sys2RoleController.java} | 64 +- .../system/Sys2SocialController.java} | 14 +- .../system/Sys2TenantController.java} | 30 +- .../system/Sys2TenantPackageController.java} | 32 +- .../system/Sys2UserController.java} | 94 +- .../system/SysSaasMenuController.java} | 66 +- .../system/saas/domain/Sys2Application.java} | 8 +- .../system/saas/domain/Sys2Cache.java} | 8 +- .../system/saas/domain/Sys2Client.java} | 8 +- .../system/saas/domain/Sys2Config.java} | 8 +- .../dromara/system/saas/domain/Sys2Dept.java} | 8 +- .../system/saas/domain/Sys2DictData.java} | 8 +- .../system/saas/domain/Sys2DictType.java} | 8 +- .../system/saas/domain/Sys2Logininfor.java} | 8 +- .../system/saas/domain/Sys2Notice.java} | 8 +- .../system/saas/domain/Sys2OperLog.java} | 6 +- .../dromara/system/saas/domain/Sys2Oss.java} | 6 +- .../system/saas/domain/Sys2OssConfig.java} | 8 +- .../dromara/system/saas/domain/Sys2Post.java} | 8 +- .../dromara/system/saas/domain/Sys2Role.java} | 10 +- .../system/saas/domain/Sys2RoleDept.java} | 8 +- .../system/saas/domain/Sys2RoleMenu.java} | 8 +- .../system/saas/domain/Sys2Social.java} | 8 +- .../system/saas/domain/Sys2Tenant.java} | 8 +- .../saas/domain/Sys2TenantApplication.java} | 8 +- .../saas/domain/Sys2TenantPackage.java} | 8 +- .../dromara/system/saas/domain/Sys2User.java} | 12 +- .../system/saas/domain/Sys2UserOnline.java} | 4 +- .../system/saas/domain/Sys2UserPost.java} | 8 +- .../system/saas/domain/Sys2UserRole.java} | 8 +- .../system/saas/domain/SysSaasMenu.java} | 17 +- .../saas/domain/bo/Sys2ApplicationBo.java} | 10 +- .../system/saas/domain/bo/Sys2ClientBo.java} | 10 +- .../system/saas/domain/bo/Sys2ConfigBo.java} | 10 +- .../system/saas/domain/bo/Sys2DeptBo.java} | 10 +- .../saas/domain/bo/Sys2DictDataBo.java} | 10 +- .../saas/domain/bo/Sys2DictTypeBo.java} | 10 +- .../saas/domain/bo/Sys2LogininforBo.java} | 10 +- .../system/saas/domain/bo/Sys2NoticeBo.java} | 10 +- .../system/saas/domain/bo/Sys2OperLogBo.java} | 10 +- .../system/saas/domain/bo/Sys2OssBo.java} | 10 +- .../saas/domain/bo/Sys2OssConfigBo.java} | 10 +- .../system/saas/domain/bo/Sys2PostBo.java} | 10 +- .../system/saas/domain/bo/Sys2RoleBo.java} | 12 +- .../system/saas/domain/bo/Sys2SocialBo.java} | 10 +- .../domain/bo/Sys2TenantApplicationBo.java} | 10 +- .../system/saas/domain/bo/Sys2TenantBo.java} | 10 +- .../saas/domain/bo/Sys2TenantPackageBo.java} | 10 +- .../system/saas/domain/bo/Sys2UserBo.java} | 14 +- .../saas/domain/bo/Sys2UserPasswordBo.java} | 4 +- .../saas/domain/bo/Sys2UserProfileBo.java} | 4 +- .../system/saas/domain/bo/SysSaasMenuBo.java} | 10 +- .../saas/domain/vo/Sys2ApplicationVo.java} | 10 +- .../system/saas/domain/vo/Sys2ClientVo.java} | 10 +- .../system/saas/domain/vo/Sys2ConfigVo.java} | 12 +- .../system/saas/domain/vo/Sys2DeptVo.java} | 12 +- .../saas/domain/vo/Sys2DictDataVo.java} | 12 +- .../saas/domain/vo/Sys2DictTypeVo.java} | 10 +- .../saas/domain/vo/Sys2LogininforVo.java} | 14 +- .../system/saas/domain/vo/Sys2NoticeVo.java} | 10 +- .../system/saas/domain/vo/Sys2OperLogVo.java} | 14 +- .../saas/domain/vo/Sys2OssConfigVo.java} | 10 +- .../saas/domain/vo/Sys2OssUploadVo.java} | 4 +- .../system/saas/domain/vo/Sys2OssVo.java} | 10 +- .../system/saas/domain/vo/Sys2PostVo.java} | 12 +- .../system/saas/domain/vo/Sys2RoleVo.java} | 12 +- .../system/saas/domain/vo/Sys2SocialVo.java} | 10 +- .../domain/vo/Sys2TenantApplicationVo.java} | 10 +- .../saas/domain/vo/Sys2TenantPackageVo.java} | 10 +- .../system/saas/domain/vo/Sys2TenantVo.java} | 10 +- .../saas/domain/vo/Sys2UserExportVo.java} | 10 +- .../saas/domain/vo/Sys2UserImportVo.java} | 8 +- .../saas/domain/vo/Sys2UserInfoVo.java} | 10 +- .../system/saas/domain/vo/Sys2UserVo.java} | 14 +- .../system/saas/domain/vo/SysSaasMenuVo.java} | 19 +- .../system/saas/domain/vo/TwoAvatarVo.java} | 4 +- .../saas/domain/vo/TwoCacheListInfoVo.java} | 4 +- .../saas/domain/vo/TwoDeptTreeSelectVo.java} | 4 +- .../saas/domain/vo/TwoMenuTreeSelectVo.java} | 4 +- .../system/saas/domain/vo/TwoMetaVo.java} | 12 +- .../system/saas/domain/vo/TwoProfileVo.java} | 6 +- .../system/saas/domain/vo/TwoRouterVo.java} | 8 +- .../system/saas/domain/vo/TwoUserInfoVo.java} | 6 +- .../saas}/listener/SysUserImportListener.java | 32 +- .../saas/mapper/Sys2ApplicationMapper.java | 17 + .../system/saas/mapper/Sys2ClientMapper.java | 17 + .../system/saas/mapper/Sys2ConfigMapper.java | 16 + .../system/saas/mapper/Sys2DeptMapper.java} | 12 +- .../saas/mapper/Sys2DictDataMapper.java | 25 + .../saas/mapper/Sys2DictTypeMapper.java | 16 + .../saas/mapper/Sys2LogininforMapper.java | 16 + .../system/saas/mapper/Sys2NoticeMapper.java | 16 + .../system/saas/mapper/Sys2OperLogMapper.java | 16 + .../saas/mapper/Sys2OssConfigMapper.java | 18 + .../system/saas/mapper/Sys2OssMapper.java | 15 + .../system/saas/mapper/Sys2PostMapper.java} | 14 +- .../saas/mapper/Sys2RoleDeptMapper.java | 15 + .../system/saas/mapper/Sys2RoleMapper.java} | 20 +- .../saas/mapper/Sys2RoleMenuMapper.java | 15 + .../system/saas/mapper/Sys2SocialMapper.java | 16 + .../mapper/Sys2TenantApplicationMapper.java | 17 + .../system/saas/mapper/Sys2TenantMapper.java | 16 + .../saas/mapper/Sys2TenantPackageMapper.java | 16 + .../system/saas/mapper/Sys2UserMapper.java} | 26 +- .../saas/mapper/Sys2UserPostMapper.java | 15 + .../saas/mapper/Sys2UserRoleMapper.java | 19 + .../saas/mapper/SysSaasMenuMapper.java} | 26 +- .../runner/System2ApplicationRunner.java} | 8 +- .../service/ISys2ApplicationService.java} | 18 +- .../saas/service/ISys2ClientService.java} | 20 +- .../saas/service/ISys2ConfigService.java} | 20 +- .../saas/service/ISys2DataScopeService.java} | 4 +- .../saas/service/ISys2DeptService.java} | 24 +- .../saas/service/ISys2DictDataService.java} | 20 +- .../saas/service/ISys2DictTypeService.java} | 28 +- .../saas/service/ISys2LogininforService.java} | 14 +- .../saas/service/ISys2NoticeService.java} | 18 +- .../saas/service/ISys2OperLogService.java} | 16 +- .../saas/service/ISys2OssConfigService.java} | 18 +- .../system/saas/service/ISys2OssService.java} | 30 +- .../saas/service/ISys2PermissionService.java} | 4 +- .../saas/service/ISys2PostService.java} | 26 +- .../saas/service/ISys2RoleService.java} | 38 +- .../saas/service/ISys2SocialService.java} | 20 +- .../ISys2TenantApplicationService.java} | 18 +- .../service/ISys2TenantPackageService.java} | 24 +- .../saas/service/ISys2TenantService.java} | 24 +- .../saas/service/ISys2UserService.java} | 42 +- .../saas/service/ISysSaasMenuService.java} | 30 +- .../impl/Sys2ApplicationServiceImpl.java} | 46 +- .../service/impl/Sys2ClientServiceImpl.java} | 64 +- .../service/impl/Sys2ConfigServiceImpl.java} | 72 +- .../impl/Sys2DataScopeServiceImpl.java} | 35 +- .../service/impl/Sys2DeptServiceImpl.java} | 140 +- .../impl/Sys2DictDataServiceImpl.java} | 64 +- .../impl/Sys2DictTypeServiceImpl.java} | 102 +- .../impl/Sys2LogininforServiceImpl.java} | 58 +- .../service/impl/Sys2NoticeServiceImpl.java} | 58 +- .../service/impl/Sys2OperLogServiceImpl.java} | 64 +- .../impl/Sys2OssConfigServiceImpl.java} | 92 +- .../service/impl/Sys2OssServiceImpl.java} | 98 +- .../impl/Sys2PermissionServiceImpl.java} | 14 +- .../service/impl/Sys2PostServiceImpl.java} | 106 +- .../service/impl/Sys2RoleServiceImpl.java} | 168 +-- .../impl/Sys2SensitiveServiceImpl.java} | 4 +- .../service/impl/Sys2SocialServiceImpl.java} | 46 +- .../Sys2TenantApplicationServiceImpl.java} | 42 +- .../impl/Sys2TenantPackageServiceImpl.java} | 72 +- .../service/impl/Sys2TenantServiceImpl.java} | 162 ++- .../service/impl/Sys2UserServiceImpl.java} | 262 ++-- .../service/impl/SysSaasMenuServiceImpl.java} | 162 +-- .../src/main/resources/mapper/package-info.md | 0 .../systemTenant}/SysApplicationMapper.xml | 2 +- .../mapper/systemTenant}/SysClientMapper.xml | 2 +- .../mapper/systemTenant/SysConfigMapper.xml | 7 + .../mapper/systemTenant}/SysDeptMapper.xml | 14 +- .../systemTenant/SysDictDataMapper.xml} | 2 +- .../systemTenant}/SysDictTypeMapper.xml | 2 +- .../systemTenant/SysLogininforMapper.xml | 7 + .../mapper/systemTenant}/SysNoticeMapper.xml | 2 +- .../mapper/systemTenant/SysOperLogMapper.xml} | 2 +- .../systemTenant}/SysOssConfigMapper.xml | 2 +- .../mapper/systemTenant}/SysOssMapper.xml | 2 +- .../mapper/systemTenant}/SysPostMapper.xml | 12 +- .../systemTenant}/SysRoleDeptMapper.xml | 2 +- .../mapper/systemTenant}/SysRoleMapper.xml | 16 +- .../systemTenant}/SysRoleMenuMapper.xml | 2 +- .../systemTenant/SysSaasMenuMapper.xml} | 36 +- .../mapper/systemTenant}/SysSocialMapper.xml | 2 +- .../SysTenantApplicationMapper.xml | 7 + .../mapper/systemTenant}/SysTenantMapper.xml | 2 +- .../systemTenant/SysTenantPackageMapper.xml | 7 + .../mapper/systemTenant}/SysUserMapper.xml | 34 +- .../systemTenant}/SysUserPostMapper.xml | 2 +- .../systemTenant}/SysUserRoleMapper.xml | 6 +- script/sql/ry_vue_5.X.sql | 10 + script/sql/tenant/ry_vue_5.X.sql | 1195 ++++++++--------- 195 files changed, 2966 insertions(+), 2690 deletions(-) rename ruoyi-modules/{ruoyi-system-tenant => ruoyi-system-saas}/pom.xml (98%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/monitor/SysLogininforController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2LogininforController.java} (75%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/monitor/SysOperlogController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2OperlogController.java} (71%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/monitor/SysUserOnlineController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2UserOnlineController.java} (88%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysApplicationController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ApplicationController.java} (76%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysClientController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ClientController.java} (77%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysConfigController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ConfigController.java} (78%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysDeptController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DeptController.java} (78%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysDictDataController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DictDataController.java} (71%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysDictTypeController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DictTypeController.java} (74%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysNoticeController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2NoticeController.java} (71%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysOssConfigController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2OssConfigController.java} (80%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysOssController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2OssController.java} (76%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysPostController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2PostController.java} (77%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysProfileController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ProfileController.java} (66%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysRoleController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2RoleController.java} (75%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysSocialController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2SocialController.java} (67%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysTenantController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2TenantController.java} (86%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysTenantPackageController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2TenantPackageController.java} (81%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysUserController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2UserController.java} (75%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysMenuController.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasMenuController.java} (68%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysApplication.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Application.java} (78%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysCache.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Cache.java} (78%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysClient.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Client.java} (88%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysConfig.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Config.java} (83%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysDept.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Dept.java} (90%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysDictData.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2DictData.java} (87%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysDictType.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2DictType.java} (79%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysLogininfor.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Logininfor.java} (87%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysNotice.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Notice.java} (84%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysOperLog.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2OperLog.java} (93%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysOss.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Oss.java} (87%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysOssConfig.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2OssConfig.java} (88%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysPost.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Post.java} (86%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysRole.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Role.java} (90%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysRoleDept.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2RoleDept.java} (72%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysRoleMenu.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2RoleMenu.java} (72%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysSocial.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Social.java} (93%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysTenant.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Tenant.java} (91%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysTenantApplication.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2TenantApplication.java} (67%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysTenantPackage.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2TenantPackage.java} (85%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysUser.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2User.java} (88%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysUserOnline.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserOnline.java} (91%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysUserPost.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserPost.java} (72%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysUserRole.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserRole.java} (72%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysMenu.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasMenu.java} (93%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysApplicationBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ApplicationBo.java} (76%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysClientBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ClientBo.java} (85%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysConfigBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ConfigBo.java} (82%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysDeptBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DeptBo.java} (86%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysDictDataBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DictDataBo.java} (85%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysDictTypeBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DictTypeBo.java} (81%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysLogininforBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2LogininforBo.java} (81%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysNoticeBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2NoticeBo.java} (81%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysOperLogBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OperLogBo.java} (88%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysOssBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OssBo.java} (71%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysOssConfigBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OssConfigBo.java} (90%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysPostBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2PostBo.java} (85%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysRoleBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2RoleBo.java} (87%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysSocialBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2SocialBo.java} (91%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysTenantApplicationBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantApplicationBo.java} (66%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysTenantBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantBo.java} (89%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysTenantPackageBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantPackageBo.java} (81%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysUserBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserBo.java} (87%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysUserPasswordBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserPasswordBo.java} (81%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysUserProfileBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserProfileBo.java} (93%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysMenuBo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasMenuBo.java} (89%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysApplicationVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ApplicationVo.java} (74%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysClientVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ClientVo.java} (88%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysConfigVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ConfigVo.java} (82%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysDeptVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DeptVo.java} (86%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysDictDataVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DictDataVo.java} (85%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysDictTypeVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DictTypeVo.java} (79%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysLogininforVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2LogininforVo.java} (84%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysNoticeVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2NoticeVo.java} (83%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysOperLogVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OperLogVo.java} (89%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysOssConfigVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssConfigVo.java} (84%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysOssUploadVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssUploadVo.java} (78%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysOssVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssVo.java} (82%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysPostVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2PostVo.java} (86%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysRoleVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2RoleVo.java} (89%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysSocialVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2SocialVo.java} (91%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysTenantApplicationVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantApplicationVo.java} (66%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysTenantPackageVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantPackageVo.java} (83%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysTenantVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantVo.java} (90%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysUserExportVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserExportVo.java} (84%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysUserImportVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserImportVo.java} (87%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysUserInfoVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserInfoVo.java} (67%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysUserVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserVo.java} (88%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysMenuVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasMenuVo.java} (78%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/AvatarVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoAvatarVo.java} (68%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/CacheListInfoVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoCacheListInfoVo.java} (78%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/DeptTreeSelectVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoDeptTreeSelectVo.java} (80%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/MenuTreeSelectVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoMenuTreeSelectVo.java} (80%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/MetaVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoMetaVo.java} (74%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/ProfileVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoProfileVo.java} (73%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/RouterVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoRouterVo.java} (87%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/UserInfoVo.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoUserInfoVo.java} (74%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant => ruoyi-system-saas/src/main/java/org/dromara/system/saas}/listener/SysUserImportListener.java (77%) create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ApplicationMapper.java create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ClientMapper.java create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ConfigMapper.java rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysDeptMapper.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DeptMapper.java} (74%) create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DictDataMapper.java create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DictTypeMapper.java create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2LogininforMapper.java create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2NoticeMapper.java create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OperLogMapper.java create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OssConfigMapper.java create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OssMapper.java rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysPostMapper.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2PostMapper.java} (61%) create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleDeptMapper.java rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysRoleMapper.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleMapper.java} (66%) create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleMenuMapper.java create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2SocialMapper.java create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantApplicationMapper.java create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantMapper.java create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantPackageMapper.java rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysUserMapper.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserMapper.java} (66%) create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserPostMapper.java create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserRoleMapper.java rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysMenuMapper.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasMenuMapper.java} (63%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/runner/SystemApplicationRunner.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/runner/System2ApplicationRunner.java} (69%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysApplicationService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ApplicationService.java} (68%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysClientService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ClientService.java} (61%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysConfigService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ConfigService.java} (71%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysDataScopeService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DataScopeService.java} (81%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysDeptService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DeptService.java} (78%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysDictDataService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DictDataService.java} (67%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysDictTypeService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DictTypeService.java} (63%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysLogininforService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2LogininforService.java} (61%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysNoticeService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2NoticeService.java} (66%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysOperLogService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OperLogService.java} (63%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysOssConfigService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OssConfigService.java} (67%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysOssService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OssService.java} (66%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysPermissionService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2PermissionService.java} (83%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysPostService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2PostService.java} (74%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysRoleService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2RoleService.java} (78%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysSocialService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2SocialService.java} (50%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysTenantApplicationService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantApplicationService.java} (69%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysTenantPackageService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantPackageService.java} (52%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysTenantService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantService.java} (64%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysUserService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2UserService.java} (76%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysMenuService.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasMenuService.java} (76%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysApplicationServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ApplicationServiceImpl.java} (62%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysClientServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ClientServiceImpl.java} (61%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysConfigServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ConfigServiceImpl.java} (68%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysDataScopeServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DataScopeServiceImpl.java} (60%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysDeptServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DeptServiceImpl.java} (65%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysDictDataServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DictDataServiceImpl.java} (58%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysDictTypeServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DictTypeServiceImpl.java} (62%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysLogininforServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2LogininforServiceImpl.java} (74%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysNoticeServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2NoticeServiceImpl.java} (51%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysOperLogServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OperLogServiceImpl.java} (64%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysOssConfigServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OssConfigServiceImpl.java} (56%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysOssServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OssServiceImpl.java} (70%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysPermissionServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2PermissionServiceImpl.java} (76%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysPostServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2PostServiceImpl.java} (61%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysRoleServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2RoleServiceImpl.java} (71%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysSensitiveServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2SensitiveServiceImpl.java} (91%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysSocialServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2SocialServiceImpl.java} (54%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysTenantApplicationServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantApplicationServiceImpl.java} (61%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysTenantPackageServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantPackageServiceImpl.java} (56%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysTenantServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantServiceImpl.java} (63%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysUserServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2UserServiceImpl.java} (64%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysMenuServiceImpl.java => ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java} (61%) rename ruoyi-modules/{ruoyi-system-tenant => ruoyi-system-saas}/src/main/resources/mapper/package-info.md (100%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system => ruoyi-system-saas/src/main/resources/mapper/systemTenant}/SysApplicationMapper.xml (67%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system => ruoyi-system-saas/src/main/resources/mapper/systemTenant}/SysClientMapper.xml (70%) create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysConfigMapper.xml rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system => ruoyi-system-saas/src/main/resources/mapper/systemTenant}/SysDeptMapper.xml (63%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system/SysOperLogMapper.xml => ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDictDataMapper.xml} (73%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system => ruoyi-system-saas/src/main/resources/mapper/systemTenant}/SysDictTypeMapper.xml (70%) create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysLogininforMapper.xml rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system => ruoyi-system-saas/src/main/resources/mapper/systemTenant}/SysNoticeMapper.xml (71%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system/SysConfigMapper.xml => ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOperLogMapper.xml} (73%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system => ruoyi-system-saas/src/main/resources/mapper/systemTenant}/SysOssConfigMapper.xml (68%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system => ruoyi-system-saas/src/main/resources/mapper/systemTenant}/SysOssMapper.xml (70%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system => ruoyi-system-saas/src/main/resources/mapper/systemTenant}/SysPostMapper.xml (64%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system => ruoyi-system-saas/src/main/resources/mapper/systemTenant}/SysRoleDeptMapper.xml (70%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system => ruoyi-system-saas/src/main/resources/mapper/systemTenant}/SysRoleMapper.xml (78%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system => ruoyi-system-saas/src/main/resources/mapper/systemTenant}/SysRoleMenuMapper.xml (70%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system/SysMenuMapper.xml => ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSaasMenuMapper.xml} (60%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system => ruoyi-system-saas/src/main/resources/mapper/systemTenant}/SysSocialMapper.xml (69%) create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantApplicationMapper.xml rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system => ruoyi-system-saas/src/main/resources/mapper/systemTenant}/SysTenantMapper.xml (69%) create mode 100644 ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantPackageMapper.xml rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system => ruoyi-system-saas/src/main/resources/mapper/systemTenant}/SysUserMapper.xml (69%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system => ruoyi-system-saas/src/main/resources/mapper/systemTenant}/SysUserPostMapper.xml (70%) rename ruoyi-modules/{ruoyi-system-tenant/src/main/resources/mapper/system => ruoyi-system-saas/src/main/resources/mapper/systemTenant}/SysUserRoleMapper.xml (67%) diff --git a/pom.xml b/pom.xml index 5db785c8c..d7ee8d969 100644 --- a/pom.xml +++ b/pom.xml @@ -370,6 +370,12 @@ ${revision} + + org.dromara + ruoyi-system-saas + ${revision} + + org.dromara ruoyi-job diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index b7e3b30d9..7f9f4bd29 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -47,6 +47,11 @@ ruoyi-system + + org.dromara + ruoyi-system-saas + + org.dromara ruoyi-job diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index ec1bfad60..012c71e44 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -14,7 +14,7 @@ ruoyi-generator ruoyi-job ruoyi-system - ruoyi-system-tenant + ruoyi-system-saas ruoyi-workflow diff --git a/ruoyi-modules/ruoyi-system-tenant/pom.xml b/ruoyi-modules/ruoyi-system-saas/pom.xml similarity index 98% rename from ruoyi-modules/ruoyi-system-tenant/pom.xml rename to ruoyi-modules/ruoyi-system-saas/pom.xml index f2adee58d..f46d7794a 100644 --- a/ruoyi-modules/ruoyi-system-tenant/pom.xml +++ b/ruoyi-modules/ruoyi-system-saas/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - ruoyi-system-tenant + ruoyi-system-saas system-tenant 系统模块 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/monitor/SysLogininforController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2LogininforController.java similarity index 75% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/monitor/SysLogininforController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2LogininforController.java index e0f4318de..4e53d365e 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/monitor/SysLogininforController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2LogininforController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.monitor; +package org.dromara.system.saas.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; @@ -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.tenant.domain.bo.SysLogininforBo; -import org.dromara.system.tenant.domain.vo.SysLogininforVo; -import org.dromara.system.tenant.service.ISysLogininforService; +import org.dromara.system.saas.domain.bo.Sys2LogininforBo; +import org.dromara.system.saas.domain.vo.Sys2LogininforVo; +import org.dromara.system.saas.service.ISys2LogininforService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -28,17 +28,17 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/monitor/logininfor") -public class SysLogininforController extends BaseController { +@RequestMapping("/monitor2/logininfor") +public class Sys2LogininforController extends BaseController { - private final ISysLogininforService logininforService; + private final ISys2LogininforService logininforService; /** * 获取系统访问记录列表 */ @SaCheckPermission("monitor:logininfor:list") @GetMapping("/list") - public TableDataInfo list(SysLogininforBo logininfor, PageQuery pageQuery) { + public TableDataInfo list(Sys2LogininforBo logininfor, PageQuery pageQuery) { return logininforService.selectPageLogininforList(logininfor, pageQuery); } @@ -48,9 +48,9 @@ public class SysLogininforController extends BaseController { @Log(title = "登录日志", businessType = BusinessType.EXPORT) @SaCheckPermission("monitor:logininfor:export") @PostMapping("/export") - public void export(SysLogininforBo logininfor, HttpServletResponse response) { - List list = logininforService.selectLogininforList(logininfor); - ExcelUtil.exportExcel(list, "登录日志", SysLogininforVo.class, response); + public void export(Sys2LogininforBo logininfor, HttpServletResponse response) { + List list = logininforService.selectLogininforList(logininfor); + ExcelUtil.exportExcel(list, "登录日志", Sys2LogininforVo.class, response); } /** diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/monitor/SysOperlogController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2OperlogController.java similarity index 71% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/monitor/SysOperlogController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2OperlogController.java index 3493ee748..5cb346e37 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/monitor/SysOperlogController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2OperlogController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.monitor; +package org.dromara.system.saas.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.common.log.annotation.Log; @@ -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.tenant.domain.bo.SysOperLogBo; -import org.dromara.system.tenant.domain.vo.SysOperLogVo; -import org.dromara.system.tenant.service.ISysOperLogService; +import org.dromara.system.saas.domain.bo.Sys2OperLogBo; +import org.dromara.system.saas.domain.vo.Sys2OperLogVo; +import org.dromara.system.saas.service.ISys2OperLogService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -26,17 +26,17 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/monitor/operlog") -public class SysOperlogController extends BaseController { +@RequestMapping("/monitor2/operlog") +public class Sys2OperlogController extends BaseController { - private final ISysOperLogService operLogService; + private final ISys2OperLogService operLogService; /** * 获取操作日志记录列表 */ @SaCheckPermission("monitor:operlog:list") @GetMapping("/list") - public TableDataInfo list(SysOperLogBo operLog, PageQuery pageQuery) { + public TableDataInfo list(Sys2OperLogBo operLog, PageQuery pageQuery) { return operLogService.selectPageOperLogList(operLog, pageQuery); } @@ -46,9 +46,9 @@ public class SysOperlogController extends BaseController { @Log(title = "操作日志", businessType = BusinessType.EXPORT) @SaCheckPermission("monitor:operlog:export") @PostMapping("/export") - public void export(SysOperLogBo operLog, HttpServletResponse response) { - List list = operLogService.selectOperLogList(operLog); - ExcelUtil.exportExcel(list, "操作日志", SysOperLogVo.class, response); + public void export(Sys2OperLogBo operLog, HttpServletResponse response) { + List list = operLogService.selectOperLogList(operLog); + ExcelUtil.exportExcel(list, "操作日志", Sys2OperLogVo.class, response); } /** diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/monitor/SysUserOnlineController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2UserOnlineController.java similarity index 88% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/monitor/SysUserOnlineController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2UserOnlineController.java index 4810ec626..2e1e65920 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/monitor/SysUserOnlineController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2UserOnlineController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.monitor; +package org.dromara.system.saas.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.exception.NotLoginException; @@ -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.tenant.domain.SysUserOnline; +import org.dromara.system.saas.domain.Sys2UserOnline; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -30,8 +30,8 @@ import java.util.stream.Collectors; */ @RequiredArgsConstructor @RestController -@RequestMapping("/monitor/online") -public class SysUserOnlineController extends BaseController { +@RequestMapping("/monitor2/online") +public class Sys2UserOnlineController extends BaseController { /** * 获取在线用户监控列表 @@ -41,7 +41,7 @@ public class SysUserOnlineController extends BaseController { */ @SaCheckPermission("monitor:online:list") @GetMapping("/list") - public TableDataInfo list(String ipaddr, String userName) { + public TableDataInfo list(String ipaddr, String userName) { // 获取所有未过期的 token List keys = StpUtil.searchTokenValue("", 0, -1, false); List userOnlineDTOList = new ArrayList<>(); @@ -69,7 +69,7 @@ public class SysUserOnlineController extends BaseController { } Collections.reverse(userOnlineDTOList); userOnlineDTOList.removeAll(Collections.singleton(null)); - List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class); + List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, Sys2UserOnline.class); return TableDataInfo.build(userOnlineList); } @@ -93,17 +93,17 @@ public class SysUserOnlineController extends BaseController { * 获取当前用户登录在线设备 */ @GetMapping() - public TableDataInfo getInfo() { + public TableDataInfo getInfo() { // 获取指定账号 id 的 token 集合 List tokenIds = StpUtil.getTokenValueListByLoginId(StpUtil.getLoginIdAsString()); List userOnlineDTOList = tokenIds.stream() .filter(token -> StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) >= -1) .map(token -> (UserOnlineDTO) RedisUtils.getCacheObject(CacheConstants.ONLINE_TOKEN_KEY + token)) .collect(Collectors.toList()); - //复制和处理 SysUserOnline 对象列表 + //复制和处理 Sys2UserOnline 对象列表 Collections.reverse(userOnlineDTOList); userOnlineDTOList.removeAll(Collections.singleton(null)); - List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class); + List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, Sys2UserOnline.class); return TableDataInfo.build(userOnlineList); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysApplicationController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ApplicationController.java similarity index 76% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysApplicationController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ApplicationController.java index 2d87b044b..a9136beee 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysApplicationController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ApplicationController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; import java.util.List; @@ -17,9 +17,9 @@ 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.tenant.domain.vo.SysApplicationVo; -import org.dromara.system.tenant.domain.bo.SysApplicationBo; -import org.dromara.system.tenant.service.ISysApplicationService; +import org.dromara.system.saas.domain.vo.Sys2ApplicationVo; +import org.dromara.system.saas.domain.bo.Sys2ApplicationBo; +import org.dromara.system.saas.service.ISys2ApplicationService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** @@ -31,17 +31,17 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/application") -public class SysApplicationController extends BaseController { +@RequestMapping("/system2/application") +public class Sys2ApplicationController extends BaseController { - private final ISysApplicationService sysApplicationService; + private final ISys2ApplicationService sysApplicationService; /** * 查询应用列表 */ @SaCheckPermission("system:application:list") @GetMapping("/list") - public TableDataInfo list(SysApplicationBo bo, PageQuery pageQuery) { + public TableDataInfo list(Sys2ApplicationBo bo, PageQuery pageQuery) { return sysApplicationService.queryPageList(bo, pageQuery); } @@ -51,9 +51,9 @@ public class SysApplicationController extends BaseController { @SaCheckPermission("system:application:export") @Log(title = "应用", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(SysApplicationBo bo, HttpServletResponse response) { - List list = sysApplicationService.queryList(bo); - ExcelUtil.exportExcel(list, "应用", SysApplicationVo.class, response); + public void export(Sys2ApplicationBo bo, HttpServletResponse response) { + List list = sysApplicationService.queryList(bo); + ExcelUtil.exportExcel(list, "应用", Sys2ApplicationVo.class, response); } /** @@ -63,7 +63,7 @@ public class SysApplicationController extends BaseController { */ @SaCheckPermission("system:application:query") @GetMapping("/{applicationId}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long applicationId) { return R.ok(sysApplicationService.queryById(applicationId)); } @@ -75,7 +75,7 @@ public class SysApplicationController extends BaseController { @Log(title = "应用", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SysApplicationBo bo) { + public R add(@Validated(AddGroup.class) @RequestBody Sys2ApplicationBo bo) { return toAjax(sysApplicationService.insertByBo(bo)); } @@ -86,7 +86,7 @@ public class SysApplicationController extends BaseController { @Log(title = "应用", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SysApplicationBo bo) { + public R edit(@Validated(EditGroup.class) @RequestBody Sys2ApplicationBo bo) { return toAjax(sysApplicationService.updateByBo(bo)); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysClientController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ClientController.java similarity index 77% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysClientController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ClientController.java index adaeab70a..cc458a6c3 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysClientController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ClientController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; import java.util.List; @@ -6,6 +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.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -17,9 +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.tenant.domain.vo.SysClientVo; -import org.dromara.system.tenant.domain.bo.SysClientBo; -import org.dromara.system.tenant.service.ISysClientService; +import org.dromara.system.saas.domain.vo.Sys2ClientVo; +import org.dromara.system.saas.service.ISys2ClientService; import org.dromara.common.mybatis.core.page.TableDataInfo; /** @@ -31,17 +31,17 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/client") -public class SysClientController extends BaseController { +@RequestMapping("/system2/client") +public class Sys2ClientController extends BaseController { - private final ISysClientService sysClientService; + private final ISys2ClientService sysClientService; /** * 查询客户端管理列表 */ @SaCheckPermission("system:client:list") @GetMapping("/list") - public TableDataInfo list(SysClientBo bo, PageQuery pageQuery) { + public TableDataInfo list(Sys2ClientBo bo, PageQuery pageQuery) { return sysClientService.queryPageList(bo, pageQuery); } @@ -51,9 +51,9 @@ public class SysClientController extends BaseController { @SaCheckPermission("system:client:export") @Log(title = "客户端管理", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(SysClientBo bo, HttpServletResponse response) { - List list = sysClientService.queryList(bo); - ExcelUtil.exportExcel(list, "客户端管理", SysClientVo.class, response); + public void export(Sys2ClientBo bo, HttpServletResponse response) { + List list = sysClientService.queryList(bo); + ExcelUtil.exportExcel(list, "客户端管理", Sys2ClientVo.class, response); } /** @@ -63,7 +63,7 @@ public class SysClientController extends BaseController { */ @SaCheckPermission("system:client:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(sysClientService.queryById(id)); } @@ -75,7 +75,7 @@ public class SysClientController extends BaseController { @Log(title = "客户端管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SysClientBo bo) { + public R add(@Validated(AddGroup.class) @RequestBody Sys2ClientBo bo) { return toAjax(sysClientService.insertByBo(bo)); } @@ -86,7 +86,7 @@ public class SysClientController extends BaseController { @Log(title = "客户端管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SysClientBo bo) { + public R edit(@Validated(EditGroup.class) @RequestBody Sys2ClientBo bo) { return toAjax(sysClientService.updateByBo(bo)); } @@ -96,7 +96,7 @@ public class SysClientController extends BaseController { @SaCheckPermission("system:client:edit") @Log(title = "客户端管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public R changeStatus(@RequestBody SysClientBo bo) { + public R changeStatus(@RequestBody Sys2ClientBo bo) { return toAjax(sysClientService.updateUserStatus(bo.getClientId(), bo.getStatus())); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysConfigController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ConfigController.java similarity index 78% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysConfigController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ConfigController.java index 3015e94d5..c7f4a2895 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysConfigController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ConfigController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.common.core.domain.R; @@ -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.tenant.domain.bo.SysConfigBo; -import org.dromara.system.tenant.domain.vo.SysConfigVo; -import org.dromara.system.tenant.service.ISysConfigService; +import org.dromara.system.saas.domain.bo.Sys2ConfigBo; +import org.dromara.system.saas.domain.vo.Sys2ConfigVo; +import org.dromara.system.saas.service.ISys2ConfigService; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -26,17 +26,17 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/config") -public class SysConfigController extends BaseController { +@RequestMapping("/system2/config") +public class Sys2ConfigController extends BaseController { - private final ISysConfigService configService; + private final ISys2ConfigService configService; /** * 获取参数配置列表 */ @SaCheckPermission("system:config:list") @GetMapping("/list") - public TableDataInfo list(SysConfigBo config, PageQuery pageQuery) { + public TableDataInfo list(Sys2ConfigBo config, PageQuery pageQuery) { return configService.selectPageConfigList(config, pageQuery); } @@ -46,9 +46,9 @@ public class SysConfigController extends BaseController { @Log(title = "参数管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:config:export") @PostMapping("/export") - public void export(SysConfigBo config, HttpServletResponse response) { - List list = configService.selectConfigList(config); - ExcelUtil.exportExcel(list, "参数数据", SysConfigVo.class, response); + public void export(Sys2ConfigBo config, HttpServletResponse response) { + List list = configService.selectConfigList(config); + ExcelUtil.exportExcel(list, "参数数据", Sys2ConfigVo.class, response); } /** @@ -58,7 +58,7 @@ public class SysConfigController extends BaseController { */ @SaCheckPermission("system:config:query") @GetMapping(value = "/{configId}") - public R getInfo(@PathVariable Long configId) { + public R getInfo(@PathVariable Long configId) { return R.ok(configService.selectConfigById(configId)); } @@ -78,7 +78,7 @@ public class SysConfigController extends BaseController { @SaCheckPermission("system:config:add") @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysConfigBo config) { + public R add(@Validated @RequestBody Sys2ConfigBo config) { if (!configService.checkConfigKeyUnique(config)) { return R.fail("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); } @@ -92,7 +92,7 @@ public class SysConfigController extends BaseController { @SaCheckPermission("system:config:edit") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysConfigBo config) { + public R edit(@Validated @RequestBody Sys2ConfigBo config) { if (!configService.checkConfigKeyUnique(config)) { return R.fail("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); } @@ -106,7 +106,7 @@ public class SysConfigController extends BaseController { @SaCheckPermission("system:config:edit") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping("/updateByKey") - public R updateByKey(@RequestBody SysConfigBo config) { + public R updateByKey(@RequestBody Sys2ConfigBo config) { configService.updateConfig(config); return R.ok(); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysDeptController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DeptController.java similarity index 78% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysDeptController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DeptController.java index 5a12232ce..acc314456 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysDeptController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DeptController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.convert.Convert; @@ -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.tenant.domain.bo.SysDeptBo; -import org.dromara.system.tenant.domain.vo.SysDeptVo; -import org.dromara.system.tenant.service.ISysDeptService; -import org.dromara.system.tenant.service.ISysPostService; +import org.dromara.system.saas.domain.bo.Sys2DeptBo; +import org.dromara.system.saas.domain.vo.Sys2DeptVo; +import org.dromara.system.saas.service.ISys2DeptService; +import org.dromara.system.saas.service.ISys2PostService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -26,19 +26,19 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/dept") -public class SysDeptController extends BaseController { +@RequestMapping("/system2/dept") +public class Sys2DeptController extends BaseController { - private final ISysDeptService deptService; - private final ISysPostService postService; + private final ISys2DeptService deptService; + private final ISys2PostService postService; /** * 获取部门列表 */ @SaCheckPermission("system:dept:list") @GetMapping("/list") - public R> list(SysDeptBo dept) { - List depts = deptService.selectDeptList(dept); + public R> list(Sys2DeptBo dept) { + List depts = deptService.selectDeptList(dept); return R.ok(depts); } @@ -49,8 +49,8 @@ public class SysDeptController extends BaseController { */ @SaCheckPermission("system:dept:list") @GetMapping("/list/exclude/{deptId}") - public R> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) { - List depts = deptService.selectDeptList(new SysDeptBo()); + public R> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) { + List depts = deptService.selectDeptList(new Sys2DeptBo()); depts.removeIf(d -> d.getDeptId().equals(deptId) || StringUtils.splitList(d.getAncestors()).contains(Convert.toStr(deptId))); return R.ok(depts); @@ -63,7 +63,7 @@ public class SysDeptController extends BaseController { */ @SaCheckPermission("system:dept:query") @GetMapping(value = "/{deptId}") - public R getInfo(@PathVariable Long deptId) { + public R getInfo(@PathVariable Long deptId) { deptService.checkDeptDataScope(deptId); return R.ok(deptService.selectDeptById(deptId)); } @@ -74,7 +74,7 @@ public class SysDeptController extends BaseController { @SaCheckPermission("system:dept:add") @Log(title = "部门管理", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysDeptBo dept) { + public R add(@Validated @RequestBody Sys2DeptBo dept) { if (!deptService.checkDeptNameUnique(dept)) { return R.fail("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在"); } @@ -87,7 +87,7 @@ public class SysDeptController extends BaseController { @SaCheckPermission("system:dept:edit") @Log(title = "部门管理", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysDeptBo dept) { + public R edit(@Validated @RequestBody Sys2DeptBo dept) { Long deptId = dept.getDeptId(); deptService.checkDeptDataScope(deptId); if (!deptService.checkDeptNameUnique(dept)) { @@ -133,7 +133,7 @@ public class SysDeptController extends BaseController { */ @SaCheckPermission("system:dept:query") @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] deptIds) { + public R> optionselect(@RequestParam(required = false) Long[] deptIds) { return R.ok(deptService.selectDeptByIds(deptIds == null ? null : List.of(deptIds))); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysDictDataController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DictDataController.java similarity index 71% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysDictDataController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DictDataController.java index 9ab67c532..05c6e2a28 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysDictDataController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DictDataController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; @@ -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.tenant.domain.bo.SysDictDataBo; -import org.dromara.system.tenant.domain.vo.SysDictDataVo; -import org.dromara.system.tenant.service.ISysDictDataService; -import org.dromara.system.tenant.service.ISysDictTypeService; +import org.dromara.system.saas.domain.bo.Sys2DictDataBo; +import org.dromara.system.saas.domain.vo.Sys2DictDataVo; +import org.dromara.system.saas.service.ISys2DictDataService; +import org.dromara.system.saas.service.ISys2DictTypeService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -29,18 +29,18 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/dict/data") -public class SysDictDataController extends BaseController { +@RequestMapping("/system2/dict/data") +public class Sys2DictDataController extends BaseController { - private final ISysDictDataService dictDataService; - private final ISysDictTypeService dictTypeService; + private final ISys2DictDataService dictDataService; + private final ISys2DictTypeService dictTypeService; /** * 查询字典数据列表 */ @SaCheckPermission("system:dict:list") @GetMapping("/list") - public TableDataInfo list(SysDictDataBo dictData, PageQuery pageQuery) { + public TableDataInfo list(Sys2DictDataBo dictData, PageQuery pageQuery) { return dictDataService.selectPageDictDataList(dictData, pageQuery); } @@ -50,9 +50,9 @@ public class SysDictDataController extends BaseController { @Log(title = "字典数据", businessType = BusinessType.EXPORT) @SaCheckPermission("system:dict:export") @PostMapping("/export") - public void export(SysDictDataBo dictData, HttpServletResponse response) { - List list = dictDataService.selectDictDataList(dictData); - ExcelUtil.exportExcel(list, "字典数据", SysDictDataVo.class, response); + public void export(Sys2DictDataBo dictData, HttpServletResponse response) { + List list = dictDataService.selectDictDataList(dictData); + ExcelUtil.exportExcel(list, "字典数据", Sys2DictDataVo.class, response); } /** @@ -62,7 +62,7 @@ public class SysDictDataController extends BaseController { */ @SaCheckPermission("system:dict:query") @GetMapping(value = "/{dictCode}") - public R getInfo(@PathVariable Long dictCode) { + public R getInfo(@PathVariable Long dictCode) { return R.ok(dictDataService.selectDictDataById(dictCode)); } @@ -72,8 +72,8 @@ public class SysDictDataController extends BaseController { * @param dictType 字典类型 */ @GetMapping(value = "/type/{dictType}") - public R> dictType(@PathVariable String dictType) { - List data = dictTypeService.selectDictDataByType(dictType); + public R> dictType(@PathVariable String dictType) { + List data = dictTypeService.selectDictDataByType(dictType); if (ObjectUtil.isNull(data)) { data = new ArrayList<>(); } @@ -86,7 +86,7 @@ public class SysDictDataController extends BaseController { @SaCheckPermission("system:dict:add") @Log(title = "字典数据", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysDictDataBo dict) { + public R add(@Validated @RequestBody Sys2DictDataBo dict) { if (!dictDataService.checkDictDataUnique(dict)) { return R.fail("新增字典数据'" + dict.getDictValue() + "'失败，字典键值已存在"); } @@ -100,7 +100,7 @@ public class SysDictDataController extends BaseController { @SaCheckPermission("system:dict:edit") @Log(title = "字典数据", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysDictDataBo dict) { + public R edit(@Validated @RequestBody Sys2DictDataBo dict) { if (!dictDataService.checkDictDataUnique(dict)) { return R.fail("修改字典数据'" + dict.getDictValue() + "'失败，字典键值已存在"); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysDictTypeController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DictTypeController.java similarity index 74% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysDictTypeController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DictTypeController.java index b0f6e6f7f..c620c8469 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysDictTypeController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DictTypeController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.common.core.domain.R; @@ -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.tenant.domain.bo.SysDictTypeBo; -import org.dromara.system.tenant.domain.vo.SysDictTypeVo; -import org.dromara.system.tenant.service.ISysDictTypeService; +import org.dromara.system.saas.domain.bo.Sys2DictTypeBo; +import org.dromara.system.saas.domain.vo.Sys2DictTypeVo; +import org.dromara.system.saas.service.ISys2DictTypeService; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -26,17 +26,17 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/dict/type") -public class SysDictTypeController extends BaseController { +@RequestMapping("/system2/dict/type") +public class Sys2DictTypeController extends BaseController { - private final ISysDictTypeService dictTypeService; + private final ISys2DictTypeService dictTypeService; /** * 查询字典类型列表 */ @SaCheckPermission("system:dict:list") @GetMapping("/list") - public TableDataInfo list(SysDictTypeBo dictType, PageQuery pageQuery) { + public TableDataInfo list(Sys2DictTypeBo dictType, PageQuery pageQuery) { return dictTypeService.selectPageDictTypeList(dictType, pageQuery); } @@ -46,9 +46,9 @@ public class SysDictTypeController extends BaseController { @Log(title = "字典类型", businessType = BusinessType.EXPORT) @SaCheckPermission("system:dict:export") @PostMapping("/export") - public void export(SysDictTypeBo dictType, HttpServletResponse response) { - List list = dictTypeService.selectDictTypeList(dictType); - ExcelUtil.exportExcel(list, "字典类型", SysDictTypeVo.class, response); + public void export(Sys2DictTypeBo dictType, HttpServletResponse response) { + List list = dictTypeService.selectDictTypeList(dictType); + ExcelUtil.exportExcel(list, "字典类型", Sys2DictTypeVo.class, response); } /** @@ -58,7 +58,7 @@ public class SysDictTypeController extends BaseController { */ @SaCheckPermission("system:dict:query") @GetMapping(value = "/{dictId}") - public R getInfo(@PathVariable Long dictId) { + public R getInfo(@PathVariable Long dictId) { return R.ok(dictTypeService.selectDictTypeById(dictId)); } @@ -68,7 +68,7 @@ public class SysDictTypeController extends BaseController { @SaCheckPermission("system:dict:add") @Log(title = "字典类型", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysDictTypeBo dict) { + public R add(@Validated @RequestBody Sys2DictTypeBo dict) { if (!dictTypeService.checkDictTypeUnique(dict)) { return R.fail("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); } @@ -82,7 +82,7 @@ public class SysDictTypeController extends BaseController { @SaCheckPermission("system:dict:edit") @Log(title = "字典类型", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysDictTypeBo dict) { + public R edit(@Validated @RequestBody Sys2DictTypeBo dict) { if (!dictTypeService.checkDictTypeUnique(dict)) { return R.fail("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); } @@ -118,8 +118,8 @@ public class SysDictTypeController extends BaseController { * 获取字典选择框列表 */ @GetMapping("/optionselect") - public R> optionselect() { - List dictTypes = dictTypeService.selectDictTypeAll(); + public R> optionselect() { + List dictTypes = dictTypeService.selectDictTypeAll(); return R.ok(dictTypes); } } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysNoticeController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2NoticeController.java similarity index 71% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysNoticeController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2NoticeController.java index 16a5d380d..444c8656d 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysNoticeController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2NoticeController.java @@ -1,18 +1,18 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; -import org.dromara.common.core.service.DictService; +import org.dromara.common.core.service.TwoDictService; 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.common.sse.utils.SseMessageUtils; import org.dromara.common.web.core.BaseController; -import org.dromara.system.tenant.domain.bo.SysNoticeBo; -import org.dromara.system.tenant.domain.vo.SysNoticeVo; -import org.dromara.system.tenant.service.ISysNoticeService; +import org.dromara.system.saas.domain.bo.Sys2NoticeBo; +import org.dromara.system.saas.domain.vo.Sys2NoticeVo; +import org.dromara.system.saas.service.ISys2NoticeService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -24,18 +24,18 @@ import org.springframework.web.bind.annotation.*; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/notice") -public class SysNoticeController extends BaseController { +@RequestMapping("/system2/notice") +public class Sys2NoticeController extends BaseController { - private final ISysNoticeService noticeService; - private final DictService dictService; + private final ISys2NoticeService noticeService; + private final TwoDictService dictService; /** * 获取通知公告列表 */ @SaCheckPermission("system:notice:list") @GetMapping("/list") - public TableDataInfo list(SysNoticeBo notice, PageQuery pageQuery) { + public TableDataInfo list(Sys2NoticeBo notice, PageQuery pageQuery) { return noticeService.selectPageNoticeList(notice, pageQuery); } @@ -46,7 +46,7 @@ public class SysNoticeController extends BaseController { */ @SaCheckPermission("system:notice:query") @GetMapping(value = "/{noticeId}") - public R getInfo(@PathVariable Long noticeId) { + public R getInfo(@PathVariable Long noticeId) { return R.ok(noticeService.selectNoticeById(noticeId)); } @@ -56,12 +56,12 @@ public class SysNoticeController extends BaseController { @SaCheckPermission("system:notice:add") @Log(title = "通知公告", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysNoticeBo notice) { + public R add(@Validated @RequestBody Sys2NoticeBo notice) { int rows = noticeService.insertNotice(notice); if (rows <= 0) { return R.fail(); } - String type = dictService.getDictLabel("sys_notice_type", notice.getNoticeType()); + String type = dictService.getDictLabel("sys2_notice_type", notice.getNoticeType()); SseMessageUtils.publishAll("[" + type + "] " + notice.getNoticeTitle()); return R.ok(); } @@ -72,7 +72,7 @@ public class SysNoticeController extends BaseController { @SaCheckPermission("system:notice:edit") @Log(title = "通知公告", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysNoticeBo notice) { + public R edit(@Validated @RequestBody Sys2NoticeBo notice) { return toAjax(noticeService.updateNotice(notice)); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysOssConfigController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2OssConfigController.java similarity index 80% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysOssConfigController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2OssConfigController.java index 229da41e2..bba31e630 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysOssConfigController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2OssConfigController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import org.dromara.common.core.domain.R; @@ -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.tenant.domain.bo.SysOssConfigBo; -import org.dromara.system.tenant.domain.vo.SysOssConfigVo; -import org.dromara.system.tenant.service.ISysOssConfigService; +import org.dromara.system.saas.domain.bo.Sys2OssConfigBo; +import org.dromara.system.saas.domain.vo.Sys2OssConfigVo; +import org.dromara.system.saas.service.ISys2OssConfigService; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; @@ -32,17 +32,17 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/resource/oss/config") -public class SysOssConfigController extends BaseController { +@RequestMapping("/resource2/oss/config") +public class Sys2OssConfigController extends BaseController { - private final ISysOssConfigService ossConfigService; + private final ISys2OssConfigService ossConfigService; /** * 查询对象存储配置列表 */ @SaCheckPermission("system:ossConfig:list") @GetMapping("/list") - public TableDataInfo list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) { + public TableDataInfo list(@Validated(QueryGroup.class) Sys2OssConfigBo bo, PageQuery pageQuery) { return ossConfigService.queryPageList(bo, pageQuery); } @@ -53,7 +53,7 @@ public class SysOssConfigController extends BaseController { */ @SaCheckPermission("system:ossConfig:list") @GetMapping("/{ossConfigId}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long ossConfigId) { return R.ok(ossConfigService.queryById(ossConfigId)); } @@ -65,7 +65,7 @@ public class SysOssConfigController extends BaseController { @Log(title = "对象存储配置", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) { + public R add(@Validated(AddGroup.class) @RequestBody Sys2OssConfigBo bo) { return toAjax(ossConfigService.insertByBo(bo)); } @@ -76,7 +76,7 @@ public class SysOssConfigController extends BaseController { @Log(title = "对象存储配置", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) { + public R edit(@Validated(EditGroup.class) @RequestBody Sys2OssConfigBo bo) { return toAjax(ossConfigService.updateByBo(bo)); } @@ -99,7 +99,7 @@ public class SysOssConfigController extends BaseController { @SaCheckPermission("system:ossConfig:edit") @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public R changeStatus(@RequestBody SysOssConfigBo bo) { + public R changeStatus(@RequestBody Sys2OssConfigBo bo) { return toAjax(ossConfigService.updateOssConfigStatus(bo)); } } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2OssController.java similarity index 76% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysOssController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2OssController.java index b48f20e88..d46055ea5 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysOssController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2OssController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; @@ -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.tenant.domain.bo.SysOssBo; -import org.dromara.system.tenant.domain.vo.SysOssUploadVo; -import org.dromara.system.tenant.domain.vo.SysOssVo; -import org.dromara.system.tenant.service.ISysOssService; +import org.dromara.system.saas.domain.bo.Sys2OssBo; +import org.dromara.system.saas.domain.vo.Sys2OssUploadVo; +import org.dromara.system.saas.domain.vo.Sys2OssVo; +import org.dromara.system.saas.service.ISys2OssService; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; @@ -34,17 +34,17 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/resource/oss") -public class SysOssController extends BaseController { +@RequestMapping("/resource2/oss") +public class Sys2OssController extends BaseController { - private final ISysOssService ossService; + private final ISys2OssService ossService; /** * 查询OSS对象存储列表 */ @SaCheckPermission("system:oss:list") @GetMapping("/list") - public TableDataInfo list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) { + public TableDataInfo list(@Validated(QueryGroup.class) Sys2OssBo bo, PageQuery pageQuery) { return ossService.queryPageList(bo, pageQuery); } @@ -55,9 +55,9 @@ public class SysOssController extends BaseController { */ @SaCheckPermission("system:oss:list") @GetMapping("/listByIds/{ossIds}") - public R> listByIds(@NotEmpty(message = "主键不能为空") + public R> listByIds(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) { - List list = ossService.listByIds(Arrays.asList(ossIds)); + List list = ossService.listByIds(Arrays.asList(ossIds)); return R.ok(list); } @@ -69,12 +69,12 @@ public class SysOssController extends BaseController { @SaCheckPermission("system:oss:upload") @Log(title = "OSS对象存储", businessType = BusinessType.INSERT) @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public R upload(@RequestPart("file") MultipartFile file) { + public R upload(@RequestPart("file") MultipartFile file) { if (ObjectUtil.isNull(file)) { return R.fail("上传文件不能为空"); } - SysOssVo oss = ossService.upload(file); - SysOssUploadVo uploadVo = new SysOssUploadVo(); + Sys2OssVo oss = ossService.upload(file); + Sys2OssUploadVo uploadVo = new Sys2OssUploadVo(); uploadVo.setUrl(oss.getUrl()); uploadVo.setFileName(oss.getOriginalName()); uploadVo.setOssId(oss.getOssId().toString()); diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysPostController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2PostController.java similarity index 77% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysPostController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2PostController.java index 5e831b56f..836b293ae 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysPostController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2PostController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; @@ -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.tenant.domain.bo.SysPostBo; -import org.dromara.system.tenant.domain.vo.SysPostVo; -import org.dromara.system.tenant.service.ISysPostService; +import org.dromara.system.saas.domain.bo.Sys2PostBo; +import org.dromara.system.saas.domain.vo.Sys2PostVo; +import org.dromara.system.saas.service.ISys2PostService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -29,17 +29,17 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/post") -public class SysPostController extends BaseController { +@RequestMapping("/system2/post") +public class Sys2PostController extends BaseController { - private final ISysPostService postService; + private final ISys2PostService postService; /** * 获取岗位列表 */ @SaCheckPermission("system:post:list") @GetMapping("/list") - public TableDataInfo list(SysPostBo post, PageQuery pageQuery) { + public TableDataInfo list(Sys2PostBo post, PageQuery pageQuery) { return postService.selectPagePostList(post, pageQuery); } @@ -49,9 +49,9 @@ public class SysPostController extends BaseController { @Log(title = "岗位管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:post:export") @PostMapping("/export") - public void export(SysPostBo post, HttpServletResponse response) { - List list = postService.selectPostList(post); - ExcelUtil.exportExcel(list, "岗位数据", SysPostVo.class, response); + public void export(Sys2PostBo post, HttpServletResponse response) { + List list = postService.selectPostList(post); + ExcelUtil.exportExcel(list, "岗位数据", Sys2PostVo.class, response); } /** @@ -61,7 +61,7 @@ public class SysPostController extends BaseController { */ @SaCheckPermission("system:post:query") @GetMapping(value = "/{postId}") - public R getInfo(@PathVariable Long postId) { + public R getInfo(@PathVariable Long postId) { return R.ok(postService.selectPostById(postId)); } @@ -71,7 +71,7 @@ public class SysPostController extends BaseController { @SaCheckPermission("system:post:add") @Log(title = "岗位管理", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysPostBo post) { + public R add(@Validated @RequestBody Sys2PostBo post) { if (!postService.checkPostNameUnique(post)) { return R.fail("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在"); } else if (!postService.checkPostCodeUnique(post)) { @@ -86,7 +86,7 @@ public class SysPostController extends BaseController { @SaCheckPermission("system:post:edit") @Log(title = "岗位管理", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysPostBo post) { + public R edit(@Validated @RequestBody Sys2PostBo post) { if (!postService.checkPostNameUnique(post)) { return R.fail("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在"); } else if (!postService.checkPostCodeUnique(post)) { @@ -118,10 +118,10 @@ public class SysPostController extends BaseController { */ @SaCheckPermission("system:post:query") @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) { - List list = new ArrayList<>(); + public R> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) { + List list = new ArrayList<>(); if (ObjectUtil.isNotNull(deptId)) { - SysPostBo post = new SysPostBo(); + Sys2PostBo post = new Sys2PostBo(); post.setDeptId(deptId); list = postService.selectPostList(post); } else if (postIds != null) { diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysProfileController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ProfileController.java similarity index 66% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysProfileController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ProfileController.java index f0887b0ba..a45b75644 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysProfileController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ProfileController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.bean.BeanUtil; @@ -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.tenant.domain.bo.SysUserBo; -import org.dromara.system.tenant.domain.bo.SysUserPasswordBo; -import org.dromara.system.tenant.domain.bo.SysUserProfileBo; -import org.dromara.system.tenant.domain.vo.AvatarVo; -import org.dromara.system.tenant.domain.vo.ProfileVo; -import org.dromara.system.tenant.domain.vo.SysOssVo; -import org.dromara.system.tenant.domain.vo.SysUserVo; -import org.dromara.system.tenant.service.ISysOssService; -import org.dromara.system.tenant.service.ISysUserService; +import org.dromara.system.saas.domain.bo.Sys2UserBo; +import org.dromara.system.saas.domain.bo.Sys2UserPasswordBo; +import org.dromara.system.saas.domain.bo.Sys2UserProfileBo; +import org.dromara.system.saas.domain.vo.TwoAvatarVo; +import org.dromara.system.saas.domain.vo.TwoProfileVo; +import org.dromara.system.saas.domain.vo.Sys2OssVo; +import org.dromara.system.saas.domain.vo.Sys2UserVo; +import org.dromara.system.saas.service.ISys2OssService; +import org.dromara.system.saas.service.ISys2UserService; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -38,23 +38,23 @@ import java.util.Arrays; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/user/profile") -public class SysProfileController extends BaseController { +@RequestMapping("/system2/user/profile") +public class Sys2ProfileController extends BaseController { - private final ISysUserService userService; - private final ISysOssService ossService; + private final ISys2UserService userService; + private final ISys2OssService ossService; /** * 个人信息 */ @GetMapping - public R profile() { - SysUserVo user = userService.selectUserById(LoginHelper.getUserId()); - ProfileVo profileVo = new ProfileVo(); - profileVo.setUser(user); - profileVo.setRoleGroup(userService.selectUserRoleGroup(user.getUserId())); - profileVo.setPostGroup(userService.selectUserPostGroup(user.getUserId())); - return R.ok(profileVo); + public R profile() { + Sys2UserVo user = userService.selectUserById(LoginHelper.getUserId()); + TwoProfileVo twoProfileVo = new TwoProfileVo(); + twoProfileVo.setUser(user); + twoProfileVo.setRoleGroup(userService.selectUserRoleGroup(user.getUserId())); + twoProfileVo.setPostGroup(userService.selectUserPostGroup(user.getUserId())); + return R.ok(twoProfileVo); } /** @@ -63,8 +63,8 @@ public class SysProfileController extends BaseController { @RepeatSubmit @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping - public R updateProfile(@Validated @RequestBody SysUserProfileBo profile) { - SysUserBo user = BeanUtil.toBean(profile, SysUserBo.class); + public R updateProfile(@Validated @RequestBody Sys2UserProfileBo profile) { + Sys2UserBo user = BeanUtil.toBean(profile, Sys2UserBo.class); user.setUserId(LoginHelper.getUserId()); String username = LoginHelper.getUsername(); if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { @@ -89,8 +89,8 @@ public class SysProfileController extends BaseController { @ApiEncrypt @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping("/updatePwd") - public R updatePwd(@Validated @RequestBody SysUserPasswordBo bo) { - SysUserVo user = userService.selectUserById(LoginHelper.getUserId()); + public R updatePwd(@Validated @RequestBody Sys2UserPasswordBo bo) { + Sys2UserVo user = userService.selectUserById(LoginHelper.getUserId()); String password = user.getPassword(); if (!BCrypt.checkpw(bo.getOldPassword(), password)) { return R.fail("修改密码失败，旧密码错误"); @@ -113,18 +113,18 @@ public class SysProfileController extends BaseController { @RepeatSubmit @Log(title = "用户头像", businessType = BusinessType.UPDATE) @PostMapping(value = "/avatar", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public R avatar(@RequestPart("avatarfile") MultipartFile avatarfile) { + public R avatar(@RequestPart("avatarfile") MultipartFile avatarfile) { if (!avatarfile.isEmpty()) { String extension = FileUtil.extName(avatarfile.getOriginalFilename()); if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) { return R.fail("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式"); } - SysOssVo oss = ossService.upload(avatarfile); + Sys2OssVo oss = ossService.upload(avatarfile); String avatar = oss.getUrl(); if (userService.updateUserAvatar(LoginHelper.getUserId(), oss.getOssId())) { - AvatarVo avatarVo = new AvatarVo(); - avatarVo.setImgUrl(avatar); - return R.ok(avatarVo); + TwoAvatarVo twoAvatarVo = new TwoAvatarVo(); + twoAvatarVo.setImgUrl(avatar); + return R.ok(twoAvatarVo); } } return R.fail("上传图片异常，请联系管理员"); diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysRoleController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2RoleController.java similarity index 75% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysRoleController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2RoleController.java index 44bab114b..89cd85517 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysRoleController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2RoleController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; @@ -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.tenant.domain.SysUserRole; -import org.dromara.system.tenant.domain.bo.SysDeptBo; -import org.dromara.system.tenant.domain.bo.SysRoleBo; -import org.dromara.system.tenant.domain.bo.SysUserBo; -import org.dromara.system.tenant.domain.vo.DeptTreeSelectVo; -import org.dromara.system.tenant.domain.vo.SysRoleVo; -import org.dromara.system.tenant.domain.vo.SysUserVo; -import org.dromara.system.tenant.service.ISysDeptService; -import org.dromara.system.tenant.service.ISysRoleService; -import org.dromara.system.tenant.service.ISysUserService; +import org.dromara.system.saas.domain.Sys2UserRole; +import org.dromara.system.saas.domain.bo.Sys2DeptBo; +import org.dromara.system.saas.domain.bo.Sys2RoleBo; +import org.dromara.system.saas.domain.bo.Sys2UserBo; +import org.dromara.system.saas.domain.vo.TwoDeptTreeSelectVo; +import org.dromara.system.saas.domain.vo.Sys2RoleVo; +import org.dromara.system.saas.domain.vo.Sys2UserVo; +import org.dromara.system.saas.service.ISys2DeptService; +import org.dromara.system.saas.service.ISys2RoleService; +import org.dromara.system.saas.service.ISys2UserService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -33,19 +33,19 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/role") -public class SysRoleController extends BaseController { +@RequestMapping("/system2/role") +public class Sys2RoleController extends BaseController { - private final ISysRoleService roleService; - private final ISysUserService userService; - private final ISysDeptService deptService; + private final ISys2RoleService roleService; + private final ISys2UserService userService; + private final ISys2DeptService deptService; /** * 获取角色信息列表 */ @SaCheckPermission("system:role:list") @GetMapping("/list") - public TableDataInfo list(SysRoleBo role, PageQuery pageQuery) { + public TableDataInfo list(Sys2RoleBo role, PageQuery pageQuery) { return roleService.selectPageRoleList(role, pageQuery); } @@ -55,9 +55,9 @@ public class SysRoleController extends BaseController { @Log(title = "角色管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:role:export") @PostMapping("/export") - public void export(SysRoleBo role, HttpServletResponse response) { - List list = roleService.selectRoleList(role); - ExcelUtil.exportExcel(list, "角色数据", SysRoleVo.class, response); + public void export(Sys2RoleBo role, HttpServletResponse response) { + List list = roleService.selectRoleList(role); + ExcelUtil.exportExcel(list, "角色数据", Sys2RoleVo.class, response); } /** @@ -67,7 +67,7 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:query") @GetMapping(value = "/{roleId}") - public R getInfo(@PathVariable Long roleId) { + public R getInfo(@PathVariable Long roleId) { roleService.checkRoleDataScope(roleId); return R.ok(roleService.selectRoleById(roleId)); } @@ -78,7 +78,7 @@ public class SysRoleController extends BaseController { @SaCheckPermission("system:role:add") @Log(title = "角色管理", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysRoleBo role) { + public R add(@Validated @RequestBody Sys2RoleBo role) { roleService.checkRoleAllowed(role); if (!roleService.checkRoleNameUnique(role)) { return R.fail("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); @@ -95,7 +95,7 @@ public class SysRoleController extends BaseController { @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysRoleBo role) { + public R edit(@Validated @RequestBody Sys2RoleBo role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); if (!roleService.checkRoleNameUnique(role)) { @@ -117,7 +117,7 @@ public class SysRoleController extends BaseController { @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/dataScope") - public R dataScope(@RequestBody SysRoleBo role) { + public R dataScope(@RequestBody Sys2RoleBo role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); return toAjax(roleService.authDataScope(role)); @@ -129,7 +129,7 @@ public class SysRoleController extends BaseController { @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public R changeStatus(@RequestBody SysRoleBo role) { + public R changeStatus(@RequestBody Sys2RoleBo role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); return toAjax(roleService.updateRoleStatus(role.getRoleId(), role.getStatus())); @@ -154,7 +154,7 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:query") @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] roleIds) { + public R> optionselect(@RequestParam(required = false) Long[] roleIds) { return R.ok(roleService.selectRoleByIds(roleIds == null ? null : List.of(roleIds))); } @@ -163,7 +163,7 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:list") @GetMapping("/authUser/allocatedList") - public TableDataInfo allocatedList(SysUserBo user, PageQuery pageQuery) { + public TableDataInfo allocatedList(Sys2UserBo user, PageQuery pageQuery) { return userService.selectAllocatedList(user, pageQuery); } @@ -172,7 +172,7 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:list") @GetMapping("/authUser/unallocatedList") - public TableDataInfo unallocatedList(SysUserBo user, PageQuery pageQuery) { + public TableDataInfo unallocatedList(Sys2UserBo user, PageQuery pageQuery) { return userService.selectUnallocatedList(user, pageQuery); } @@ -182,7 +182,7 @@ public class SysRoleController extends BaseController { @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancel") - public R cancelAuthUser(@RequestBody SysUserRole userRole) { + public R cancelAuthUser(@RequestBody Sys2UserRole userRole) { return toAjax(roleService.deleteAuthUser(userRole)); } @@ -220,10 +220,10 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:list") @GetMapping(value = "/deptTree/{roleId}") - public R roleDeptTreeselect(@PathVariable("roleId") Long roleId) { - DeptTreeSelectVo selectVo = new DeptTreeSelectVo(); + public R roleDeptTreeselect(@PathVariable("roleId") Long roleId) { + TwoDeptTreeSelectVo selectVo = new TwoDeptTreeSelectVo(); selectVo.setCheckedKeys(deptService.selectDeptListByRoleId(roleId)); - selectVo.setDepts(deptService.selectDeptTreeList(new SysDeptBo())); + selectVo.setDepts(deptService.selectDeptTreeList(new Sys2DeptBo())); return R.ok(selectVo); } } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysSocialController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2SocialController.java similarity index 67% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysSocialController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2SocialController.java index 8a47e50fb..f81a7cdca 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysSocialController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2SocialController.java @@ -1,11 +1,11 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; 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.tenant.domain.vo.SysSocialVo; -import org.dromara.system.tenant.service.ISysSocialService; +import org.dromara.system.saas.domain.vo.Sys2SocialVo; +import org.dromara.system.saas.service.ISys2SocialService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -22,16 +22,16 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/social") -public class SysSocialController extends BaseController { +@RequestMapping("/system2/social") +public class Sys2SocialController extends BaseController { - private final ISysSocialService socialUserService; + private final ISys2SocialService socialUserService; /** * 查询社会化关系列表 */ @GetMapping("/list") - public R> list() { + public R> list() { return R.ok(socialUserService.queryListByUserId(LoginHelper.getUserId())); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysTenantController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2TenantController.java similarity index 86% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysTenantController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2TenantController.java index 961fa8bc5..df71785b0 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysTenantController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2TenantController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; @@ -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.tenant.domain.bo.SysTenantBo; -import org.dromara.system.tenant.domain.vo.SysTenantVo; -import org.dromara.system.tenant.service.ISysTenantService; +import org.dromara.system.saas.domain.bo.Sys2TenantBo; +import org.dromara.system.saas.domain.vo.Sys2TenantVo; +import org.dromara.system.saas.service.ISys2TenantService; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -38,11 +38,11 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/tenant") +@RequestMapping("/system2/tenant") @ConditionalOnProperty(value = "tenant.enable", havingValue = "true") -public class SysTenantController extends BaseController { +public class Sys2TenantController extends BaseController { - private final ISysTenantService tenantService; + private final ISys2TenantService tenantService; /** * 查询租户列表 @@ -50,7 +50,7 @@ public class SysTenantController extends BaseController { @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:tenant:list") @GetMapping("/list") - public TableDataInfo list(SysTenantBo bo, PageQuery pageQuery) { + public TableDataInfo list(Sys2TenantBo bo, PageQuery pageQuery) { return tenantService.queryPageList(bo, pageQuery); } @@ -61,9 +61,9 @@ public class SysTenantController extends BaseController { @SaCheckPermission("system:tenant:export") @Log(title = "租户", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(SysTenantBo bo, HttpServletResponse response) { - List list = tenantService.queryList(bo); - ExcelUtil.exportExcel(list, "租户", SysTenantVo.class, response); + public void export(Sys2TenantBo bo, HttpServletResponse response) { + List list = tenantService.queryList(bo); + ExcelUtil.exportExcel(list, "租户", Sys2TenantVo.class, response); } /** @@ -74,7 +74,7 @@ public class SysTenantController extends BaseController { @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:tenant:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(tenantService.queryById(id)); } @@ -89,7 +89,7 @@ public class SysTenantController extends BaseController { @Lock4j @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SysTenantBo bo) { + public R add(@Validated(AddGroup.class) @RequestBody Sys2TenantBo bo) { if (!tenantService.checkCompanyNameUnique(bo)) { return R.fail("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在"); } @@ -104,7 +104,7 @@ public class SysTenantController extends BaseController { @Log(title = "租户", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) { + public R edit(@Validated(EditGroup.class) @RequestBody Sys2TenantBo bo) { tenantService.checkTenantAllowed(bo.getTenantId()); if (!tenantService.checkCompanyNameUnique(bo)) { return R.fail("修改租户'" + bo.getCompanyName() + "'失败，公司名称已存在"); @@ -119,7 +119,7 @@ public class SysTenantController extends BaseController { @SaCheckPermission("system:tenant:edit") @Log(title = "租户", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public R changeStatus(@RequestBody SysTenantBo bo) { + public R changeStatus(@RequestBody Sys2TenantBo bo) { tenantService.checkTenantAllowed(bo.getTenantId()); return toAjax(tenantService.updateTenantStatus(bo)); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysTenantPackageController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2TenantPackageController.java similarity index 81% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysTenantPackageController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2TenantPackageController.java index 7ee493170..764fc9b94 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysTenantPackageController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2TenantPackageController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; @@ -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.tenant.domain.bo.SysTenantPackageBo; -import org.dromara.system.tenant.domain.vo.SysTenantPackageVo; -import org.dromara.system.tenant.service.ISysTenantPackageService; +import org.dromara.system.saas.domain.bo.Sys2TenantPackageBo; +import org.dromara.system.saas.domain.vo.Sys2TenantPackageVo; +import org.dromara.system.saas.service.ISys2TenantPackageService; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; @@ -34,11 +34,11 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/tenant/package") +@RequestMapping("/system2/tenant/package") @ConditionalOnProperty(value = "tenant.enable", havingValue = "true") -public class SysTenantPackageController extends BaseController { +public class Sys2TenantPackageController extends BaseController { - private final ISysTenantPackageService tenantPackageService; + private final ISys2TenantPackageService tenantPackageService; /** * 查询租户套餐列表 @@ -46,7 +46,7 @@ public class SysTenantPackageController extends BaseController { @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:tenantPackage:list") @GetMapping("/list") - public TableDataInfo list(SysTenantPackageBo bo, PageQuery pageQuery) { + public TableDataInfo list(Sys2TenantPackageBo bo, PageQuery pageQuery) { return tenantPackageService.queryPageList(bo, pageQuery); } @@ -56,7 +56,7 @@ public class SysTenantPackageController extends BaseController { @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:tenantPackage:list") @GetMapping("/selectList") - public R> selectList() { + public R> selectList() { return R.ok(tenantPackageService.selectList()); } @@ -67,9 +67,9 @@ public class SysTenantPackageController extends BaseController { @SaCheckPermission("system:tenantPackage:export") @Log(title = "租户套餐", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(SysTenantPackageBo bo, HttpServletResponse response) { - List list = tenantPackageService.queryList(bo); - ExcelUtil.exportExcel(list, "租户套餐", SysTenantPackageVo.class, response); + public void export(Sys2TenantPackageBo bo, HttpServletResponse response) { + List list = tenantPackageService.queryList(bo); + ExcelUtil.exportExcel(list, "租户套餐", Sys2TenantPackageVo.class, response); } /** @@ -80,7 +80,7 @@ public class SysTenantPackageController extends BaseController { @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:tenantPackage:query") @GetMapping("/{packageId}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long packageId) { return R.ok(tenantPackageService.queryById(packageId)); } @@ -93,7 +93,7 @@ public class SysTenantPackageController extends BaseController { @Log(title = "租户套餐", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SysTenantPackageBo bo) { + public R add(@Validated(AddGroup.class) @RequestBody Sys2TenantPackageBo bo) { if (!tenantPackageService.checkPackageNameUnique(bo)) { return R.fail("新增套餐'" + bo.getPackageName() + "'失败，套餐名称已存在"); } @@ -108,7 +108,7 @@ public class SysTenantPackageController extends BaseController { @Log(title = "租户套餐", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SysTenantPackageBo bo) { + public R edit(@Validated(EditGroup.class) @RequestBody Sys2TenantPackageBo bo) { if (!tenantPackageService.checkPackageNameUnique(bo)) { return R.fail("修改套餐'" + bo.getPackageName() + "'失败，套餐名称已存在"); } @@ -122,7 +122,7 @@ public class SysTenantPackageController extends BaseController { @SaCheckPermission("system:tenantPackage:edit") @Log(title = "租户套餐", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public R changeStatus(@RequestBody SysTenantPackageBo bo) { + public R changeStatus(@RequestBody Sys2TenantPackageBo bo) { return toAjax(tenantPackageService.updatePackageStatus(bo)); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2UserController.java similarity index 75% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysUserController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2UserController.java index 396e91c91..7563236c4 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysUserController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2UserController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.secure.BCrypt; @@ -23,15 +23,13 @@ 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.tenant.domain.bo.SysDeptBo; -import org.dromara.system.tenant.domain.bo.SysPostBo; -import org.dromara.system.tenant.domain.bo.SysRoleBo; -import org.dromara.system.tenant.domain.bo.SysUserBo; -import org.dromara.system.domain.vo.*; -import org.dromara.system.tenant.domain.vo.*; -import org.dromara.system.tenant.listener.SysUserImportListener; -import org.dromara.system.service.*; -import org.dromara.system.tenant.service.*; +import org.dromara.system.saas.domain.bo.Sys2DeptBo; +import org.dromara.system.saas.domain.bo.Sys2PostBo; +import org.dromara.system.saas.domain.bo.Sys2RoleBo; +import org.dromara.system.saas.domain.bo.Sys2UserBo; +import org.dromara.system.saas.domain.vo.*; +import org.dromara.system.saas.listener.SysUserImportListener; +import org.dromara.system.saas.service.*; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -48,21 +46,21 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/user") -public class SysUserController extends BaseController { +@RequestMapping("/system2/user") +public class Sys2UserController extends BaseController { - private final ISysUserService userService; - private final ISysRoleService roleService; - private final ISysPostService postService; - private final ISysDeptService deptService; - private final ISysTenantService tenantService; + private final ISys2UserService userService; + private final ISys2RoleService roleService; + private final ISys2PostService postService; + private final ISys2DeptService deptService; + private final ISys2TenantService tenantService; /** * 获取用户列表 */ @SaCheckPermission("system:user:list") @GetMapping("/list") - public TableDataInfo list(SysUserBo user, PageQuery pageQuery) { + public TableDataInfo list(Sys2UserBo user, PageQuery pageQuery) { return userService.selectPageUserList(user, pageQuery); } @@ -72,9 +70,9 @@ public class SysUserController extends BaseController { @Log(title = "用户管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:user:export") @PostMapping("/export") - public void export(SysUserBo user, HttpServletResponse response) { - List list = userService.selectUserExportList(user); - ExcelUtil.exportExcel(list, "用户数据", SysUserExportVo.class, response); + public void export(Sys2UserBo user, HttpServletResponse response) { + List list = userService.selectUserExportList(user); + ExcelUtil.exportExcel(list, "用户数据", Sys2UserExportVo.class, response); } /** @@ -87,7 +85,7 @@ public class SysUserController extends BaseController { @SaCheckPermission("system:user:import") @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception { - ExcelResult result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport)); + ExcelResult result = ExcelUtil.importExcel(file.getInputStream(), Sys2UserImportVo.class, new SysUserImportListener(updateSupport)); return R.ok(result.getAnalysis()); } @@ -96,7 +94,7 @@ public class SysUserController extends BaseController { */ @PostMapping("/importTemplate") public void importTemplate(HttpServletResponse response) { - ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysUserImportVo.class, response); + ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", Sys2UserImportVo.class, response); } /** @@ -105,21 +103,21 @@ public class SysUserController extends BaseController { * @return 用户信息 */ @GetMapping("/getInfo") - public R getInfo() { - UserInfoVo userInfoVo = new UserInfoVo(); + public R getInfo() { + TwoUserInfoVo twoUserInfoVo = new TwoUserInfoVo(); LoginUser loginUser = LoginHelper.getLoginUser(); if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) { // 超级管理员 如果重新加载用户信息需清除动态租户 TenantHelper.clearDynamic(); } - SysUserVo user = userService.selectUserById(loginUser.getUserId()); + Sys2UserVo user = userService.selectUserById(loginUser.getUserId()); if (ObjectUtil.isNull(user)) { return R.fail("没有权限访问用户数据!"); } - userInfoVo.setUser(user); - userInfoVo.setPermissions(loginUser.getMenuPermission()); - userInfoVo.setRoles(loginUser.getRolePermission()); - return R.ok(userInfoVo); + twoUserInfoVo.setUser(user); + twoUserInfoVo.setPermissions(loginUser.getMenuPermission()); + twoUserInfoVo.setRoles(loginUser.getRolePermission()); + return R.ok(twoUserInfoVo); } /** @@ -129,20 +127,20 @@ public class SysUserController extends BaseController { */ @SaCheckPermission("system:user:query") @GetMapping(value = {"/", "/{userId}"}) - public R getInfo(@PathVariable(value = "userId", required = false) Long userId) { + public R getInfo(@PathVariable(value = "userId", required = false) Long userId) { userService.checkUserDataScope(userId); - SysUserInfoVo userInfoVo = new SysUserInfoVo(); - SysRoleBo roleBo = new SysRoleBo(); + Sys2UserInfoVo userInfoVo = new Sys2UserInfoVo(); + Sys2RoleBo roleBo = new Sys2RoleBo(); roleBo.setStatus(UserConstants.ROLE_NORMAL); - List roles = roleService.selectRoleList(roleBo); + List roles = roleService.selectRoleList(roleBo); userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin())); if (ObjectUtil.isNotNull(userId)) { - SysUserVo sysUser = userService.selectUserById(userId); + Sys2UserVo sysUser = userService.selectUserById(userId); userInfoVo.setUser(sysUser); userInfoVo.setRoleIds(roleService.selectRoleListByUserId(userId)); Long deptId = sysUser.getDeptId(); if (ObjectUtil.isNotNull(deptId)) { - SysPostBo postBo = new SysPostBo(); + Sys2PostBo postBo = new Sys2PostBo(); postBo.setDeptId(deptId); userInfoVo.setPosts(postService.selectPostList(postBo)); userInfoVo.setPostIds(postService.selectPostListByUserId(userId)); @@ -157,7 +155,7 @@ public class SysUserController extends BaseController { @SaCheckPermission("system:user:add") @Log(title = "用户管理", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysUserBo user) { + public R add(@Validated @RequestBody Sys2UserBo user) { deptService.checkDeptDataScope(user.getDeptId()); if (!userService.checkUserNameUnique(user)) { return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); @@ -181,7 +179,7 @@ public class SysUserController extends BaseController { @SaCheckPermission("system:user:edit") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysUserBo user) { + public R edit(@Validated @RequestBody Sys2UserBo user) { userService.checkUserAllowed(user.getUserId()); userService.checkUserDataScope(user.getUserId()); deptService.checkDeptDataScope(user.getDeptId()); @@ -218,8 +216,8 @@ public class SysUserController extends BaseController { */ @SaCheckPermission("system:user:query") @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] userIds, - @RequestParam(required = false) Long deptId) { + public R> optionselect(@RequestParam(required = false) Long[] userIds, + @RequestParam(required = false) Long deptId) { return R.ok(userService.selectUserByIds(userIds == null ? null : List.of(userIds), deptId)); } @@ -230,7 +228,7 @@ public class SysUserController extends BaseController { @SaCheckPermission("system:user:resetPwd") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/resetPwd") - public R resetPwd(@RequestBody SysUserBo user) { + public R resetPwd(@RequestBody Sys2UserBo user) { userService.checkUserAllowed(user.getUserId()); userService.checkUserDataScope(user.getUserId()); user.setPassword(BCrypt.hashpw(user.getPassword())); @@ -243,7 +241,7 @@ public class SysUserController extends BaseController { @SaCheckPermission("system:user:edit") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public R changeStatus(@RequestBody SysUserBo user) { + public R changeStatus(@RequestBody Sys2UserBo user) { userService.checkUserAllowed(user.getUserId()); userService.checkUserDataScope(user.getUserId()); return toAjax(userService.updateUserStatus(user.getUserId(), user.getStatus())); @@ -256,11 +254,11 @@ public class SysUserController extends BaseController { */ @SaCheckPermission("system:user:query") @GetMapping("/authRole/{userId}") - public R authRole(@PathVariable Long userId) { + public R authRole(@PathVariable Long userId) { userService.checkUserDataScope(userId); - SysUserVo user = userService.selectUserById(userId); - List roles = roleService.selectRolesAuthByUserId(userId); - SysUserInfoVo userInfoVo = new SysUserInfoVo(); + Sys2UserVo user = userService.selectUserById(userId); + List roles = roleService.selectRolesAuthByUserId(userId); + Sys2UserInfoVo userInfoVo = new Sys2UserInfoVo(); userInfoVo.setUser(user); userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin())); return R.ok(userInfoVo); @@ -286,7 +284,7 @@ public class SysUserController extends BaseController { */ @SaCheckPermission("system:user:list") @GetMapping("/deptTree") - public R>> deptTree(SysDeptBo dept) { + public R>> deptTree(Sys2DeptBo dept) { return R.ok(deptService.selectDeptTreeList(dept)); } @@ -295,7 +293,7 @@ public class SysUserController extends BaseController { */ @SaCheckPermission("system:user:list") @GetMapping("/list/dept/{deptId}") - public R> listByDept(@PathVariable @NotNull Long deptId) { + public R> listByDept(@PathVariable @NotNull Long deptId) { return R.ok(userService.selectUserListByDept(deptId)); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysMenuController.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasMenuController.java similarity index 68% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysMenuController.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasMenuController.java index 567a92945..f29c38e41 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/controller/system/SysMenuController.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasMenuController.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.controller.system; +package org.dromara.system.saas.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; @@ -12,12 +12,12 @@ import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; -import org.dromara.system.tenant.domain.SysMenu; -import org.dromara.system.tenant.domain.bo.SysMenuBo; -import org.dromara.system.tenant.domain.vo.MenuTreeSelectVo; -import org.dromara.system.tenant.domain.vo.RouterVo; -import org.dromara.system.tenant.domain.vo.SysMenuVo; -import org.dromara.system.tenant.service.ISysMenuService; +import org.dromara.system.saas.domain.SysSaasMenu; +import org.dromara.system.saas.domain.bo.SysSaasMenuBo; +import org.dromara.system.saas.domain.vo.TwoMenuTreeSelectVo; +import org.dromara.system.saas.domain.vo.TwoRouterVo; +import org.dromara.system.saas.domain.vo.SysSaasMenuVo; +import org.dromara.system.saas.service.ISysSaasMenuService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -32,10 +32,10 @@ import java.util.List; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/system/menu") -public class SysMenuController extends BaseController { +@RequestMapping("/systemSaas/menu") +public class SysSaasMenuController extends BaseController { - private final ISysMenuService menuService; + private final ISysSaasMenuService menuService; /** * 获取路由信息 @@ -43,8 +43,8 @@ public class SysMenuController extends BaseController { * @return 路由信息 */ @GetMapping("/getRouters") - public R> getRouters() { - List menus = menuService.selectMenuTreeByUserId(LoginHelper.getUserId()); + public R> getRouters() { + List menus = menuService.selectMenuTreeByUserId(LoginHelper.getUserId()); return R.ok(menuService.buildMenus(menus)); } @@ -55,10 +55,10 @@ public class SysMenuController extends BaseController { TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.TENANT_ADMIN_ROLE_KEY }, mode = SaMode.OR) - @SaCheckPermission("system:menu:list") + @SaCheckPermission("systemSaas:menu:list") @GetMapping("/list") - public R> list(SysMenuBo menu) { - List menus = menuService.selectMenuList(menu, LoginHelper.getUserId()); + public R> list(SysSaasMenuBo menu) { + List menus = menuService.selectMenuList(menu, LoginHelper.getUserId()); return R.ok(menus); } @@ -71,19 +71,19 @@ public class SysMenuController extends BaseController { TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.TENANT_ADMIN_ROLE_KEY }, mode = SaMode.OR) - @SaCheckPermission("system:menu:query") + @SaCheckPermission("systemSaas:menu:query") @GetMapping(value = "/{menuId}") - public R getInfo(@PathVariable Long menuId) { + public R getInfo(@PathVariable Long menuId) { return R.ok(menuService.selectMenuById(menuId)); } /** * 获取菜单下拉树列表 */ - @SaCheckPermission("system:menu:query") + @SaCheckPermission("systemSaas:menu:query") @GetMapping("/treeselect") - public R>> treeselect(SysMenuBo menu) { - List menus = menuService.selectMenuList(menu, LoginHelper.getUserId()); + public R>> treeselect(SysSaasMenuBo menu) { + List menus = menuService.selectMenuList(menu, LoginHelper.getUserId()); return R.ok(menuService.buildMenuTreeSelect(menus)); } @@ -92,11 +92,11 @@ public class SysMenuController extends BaseController { * * @param roleId 角色ID */ - @SaCheckPermission("system:menu:query") + @SaCheckPermission("systemSaas:menu:query") @GetMapping(value = "/roleMenuTreeselect/{roleId}") - public R roleMenuTreeselect(@PathVariable("roleId") Long roleId) { - List menus = menuService.selectMenuList(LoginHelper.getUserId()); - MenuTreeSelectVo selectVo = new MenuTreeSelectVo(); + public R roleMenuTreeselect(@PathVariable("roleId") Long roleId) { + List menus = menuService.selectMenuList(LoginHelper.getUserId()); + TwoMenuTreeSelectVo selectVo = new TwoMenuTreeSelectVo(); selectVo.setCheckedKeys(menuService.selectMenuListByRoleId(roleId)); selectVo.setMenus(menuService.buildMenuTreeSelect(menus)); return R.ok(selectVo); @@ -108,11 +108,11 @@ public class SysMenuController extends BaseController { * @param packageId 租户套餐ID */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:menu:query") + @SaCheckPermission("systemSaas:menu:query") @GetMapping(value = "/tenantPackageMenuTreeselect/{packageId}") - public R tenantPackageMenuTreeselect(@PathVariable("packageId") Long packageId) { - List menus = menuService.selectMenuList(LoginHelper.getUserId()); - MenuTreeSelectVo selectVo = new MenuTreeSelectVo(); + public R tenantPackageMenuTreeselect(@PathVariable("packageId") Long packageId) { + List menus = menuService.selectMenuList(LoginHelper.getUserId()); + TwoMenuTreeSelectVo selectVo = new TwoMenuTreeSelectVo(); selectVo.setCheckedKeys(menuService.selectMenuListByPackageId(packageId)); selectVo.setMenus(menuService.buildMenuTreeSelect(menus)); return R.ok(selectVo); @@ -122,10 +122,10 @@ public class SysMenuController extends BaseController { * 新增菜单 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:menu:add") + @SaCheckPermission("systemSaas:menu:add") @Log(title = "菜单管理", businessType = BusinessType.INSERT) @PostMapping - public R add(@Validated @RequestBody SysMenuBo menu) { + public R add(@Validated @RequestBody SysSaasMenuBo menu) { if (!menuService.checkMenuNameUnique(menu)) { return R.fail("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) { @@ -138,10 +138,10 @@ public class SysMenuController extends BaseController { * 修改菜单 */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:menu:edit") + @SaCheckPermission("systemSaas:menu:edit") @Log(title = "菜单管理", businessType = BusinessType.UPDATE) @PutMapping - public R edit(@Validated @RequestBody SysMenuBo menu) { + public R edit(@Validated @RequestBody SysSaasMenuBo menu) { if (!menuService.checkMenuNameUnique(menu)) { return R.fail("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) { @@ -158,7 +158,7 @@ public class SysMenuController extends BaseController { * @param menuId 菜单ID */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:menu:remove") + @SaCheckPermission("systemSaas:menu:remove") @Log(title = "菜单管理", businessType = BusinessType.DELETE) @DeleteMapping("/{menuId}") public R remove(@PathVariable("menuId") Long menuId) { diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysApplication.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Application.java similarity index 78% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysApplication.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Application.java index 510dd045c..97d4b94f8 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysApplication.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Application.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; @@ -8,15 +8,15 @@ import lombok.EqualsAndHashCode; import java.io.Serial; /** - * 应用对象 sys_application + * 应用对象 sys_saas_application * * @author Lion Li * @date 2024-09-22 */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_application") -public class SysApplication extends BaseEntity { +@TableName("sys_saas_application") +public class Sys2Application extends BaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysCache.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Cache.java similarity index 78% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysCache.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Cache.java index 3c5d24291..297e8b973 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysCache.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Cache.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import org.dromara.common.core.utils.StringUtils; import lombok.Data; @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; */ @Data @NoArgsConstructor -public class SysCache { +public class Sys2Cache { /** * 缓存名称 @@ -33,12 +33,12 @@ public class SysCache { */ private String remark = ""; - public SysCache(String cacheName, String remark) { + public Sys2Cache(String cacheName, String remark) { this.cacheName = cacheName; this.remark = remark; } - public SysCache(String cacheName, String cacheKey, String cacheValue) { + public Sys2Cache(String cacheName, String cacheKey, String cacheValue) { this.cacheName = StringUtils.replace(cacheName, ":", ""); this.cacheKey = StringUtils.replace(cacheKey, cacheName, ""); this.cacheValue = cacheValue; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysClient.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Client.java similarity index 88% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysClient.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Client.java index b4982f97a..46fadb82e 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysClient.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Client.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; @@ -8,15 +8,15 @@ import lombok.EqualsAndHashCode; import java.io.Serial; /** - * 授权管理对象 sys_client + * 授权管理对象 sys2_client * * @author Michelle.Chung * @date 2023-05-15 */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_client") -public class SysClient extends BaseEntity { +@TableName("sys2_client") +public class Sys2Client extends BaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysConfig.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Config.java similarity index 83% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysConfig.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Config.java index b02804b2a..6d756de07 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysConfig.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Config.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -7,15 +7,15 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 参数配置表 sys_config + * 参数配置表 sys2_config * * @author Lion Li */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_config") -public class SysConfig extends TenantEntity { +@TableName("sys2_config") +public class Sys2Config extends TenantEntity { /** * 参数主键 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysDept.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Dept.java similarity index 90% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysDept.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Dept.java index 18435f264..f38ca5e55 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysDept.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Dept.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; @@ -10,15 +10,15 @@ import org.dromara.common.tenant.core.TenantEntity; import java.io.Serial; /** - * 部门表 sys_dept + * 部门表 sys2_dept * * @author Lion Li */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_dept") -public class SysDept extends TenantEntity { +@TableName("sys2_dept") +public class Sys2Dept extends TenantEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysDictData.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2DictData.java similarity index 87% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysDictData.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2DictData.java index 22de0a5fb..d1dfb1e80 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysDictData.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2DictData.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -8,15 +8,15 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 字典数据表 sys_dict_data + * 字典数据表 sys2_dict_data * * @author Lion Li */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_dict_data") -public class SysDictData extends TenantEntity { +@TableName("sys2_dict_data") +public class Sys2DictData extends TenantEntity { /** * 字典编码 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysDictType.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2DictType.java similarity index 79% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysDictType.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2DictType.java index 627ee2659..c3475ee25 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysDictType.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2DictType.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -7,15 +7,15 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 字典类型表 sys_dict_type + * 字典类型表 sys2_dict_type * * @author Lion Li */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_dict_type") -public class SysDictType extends TenantEntity { +@TableName("sys2_dict_type") +public class Sys2DictType extends TenantEntity { /** * 字典主键 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysLogininfor.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Logininfor.java similarity index 87% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysLogininfor.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Logininfor.java index 791537e9e..0e780673e 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysLogininfor.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Logininfor.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -9,14 +9,14 @@ import java.io.Serializable; import java.util.Date; /** - * 系统访问记录表 sys_logininfor + * 系统访问记录表 sys2_logininfor * * @author Lion Li */ @Data -@TableName("sys_logininfor") -public class SysLogininfor implements Serializable { +@TableName("sys2_logininfor") +public class Sys2Logininfor implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysNotice.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Notice.java similarity index 84% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysNotice.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Notice.java index 006a721bf..048966fe0 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysNotice.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Notice.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -8,14 +8,14 @@ import lombok.EqualsAndHashCode; /** - * 通知公告表 sys_notice + * 通知公告表 sys2_notice * * @author Lion Li */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_notice") -public class SysNotice extends TenantEntity { +@TableName("sys2_notice") +public class Sys2Notice extends TenantEntity { /** * 公告ID diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysOperLog.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2OperLog.java similarity index 93% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysOperLog.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2OperLog.java index acf9b2c4b..29b874b09 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysOperLog.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2OperLog.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -15,8 +15,8 @@ import java.util.Date; */ @Data -@TableName("sys_oper_log") -public class SysOperLog implements Serializable { +@TableName("sys2_oper_log") +public class Sys2OperLog implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysOss.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Oss.java similarity index 87% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysOss.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Oss.java index 2c6e2cc86..23e7db46e 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysOss.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Oss.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -13,8 +13,8 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_oss") -public class SysOss extends TenantEntity { +@TableName("sys2_oss") +public class Sys2Oss extends TenantEntity { /** * 对象存储主键 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysOssConfig.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2OssConfig.java similarity index 88% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysOssConfig.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2OssConfig.java index b092c345e..b0151895b 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysOssConfig.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2OssConfig.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -7,14 +7,14 @@ import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; /** - * 对象存储配置对象 sys_oss_config + * 对象存储配置对象 sys2_oss_config * * @author Lion Li */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_oss_config") -public class SysOssConfig extends BaseEntity { +@TableName("sys2_oss_config") +public class Sys2OssConfig extends BaseEntity { /** * 主键 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysPost.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Post.java similarity index 86% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysPost.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Post.java index 056acef61..f0e75bbc3 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysPost.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Post.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -7,15 +7,15 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 岗位表 sys_post + * 岗位表 sys2_post * * @author Lion Li */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_post") -public class SysPost extends TenantEntity { +@TableName("sys2_post") +public class Sys2Post extends TenantEntity { /** * 岗位序号 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysRole.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Role.java similarity index 90% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysRole.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Role.java index 951ef2936..8bdd4f642 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysRole.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Role.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; @@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; /** - * 角色表 sys_role + * 角色表 sys2_role * * @author Lion Li */ @@ -17,8 +17,8 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@TableName("sys_role") -public class SysRole extends TenantEntity { +@TableName("sys2_role") +public class Sys2Role extends TenantEntity { /** * 角色ID @@ -72,7 +72,7 @@ public class SysRole extends TenantEntity { */ private String remark; - public SysRole(Long roleId) { + public Sys2Role(Long roleId) { this.roleId = roleId; } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysRoleDept.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2RoleDept.java similarity index 72% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysRoleDept.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2RoleDept.java index fcd3fd07a..4c943f87a 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysRoleDept.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2RoleDept.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; /** - * 角色和部门关联 sys_role_dept + * 角色和部门关联 sys2_role_dept * * @author Lion Li */ @Data -@TableName("sys_role_dept") -public class SysRoleDept { +@TableName("sys2_role_dept") +public class Sys2RoleDept { /** * 角色ID diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysRoleMenu.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2RoleMenu.java similarity index 72% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysRoleMenu.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2RoleMenu.java index d9b000c24..168875d85 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysRoleMenu.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2RoleMenu.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; /** - * 角色和菜单关联 sys_role_menu + * 角色和菜单关联 sys2_role_menu * * @author Lion Li */ @Data -@TableName("sys_role_menu") -public class SysRoleMenu { +@TableName("sys2_role_menu") +public class Sys2RoleMenu { /** * 角色ID diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysSocial.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Social.java similarity index 93% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysSocial.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Social.java index be6e99ba0..7e6d20841 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysSocial.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Social.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -9,14 +9,14 @@ import org.dromara.common.tenant.core.TenantEntity; import java.io.Serial; /** - * 社会化关系对象 sys_social + * 社会化关系对象 sys2_social * * @author thiszhc */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_social") -public class SysSocial extends TenantEntity { +@TableName("sys2_social") +public class Sys2Social extends TenantEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysTenant.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Tenant.java similarity index 91% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysTenant.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Tenant.java index ddbc91baf..d90533f8c 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysTenant.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Tenant.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; @@ -11,14 +11,14 @@ import java.io.Serial; import java.util.Date; /** - * 租户对象 sys_tenant + * 租户对象 sys2_tenant * * @author Michelle.Chung */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_tenant") -public class SysTenant extends BaseEntity { +@TableName("sys2_tenant") +public class Sys2Tenant extends BaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysTenantApplication.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2TenantApplication.java similarity index 67% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysTenantApplication.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2TenantApplication.java index 7ba291f55..1ce038915 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysTenantApplication.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2TenantApplication.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; @@ -7,14 +7,14 @@ import java.io.Serial; import java.io.Serializable; /** - * 租户和应用关联对象 sys_tenant_application + * 租户和应用关联对象 sys2_tenant_application * * @author Lion Li * @date 2024-09-22 */ @Data -@TableName("sys_tenant_application") -public class SysTenantApplication implements Serializable { +@TableName("sys2_tenant_application") +public class Sys2TenantApplication implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysTenantPackage.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2TenantPackage.java similarity index 85% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysTenantPackage.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2TenantPackage.java index 6acdd454a..d3e4c94ed 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysTenantPackage.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2TenantPackage.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; @@ -8,14 +8,14 @@ import java.io.Serial; import org.dromara.common.mybatis.core.domain.BaseEntity; /** - * 租户套餐对象 sys_tenant_package + * 租户套餐对象 sys2_tenant_package * * @author Michelle.Chung */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_tenant_package") -public class SysTenantPackage extends BaseEntity { +@TableName("sys2_tenant_package") +public class Sys2TenantPackage extends BaseEntity { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysUser.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2User.java similarity index 88% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysUser.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2User.java index c508b2663..642c2f0a6 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysUser.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2User.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.*; import org.dromara.common.core.constant.UserConstants; @@ -10,7 +10,7 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * 用户对象 sys_user + * 用户对象 sys2_user * * @author Lion Li */ @@ -18,8 +18,8 @@ import java.util.Date; @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@TableName("sys_user") -public class SysUser extends TenantEntity { +@TableName("sys2_user") +public class Sys2User extends TenantEntity { /** * 用户ID @@ -43,7 +43,7 @@ public class SysUser extends TenantEntity { private String nickName; /** - * 用户类型（sys_user系统用户） + * 用户类型（sys2_user系统用户） */ private String userType; @@ -104,7 +104,7 @@ public class SysUser extends TenantEntity { private String remark; - public SysUser(Long userId) { + public Sys2User(Long userId) { this.userId = userId; } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysUserOnline.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserOnline.java similarity index 91% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysUserOnline.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserOnline.java index e75eba06f..7ab8bca64 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysUserOnline.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserOnline.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @author Lion Li */ @Data -public class SysUserOnline { +public class Sys2UserOnline { /** * 会话编号 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysUserPost.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserPost.java similarity index 72% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysUserPost.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserPost.java index d6d6e02b7..5502f807f 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysUserPost.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserPost.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; /** - * 用户和岗位关联 sys_user_post + * 用户和岗位关联 sys2_user_post * * @author Lion Li */ @Data -@TableName("sys_user_post") -public class SysUserPost { +@TableName("sys2_user_post") +public class Sys2UserPost { /** * 用户ID diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysUserRole.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserRole.java similarity index 72% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysUserRole.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserRole.java index fefcc1895..cd7d26faf 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysUserRole.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserRole.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; /** - * 用户和角色关联 sys_user_role + * 用户和角色关联 sys2_user_role * * @author Lion Li */ @Data -@TableName("sys_user_role") -public class SysUserRole { +@TableName("sys2_user_role") +public class Sys2UserRole { /** * 用户ID diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysMenu.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasMenu.java similarity index 93% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysMenu.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasMenu.java index 9496029cf..0e7138087 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/SysMenu.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasMenu.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain; +package org.dromara.system.saas.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -14,20 +14,25 @@ import java.util.ArrayList; import java.util.List; /** - * 菜单权限表 sys_menu + * 菜单权限表 sys_saas_menu * * @author Lion Li */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_menu") -public class SysMenu extends BaseEntity { +@TableName("sys_saas_menu") +public class SysSaasMenu extends BaseEntity { + + /** + * 应用id + */ + @TableId(value = "application_id") + private Long applicationId; /** * 菜单ID */ - @TableId(value = "menu_id") private Long menuId; /** @@ -110,7 +115,7 @@ public class SysMenu extends BaseEntity { * 子菜单 */ @TableField(exist = false) - private List children = new ArrayList<>(); + private List children = new ArrayList<>(); /** * 获取路由名称 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysApplicationBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ApplicationBo.java similarity index 76% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysApplicationBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ApplicationBo.java index 04ed7d5fb..062e99dc7 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysApplicationBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ApplicationBo.java @@ -1,6 +1,6 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; -import org.dromara.system.tenant.domain.SysApplication; +import org.dromara.system.saas.domain.Sys2Application; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; @@ -10,15 +10,15 @@ import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; /** - * 应用业务对象 sys_application + * 应用业务对象 sys_saas_application * * @author Lion Li * @date 2024-09-22 */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysApplication.class, reverseConvertGenerate = false) -public class SysApplicationBo extends BaseEntity { +@AutoMapper(target = Sys2Application.class, reverseConvertGenerate = false) +public class Sys2ApplicationBo extends BaseEntity { /** * id diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysClientBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ClientBo.java similarity index 85% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysClientBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ClientBo.java index 77edd5594..751c28a13 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysClientBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ClientBo.java @@ -1,6 +1,6 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; -import org.dromara.system.tenant.domain.SysClient; +import org.dromara.system.saas.domain.Sys2Client; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; @@ -12,15 +12,15 @@ import jakarta.validation.constraints.*; import java.util.List; /** - * 授权管理业务对象 sys_client + * 授权管理业务对象 sys2_client * * @author Michelle.Chung * @date 2023-05-15 */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysClient.class, reverseConvertGenerate = false) -public class SysClientBo extends BaseEntity { +@AutoMapper(target = Sys2Client.class, reverseConvertGenerate = false) +public class Sys2ClientBo extends BaseEntity { /** * id diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysConfigBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ConfigBo.java similarity index 82% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysConfigBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ConfigBo.java index 29ec51719..ed5483d0d 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysConfigBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ConfigBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -6,18 +6,18 @@ import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.tenant.domain.SysConfig; +import org.dromara.system.saas.domain.Sys2Config; /** - * 参数配置业务对象 sys_config + * 参数配置业务对象 sys2_config * * @author Michelle.Chung */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysConfig.class, reverseConvertGenerate = false) -public class SysConfigBo extends BaseEntity { +@AutoMapper(target = Sys2Config.class, reverseConvertGenerate = false) +public class Sys2ConfigBo extends BaseEntity { /** * 参数主键 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysDeptBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DeptBo.java similarity index 86% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysDeptBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DeptBo.java index 98a578cbf..47c7767c0 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysDeptBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DeptBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.Email; @@ -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.tenant.domain.SysDept; +import org.dromara.system.saas.domain.Sys2Dept; /** - * 部门业务对象 sys_dept + * 部门业务对象 sys2_dept * * @author Michelle.Chung */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysDept.class, reverseConvertGenerate = false) -public class SysDeptBo extends BaseEntity { +@AutoMapper(target = Sys2Dept.class, reverseConvertGenerate = false) +public class Sys2DeptBo extends BaseEntity { /** * 部门id diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysDictDataBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DictDataBo.java similarity index 85% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysDictDataBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DictDataBo.java index 3b01200bd..84aeba191 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysDictDataBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DictDataBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -6,18 +6,18 @@ import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.tenant.domain.SysDictData; +import org.dromara.system.saas.domain.Sys2DictData; /** - * 字典数据业务对象 sys_dict_data + * 字典数据业务对象 sys2_dict_data * * @author Michelle.Chung */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysDictData.class, reverseConvertGenerate = false) -public class SysDictDataBo extends BaseEntity { +@AutoMapper(target = Sys2DictData.class, reverseConvertGenerate = false) +public class Sys2DictDataBo extends BaseEntity { /** * 字典编码 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysDictTypeBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DictTypeBo.java similarity index 81% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysDictTypeBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DictTypeBo.java index 0df3f1f99..d29785b2c 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysDictTypeBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DictTypeBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -8,18 +8,18 @@ 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.tenant.domain.SysDictType; +import org.dromara.system.saas.domain.Sys2DictType; /** - * 字典类型业务对象 sys_dict_type + * 字典类型业务对象 sys2_dict_type * * @author Michelle.Chung */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysDictType.class, reverseConvertGenerate = false) -public class SysDictTypeBo extends BaseEntity { +@AutoMapper(target = Sys2DictType.class, reverseConvertGenerate = false) +public class Sys2DictTypeBo extends BaseEntity { /** * 字典主键 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysLogininforBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2LogininforBo.java similarity index 81% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysLogininforBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2LogininforBo.java index 57d8514ae..335bd608b 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysLogininforBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2LogininforBo.java @@ -1,6 +1,6 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; -import org.dromara.system.tenant.domain.SysLogininfor; +import org.dromara.system.saas.domain.Sys2Logininfor; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -9,14 +9,14 @@ import java.util.HashMap; import java.util.Map; /** - * 系统访问记录业务对象 sys_logininfor + * 系统访问记录业务对象 sys2_logininfor * * @author Michelle.Chung */ @Data -@AutoMapper(target = SysLogininfor.class, reverseConvertGenerate = false) -public class SysLogininforBo { +@AutoMapper(target = Sys2Logininfor.class, reverseConvertGenerate = false) +public class Sys2LogininforBo { /** * 访问ID diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysNoticeBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2NoticeBo.java similarity index 81% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysNoticeBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2NoticeBo.java index b8bfe3b49..14268a07f 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysNoticeBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2NoticeBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -7,18 +7,18 @@ 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.tenant.domain.SysNotice; +import org.dromara.system.saas.domain.Sys2Notice; /** - * 通知公告业务对象 sys_notice + * 通知公告业务对象 sys2_notice * * @author Michelle.Chung */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysNotice.class, reverseConvertGenerate = false) -public class SysNoticeBo extends BaseEntity { +@AutoMapper(target = Sys2Notice.class, reverseConvertGenerate = false) +public class Sys2NoticeBo extends BaseEntity { /** * 公告ID diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysOperLogBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OperLogBo.java similarity index 88% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysOperLogBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OperLogBo.java index 568d46f17..7496b0f54 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysOperLogBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OperLogBo.java @@ -1,7 +1,7 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; import org.dromara.common.log.event.OperLogEvent; -import org.dromara.system.tenant.domain.SysOperLog; +import org.dromara.system.saas.domain.Sys2OperLog; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMappers; import lombok.Data; @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.Map; /** - * 操作日志记录业务对象 sys_oper_log + * 操作日志记录业务对象 sys2_oper_log * * @author Michelle.Chung * @date 2023-02-07 @@ -19,10 +19,10 @@ import java.util.Map; @Data @AutoMappers({ - @AutoMapper(target = SysOperLog.class, reverseConvertGenerate = false), + @AutoMapper(target = Sys2OperLog.class, reverseConvertGenerate = false), @AutoMapper(target = OperLogEvent.class) }) -public class SysOperLogBo { +public class Sys2OperLogBo { /** * 日志主键 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysOssBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OssBo.java similarity index 71% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysOssBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OssBo.java index b6b28480f..9c3680001 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysOssBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OssBo.java @@ -1,20 +1,20 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.tenant.domain.SysOss; +import org.dromara.system.saas.domain.Sys2Oss; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; /** - * OSS对象存储分页查询对象 sys_oss + * OSS对象存储分页查询对象 sys2_oss * * @author Lion Li */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysOss.class, reverseConvertGenerate = false) -public class SysOssBo extends BaseEntity { +@AutoMapper(target = Sys2Oss.class, reverseConvertGenerate = false) +public class Sys2OssBo extends BaseEntity { /** * ossId diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysOssConfigBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OssConfigBo.java similarity index 90% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysOssConfigBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OssConfigBo.java index 2e0da76c3..dce191b31 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysOssConfigBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OssConfigBo.java @@ -1,9 +1,9 @@ -package org.dromara.system.tenant.domain.bo; +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.tenant.domain.SysOssConfig; +import org.dromara.system.saas.domain.Sys2OssConfig; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -12,7 +12,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 对象存储配置业务对象 sys_oss_config + * 对象存储配置业务对象 sys2_oss_config * * @author Lion Li * @author 孤舟烟雨 @@ -21,8 +21,8 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysOssConfig.class, reverseConvertGenerate = false) -public class SysOssConfigBo extends BaseEntity { +@AutoMapper(target = Sys2OssConfig.class, reverseConvertGenerate = false) +public class Sys2OssConfigBo extends BaseEntity { /** * 主键 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysPostBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2PostBo.java similarity index 85% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysPostBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2PostBo.java index 792d5d74a..7e9628533 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysPostBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2PostBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -7,18 +7,18 @@ import jakarta.validation.constraints.Size; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.tenant.domain.SysPost; +import org.dromara.system.saas.domain.Sys2Post; /** - * 岗位信息业务对象 sys_post + * 岗位信息业务对象 sys2_post * * @author Michelle.Chung */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysPost.class, reverseConvertGenerate = false) -public class SysPostBo extends BaseEntity { +@AutoMapper(target = Sys2Post.class, reverseConvertGenerate = false) +public class Sys2PostBo extends BaseEntity { /** * 岗位ID diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysRoleBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2RoleBo.java similarity index 87% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysRoleBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2RoleBo.java index 00fd520c7..c37ea65de 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysRoleBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2RoleBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -9,10 +9,10 @@ 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.tenant.domain.SysRole; +import org.dromara.system.saas.domain.Sys2Role; /** - * 角色信息业务对象 sys_role + * 角色信息业务对象 sys2_role * * @author Michelle.Chung */ @@ -20,8 +20,8 @@ import org.dromara.system.tenant.domain.SysRole; @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysRole.class, reverseConvertGenerate = false) -public class SysRoleBo extends BaseEntity { +@AutoMapper(target = Sys2Role.class, reverseConvertGenerate = false) +public class Sys2RoleBo extends BaseEntity { /** * 角色ID @@ -83,7 +83,7 @@ public class SysRoleBo extends BaseEntity { */ private Long[] deptIds; - public SysRoleBo(Long roleId) { + public Sys2RoleBo(Long roleId) { this.roleId = roleId; } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysSocialBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2SocialBo.java similarity index 91% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysSocialBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2SocialBo.java index 6a388140b..72f1e0c0a 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysSocialBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2SocialBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -9,18 +9,18 @@ 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.tenant.domain.SysSocial; +import org.dromara.system.saas.domain.Sys2Social; /** - * 社会化关系业务对象 sys_social + * 社会化关系业务对象 sys2_social * * @author Lion Li */ @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysSocial.class, reverseConvertGenerate = false) -public class SysSocialBo extends TenantEntity { +@AutoMapper(target = Sys2Social.class, reverseConvertGenerate = false) +public class Sys2SocialBo extends TenantEntity { /** * 主键 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysTenantApplicationBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantApplicationBo.java similarity index 66% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysTenantApplicationBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantApplicationBo.java index 972475772..5a14a7881 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysTenantApplicationBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantApplicationBo.java @@ -1,6 +1,6 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; -import org.dromara.system.tenant.domain.SysTenantApplication; +import org.dromara.system.saas.domain.Sys2TenantApplication; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; @@ -9,15 +9,15 @@ import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; /** - * 租户和应用关联业务对象 sys_tenant_application + * 租户和应用关联业务对象 sys2_tenant_application * * @author Lion Li * @date 2024-09-22 */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysTenantApplication.class, reverseConvertGenerate = false) -public class SysTenantApplicationBo extends BaseEntity { +@AutoMapper(target = Sys2TenantApplication.class, reverseConvertGenerate = false) +public class Sys2TenantApplicationBo extends BaseEntity { @NotNull(message = "租户ID不能为空", groups = {EditGroup.class}) private Long tenantId; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysTenantBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantBo.java similarity index 89% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysTenantBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantBo.java index 8ad16cb77..19a1456b6 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysTenantBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantBo.java @@ -1,8 +1,8 @@ -package org.dromara.system.tenant.domain.bo; +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.tenant.domain.SysTenant; +import org.dromara.system.saas.domain.Sys2Tenant; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,15 +13,15 @@ import java.util.Date; import org.dromara.common.mybatis.core.domain.BaseEntity; /** - * 租户业务对象 sys_tenant + * 租户业务对象 sys2_tenant * * @author Michelle.Chung */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysTenant.class, reverseConvertGenerate = false) -public class SysTenantBo extends BaseEntity { +@AutoMapper(target = Sys2Tenant.class, reverseConvertGenerate = false) +public class Sys2TenantBo extends BaseEntity { /** * id diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysTenantPackageBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantPackageBo.java similarity index 81% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysTenantPackageBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantPackageBo.java index 1b8134a05..3f9b81205 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysTenantPackageBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantPackageBo.java @@ -1,8 +1,8 @@ -package org.dromara.system.tenant.domain.bo; +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.tenant.domain.SysTenantPackage; +import org.dromara.system.saas.domain.Sys2TenantPackage; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapping; import lombok.Data; @@ -12,15 +12,15 @@ import jakarta.validation.constraints.*; import org.dromara.common.mybatis.core.domain.BaseEntity; /** - * 租户套餐业务对象 sys_tenant_package + * 租户套餐业务对象 sys2_tenant_package * * @author Michelle.Chung */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysTenantPackage.class, reverseConvertGenerate = false) -public class SysTenantPackageBo extends BaseEntity { +@AutoMapper(target = Sys2TenantPackage.class, reverseConvertGenerate = false) +public class Sys2TenantPackageBo extends BaseEntity { /** * 租户套餐id diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysUserBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserBo.java similarity index 87% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysUserBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserBo.java index 6f168c566..c4db816bd 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysUserBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.Email; @@ -10,10 +10,10 @@ 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.tenant.domain.SysUser; +import org.dromara.system.saas.domain.Sys2User; /** - * 用户信息业务对象 sys_user + * 用户信息业务对象 sys2_user * * @author Michelle.Chung */ @@ -21,8 +21,8 @@ import org.dromara.system.tenant.domain.SysUser; @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysUser.class, reverseConvertGenerate = false) -public class SysUserBo extends BaseEntity { +@AutoMapper(target = Sys2User.class, reverseConvertGenerate = false) +public class Sys2UserBo extends BaseEntity { /** * 应用id @@ -57,7 +57,7 @@ public class SysUserBo extends BaseEntity { private String nickName; /** - * 用户类型（sys_user系统用户） + * 用户类型（sys2_user系统用户） */ private String userType; @@ -114,7 +114,7 @@ public class SysUserBo extends BaseEntity { */ private String excludeUserIds; - public SysUserBo(Long userId) { + public Sys2UserBo(Long userId) { this.userId = userId; } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysUserPasswordBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserPasswordBo.java similarity index 81% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysUserPasswordBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserPasswordBo.java index 17edc395a..2eae6017d 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysUserPasswordBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserPasswordBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; import jakarta.validation.constraints.NotBlank; import lombok.Data; @@ -10,7 +10,7 @@ import java.io.Serializable; * 用户密码修改bo */ @Data -public class SysUserPasswordBo implements Serializable { +public class Sys2UserPasswordBo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysUserProfileBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserProfileBo.java similarity index 93% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysUserProfileBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserProfileBo.java index 16bfd1420..d799d9ff0 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysUserProfileBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserProfileBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Pattern; @@ -21,7 +21,7 @@ import org.dromara.common.sensitive.core.SensitiveStrategy; @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -public class SysUserProfileBo extends BaseEntity { +public class Sys2UserProfileBo extends BaseEntity { /** * 用户昵称 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysMenuBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasMenuBo.java similarity index 89% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysMenuBo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasMenuBo.java index 6331dbc8a..a229f2f1b 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/bo/SysMenuBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasMenuBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.bo; +package org.dromara.system.saas.domain.bo; import com.fasterxml.jackson.annotation.JsonInclude; import io.github.linpeilie.annotations.AutoMapper; @@ -10,18 +10,18 @@ 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.tenant.domain.SysMenu; +import org.dromara.system.saas.domain.SysSaasMenu; /** - * 菜单权限业务对象 sys_menu + * 菜单权限业务对象 sys_saas_menu * * @author Michelle.Chung */ @Data @EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysMenu.class, reverseConvertGenerate = false) -public class SysMenuBo extends BaseEntity { +@AutoMapper(target = SysSaasMenu.class, reverseConvertGenerate = false) +public class SysSaasMenuBo extends BaseEntity { /** * 菜单ID diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysApplicationVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ApplicationVo.java similarity index 74% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysApplicationVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ApplicationVo.java index 2207d4520..b892df21f 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysApplicationVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ApplicationVo.java @@ -1,6 +1,6 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; -import org.dromara.system.tenant.domain.SysApplication; +import org.dromara.system.saas.domain.Sys2Application; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; @@ -11,15 +11,15 @@ import java.io.Serializable; /** - * 应用视图对象 sys_application + * 应用视图对象 sys_saas_application * * @author Lion Li * @date 2024-09-22 */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = SysApplication.class) -public class SysApplicationVo implements Serializable { +@AutoMapper(target = Sys2Application.class) +public class Sys2ApplicationVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysClientVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ClientVo.java similarity index 88% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysClientVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ClientVo.java index 10aea0165..5d5b35616 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysClientVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ClientVo.java @@ -1,6 +1,6 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; -import org.dromara.system.tenant.domain.SysClient; +import org.dromara.system.saas.domain.Sys2Client; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; @@ -14,15 +14,15 @@ import java.util.List; /** - * 授权管理视图对象 sys_client + * 授权管理视图对象 sys2_client * * @author Michelle.Chung * @date 2023-05-15 */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = SysClient.class) -public class SysClientVo implements Serializable { +@AutoMapper(target = Sys2Client.class) +public class Sys2ClientVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysConfigVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ConfigVo.java similarity index 82% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysConfigVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ConfigVo.java index 65114ed20..0c2a644ef 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysConfigVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ConfigVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; 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.tenant.domain.SysConfig; +import org.dromara.system.saas.domain.Sys2Config; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -14,14 +14,14 @@ import java.util.Date; /** - * 参数配置视图对象 sys_config + * 参数配置视图对象 sys2_config * * @author Michelle.Chung */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = SysConfig.class) -public class SysConfigVo implements Serializable { +@AutoMapper(target = Sys2Config.class) +public class Sys2ConfigVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -54,7 +54,7 @@ public class SysConfigVo implements Serializable { * 系统内置（Y是 N否） */ @ExcelProperty(value = "系统内置", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_yes_no") + @ExcelDictFormat(dictType = "sys2_yes_no") private String configType; /** diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysDeptVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DeptVo.java similarity index 86% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysDeptVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DeptVo.java index a31aafd69..c84d315b1 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysDeptVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DeptVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; 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.tenant.domain.SysDept; +import org.dromara.system.saas.domain.Sys2Dept; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -13,14 +13,14 @@ import java.io.Serializable; import java.util.Date; /** - * 部门视图对象 sys_dept + * 部门视图对象 sys2_dept * * @author Michelle.Chung */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = SysDept.class) -public class SysDeptVo implements Serializable { +@AutoMapper(target = Sys2Dept.class) +public class Sys2DeptVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -90,7 +90,7 @@ public class SysDeptVo implements Serializable { * 部门状态（0正常 1停用） */ @ExcelProperty(value = "部门状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_normal_disable") + @ExcelDictFormat(dictType = "sys2_normal_disable") private String status; /** diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysDictDataVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DictDataVo.java similarity index 85% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysDictDataVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DictDataVo.java index 2882c55af..c79c58be1 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysDictDataVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DictDataVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; 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.tenant.domain.SysDictData; +import org.dromara.system.saas.domain.Sys2DictData; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -14,14 +14,14 @@ import java.util.Date; /** - * 字典数据视图对象 sys_dict_data + * 字典数据视图对象 sys2_dict_data * * @author Michelle.Chung */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = SysDictData.class) -public class SysDictDataVo implements Serializable { +@AutoMapper(target = Sys2DictData.class) +public class Sys2DictDataVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -70,7 +70,7 @@ public class SysDictDataVo implements Serializable { * 是否默认（Y是 N否） */ @ExcelProperty(value = "是否默认", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_yes_no") + @ExcelDictFormat(dictType = "sys2_yes_no") private String isDefault; /** diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysDictTypeVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DictTypeVo.java similarity index 79% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysDictTypeVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DictTypeVo.java index 5972fb996..e0ad7cc09 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysDictTypeVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DictTypeVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.system.tenant.domain.SysDictType; +import org.dromara.system.saas.domain.Sys2DictType; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -12,14 +12,14 @@ import java.util.Date; /** - * 字典类型视图对象 sys_dict_type + * 字典类型视图对象 sys2_dict_type * * @author Michelle.Chung */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = SysDictType.class) -public class SysDictTypeVo implements Serializable { +@AutoMapper(target = Sys2DictType.class) +public class Sys2DictTypeVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysLogininforVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2LogininforVo.java similarity index 84% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysLogininforVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2LogininforVo.java index 34dd9f7b3..f3c5ed2fc 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysLogininforVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2LogininforVo.java @@ -1,11 +1,11 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import java.util.Date; 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.tenant.domain.SysLogininfor; +import org.dromara.system.saas.domain.Sys2Logininfor; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -15,15 +15,15 @@ import java.io.Serializable; /** - * 系统访问记录视图对象 sys_logininfor + * 系统访问记录视图对象 sys2_logininfor * * @author Michelle.Chung * @date 2023-02-07 */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = SysLogininfor.class) -public class SysLogininforVo implements Serializable { +@AutoMapper(target = Sys2Logininfor.class) +public class Sys2LogininforVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -55,14 +55,14 @@ public class SysLogininforVo implements Serializable { * 设备类型 */ @ExcelProperty(value = "设备类型", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_device_type") + @ExcelDictFormat(dictType = "sys2_device_type") private String deviceType; /** * 登录状态（0成功 1失败） */ @ExcelProperty(value = "登录状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_common_status") + @ExcelDictFormat(dictType = "sys2_common_status") private String status; /** diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysNoticeVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2NoticeVo.java similarity index 83% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysNoticeVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2NoticeVo.java index 9e67c7948..dd334ebd4 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysNoticeVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2NoticeVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.tenant.domain.vo; +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.tenant.domain.SysNotice; +import org.dromara.system.saas.domain.Sys2Notice; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -13,13 +13,13 @@ import java.util.Date; /** - * 通知公告视图对象 sys_notice + * 通知公告视图对象 sys2_notice * * @author Michelle.Chung */ @Data -@AutoMapper(target = SysNotice.class) -public class SysNoticeVo implements Serializable { +@AutoMapper(target = Sys2Notice.class) +public class Sys2NoticeVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysOperLogVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OperLogVo.java similarity index 89% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysOperLogVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OperLogVo.java index 95b0fe399..607cc0b1d 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysOperLogVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OperLogVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; 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.tenant.domain.SysOperLog; +import org.dromara.system.saas.domain.Sys2OperLog; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -14,15 +14,15 @@ import java.util.Date; /** - * 操作日志记录视图对象 sys_oper_log + * 操作日志记录视图对象 sys2_oper_log * * @author Michelle.Chung * @date 2023-02-07 */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = SysOperLog.class) -public class SysOperLogVo implements Serializable { +@AutoMapper(target = Sys2OperLog.class) +public class Sys2OperLogVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -48,7 +48,7 @@ public class SysOperLogVo implements Serializable { * 业务类型（0其它 1新增 2修改 3删除） */ @ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_oper_type") + @ExcelDictFormat(dictType = "sys2_oper_type") private Integer businessType; /** @@ -121,7 +121,7 @@ public class SysOperLogVo implements Serializable { * 操作状态（0正常 1异常） */ @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_common_status") + @ExcelDictFormat(dictType = "sys2_common_status") private Integer status; /** diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysOssConfigVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssConfigVo.java similarity index 84% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysOssConfigVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssConfigVo.java index d92af7e8a..137f3f3e0 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysOssConfigVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssConfigVo.java @@ -1,7 +1,7 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import org.dromara.system.tenant.domain.SysOssConfig; +import org.dromara.system.saas.domain.Sys2OssConfig; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -10,7 +10,7 @@ import java.io.Serializable; /** - * 对象存储配置视图对象 sys_oss_config + * 对象存储配置视图对象 sys2_oss_config * * @author Lion Li * @author 孤舟烟雨 @@ -18,8 +18,8 @@ import java.io.Serializable; */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = SysOssConfig.class) -public class SysOssConfigVo implements Serializable { +@AutoMapper(target = Sys2OssConfig.class) +public class Sys2OssConfigVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysOssUploadVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssUploadVo.java similarity index 78% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysOssUploadVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssUploadVo.java index 446c1d22c..82d40d872 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysOssUploadVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssUploadVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @author Michelle.Chung */ @Data -public class SysOssUploadVo { +public class Sys2OssUploadVo { /** * URL地址 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysOssVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssVo.java similarity index 82% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysOssVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssVo.java index 8a398e249..ce3d24973 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysOssVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.tenant.domain.vo; +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.tenant.domain.SysOss; +import org.dromara.system.saas.domain.Sys2Oss; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -11,13 +11,13 @@ import java.io.Serializable; import java.util.Date; /** - * OSS对象存储视图对象 sys_oss + * OSS对象存储视图对象 sys2_oss * * @author Lion Li */ @Data -@AutoMapper(target = SysOss.class) -public class SysOssVo implements Serializable { +@AutoMapper(target = Sys2Oss.class) +public class Sys2OssVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysPostVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2PostVo.java similarity index 86% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysPostVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2PostVo.java index 751166d1d..dfbde3cbd 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysPostVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2PostVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -8,21 +8,21 @@ 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.tenant.domain.SysPost; +import org.dromara.system.saas.domain.Sys2Post; import java.io.Serial; import java.io.Serializable; import java.util.Date; /** - * 岗位信息视图对象 sys_post + * 岗位信息视图对象 sys2_post * * @author Michelle.Chung */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = SysPost.class) -public class SysPostVo implements Serializable { +@AutoMapper(target = Sys2Post.class) +public class Sys2PostVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -67,7 +67,7 @@ public class SysPostVo implements Serializable { * 状态（0正常 1停用） */ @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_normal_disable") + @ExcelDictFormat(dictType = "sys2_normal_disable") private String status; /** diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysRoleVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2RoleVo.java similarity index 89% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysRoleVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2RoleVo.java index 59e95129e..80cbc4e75 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysRoleVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2RoleVo.java @@ -1,11 +1,11 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; 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.tenant.domain.SysRole; +import org.dromara.system.saas.domain.Sys2Role; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -14,14 +14,14 @@ import java.io.Serializable; import java.util.Date; /** - * 角色信息视图对象 sys_role + * 角色信息视图对象 sys2_role * * @author Michelle.Chung */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = SysRole.class) -public class SysRoleVo implements Serializable { +@AutoMapper(target = Sys2Role.class) +public class Sys2RoleVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -73,7 +73,7 @@ public class SysRoleVo implements Serializable { * 角色状态（0正常 1停用） */ @ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_normal_disable") + @ExcelDictFormat(dictType = "sys2_normal_disable") private String status; /** diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysSocialVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2SocialVo.java similarity index 91% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysSocialVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2SocialVo.java index b5056be66..fe62c83d6 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysSocialVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2SocialVo.java @@ -1,8 +1,8 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.system.tenant.domain.SysSocial; +import org.dromara.system.saas.domain.Sys2Social; import java.io.Serial; import java.io.Serializable; @@ -10,13 +10,13 @@ import java.util.Date; /** - * 社会化关系视图对象 sys_social + * 社会化关系视图对象 sys2_social * * @author thiszhc */ @Data -@AutoMapper(target = SysSocial.class) -public class SysSocialVo implements Serializable { +@AutoMapper(target = Sys2Social.class) +public class Sys2SocialVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysTenantApplicationVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantApplicationVo.java similarity index 66% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysTenantApplicationVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantApplicationVo.java index aefe7014d..71e8532e0 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysTenantApplicationVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantApplicationVo.java @@ -1,6 +1,6 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; -import org.dromara.system.tenant.domain.SysTenantApplication; +import org.dromara.system.saas.domain.Sys2TenantApplication; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; @@ -11,15 +11,15 @@ import java.io.Serializable; /** - * 租户和应用关联视图对象 sys_tenant_application + * 租户和应用关联视图对象 sys2_tenant_application * * @author Lion Li * @date 2024-09-22 */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = SysTenantApplication.class) -public class SysTenantApplicationVo implements Serializable { +@AutoMapper(target = Sys2TenantApplication.class) +public class Sys2TenantApplicationVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysTenantPackageVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantPackageVo.java similarity index 83% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysTenantPackageVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantPackageVo.java index 114941b89..bc842253e 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysTenantPackageVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantPackageVo.java @@ -1,10 +1,10 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; 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.tenant.domain.SysTenantPackage; +import org.dromara.system.saas.domain.Sys2TenantPackage; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -13,14 +13,14 @@ import java.io.Serializable; /** - * 租户套餐视图对象 sys_tenant_package + * 租户套餐视图对象 sys2_tenant_package * * @author Michelle.Chung */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = SysTenantPackage.class) -public class SysTenantPackageVo implements Serializable { +@AutoMapper(target = Sys2TenantPackage.class) +public class Sys2TenantPackageVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysTenantVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantVo.java similarity index 90% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysTenantVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantVo.java index d78fe73bf..75c373a6a 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysTenantVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantVo.java @@ -1,11 +1,11 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import java.util.Date; 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.tenant.domain.SysTenant; +import org.dromara.system.saas.domain.Sys2Tenant; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -14,14 +14,14 @@ import java.io.Serializable; /** - * 租户视图对象 sys_tenant + * 租户视图对象 sys2_tenant * * @author Michelle.Chung */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = SysTenant.class) -public class SysTenantVo implements Serializable { +@AutoMapper(target = Sys2Tenant.class) +public class Sys2TenantVo implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysUserExportVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserExportVo.java similarity index 84% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysUserExportVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserExportVo.java index e02393823..4d32efa28 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysUserExportVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserExportVo.java @@ -1,10 +1,8 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; -import io.github.linpeilie.annotations.AutoMapper; -import io.github.linpeilie.annotations.ReverseAutoMapping; import lombok.Data; import lombok.NoArgsConstructor; @@ -20,7 +18,7 @@ import java.util.Date; @Data @NoArgsConstructor -public class SysUserExportVo implements Serializable { +public class Sys2UserExportVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -59,14 +57,14 @@ public class SysUserExportVo implements Serializable { * 用户性别 */ @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_user_sex") + @ExcelDictFormat(dictType = "sys2_user_sex") private String sex; /** * 帐号状态（0正常 1停用） */ @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_normal_disable") + @ExcelDictFormat(dictType = "sys2_normal_disable") private String status; /** diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysUserImportVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserImportVo.java similarity index 87% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysUserImportVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserImportVo.java index c870e2931..e6a888bd3 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysUserImportVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserImportVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; import org.dromara.common.excel.annotation.ExcelDictFormat; @@ -18,7 +18,7 @@ import java.io.Serializable; @Data @NoArgsConstructor // @Accessors(chain = true) // 导入不允许使用 会找不到set方法 -public class SysUserImportVo implements Serializable { +public class Sys2UserImportVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -63,14 +63,14 @@ public class SysUserImportVo implements Serializable { * 用户性别 */ @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_user_sex") + @ExcelDictFormat(dictType = "sys2_user_sex") private String sex; /** * 帐号状态（0正常 1停用） */ @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_normal_disable") + @ExcelDictFormat(dictType = "sys2_normal_disable") private String status; } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysUserInfoVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserInfoVo.java similarity index 67% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysUserInfoVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserInfoVo.java index 52a7326e8..674c5b04b 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysUserInfoVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserInfoVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import lombok.Data; @@ -10,12 +10,12 @@ import java.util.List; * @author Michelle.Chung */ @Data -public class SysUserInfoVo { +public class Sys2UserInfoVo { /** * 用户信息 */ - private SysUserVo user; + private Sys2UserVo user; /** * 角色ID列表 @@ -25,7 +25,7 @@ public class SysUserInfoVo { /** * 角色列表 */ - private List roles; + private List roles; /** * 岗位ID列表 @@ -35,6 +35,6 @@ public class SysUserInfoVo { /** * 岗位列表 */ - private List posts; + private List posts; } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserVo.java similarity index 88% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysUserVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserVo.java index 74a6688ad..4af26ca59 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysUserVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -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.tenant.domain.SysUser; +import org.dromara.system.saas.domain.Sys2User; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -17,13 +17,13 @@ import java.util.List; /** - * 用户信息视图对象 sys_user + * 用户信息视图对象 sys2_user * * @author Michelle.Chung */ @Data -@AutoMapper(target = SysUser.class) -public class SysUserVo implements Serializable { +@AutoMapper(target = Sys2User.class) +public class Sys2UserVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -54,7 +54,7 @@ public class SysUserVo implements Serializable { private String nickName; /** - * 用户类型（sys_user系统用户） + * 用户类型（sys2_user系统用户） */ private String userType; @@ -122,7 +122,7 @@ public class SysUserVo implements Serializable { /** * 角色对象 */ - private List roles; + private List roles; /** * 角色组 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysMenuVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasMenuVo.java similarity index 78% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysMenuVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasMenuVo.java index 84e9ce0d5..8e3052cd3 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/SysMenuVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasMenuVo.java @@ -1,6 +1,6 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; -import org.dromara.system.tenant.domain.SysMenu; +import org.dromara.system.saas.domain.SysSaasMenu; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -12,17 +12,20 @@ import java.util.List; /** - * 菜单权限视图对象 sys_menu + * 菜单权限视图对象 sys_saas_menu * * @author Michelle.Chung */ @Data -@AutoMapper(target = SysMenu.class) -public class SysMenuVo implements Serializable { +@AutoMapper(target = SysSaasMenu.class) +public class SysSaasMenuVo implements Serializable { @Serial private static final long serialVersionUID = 1L; - + /** + * 应用id + */ + private Long applicationId; /** * 菜单ID */ @@ -69,7 +72,7 @@ public class SysMenuVo implements Serializable { private String isCache; /** - * 菜单类型（M目录 C菜单 F按钮） + * 菜单类型（A应用 M目录 C菜单 F按钮 A应用） */ private String menuType; @@ -111,6 +114,6 @@ public class SysMenuVo implements Serializable { /** * 子菜单 */ - private List children = new ArrayList<>(); + private List children = new ArrayList<>(); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/AvatarVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoAvatarVo.java similarity index 68% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/AvatarVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoAvatarVo.java index ce6875a65..595c9651e 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/AvatarVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoAvatarVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @author Michelle.Chung */ @Data -public class AvatarVo { +public class TwoAvatarVo { /** * 头像地址 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/CacheListInfoVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoCacheListInfoVo.java similarity index 78% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/CacheListInfoVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoCacheListInfoVo.java index f98f82a89..87752f19e 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/CacheListInfoVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoCacheListInfoVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import lombok.Data; @@ -12,7 +12,7 @@ import java.util.Properties; * @author Michelle.Chung */ @Data -public class CacheListInfoVo { +public class TwoCacheListInfoVo { private Properties info; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/DeptTreeSelectVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoDeptTreeSelectVo.java similarity index 80% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/DeptTreeSelectVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoDeptTreeSelectVo.java index 566d64997..b0d5c79a7 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/DeptTreeSelectVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoDeptTreeSelectVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import cn.hutool.core.lang.tree.Tree; import lombok.Data; @@ -11,7 +11,7 @@ import java.util.List; * @author Michelle.Chung */ @Data -public class DeptTreeSelectVo { +public class TwoDeptTreeSelectVo { /** * 选中部门列表 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/MenuTreeSelectVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoMenuTreeSelectVo.java similarity index 80% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/MenuTreeSelectVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoMenuTreeSelectVo.java index 852a045ab..6324c9f61 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/MenuTreeSelectVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoMenuTreeSelectVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import cn.hutool.core.lang.tree.Tree; import lombok.Data; @@ -11,7 +11,7 @@ import java.util.List; * @author Michelle.Chung */ @Data -public class MenuTreeSelectVo { +public class TwoMenuTreeSelectVo { /** * 选中菜单列表 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/MetaVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoMetaVo.java similarity index 74% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/MetaVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoMetaVo.java index 29b4185f3..e04a5696e 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/MetaVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoMetaVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import org.dromara.common.core.utils.StringUtils; import lombok.Data; @@ -10,7 +10,7 @@ import lombok.Data; */ @Data -public class MetaVo { +public class TwoMetaVo { /** * 设置该路由在侧边栏和面包屑中展示的名字 @@ -32,24 +32,24 @@ public class MetaVo { */ private String link; - public MetaVo(String title, String icon) { + public TwoMetaVo(String title, String icon) { this.title = title; this.icon = icon; } - public MetaVo(String title, String icon, boolean noCache) { + public TwoMetaVo(String title, String icon, boolean noCache) { this.title = title; this.icon = icon; this.noCache = noCache; } - public MetaVo(String title, String icon, String link) { + public TwoMetaVo(String title, String icon, String link) { this.title = title; this.icon = icon; this.link = link; } - public MetaVo(String title, String icon, boolean noCache, String link) { + public TwoMetaVo(String title, String icon, boolean noCache, String link) { this.title = title; this.icon = icon; this.noCache = noCache; diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/ProfileVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoProfileVo.java similarity index 73% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/ProfileVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoProfileVo.java index b35287261..8ee64a465 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/ProfileVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoProfileVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import lombok.Data; @@ -8,12 +8,12 @@ import lombok.Data; * @author Michelle.Chung */ @Data -public class ProfileVo { +public class TwoProfileVo { /** * 用户信息 */ - private SysUserVo user; + private Sys2UserVo user; /** * 用户所属角色组 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/RouterVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoRouterVo.java similarity index 87% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/RouterVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoRouterVo.java index 387e127b9..d2bb0a811 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/RouterVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoRouterVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; @@ -12,7 +12,7 @@ import java.util.List; */ @Data @JsonInclude(JsonInclude.Include.NON_EMPTY) -public class RouterVo { +public class TwoRouterVo { /** * 路由名字 @@ -52,11 +52,11 @@ public class RouterVo { /** * 其他元素 */ - private MetaVo meta; + private TwoMetaVo meta; /** * 子路由 */ - private List children; + private List children; } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/UserInfoVo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoUserInfoVo.java similarity index 74% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/UserInfoVo.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoUserInfoVo.java index d5fe17da6..3993779d8 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/domain/vo/UserInfoVo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoUserInfoVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.domain.vo; +package org.dromara.system.saas.domain.vo; import lombok.Data; @@ -10,12 +10,12 @@ import java.util.Set; * @author Michelle.Chung */ @Data -public class UserInfoVo { +public class TwoUserInfoVo { /** * 用户基本信息 */ - private SysUserVo user; + private Sys2UserVo user; /** * 菜单权限 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/listener/SysUserImportListener.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/listener/SysUserImportListener.java similarity index 77% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/listener/SysUserImportListener.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/listener/SysUserImportListener.java index 586482711..7ab5e932d 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/listener/SysUserImportListener.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/listener/SysUserImportListener.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.listener; +package org.dromara.system.saas.listener; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; @@ -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.tenant.domain.bo.SysUserBo; -import org.dromara.system.tenant.domain.vo.SysUserImportVo; -import org.dromara.system.tenant.domain.vo.SysUserVo; -import org.dromara.system.tenant.service.ISysConfigService; -import org.dromara.system.tenant.service.ISysUserService; +import org.dromara.system.saas.domain.bo.Sys2UserBo; +import org.dromara.system.saas.domain.vo.Sys2UserImportVo; +import org.dromara.system.saas.domain.vo.Sys2UserVo; +import org.dromara.system.saas.service.ISys2ConfigService; +import org.dromara.system.saas.service.ISys2UserService; import lombok.extern.slf4j.Slf4j; import java.util.List; @@ -26,9 +26,9 @@ import java.util.List; * @author Lion Li */ @Slf4j -public class SysUserImportListener extends AnalysisEventListener implements ExcelListener { +public class SysUserImportListener extends AnalysisEventListener implements ExcelListener { - private final ISysUserService userService; + private final ISys2UserService userService; private final String password; @@ -42,20 +42,20 @@ public class SysUserImportListener extends AnalysisEventListener").append(successNum).append("、账号 ").append(user.getUserName()).append(" 导入成功"); } else if (isUpdateSupport) { Long userId = sysUser.getUserId(); - SysUserBo user = BeanUtil.toBean(userVo, SysUserBo.class); + Sys2UserBo user = BeanUtil.toBean(userVo, Sys2UserBo.class); user.setUserId(userId); ValidatorUtils.validate(user); userService.checkUserAllowed(user.getUserId()); @@ -91,7 +91,7 @@ public class SysUserImportListener extends AnalysisEventListener getExcelResult() { + public ExcelResult getExcelResult() { return new ExcelResult<>() { @Override @@ -106,7 +106,7 @@ public class SysUserImportListener extends AnalysisEventListener getList() { + public List getList() { return null; } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ApplicationMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ApplicationMapper.java new file mode 100644 index 000000000..bb22041d6 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ApplicationMapper.java @@ -0,0 +1,17 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.system.saas.domain.Sys2Application; +import org.dromara.system.saas.domain.vo.Sys2ApplicationVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 应用Mapper接口 + * + * @author Lion Li + * @date 2024-09-22 + */ +@Mapper +public interface Sys2ApplicationMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ClientMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ClientMapper.java new file mode 100644 index 000000000..ade939bb1 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ClientMapper.java @@ -0,0 +1,17 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.system.saas.domain.Sys2Client; +import org.dromara.system.saas.domain.vo.Sys2ClientVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 授权管理Mapper接口 + * + * @author Michelle.Chung + * @date 2023-05-15 + */ +@Mapper +public interface Sys2ClientMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ConfigMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ConfigMapper.java new file mode 100644 index 000000000..9d473880c --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2ConfigMapper.java @@ -0,0 +1,16 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.saas.domain.Sys2Config; +import org.dromara.system.saas.domain.vo.Sys2ConfigVo; + +/** + * 参数配置 数据层 + * + * @author Lion Li + */ +@Mapper +public interface Sys2ConfigMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DeptMapper.java similarity index 74% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysDeptMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DeptMapper.java index 81b8515c2..27d2b5550 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysDeptMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DeptMapper.java @@ -1,12 +1,13 @@ -package org.dromara.system.tenant.mapper; +package org.dromara.system.saas.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +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.tenant.domain.SysDept; -import org.dromara.system.tenant.domain.vo.SysDeptVo; +import org.dromara.system.saas.domain.Sys2Dept; +import org.dromara.system.saas.domain.vo.Sys2DeptVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,7 +17,8 @@ import java.util.List; * * @author Lion Li */ -public interface SysDeptMapper extends BaseMapperPlus { +@Mapper +public interface Sys2DeptMapper extends BaseMapperPlus { /** * 查询部门管理数据 @@ -27,7 +29,7 @@ public interface SysDeptMapper extends BaseMapperPlus { @DataPermission({ @DataColumn(key = "deptName", value = "dept_id") }) - List selectDeptList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + List selectDeptList(@Param(Constants.WRAPPER) Wrapper queryWrapper); @DataPermission({ @DataColumn(key = "deptName", value = "dept_id") diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DictDataMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DictDataMapper.java new file mode 100644 index 000000000..15fb19cc4 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DictDataMapper.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.Sys2DictData; +import org.dromara.system.saas.domain.vo.Sys2DictDataVo; + +import java.util.List; + +/** + * 字典表 数据层 + * + * @author Lion Li + */ +@Mapper +public interface Sys2DictDataMapper extends BaseMapperPlus { + + default List selectDictDataByType(String dictType) { + return selectVoList( + new LambdaQueryWrapper() + .eq(Sys2DictData::getDictType, dictType) + .orderByAsc(Sys2DictData::getDictSort)); + } +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DictTypeMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DictTypeMapper.java new file mode 100644 index 000000000..9f9c6f3bd --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2DictTypeMapper.java @@ -0,0 +1,16 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.system.saas.domain.Sys2DictType; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.saas.domain.vo.Sys2DictTypeVo; + +/** + * 字典表 数据层 + * + * @author Lion Li + */ +@Mapper +public interface Sys2DictTypeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2LogininforMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2LogininforMapper.java new file mode 100644 index 000000000..4305f40c1 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2LogininforMapper.java @@ -0,0 +1,16 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.saas.domain.Sys2Logininfor; +import org.dromara.system.saas.domain.vo.Sys2LogininforVo; + +/** + * 系统访问日志情况信息 数据层 + * + * @author Lion Li + */ +@Mapper +public interface Sys2LogininforMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2NoticeMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2NoticeMapper.java new file mode 100644 index 000000000..baf540158 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2NoticeMapper.java @@ -0,0 +1,16 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.saas.domain.Sys2Notice; +import org.dromara.system.saas.domain.vo.Sys2NoticeVo; + +/** + * 通知公告表 数据层 + * + * @author Lion Li + */ +@Mapper +public interface Sys2NoticeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OperLogMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OperLogMapper.java new file mode 100644 index 000000000..60011fbe6 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OperLogMapper.java @@ -0,0 +1,16 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.saas.domain.Sys2OperLog; +import org.dromara.system.saas.domain.vo.Sys2OperLogVo; + +/** + * 操作日志 数据层 + * + * @author Lion Li + */ +@Mapper +public interface Sys2OperLogMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OssConfigMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OssConfigMapper.java new file mode 100644 index 000000000..7541c0fcb --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OssConfigMapper.java @@ -0,0 +1,18 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.saas.domain.Sys2OssConfig; +import org.dromara.system.saas.domain.vo.Sys2OssConfigVo; + +/** + * 对象存储配置Mapper接口 + * + * @author Lion Li + * @author 孤舟烟雨 + * @date 2021-08-13 + */ +@Mapper +public interface Sys2OssConfigMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OssMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OssMapper.java new file mode 100644 index 000000000..db809ab7d --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2OssMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.saas.domain.Sys2Oss; +import org.dromara.system.saas.domain.vo.Sys2OssVo; + +/** + * 文件上传 数据层 + * + * @author Lion Li + */ +@Mapper +public interface Sys2OssMapper extends BaseMapperPlus { +} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysPostMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2PostMapper.java similarity index 61% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysPostMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2PostMapper.java index 288fe824f..db92fb6ca 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysPostMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2PostMapper.java @@ -1,14 +1,15 @@ -package org.dromara.system.tenant.mapper; +package org.dromara.system.saas.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; 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.tenant.domain.SysPost; -import org.dromara.system.tenant.domain.vo.SysPostVo; +import org.dromara.system.saas.domain.Sys2Post; +import org.dromara.system.saas.domain.vo.Sys2PostVo; import java.util.List; @@ -17,13 +18,14 @@ import java.util.List; * * @author Lion Li */ -public interface SysPostMapper extends BaseMapperPlus { +@Mapper +public interface Sys2PostMapper extends BaseMapperPlus { @DataPermission({ @DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "userName", value = "create_by") }) - Page selectPagePostList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + Page selectPagePostList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); /** * 查询用户所属岗位组 @@ -31,6 +33,6 @@ public interface SysPostMapper extends BaseMapperPlus { * @param userId 用户ID * @return 结果 */ - List selectPostsByUserId(Long userId); + List selectPostsByUserId(Long userId); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleDeptMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleDeptMapper.java new file mode 100644 index 000000000..2eaaeb345 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleDeptMapper.java @@ -0,0 +1,15 @@ +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; + +/** + * 角色与部门关联表 数据层 + * + * @author Lion Li + */ +@Mapper +public interface Sys2RoleDeptMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysRoleMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleMapper.java similarity index 66% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysRoleMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleMapper.java index c883f7a40..82e961f2b 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysRoleMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleMapper.java @@ -1,14 +1,15 @@ -package org.dromara.system.tenant.mapper; +package org.dromara.system.saas.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; 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.tenant.domain.SysRole; -import org.dromara.system.tenant.domain.vo.SysRoleVo; +import org.dromara.system.saas.domain.Sys2Role; +import org.dromara.system.saas.domain.vo.Sys2RoleVo; import java.util.List; @@ -17,13 +18,14 @@ import java.util.List; * * @author Lion Li */ -public interface SysRoleMapper extends BaseMapperPlus { +@Mapper +public interface Sys2RoleMapper extends BaseMapperPlus { @DataPermission({ @DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "userName", value = "r.create_by") }) - Page selectPageRoleList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + Page selectPageRoleList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); /** * 根据条件分页查询角色数据 @@ -35,13 +37,13 @@ public interface SysRoleMapper extends BaseMapperPlus { @DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "userName", value = "r.create_by") }) - List selectRoleList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + List selectRoleList(@Param(Constants.WRAPPER) Wrapper queryWrapper); @DataPermission({ @DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "userName", value = "r.create_by") }) - SysRoleVo selectRoleById(Long roleId); + Sys2RoleVo selectRoleById(Long roleId); /** * 根据用户ID查询角色 @@ -49,7 +51,7 @@ public interface SysRoleMapper extends BaseMapperPlus { * @param userId 用户ID * @return 角色列表 */ - List selectRolePermissionByUserId(Long userId); + List selectRolePermissionByUserId(Long userId); /** * 根据用户ID查询角色 @@ -57,6 +59,6 @@ public interface SysRoleMapper extends BaseMapperPlus { * @param userId 用户ID * @return 角色列表 */ - List selectRolesByUserId(Long userId); + List selectRolesByUserId(Long userId); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleMenuMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleMenuMapper.java new file mode 100644 index 000000000..7141d50a8 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2RoleMenuMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.saas.domain.Sys2RoleMenu; + +/** + * 角色与菜单关联表 数据层 + * + * @author Lion Li + */ +@Mapper +public interface Sys2RoleMenuMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2SocialMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2SocialMapper.java new file mode 100644 index 000000000..9713dbee1 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2SocialMapper.java @@ -0,0 +1,16 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.saas.domain.Sys2Social; +import org.dromara.system.saas.domain.vo.Sys2SocialVo; + +/** + * 社会化关系Mapper接口 + * + * @author thiszhc + */ +@Mapper +public interface Sys2SocialMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantApplicationMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantApplicationMapper.java new file mode 100644 index 000000000..5a4954c15 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantApplicationMapper.java @@ -0,0 +1,17 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.system.saas.domain.Sys2TenantApplication; +import org.dromara.system.saas.domain.vo.Sys2TenantApplicationVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 租户和应用关联Mapper接口 + * + * @author Lion Li + * @date 2024-09-22 + */ +@Mapper +public interface Sys2TenantApplicationMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantMapper.java new file mode 100644 index 000000000..7c665b91e --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantMapper.java @@ -0,0 +1,16 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.system.saas.domain.Sys2Tenant; +import org.dromara.system.saas.domain.vo.Sys2TenantVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 租户Mapper接口 + * + * @author Michelle.Chung + */ +@Mapper +public interface Sys2TenantMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantPackageMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantPackageMapper.java new file mode 100644 index 000000000..ca45d1076 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2TenantPackageMapper.java @@ -0,0 +1,16 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.saas.domain.Sys2TenantPackage; +import org.dromara.system.saas.domain.vo.Sys2TenantPackageVo; + +/** + * 租户套餐Mapper接口 + * + * @author Michelle.Chung + */ +@Mapper +public interface Sys2TenantPackageMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserMapper.java similarity index 66% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysUserMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserMapper.java index cf21a782d..137cea34e 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysUserMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserMapper.java @@ -1,15 +1,16 @@ -package org.dromara.system.tenant.mapper; +package org.dromara.system.saas.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; 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.tenant.domain.SysUser; -import org.dromara.system.tenant.domain.vo.SysUserExportVo; -import org.dromara.system.tenant.domain.vo.SysUserVo; +import org.dromara.system.saas.domain.Sys2User; +import org.dromara.system.saas.domain.vo.Sys2UserExportVo; +import org.dromara.system.saas.domain.vo.Sys2UserVo; import java.util.List; @@ -18,19 +19,20 @@ import java.util.List; * * @author Lion Li */ -public interface SysUserMapper extends BaseMapperPlus { +@Mapper +public interface Sys2UserMapper extends BaseMapperPlus { @DataPermission({ @DataColumn(key = "deptName", value = "u.dept_id"), @DataColumn(key = "userName", value = "u.user_id") }) - Page selectPageUserList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + Page selectPageUserList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); @DataPermission({ @DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "userName", value = "user_id") }) - List selectUserList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + List selectUserList(@Param(Constants.WRAPPER) Wrapper queryWrapper); /** * 根据条件分页查询用户列表 @@ -42,7 +44,7 @@ public interface SysUserMapper extends BaseMapperPlus { @DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "userName", value = "u.user_id") }) - List selectUserExportList(@Param(Constants.WRAPPER) Wrapper queryWrapper); + List selectUserExportList(@Param(Constants.WRAPPER) Wrapper queryWrapper); /** * 根据条件分页查询已配用户角色列表 @@ -54,7 +56,7 @@ public interface SysUserMapper extends BaseMapperPlus { @DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "userName", value = "u.user_id") }) - Page selectAllocatedList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + Page selectAllocatedList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); /** * 根据条件分页查询未分配用户角色列表 @@ -66,7 +68,7 @@ public interface SysUserMapper extends BaseMapperPlus { @DataColumn(key = "deptName", value = "d.dept_id"), @DataColumn(key = "userName", value = "u.user_id") }) - Page selectUnallocatedList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + Page selectUnallocatedList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); @DataPermission({ @DataColumn(key = "deptName", value = "dept_id"), @@ -79,13 +81,13 @@ public interface SysUserMapper extends BaseMapperPlus { @DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "userName", value = "user_id") }) - int update(@Param(Constants.ENTITY) SysUser user, @Param(Constants.WRAPPER) Wrapper updateWrapper); + int update(@Param(Constants.ENTITY) Sys2User user, @Param(Constants.WRAPPER) Wrapper updateWrapper); @Override @DataPermission({ @DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "userName", value = "user_id") }) - int updateById(@Param(Constants.ENTITY) SysUser user); + int updateById(@Param(Constants.ENTITY) Sys2User user); } diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserPostMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserPostMapper.java new file mode 100644 index 000000000..340a850d1 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserPostMapper.java @@ -0,0 +1,15 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.saas.domain.Sys2UserPost; + +/** + * 用户与岗位关联表 数据层 + * + * @author Lion Li + */ +@Mapper +public interface Sys2UserPostMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserRoleMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserRoleMapper.java new file mode 100644 index 000000000..257367276 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/Sys2UserRoleMapper.java @@ -0,0 +1,19 @@ +package org.dromara.system.saas.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.saas.domain.Sys2UserRole; + +import java.util.List; + +/** + * 用户与角色关联表 数据层 + * + * @author Lion Li + */ +@Mapper +public interface Sys2UserRoleMapper extends BaseMapperPlus { + + List selectUserIdsByRoleId(Long roleId); + +} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysMenuMapper.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasMenuMapper.java similarity index 63% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysMenuMapper.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasMenuMapper.java index 834e53349..93651f5cd 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/mapper/SysMenuMapper.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/mapper/SysSaasMenuMapper.java @@ -1,12 +1,13 @@ -package org.dromara.system.tenant.mapper; +package org.dromara.system.saas.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; import org.dromara.common.core.constant.UserConstants; -import org.dromara.system.tenant.domain.SysMenu; +import org.dromara.system.saas.domain.SysSaasMenu; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.tenant.domain.vo.SysMenuVo; +import org.dromara.system.saas.domain.vo.SysSaasMenuVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,7 +17,8 @@ import java.util.List; * * @author Lion Li */ -public interface SysMenuMapper extends BaseMapperPlus { +@Mapper +public interface SysSaasMenuMapper extends BaseMapperPlus { /** * 根据用户查询系统菜单列表 @@ -24,7 +26,7 @@ public interface SysMenuMapper extends BaseMapperPlus { * @param queryWrapper 查询条件 * @return 菜单列表 */ - List selectMenuListByUserId(@Param(Constants.WRAPPER) Wrapper queryWrapper); + List selectMenuListByUserId(@Param(Constants.WRAPPER) Wrapper queryWrapper); /** * 根据用户ID查询权限 @@ -47,12 +49,12 @@ public interface SysMenuMapper extends BaseMapperPlus { * * @return 菜单列表 */ - default List selectMenuTreeAll() { - LambdaQueryWrapper lqw = new LambdaQueryWrapper() - .in(SysMenu::getMenuType, UserConstants.TYPE_DIR, UserConstants.TYPE_MENU) - .eq(SysMenu::getStatus, UserConstants.MENU_NORMAL) - .orderByAsc(SysMenu::getParentId) - .orderByAsc(SysMenu::getOrderNum); + default List selectMenuTreeAll() { + LambdaQueryWrapper lqw = new LambdaQueryWrapper() + .in(SysSaasMenu::getMenuType, UserConstants.TYPE_DIR, UserConstants.TYPE_MENU) + .eq(SysSaasMenu::getStatus, UserConstants.MENU_NORMAL) + .orderByAsc(SysSaasMenu::getParentId) + .orderByAsc(SysSaasMenu::getOrderNum); return this.selectList(lqw); } @@ -62,7 +64,7 @@ public interface SysMenuMapper extends BaseMapperPlus { * @param userId 用户ID * @return 菜单列表 */ - List selectMenuTreeByUserId(Long userId); + List selectMenuTreeByUserId(Long userId); /** * 根据角色ID查询菜单树信息 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/runner/SystemApplicationRunner.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/runner/System2ApplicationRunner.java similarity index 69% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/runner/SystemApplicationRunner.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/runner/System2ApplicationRunner.java index 20fc84f49..94f5e373e 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/runner/SystemApplicationRunner.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/runner/System2ApplicationRunner.java @@ -1,6 +1,6 @@ -package org.dromara.system.tenant.runner; +package org.dromara.system.saas.runner; -import org.dromara.system.tenant.service.ISysOssConfigService; +import org.dromara.system.saas.service.ISys2OssConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationArguments; @@ -15,9 +15,9 @@ import org.springframework.stereotype.Component; @Slf4j @RequiredArgsConstructor @Component -public class SystemApplicationRunner implements ApplicationRunner { +public class System2ApplicationRunner implements ApplicationRunner { - private final ISysOssConfigService ossConfigService; + private final ISys2OssConfigService ossConfigService; @Override public void run(ApplicationArguments args) throws Exception { diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysApplicationService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ApplicationService.java similarity index 68% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysApplicationService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ApplicationService.java index 5135b7ca1..63edff565 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysApplicationService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ApplicationService.java @@ -1,7 +1,7 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; -import org.dromara.system.tenant.domain.vo.SysApplicationVo; -import org.dromara.system.tenant.domain.bo.SysApplicationBo; +import org.dromara.system.saas.domain.vo.Sys2ApplicationVo; +import org.dromara.system.saas.domain.bo.Sys2ApplicationBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -14,7 +14,7 @@ import java.util.List; * @author Lion Li * @date 2024-09-22 */ -public interface ISysApplicationService { +public interface ISys2ApplicationService { /** * 查询应用 @@ -22,7 +22,7 @@ public interface ISysApplicationService { * @param applicationId 主键 * @return 应用 */ - SysApplicationVo queryById(Long applicationId); + Sys2ApplicationVo queryById(Long applicationId); /** * 分页查询应用列表 @@ -31,7 +31,7 @@ public interface ISysApplicationService { * @param pageQuery 分页参数 * @return 应用分页列表 */ - TableDataInfo queryPageList(SysApplicationBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(Sys2ApplicationBo bo, PageQuery pageQuery); /** * 查询符合条件的应用列表 @@ -39,7 +39,7 @@ public interface ISysApplicationService { * @param bo 查询条件 * @return 应用列表 */ - List queryList(SysApplicationBo bo); + List queryList(Sys2ApplicationBo bo); /** * 新增应用 @@ -47,7 +47,7 @@ public interface ISysApplicationService { * @param bo 应用 * @return 是否新增成功 */ - Boolean insertByBo(SysApplicationBo bo); + Boolean insertByBo(Sys2ApplicationBo bo); /** * 修改应用 @@ -55,7 +55,7 @@ public interface ISysApplicationService { * @param bo 应用 * @return 是否修改成功 */ - Boolean updateByBo(SysApplicationBo bo); + Boolean updateByBo(Sys2ApplicationBo bo); /** * 校验并批量删除应用信息 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysClientService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ClientService.java similarity index 61% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysClientService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ClientService.java index 4eb42b46d..dd59b3bce 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysClientService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ClientService.java @@ -1,7 +1,7 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; -import org.dromara.system.tenant.domain.vo.SysClientVo; -import org.dromara.system.tenant.domain.bo.SysClientBo; +import org.dromara.system.saas.domain.bo.Sys2ClientBo; +import org.dromara.system.saas.domain.vo.Sys2ClientVo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -14,37 +14,37 @@ import java.util.List; * @author Michelle.Chung * @date 2023-06-18 */ -public interface ISysClientService { +public interface ISys2ClientService { /** * 查询客户端管理 */ - SysClientVo queryById(Long id); + Sys2ClientVo queryById(Long id); /** * 查询客户端信息基于客户端id */ - SysClientVo queryByClientId(String clientId); + Sys2ClientVo queryByClientId(String clientId); /** * 查询客户端管理列表 */ - TableDataInfo queryPageList(SysClientBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(Sys2ClientBo bo, PageQuery pageQuery); /** * 查询客户端管理列表 */ - List queryList(SysClientBo bo); + List queryList(Sys2ClientBo bo); /** * 新增客户端管理 */ - Boolean insertByBo(SysClientBo bo); + Boolean insertByBo(Sys2ClientBo bo); /** * 修改客户端管理 */ - Boolean updateByBo(SysClientBo bo); + Boolean updateByBo(Sys2ClientBo bo); /** * 修改状态 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysConfigService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ConfigService.java similarity index 71% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysConfigService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ConfigService.java index 87f145004..d4a8457ae 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysConfigService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2ConfigService.java @@ -1,9 +1,9 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.tenant.domain.bo.SysConfigBo; -import org.dromara.system.tenant.domain.vo.SysConfigVo; +import org.dromara.system.saas.domain.bo.Sys2ConfigBo; +import org.dromara.system.saas.domain.vo.Sys2ConfigVo; import java.util.List; @@ -12,10 +12,10 @@ import java.util.List; * * @author Lion Li */ -public interface ISysConfigService { +public interface ISys2ConfigService { - TableDataInfo selectPageConfigList(SysConfigBo config, PageQuery pageQuery); + TableDataInfo selectPageConfigList(Sys2ConfigBo config, PageQuery pageQuery); /** * 查询参数配置信息 @@ -23,7 +23,7 @@ public interface ISysConfigService { * @param configId 参数配置ID * @return 参数配置信息 */ - SysConfigVo selectConfigById(Long configId); + Sys2ConfigVo selectConfigById(Long configId); /** * 根据键名查询参数配置信息 @@ -46,7 +46,7 @@ public interface ISysConfigService { * @param config 参数配置信息 * @return 参数配置集合 */ - List selectConfigList(SysConfigBo config); + List selectConfigList(Sys2ConfigBo config); /** * 新增参数配置 @@ -54,7 +54,7 @@ public interface ISysConfigService { * @param bo 参数配置信息 * @return 结果 */ - String insertConfig(SysConfigBo bo); + String insertConfig(Sys2ConfigBo bo); /** * 修改参数配置 @@ -62,7 +62,7 @@ public interface ISysConfigService { * @param bo 参数配置信息 * @return 结果 */ - String updateConfig(SysConfigBo bo); + String updateConfig(Sys2ConfigBo bo); /** * 批量删除参数信息 @@ -82,6 +82,6 @@ public interface ISysConfigService { * @param config 参数信息 * @return 结果 */ - boolean checkConfigKeyUnique(SysConfigBo config); + boolean checkConfigKeyUnique(Sys2ConfigBo config); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysDataScopeService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DataScopeService.java similarity index 81% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysDataScopeService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DataScopeService.java index 22c804a7f..f99581948 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysDataScopeService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DataScopeService.java @@ -1,11 +1,11 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; /** * 通用 数据权限 服务 * * @author Lion Li */ -public interface ISysDataScopeService { +public interface ISys2DataScopeService { /** * 获取角色自定义权限 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysDeptService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DeptService.java similarity index 78% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysDeptService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DeptService.java index 680277acf..9b58ccd93 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysDeptService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DeptService.java @@ -1,8 +1,8 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; import cn.hutool.core.lang.tree.Tree; -import org.dromara.system.tenant.domain.bo.SysDeptBo; -import org.dromara.system.tenant.domain.vo.SysDeptVo; +import org.dromara.system.saas.domain.bo.Sys2DeptBo; +import org.dromara.system.saas.domain.vo.Sys2DeptVo; import java.util.List; @@ -11,14 +11,14 @@ import java.util.List; * * @author Lion Li */ -public interface ISysDeptService { +public interface ISys2DeptService { /** * 查询部门管理数据 * * @param dept 部门信息 * @return 部门信息集合 */ - List selectDeptList(SysDeptBo dept); + List selectDeptList(Sys2DeptBo dept); /** * 查询部门树结构信息 @@ -26,7 +26,7 @@ public interface ISysDeptService { * @param dept 部门信息 * @return 部门树信息集合 */ - List> selectDeptTreeList(SysDeptBo dept); + List> selectDeptTreeList(Sys2DeptBo dept); /** * 构建前端所需要下拉树结构 @@ -34,7 +34,7 @@ public interface ISysDeptService { * @param depts 部门列表 * @return 下拉树结构列表 */ - List> buildDeptTreeSelect(List depts); + List> buildDeptTreeSelect(List depts); /** * 根据角色ID查询部门树信息 @@ -50,7 +50,7 @@ public interface ISysDeptService { * @param deptId 部门ID * @return 部门信息 */ - SysDeptVo selectDeptById(Long deptId); + Sys2DeptVo selectDeptById(Long deptId); /** * 通过部门ID串查询部门 @@ -58,7 +58,7 @@ public interface ISysDeptService { * @param deptIds 部门id串 * @return 部门列表信息 */ - List selectDeptByIds(List deptIds); + List selectDeptByIds(List deptIds); /** * 根据ID查询所有子部门数（正常状态） @@ -90,7 +90,7 @@ public interface ISysDeptService { * @param dept 部门信息 * @return 结果 */ - boolean checkDeptNameUnique(SysDeptBo dept); + boolean checkDeptNameUnique(Sys2DeptBo dept); /** * 校验部门是否有数据权限 @@ -105,7 +105,7 @@ public interface ISysDeptService { * @param bo 部门信息 * @return 结果 */ - int insertDept(SysDeptBo bo); + int insertDept(Sys2DeptBo bo); /** * 修改保存部门信息 @@ -113,7 +113,7 @@ public interface ISysDeptService { * @param bo 部门信息 * @return 结果 */ - int updateDept(SysDeptBo bo); + int updateDept(Sys2DeptBo bo); /** * 删除部门管理信息 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysDictDataService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DictDataService.java similarity index 67% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysDictDataService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DictDataService.java index d5e641f8f..d0bfaf84d 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysDictDataService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DictDataService.java @@ -1,9 +1,9 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.tenant.domain.bo.SysDictDataBo; -import org.dromara.system.tenant.domain.vo.SysDictDataVo; +import org.dromara.system.saas.domain.bo.Sys2DictDataBo; +import org.dromara.system.saas.domain.vo.Sys2DictDataVo; import java.util.List; @@ -12,10 +12,10 @@ import java.util.List; * * @author Lion Li */ -public interface ISysDictDataService { +public interface ISys2DictDataService { - TableDataInfo selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery); + TableDataInfo selectPageDictDataList(Sys2DictDataBo dictData, PageQuery pageQuery); /** * 根据条件分页查询字典数据 @@ -23,7 +23,7 @@ public interface ISysDictDataService { * @param dictData 字典数据信息 * @return 字典数据集合信息 */ - List selectDictDataList(SysDictDataBo dictData); + List selectDictDataList(Sys2DictDataBo dictData); /** * 根据字典类型和字典键值查询字典数据信息 @@ -40,7 +40,7 @@ public interface ISysDictDataService { * @param dictCode 字典数据ID * @return 字典数据 */ - SysDictDataVo selectDictDataById(Long dictCode); + Sys2DictDataVo selectDictDataById(Long dictCode); /** * 批量删除字典数据信息 @@ -55,7 +55,7 @@ public interface ISysDictDataService { * @param bo 字典数据信息 * @return 结果 */ - List insertDictData(SysDictDataBo bo); + List insertDictData(Sys2DictDataBo bo); /** * 修改保存字典数据信息 @@ -63,7 +63,7 @@ public interface ISysDictDataService { * @param bo 字典数据信息 * @return 结果 */ - List updateDictData(SysDictDataBo bo); + List updateDictData(Sys2DictDataBo bo); /** * 校验字典键值是否唯一 @@ -71,6 +71,6 @@ public interface ISysDictDataService { * @param dict 字典数据 * @return 结果 */ - boolean checkDictDataUnique(SysDictDataBo dict); + boolean checkDictDataUnique(Sys2DictDataBo dict); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysDictTypeService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DictTypeService.java similarity index 63% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysDictTypeService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DictTypeService.java index 23dbba154..465e6a2a8 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysDictTypeService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2DictTypeService.java @@ -1,10 +1,10 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.tenant.domain.bo.SysDictTypeBo; -import org.dromara.system.tenant.domain.vo.SysDictDataVo; -import org.dromara.system.tenant.domain.vo.SysDictTypeVo; +import org.dromara.system.saas.domain.bo.Sys2DictTypeBo; +import org.dromara.system.saas.domain.vo.Sys2DictDataVo; +import org.dromara.system.saas.domain.vo.Sys2DictTypeVo; import java.util.List; @@ -13,10 +13,10 @@ import java.util.List; * * @author Lion Li */ -public interface ISysDictTypeService { +public interface ISys2DictTypeService { - TableDataInfo selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery); + TableDataInfo selectPageDictTypeList(Sys2DictTypeBo dictType, PageQuery pageQuery); /** * 根据条件分页查询字典类型 @@ -24,14 +24,14 @@ public interface ISysDictTypeService { * @param dictType 字典类型信息 * @return 字典类型集合信息 */ - List selectDictTypeList(SysDictTypeBo dictType); + List selectDictTypeList(Sys2DictTypeBo dictType); /** * 根据所有字典类型 * * @return 字典类型集合信息 */ - List selectDictTypeAll(); + List selectDictTypeAll(); /** * 根据字典类型查询字典数据 @@ -39,7 +39,7 @@ public interface ISysDictTypeService { * @param dictType 字典类型 * @return 字典数据集合信息 */ - List selectDictDataByType(String dictType); + List selectDictDataByType(String dictType); /** * 根据字典类型ID查询信息 @@ -47,7 +47,7 @@ public interface ISysDictTypeService { * @param dictId 字典类型ID * @return 字典类型 */ - SysDictTypeVo selectDictTypeById(Long dictId); + Sys2DictTypeVo selectDictTypeById(Long dictId); /** * 根据字典类型查询信息 @@ -55,7 +55,7 @@ public interface ISysDictTypeService { * @param dictType 字典类型 * @return 字典类型 */ - SysDictTypeVo selectDictTypeByType(String dictType); + Sys2DictTypeVo selectDictTypeByType(String dictType); /** * 批量删除字典信息 @@ -75,7 +75,7 @@ public interface ISysDictTypeService { * @param bo 字典类型信息 * @return 结果 */ - List insertDictType(SysDictTypeBo bo); + List insertDictType(Sys2DictTypeBo bo); /** * 修改保存字典类型信息 @@ -83,7 +83,7 @@ public interface ISysDictTypeService { * @param bo 字典类型信息 * @return 结果 */ - List updateDictType(SysDictTypeBo bo); + List updateDictType(Sys2DictTypeBo bo); /** * 校验字典类型称是否唯一 @@ -91,5 +91,5 @@ public interface ISysDictTypeService { * @param dictType 字典类型 * @return 结果 */ - boolean checkDictTypeUnique(SysDictTypeBo dictType); + boolean checkDictTypeUnique(Sys2DictTypeBo dictType); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysLogininforService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2LogininforService.java similarity index 61% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysLogininforService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2LogininforService.java index 97c4952dd..6ad498cba 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysLogininforService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2LogininforService.java @@ -1,9 +1,9 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.tenant.domain.bo.SysLogininforBo; -import org.dromara.system.tenant.domain.vo.SysLogininforVo; +import org.dromara.system.saas.domain.bo.Sys2LogininforBo; +import org.dromara.system.saas.domain.vo.Sys2LogininforVo; import java.util.List; @@ -12,17 +12,17 @@ import java.util.List; * * @author Lion Li */ -public interface ISysLogininforService { +public interface ISys2LogininforService { - TableDataInfo selectPageLogininforList(SysLogininforBo logininfor, PageQuery pageQuery); + TableDataInfo selectPageLogininforList(Sys2LogininforBo logininfor, PageQuery pageQuery); /** * 新增系统登录日志 * * @param bo 访问日志对象 */ - void insertLogininfor(SysLogininforBo bo); + void insertLogininfor(Sys2LogininforBo bo); /** * 查询系统登录日志集合 @@ -30,7 +30,7 @@ public interface ISysLogininforService { * @param logininfor 访问日志对象 * @return 登录记录集合 */ - List selectLogininforList(SysLogininforBo logininfor); + List selectLogininforList(Sys2LogininforBo logininfor); /** * 批量删除系统登录日志 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysNoticeService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2NoticeService.java similarity index 66% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysNoticeService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2NoticeService.java index 830205d08..057a255f9 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysNoticeService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2NoticeService.java @@ -1,9 +1,9 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.tenant.domain.bo.SysNoticeBo; -import org.dromara.system.tenant.domain.vo.SysNoticeVo; +import org.dromara.system.saas.domain.bo.Sys2NoticeBo; +import org.dromara.system.saas.domain.vo.Sys2NoticeVo; import java.util.List; @@ -12,10 +12,10 @@ import java.util.List; * * @author Lion Li */ -public interface ISysNoticeService { +public interface ISys2NoticeService { - TableDataInfo selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery); + TableDataInfo selectPageNoticeList(Sys2NoticeBo notice, PageQuery pageQuery); /** * 查询公告信息 @@ -23,7 +23,7 @@ public interface ISysNoticeService { * @param noticeId 公告ID * @return 公告信息 */ - SysNoticeVo selectNoticeById(Long noticeId); + Sys2NoticeVo selectNoticeById(Long noticeId); /** * 查询公告列表 @@ -31,7 +31,7 @@ public interface ISysNoticeService { * @param notice 公告信息 * @return 公告集合 */ - List selectNoticeList(SysNoticeBo notice); + List selectNoticeList(Sys2NoticeBo notice); /** * 新增公告 @@ -39,7 +39,7 @@ public interface ISysNoticeService { * @param bo 公告信息 * @return 结果 */ - int insertNotice(SysNoticeBo bo); + int insertNotice(Sys2NoticeBo bo); /** * 修改公告 @@ -47,7 +47,7 @@ public interface ISysNoticeService { * @param bo 公告信息 * @return 结果 */ - int updateNotice(SysNoticeBo bo); + int updateNotice(Sys2NoticeBo bo); /** * 删除公告信息 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysOperLogService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OperLogService.java similarity index 63% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysOperLogService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OperLogService.java index c3cbeb8bc..0081ad23e 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysOperLogService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OperLogService.java @@ -1,9 +1,9 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.tenant.domain.bo.SysOperLogBo; -import org.dromara.system.tenant.domain.vo.SysOperLogVo; +import org.dromara.system.saas.domain.bo.Sys2OperLogBo; +import org.dromara.system.saas.domain.vo.Sys2OperLogVo; import java.util.List; @@ -12,16 +12,16 @@ import java.util.List; * * @author Lion Li */ -public interface ISysOperLogService { +public interface ISys2OperLogService { - TableDataInfo selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery); + TableDataInfo selectPageOperLogList(Sys2OperLogBo operLog, PageQuery pageQuery); /** * 新增操作日志 * * @param bo 操作日志对象 */ - void insertOperlog(SysOperLogBo bo); + void insertOperlog(Sys2OperLogBo bo); /** * 查询系统操作日志集合 @@ -29,7 +29,7 @@ public interface ISysOperLogService { * @param operLog 操作日志对象 * @return 操作日志集合 */ - List selectOperLogList(SysOperLogBo operLog); + List selectOperLogList(Sys2OperLogBo operLog); /** * 批量删除系统操作日志 @@ -45,7 +45,7 @@ public interface ISysOperLogService { * @param operId 操作ID * @return 操作日志对象 */ - SysOperLogVo selectOperLogById(Long operId); + Sys2OperLogVo selectOperLogById(Long operId); /** * 清空操作日志 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysOssConfigService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OssConfigService.java similarity index 67% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysOssConfigService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OssConfigService.java index 58762c741..961d498d4 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysOssConfigService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OssConfigService.java @@ -1,9 +1,9 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.tenant.domain.bo.SysOssConfigBo; -import org.dromara.system.tenant.domain.vo.SysOssConfigVo; +import org.dromara.system.saas.domain.bo.Sys2OssConfigBo; +import org.dromara.system.saas.domain.vo.Sys2OssConfigVo; import java.util.Collection; @@ -14,7 +14,7 @@ import java.util.Collection; * @author 孤舟烟雨 * @date 2021-08-13 */ -public interface ISysOssConfigService { +public interface ISys2OssConfigService { /** * 初始化OSS配置 @@ -24,12 +24,12 @@ public interface ISysOssConfigService { /** * 查询单个 */ - SysOssConfigVo queryById(Long ossConfigId); + Sys2OssConfigVo queryById(Long ossConfigId); /** * 查询列表 */ - TableDataInfo queryPageList(SysOssConfigBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(Sys2OssConfigBo bo, PageQuery pageQuery); /** * 根据新增业务对象插入对象存储配置 @@ -37,7 +37,7 @@ public interface ISysOssConfigService { * @param bo 对象存储配置新增业务对象 * @return 结果 */ - Boolean insertByBo(SysOssConfigBo bo); + Boolean insertByBo(Sys2OssConfigBo bo); /** * 根据编辑业务对象修改对象存储配置 @@ -45,7 +45,7 @@ public interface ISysOssConfigService { * @param bo 对象存储配置编辑业务对象 * @return 结果 */ - Boolean updateByBo(SysOssConfigBo bo); + Boolean updateByBo(Sys2OssConfigBo bo); /** * 校验并删除数据 @@ -59,6 +59,6 @@ public interface ISysOssConfigService { /** * 启用停用状态 */ - int updateOssConfigStatus(SysOssConfigBo bo); + int updateOssConfigStatus(Sys2OssConfigBo bo); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysOssService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OssService.java similarity index 66% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysOssService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OssService.java index dd7f48fc4..b36fdb5d7 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysOssService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2OssService.java @@ -1,10 +1,10 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.tenant.domain.bo.SysOssBo; -import org.dromara.system.tenant.domain.vo.SysOssVo; +import org.dromara.system.saas.domain.bo.Sys2OssBo; import jakarta.servlet.http.HttpServletResponse; +import org.dromara.system.saas.domain.vo.Sys2OssVo; import org.springframework.web.multipart.MultipartFile; import java.io.File; @@ -17,7 +17,7 @@ import java.util.List; * * @author Lion Li */ -public interface ISysOssService { +public interface ISys2OssService { /** * 查询OSS对象存储列表 @@ -26,39 +26,39 @@ public interface ISysOssService { * @param pageQuery 分页查询实体类 * @return 结果 */ - TableDataInfo queryPageList(SysOssBo sysOss, PageQuery pageQuery); + TableDataInfo queryPageList(Sys2OssBo sysOss, PageQuery pageQuery); /** - * 根据一组 ossIds 获取对应的 SysOssVo 列表 + * 根据一组 ossIds 获取对应的 Sys2OssVo 列表 * * @param ossIds 一组文件在数据库中的唯一标识集合 - * @return 包含 SysOssVo 对象的列表 + * @return 包含 Sys2OssVo 对象的列表 */ - List listByIds(Collection ossIds); + List listByIds(Collection ossIds); /** - * 根据 ossId 从缓存或数据库中获取 SysOssVo 对象 + * 根据 ossId 从缓存或数据库中获取 Sys2OssVo 对象 * * @param ossId 文件在数据库中的唯一标识 - * @return SysOssVo 对象，包含文件信息 + * @return Sys2OssVo 对象，包含文件信息 */ - SysOssVo getById(Long ossId); + Sys2OssVo getById(Long ossId); /** * 上传 MultipartFile 到对象存储服务，并保存文件信息到数据库 * * @param file 要上传的 MultipartFile 对象 - * @return 上传成功后的 SysOssVo 对象，包含文件信息 + * @return 上传成功后的 Sys2OssVo 对象，包含文件信息 */ - SysOssVo upload(MultipartFile file); + Sys2OssVo upload(MultipartFile file); /** * 上传文件到对象存储服务，并保存文件信息到数据库 * * @param file 要上传的文件对象 - * @return 上传成功后的 SysOssVo 对象，包含文件信息 + * @return 上传成功后的 Sys2OssVo 对象，包含文件信息 */ - SysOssVo upload(File file); + Sys2OssVo upload(File file); /** * 文件下载方法，支持一次性下载完整文件 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysPermissionService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2PermissionService.java similarity index 83% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysPermissionService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2PermissionService.java index 47d5a84be..dbedab0d4 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysPermissionService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2PermissionService.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; import java.util.Set; @@ -7,7 +7,7 @@ import java.util.Set; * * @author Lion Li */ -public interface ISysPermissionService { +public interface ISys2PermissionService { /** * 获取角色数据权限 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysPostService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2PostService.java similarity index 74% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysPostService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2PostService.java index c133127b0..f9bd90867 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysPostService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2PostService.java @@ -1,9 +1,9 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.tenant.domain.bo.SysPostBo; -import org.dromara.system.tenant.domain.vo.SysPostVo; +import org.dromara.system.saas.domain.bo.Sys2PostBo; +import org.dromara.system.saas.domain.vo.Sys2PostVo; import java.util.List; @@ -12,10 +12,10 @@ import java.util.List; * * @author Lion Li */ -public interface ISysPostService { +public interface ISys2PostService { - TableDataInfo selectPagePostList(SysPostBo post, PageQuery pageQuery); + TableDataInfo selectPagePostList(Sys2PostBo post, PageQuery pageQuery); /** * 查询岗位信息集合 @@ -23,14 +23,14 @@ public interface ISysPostService { * @param post 岗位信息 * @return 岗位列表 */ - List selectPostList(SysPostBo post); + List selectPostList(Sys2PostBo post); /** * 查询所有岗位 * * @return 岗位列表 */ - List selectPostAll(); + List selectPostAll(); /** * 通过岗位ID查询岗位信息 @@ -38,7 +38,7 @@ public interface ISysPostService { * @param postId 岗位ID * @return 角色对象信息 */ - SysPostVo selectPostById(Long postId); + Sys2PostVo selectPostById(Long postId); /** * 根据用户ID获取岗位选择框列表 @@ -54,7 +54,7 @@ public interface ISysPostService { * @param postIds 岗位id串 * @return 岗位列表信息 */ - List selectPostByIds(List postIds); + List selectPostByIds(List postIds); /** * 校验岗位名称 @@ -62,7 +62,7 @@ public interface ISysPostService { * @param post 岗位信息 * @return 结果 */ - boolean checkPostNameUnique(SysPostBo post); + boolean checkPostNameUnique(Sys2PostBo post); /** * 校验岗位编码 @@ -70,7 +70,7 @@ public interface ISysPostService { * @param post 岗位信息 * @return 结果 */ - boolean checkPostCodeUnique(SysPostBo post); + boolean checkPostCodeUnique(Sys2PostBo post); /** * 通过岗位ID查询岗位使用数量 @@ -110,7 +110,7 @@ public interface ISysPostService { * @param bo 岗位信息 * @return 结果 */ - int insertPost(SysPostBo bo); + int insertPost(Sys2PostBo bo); /** * 修改保存岗位信息 @@ -118,5 +118,5 @@ public interface ISysPostService { * @param bo 岗位信息 * @return 结果 */ - int updatePost(SysPostBo bo); + int updatePost(Sys2PostBo bo); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysRoleService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2RoleService.java similarity index 78% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysRoleService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2RoleService.java index 0db8f374b..2a4c4f0d2 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysRoleService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2RoleService.java @@ -1,10 +1,10 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.tenant.domain.SysUserRole; -import org.dromara.system.tenant.domain.bo.SysRoleBo; -import org.dromara.system.tenant.domain.vo.SysRoleVo; +import org.dromara.system.saas.domain.Sys2UserRole; +import org.dromara.system.saas.domain.bo.Sys2RoleBo; +import org.dromara.system.saas.domain.vo.Sys2RoleVo; import java.util.List; import java.util.Set; @@ -14,10 +14,10 @@ import java.util.Set; * * @author Lion Li */ -public interface ISysRoleService { +public interface ISys2RoleService { - TableDataInfo selectPageRoleList(SysRoleBo role, PageQuery pageQuery); + TableDataInfo selectPageRoleList(Sys2RoleBo role, PageQuery pageQuery); /** * 根据条件分页查询角色数据 @@ -25,7 +25,7 @@ public interface ISysRoleService { * @param role 角色信息 * @return 角色数据集合信息 */ - List selectRoleList(SysRoleBo role); + List selectRoleList(Sys2RoleBo role); /** * 根据用户ID查询角色列表 @@ -33,7 +33,7 @@ public interface ISysRoleService { * @param userId 用户ID * @return 角色列表 */ - List selectRolesByUserId(Long userId); + List selectRolesByUserId(Long userId); /** * 根据用户ID查询角色列表(包含被授权状态) @@ -41,7 +41,7 @@ public interface ISysRoleService { * @param userId 用户ID * @return 角色列表 */ - List selectRolesAuthByUserId(Long userId); + List selectRolesAuthByUserId(Long userId); /** * 根据用户ID查询角色权限 @@ -56,7 +56,7 @@ public interface ISysRoleService { * * @return 角色列表 */ - List selectRoleAll(); + List selectRoleAll(); /** * 根据用户ID获取角色选择框列表 @@ -72,7 +72,7 @@ public interface ISysRoleService { * @param roleId 角色ID * @return 角色对象信息 */ - SysRoleVo selectRoleById(Long roleId); + Sys2RoleVo selectRoleById(Long roleId); /** * 通过角色ID串查询角色 @@ -80,7 +80,7 @@ public interface ISysRoleService { * @param roleIds 角色ID串 * @return 角色列表信息 */ - List selectRoleByIds(List roleIds); + List selectRoleByIds(List roleIds); /** * 校验角色名称是否唯一 @@ -88,7 +88,7 @@ public interface ISysRoleService { * @param role 角色信息 * @return 结果 */ - boolean checkRoleNameUnique(SysRoleBo role); + boolean checkRoleNameUnique(Sys2RoleBo role); /** * 校验角色权限是否唯一 @@ -96,14 +96,14 @@ public interface ISysRoleService { * @param role 角色信息 * @return 结果 */ - boolean checkRoleKeyUnique(SysRoleBo role); + boolean checkRoleKeyUnique(Sys2RoleBo role); /** * 校验角色是否允许操作 * * @param role 角色信息 */ - void checkRoleAllowed(SysRoleBo role); + void checkRoleAllowed(Sys2RoleBo role); /** * 校验角色是否有数据权限 @@ -126,7 +126,7 @@ public interface ISysRoleService { * @param bo 角色信息 * @return 结果 */ - int insertRole(SysRoleBo bo); + int insertRole(Sys2RoleBo bo); /** * 修改保存角色信息 @@ -134,7 +134,7 @@ public interface ISysRoleService { * @param bo 角色信息 * @return 结果 */ - int updateRole(SysRoleBo bo); + int updateRole(Sys2RoleBo bo); /** * 修改角色状态 @@ -151,7 +151,7 @@ public interface ISysRoleService { * @param bo 角色信息 * @return 结果 */ - int authDataScope(SysRoleBo bo); + int authDataScope(Sys2RoleBo bo); /** * 通过角色ID删除角色 @@ -175,7 +175,7 @@ public interface ISysRoleService { * @param userRole 用户和角色关联信息 * @return 结果 */ - int deleteAuthUser(SysUserRole userRole); + int deleteAuthUser(Sys2UserRole userRole); /** * 批量取消授权用户角色 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysSocialService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2SocialService.java similarity index 50% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysSocialService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2SocialService.java index 72cf1b570..acf5bba8a 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysSocialService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2SocialService.java @@ -1,7 +1,7 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; -import org.dromara.system.tenant.domain.bo.SysSocialBo; -import org.dromara.system.tenant.domain.vo.SysSocialVo; +import org.dromara.system.saas.domain.bo.Sys2SocialBo; +import org.dromara.system.saas.domain.vo.Sys2SocialVo; import java.util.List; @@ -10,33 +10,33 @@ import java.util.List; * * @author thiszhc */ -public interface ISysSocialService { +public interface ISys2SocialService { /** * 查询社会化关系 */ - SysSocialVo queryById(String id); + Sys2SocialVo queryById(String id); /** * 查询社会化关系列表 */ - List queryList(SysSocialBo bo); + List queryList(Sys2SocialBo bo); /** * 查询社会化关系列表 */ - List queryListByUserId(Long userId); + List queryListByUserId(Long userId); /** * 新增授权关系 */ - Boolean insertByBo(SysSocialBo bo); + Boolean insertByBo(Sys2SocialBo bo); /** * 更新社会化关系 */ - Boolean updateByBo(SysSocialBo bo); + Boolean updateByBo(Sys2SocialBo bo); /** * 删除社会化关系信息 @@ -47,7 +47,7 @@ public interface ISysSocialService { /** * 根据 authId 查询 */ - List selectByAuthId(String authId); + List selectByAuthId(String authId); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysTenantApplicationService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantApplicationService.java similarity index 69% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysTenantApplicationService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantApplicationService.java index 662bbdf0d..c5d7487e8 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysTenantApplicationService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantApplicationService.java @@ -1,7 +1,7 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; -import org.dromara.system.tenant.domain.vo.SysTenantApplicationVo; -import org.dromara.system.tenant.domain.bo.SysTenantApplicationBo; +import org.dromara.system.saas.domain.vo.Sys2TenantApplicationVo; +import org.dromara.system.saas.domain.bo.Sys2TenantApplicationBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -14,7 +14,7 @@ import java.util.List; * @author Lion Li * @date 2024-09-22 */ -public interface ISysTenantApplicationService { +public interface ISys2TenantApplicationService { /** * 查询租户和应用关联 @@ -22,7 +22,7 @@ public interface ISysTenantApplicationService { * @param tenantId 主键 * @return 租户和应用关联 */ - SysTenantApplicationVo queryById(Long tenantId); + Sys2TenantApplicationVo queryById(Long tenantId); /** * 分页查询租户和应用关联列表 @@ -31,7 +31,7 @@ public interface ISysTenantApplicationService { * @param pageQuery 分页参数 * @return 租户和应用关联分页列表 */ - TableDataInfo queryPageList(SysTenantApplicationBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(Sys2TenantApplicationBo bo, PageQuery pageQuery); /** * 查询符合条件的租户和应用关联列表 @@ -39,7 +39,7 @@ public interface ISysTenantApplicationService { * @param bo 查询条件 * @return 租户和应用关联列表 */ - List queryList(SysTenantApplicationBo bo); + List queryList(Sys2TenantApplicationBo bo); /** * 新增租户和应用关联 @@ -47,7 +47,7 @@ public interface ISysTenantApplicationService { * @param bo 租户和应用关联 * @return 是否新增成功 */ - Boolean insertByBo(SysTenantApplicationBo bo); + Boolean insertByBo(Sys2TenantApplicationBo bo); /** * 修改租户和应用关联 @@ -55,7 +55,7 @@ public interface ISysTenantApplicationService { * @param bo 租户和应用关联 * @return 是否修改成功 */ - Boolean updateByBo(SysTenantApplicationBo bo); + Boolean updateByBo(Sys2TenantApplicationBo bo); /** * 校验并批量删除租户和应用关联信息 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysTenantPackageService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantPackageService.java similarity index 52% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysTenantPackageService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantPackageService.java index c6b349d44..5e607b6e0 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysTenantPackageService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantPackageService.java @@ -1,9 +1,9 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.tenant.domain.bo.SysTenantPackageBo; -import org.dromara.system.tenant.domain.vo.SysTenantPackageVo; +import org.dromara.system.saas.domain.bo.Sys2TenantPackageBo; +import org.dromara.system.saas.domain.vo.Sys2TenantPackageVo; import java.util.Collection; import java.util.List; @@ -13,47 +13,47 @@ import java.util.List; * * @author Michelle.Chung */ -public interface ISysTenantPackageService { +public interface ISys2TenantPackageService { /** * 查询租户套餐 */ - SysTenantPackageVo queryById(Long packageId); + Sys2TenantPackageVo queryById(Long packageId); /** * 查询租户套餐列表 */ - TableDataInfo queryPageList(SysTenantPackageBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(Sys2TenantPackageBo bo, PageQuery pageQuery); /** * 查询租户套餐已启用列表 */ - List selectList(); + List selectList(); /** * 查询租户套餐列表 */ - List queryList(SysTenantPackageBo bo); + List queryList(Sys2TenantPackageBo bo); /** * 新增租户套餐 */ - Boolean insertByBo(SysTenantPackageBo bo); + Boolean insertByBo(Sys2TenantPackageBo bo); /** * 修改租户套餐 */ - Boolean updateByBo(SysTenantPackageBo bo); + Boolean updateByBo(Sys2TenantPackageBo bo); /** * 校验套餐名称是否唯一 */ - boolean checkPackageNameUnique(SysTenantPackageBo bo); + boolean checkPackageNameUnique(Sys2TenantPackageBo bo); /** * 修改套餐状态 */ - int updatePackageStatus(SysTenantPackageBo bo); + int updatePackageStatus(Sys2TenantPackageBo bo); /** * 校验并批量删除租户套餐信息 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysTenantService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantService.java similarity index 64% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysTenantService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantService.java index fd469a46e..a2b4f45bf 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysTenantService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2TenantService.java @@ -1,7 +1,7 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; -import org.dromara.system.tenant.domain.vo.SysTenantVo; -import org.dromara.system.tenant.domain.bo.SysTenantBo; +import org.dromara.system.saas.domain.vo.Sys2TenantVo; +import org.dromara.system.saas.domain.bo.Sys2TenantBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -13,42 +13,42 @@ import java.util.List; * * @author Michelle.Chung */ -public interface ISysTenantService { +public interface ISys2TenantService { /** * 查询租户 */ - SysTenantVo queryById(Long id); + Sys2TenantVo queryById(Long id); /** * 基于租户ID查询租户 */ - SysTenantVo queryByTenantId(String tenantId); + Sys2TenantVo queryByTenantId(String tenantId); /** * 查询租户列表 */ - TableDataInfo queryPageList(SysTenantBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(Sys2TenantBo bo, PageQuery pageQuery); /** * 查询租户列表 */ - List queryList(SysTenantBo bo); + List queryList(Sys2TenantBo bo); /** * 新增租户 */ - Boolean insertByBo(SysTenantBo bo); + Boolean insertByBo(Sys2TenantBo bo); /** * 修改租户 */ - Boolean updateByBo(SysTenantBo bo); + Boolean updateByBo(Sys2TenantBo bo); /** * 修改租户状态 */ - int updateTenantStatus(SysTenantBo bo); + int updateTenantStatus(Sys2TenantBo bo); /** * 校验租户是否允许操作 @@ -63,7 +63,7 @@ public interface ISysTenantService { /** * 校验企业名称是否唯一 */ - boolean checkCompanyNameUnique(SysTenantBo bo); + boolean checkCompanyNameUnique(Sys2TenantBo bo); /** * 校验账号余额 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysUserService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2UserService.java similarity index 76% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysUserService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2UserService.java index 87f2871ca..8936232c4 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISys2UserService.java @@ -1,10 +1,10 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.tenant.domain.bo.SysUserBo; -import org.dromara.system.tenant.domain.vo.SysUserExportVo; -import org.dromara.system.tenant.domain.vo.SysUserVo; +import org.dromara.system.saas.domain.bo.Sys2UserBo; +import org.dromara.system.saas.domain.vo.Sys2UserExportVo; +import org.dromara.system.saas.domain.vo.Sys2UserVo; import java.util.List; @@ -13,10 +13,10 @@ import java.util.List; * * @author Lion Li */ -public interface ISysUserService { +public interface ISys2UserService { - TableDataInfo selectPageUserList(SysUserBo user, PageQuery pageQuery); + TableDataInfo selectPageUserList(Sys2UserBo user, PageQuery pageQuery); /** * 根据条件分页查询用户列表 @@ -24,7 +24,7 @@ public interface ISysUserService { * @param user 用户信息 * @return 用户信息集合信息 */ - List selectUserExportList(SysUserBo user); + List selectUserExportList(Sys2UserBo user); /** * 根据条件分页查询已分配用户角色列表 @@ -32,7 +32,7 @@ public interface ISysUserService { * @param user 用户信息 * @return 用户信息集合信息 */ - TableDataInfo selectAllocatedList(SysUserBo user, PageQuery pageQuery); + TableDataInfo selectAllocatedList(Sys2UserBo user, PageQuery pageQuery); /** * 根据条件分页查询未分配用户角色列表 @@ -40,7 +40,7 @@ public interface ISysUserService { * @param user 用户信息 * @return 用户信息集合信息 */ - TableDataInfo selectUnallocatedList(SysUserBo user, PageQuery pageQuery); + TableDataInfo selectUnallocatedList(Sys2UserBo user, PageQuery pageQuery); /** * 通过用户名查询用户 @@ -48,7 +48,7 @@ public interface ISysUserService { * @param userName 用户名 * @return 用户对象信息 */ - SysUserVo selectUserByUserName(String userName); + Sys2UserVo selectUserByUserName(String userName); /** * 通过手机号查询用户 @@ -56,7 +56,7 @@ public interface ISysUserService { * @param phonenumber 手机号 * @return 用户对象信息 */ - SysUserVo selectUserByPhonenumber(String phonenumber); + Sys2UserVo selectUserByPhonenumber(String phonenumber); /** * 通过用户ID查询用户 @@ -64,7 +64,7 @@ public interface ISysUserService { * @param userId 用户ID * @return 用户对象信息 */ - SysUserVo selectUserById(Long userId); + Sys2UserVo selectUserById(Long userId); /** * 通过用户ID串查询用户 @@ -73,7 +73,7 @@ public interface ISysUserService { * @param deptId 部门id * @return 用户列表信息 */ - List selectUserByIds(List userIds, Long deptId); + List selectUserByIds(List userIds, Long deptId); /** * 根据用户ID查询用户所属角色组 @@ -97,7 +97,7 @@ public interface ISysUserService { * @param user 用户信息 * @return 结果 */ - boolean checkUserNameUnique(SysUserBo user); + boolean checkUserNameUnique(Sys2UserBo user); /** * 校验手机号码是否唯一 @@ -105,7 +105,7 @@ public interface ISysUserService { * @param user 用户信息 * @return 结果 */ - boolean checkPhoneUnique(SysUserBo user); + boolean checkPhoneUnique(Sys2UserBo user); /** * 校验email是否唯一 @@ -113,7 +113,7 @@ public interface ISysUserService { * @param user 用户信息 * @return 结果 */ - boolean checkEmailUnique(SysUserBo user); + boolean checkEmailUnique(Sys2UserBo user); /** * 校验用户是否允许操作 @@ -135,7 +135,7 @@ public interface ISysUserService { * @param user 用户信息 * @return 结果 */ - int insertUser(SysUserBo user); + int insertUser(Sys2UserBo user); /** * 注册用户信息 @@ -143,7 +143,7 @@ public interface ISysUserService { * @param user 用户信息 * @return 结果 */ - boolean registerUser(SysUserBo user, String tenantId); + boolean registerUser(Sys2UserBo user, String tenantId); /** * 修改用户信息 @@ -151,7 +151,7 @@ public interface ISysUserService { * @param user 用户信息 * @return 结果 */ - int updateUser(SysUserBo user); + int updateUser(Sys2UserBo user); /** * 用户授权角色 @@ -176,7 +176,7 @@ public interface ISysUserService { * @param user 用户信息 * @return 结果 */ - int updateUserProfile(SysUserBo user); + int updateUserProfile(Sys2UserBo user); /** * 修改用户头像 @@ -218,5 +218,5 @@ public interface ISysUserService { * @param deptId 部门id * @return 结果 */ - List selectUserListByDept(Long deptId); + List selectUserListByDept(Long deptId); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysMenuService.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasMenuService.java similarity index 76% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysMenuService.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasMenuService.java index c53540908..1d41ea3df 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/ISysMenuService.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/ISysSaasMenuService.java @@ -1,10 +1,10 @@ -package org.dromara.system.tenant.service; +package org.dromara.system.saas.service; import cn.hutool.core.lang.tree.Tree; -import org.dromara.system.tenant.domain.SysMenu; -import org.dromara.system.tenant.domain.bo.SysMenuBo; -import org.dromara.system.tenant.domain.vo.RouterVo; -import org.dromara.system.tenant.domain.vo.SysMenuVo; +import org.dromara.system.saas.domain.SysSaasMenu; +import org.dromara.system.saas.domain.bo.SysSaasMenuBo; +import org.dromara.system.saas.domain.vo.TwoRouterVo; +import org.dromara.system.saas.domain.vo.SysSaasMenuVo; import java.util.List; import java.util.Set; @@ -14,7 +14,7 @@ import java.util.Set; * * @author Lion Li */ -public interface ISysMenuService { +public interface ISysSaasMenuService { /** * 根据用户查询系统菜单列表 @@ -22,7 +22,7 @@ public interface ISysMenuService { * @param userId 用户ID * @return 菜单列表 */ - List selectMenuList(Long userId); + List selectMenuList(Long userId); /** * 根据用户查询系统菜单列表 @@ -31,7 +31,7 @@ public interface ISysMenuService { * @param userId 用户ID * @return 菜单列表 */ - List selectMenuList(SysMenuBo menu, Long userId); + List selectMenuList(SysSaasMenuBo menu, Long userId); /** * 根据用户ID查询权限 @@ -55,7 +55,7 @@ public interface ISysMenuService { * @param userId 用户ID * @return 菜单列表 */ - List selectMenuTreeByUserId(Long userId); + List selectMenuTreeByUserId(Long userId); /** * 根据角色ID查询菜单树信息 @@ -79,7 +79,7 @@ public interface ISysMenuService { * @param menus 菜单列表 * @return 路由列表 */ - List buildMenus(List menus); + List buildMenus(List menus); /** * 构建前端所需要下拉树结构 @@ -87,7 +87,7 @@ public interface ISysMenuService { * @param menus 菜单列表 * @return 下拉树结构列表 */ - List> buildMenuTreeSelect(List menus); + List> buildMenuTreeSelect(List menus); /** * 根据菜单ID查询信息 @@ -95,7 +95,7 @@ public interface ISysMenuService { * @param menuId 菜单ID * @return 菜单信息 */ - SysMenuVo selectMenuById(Long menuId); + SysSaasMenuVo selectMenuById(Long menuId); /** * 是否存在菜单子节点 @@ -119,7 +119,7 @@ public interface ISysMenuService { * @param bo 菜单信息 * @return 结果 */ - int insertMenu(SysMenuBo bo); + int insertMenu(SysSaasMenuBo bo); /** * 修改保存菜单信息 @@ -127,7 +127,7 @@ public interface ISysMenuService { * @param bo 菜单信息 * @return 结果 */ - int updateMenu(SysMenuBo bo); + int updateMenu(SysSaasMenuBo bo); /** * 删除菜单管理信息 @@ -143,5 +143,5 @@ public interface ISysMenuService { * @param menu 菜单信息 * @return 结果 */ - boolean checkMenuNameUnique(SysMenuBo menu); + boolean checkMenuNameUnique(SysSaasMenuBo menu); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysApplicationServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ApplicationServiceImpl.java similarity index 62% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysApplicationServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ApplicationServiceImpl.java index 3ac15b470..d613988f4 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysApplicationServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ApplicationServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -8,11 +8,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; -import org.dromara.system.tenant.domain.SysApplication; -import org.dromara.system.tenant.domain.bo.SysApplicationBo; -import org.dromara.system.tenant.domain.vo.SysApplicationVo; -import org.dromara.system.tenant.mapper.SysApplicationMapper; -import org.dromara.system.tenant.service.ISysApplicationService; +import org.dromara.system.saas.domain.Sys2Application; +import org.dromara.system.saas.domain.bo.Sys2ApplicationBo; +import org.dromara.system.saas.domain.vo.Sys2ApplicationVo; +import org.dromara.system.saas.mapper.Sys2ApplicationMapper; +import org.dromara.system.saas.service.ISys2ApplicationService; import org.springframework.stereotype.Service; import java.util.List; @@ -27,9 +27,9 @@ import java.util.Collection; */ @RequiredArgsConstructor @Service -public class SysApplicationServiceImpl implements ISysApplicationService { +public class Sys2ApplicationServiceImpl implements ISys2ApplicationService { - private final SysApplicationMapper baseMapper; + private final Sys2ApplicationMapper baseMapper; /** * 查询应用 @@ -38,7 +38,7 @@ public class SysApplicationServiceImpl implements ISysApplicationService { * @return 应用 */ @Override - public SysApplicationVo queryById(Long applicationId){ + public Sys2ApplicationVo queryById(Long applicationId){ return baseMapper.selectVoById(applicationId); } @@ -50,9 +50,9 @@ public class SysApplicationServiceImpl implements ISysApplicationService { * @return 应用分页列表 */ @Override - public TableDataInfo queryPageList(SysApplicationBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo queryPageList(Sys2ApplicationBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -63,16 +63,16 @@ public class SysApplicationServiceImpl implements ISysApplicationService { * @return 应用列表 */ @Override - public List queryList(SysApplicationBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List queryList(Sys2ApplicationBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(SysApplicationBo bo) { + private LambdaQueryWrapper buildQueryWrapper(Sys2ApplicationBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getApplicationName()), SysApplication::getApplicationName, bo.getApplicationName()); - lqw.eq(StringUtils.isNotBlank(bo.getApplicationCode()), SysApplication::getApplicationCode, bo.getApplicationCode()); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getApplicationName()), Sys2Application::getApplicationName, bo.getApplicationName()); + lqw.eq(StringUtils.isNotBlank(bo.getApplicationCode()), Sys2Application::getApplicationCode, bo.getApplicationCode()); return lqw; } @@ -83,8 +83,8 @@ public class SysApplicationServiceImpl implements ISysApplicationService { * @return 是否新增成功 */ @Override - public Boolean insertByBo(SysApplicationBo bo) { - SysApplication add = MapstructUtils.convert(bo, SysApplication.class); + public Boolean insertByBo(Sys2ApplicationBo bo) { + Sys2Application add = MapstructUtils.convert(bo, Sys2Application.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -100,8 +100,8 @@ public class SysApplicationServiceImpl implements ISysApplicationService { * @return 是否修改成功 */ @Override - public Boolean updateByBo(SysApplicationBo bo) { - SysApplication update = MapstructUtils.convert(bo, SysApplication.class); + public Boolean updateByBo(Sys2ApplicationBo bo) { + Sys2Application update = MapstructUtils.convert(bo, Sys2Application.class); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } @@ -109,7 +109,7 @@ public class SysApplicationServiceImpl implements ISysApplicationService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(SysApplication entity){ + private void validEntityBeforeSave(Sys2Application entity){ //TODO 做一些数据校验,如唯一约束 } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysClientServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ClientServiceImpl.java similarity index 61% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysClientServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ClientServiceImpl.java index 64678e01a..e6f095472 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysClientServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ClientServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -12,11 +12,11 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.tenant.domain.SysClient; -import org.dromara.system.tenant.domain.bo.SysClientBo; -import org.dromara.system.tenant.domain.vo.SysClientVo; -import org.dromara.system.tenant.mapper.SysClientMapper; -import org.dromara.system.tenant.service.ISysClientService; +import org.dromara.system.saas.domain.Sys2Client; +import org.dromara.system.saas.domain.bo.Sys2ClientBo; +import org.dromara.system.saas.domain.vo.Sys2ClientVo; +import org.dromara.system.saas.mapper.Sys2ClientMapper; +import org.dromara.system.saas.service.ISys2ClientService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -33,16 +33,16 @@ import java.util.List; @Slf4j @RequiredArgsConstructor @Service -public class SysClientServiceImpl implements ISysClientService { +public class Sys2ClientServiceImpl implements ISys2ClientService { - private final SysClientMapper baseMapper; + private final Sys2ClientMapper baseMapper; /** * 查询客户端管理 */ @Override - public SysClientVo queryById(Long id) { - SysClientVo vo = baseMapper.selectVoById(id); + public Sys2ClientVo queryById(Long id) { + Sys2ClientVo vo = baseMapper.selectVoById(id); vo.setGrantTypeList(List.of(vo.getGrantType().split(","))); return vo; } @@ -53,17 +53,17 @@ public class SysClientServiceImpl implements ISysClientService { */ @Cacheable(cacheNames = CacheNames.SYS_CLIENT, key = "#clientId") @Override - public SysClientVo queryByClientId(String clientId) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysClient::getClientId, clientId)); + public Sys2ClientVo queryByClientId(String clientId) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(Sys2Client::getClientId, clientId)); } /** * 查询客户端管理列表 */ @Override - public TableDataInfo queryPageList(SysClientBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo queryPageList(Sys2ClientBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); result.getRecords().forEach(r -> r.setGrantTypeList(List.of(r.getGrantType().split(",")))); return TableDataInfo.build(result); } @@ -72,18 +72,18 @@ public class SysClientServiceImpl implements ISysClientService { * 查询客户端管理列表 */ @Override - public List queryList(SysClientBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List queryList(Sys2ClientBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(SysClientBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getClientId()), SysClient::getClientId, bo.getClientId()); - lqw.eq(StringUtils.isNotBlank(bo.getClientKey()), SysClient::getClientKey, bo.getClientKey()); - lqw.eq(StringUtils.isNotBlank(bo.getClientSecret()), SysClient::getClientSecret, bo.getClientSecret()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysClient::getStatus, bo.getStatus()); - lqw.orderByAsc(SysClient::getId); + private LambdaQueryWrapper buildQueryWrapper(Sys2ClientBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getClientId()), Sys2Client::getClientId, bo.getClientId()); + lqw.eq(StringUtils.isNotBlank(bo.getClientKey()), Sys2Client::getClientKey, bo.getClientKey()); + lqw.eq(StringUtils.isNotBlank(bo.getClientSecret()), Sys2Client::getClientSecret, bo.getClientSecret()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Sys2Client::getStatus, bo.getStatus()); + lqw.orderByAsc(Sys2Client::getId); return lqw; } @@ -91,8 +91,8 @@ public class SysClientServiceImpl implements ISysClientService { * 新增客户端管理 */ @Override - public Boolean insertByBo(SysClientBo bo) { - SysClient add = MapstructUtils.convert(bo, SysClient.class); + public Boolean insertByBo(Sys2ClientBo bo) { + Sys2Client add = MapstructUtils.convert(bo, Sys2Client.class); validEntityBeforeSave(add); add.setGrantType(String.join(",", bo.getGrantTypeList())); // 生成clientid @@ -111,8 +111,8 @@ public class SysClientServiceImpl implements ISysClientService { */ @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, key = "#bo.clientId") @Override - public Boolean updateByBo(SysClientBo bo) { - SysClient update = MapstructUtils.convert(bo, SysClient.class); + public Boolean updateByBo(Sys2ClientBo bo) { + Sys2Client update = MapstructUtils.convert(bo, Sys2Client.class); validEntityBeforeSave(update); update.setGrantType(String.join(",", bo.getGrantTypeList())); return baseMapper.updateById(update) > 0; @@ -125,15 +125,15 @@ public class SysClientServiceImpl implements ISysClientService { @Override public int updateUserStatus(String clientId, String status) { return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(SysClient::getStatus, status) - .eq(SysClient::getClientId, clientId)); + new LambdaUpdateWrapper() + .set(Sys2Client::getStatus, status) + .eq(Sys2Client::getClientId, clientId)); } /** * 保存前的数据校验 */ - private void validEntityBeforeSave(SysClient entity) { + private void validEntityBeforeSave(Sys2Client entity) { //TODO 做一些数据校验,如唯一约束 } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ConfigServiceImpl.java similarity index 68% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysConfigServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ConfigServiceImpl.java index 148dc0ff1..48b3f1ac7 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2ConfigServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; @@ -17,11 +17,11 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.tenant.domain.SysConfig; -import org.dromara.system.tenant.domain.bo.SysConfigBo; -import org.dromara.system.tenant.domain.vo.SysConfigVo; -import org.dromara.system.tenant.mapper.SysConfigMapper; -import org.dromara.system.tenant.service.ISysConfigService; +import org.dromara.system.saas.domain.Sys2Config; +import org.dromara.system.saas.domain.bo.Sys2ConfigBo; +import org.dromara.system.saas.domain.vo.Sys2ConfigVo; +import org.dromara.system.saas.mapper.Sys2ConfigMapper; +import org.dromara.system.saas.service.ISys2ConfigService; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; @@ -38,14 +38,14 @@ import java.util.Map; */ @RequiredArgsConstructor @Service -public class SysConfigServiceImpl implements ISysConfigService, ConfigService { +public class Sys2ConfigServiceImpl implements ISys2ConfigService, ConfigService { - private final SysConfigMapper baseMapper; + private final Sys2ConfigMapper baseMapper; @Override - public TableDataInfo selectPageConfigList(SysConfigBo config, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(config); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo selectPageConfigList(Sys2ConfigBo config, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(config); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -57,7 +57,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { */ @Override @DS("master") - public SysConfigVo selectConfigById(Long configId) { + public Sys2ConfigVo selectConfigById(Long configId) { return baseMapper.selectVoById(configId); } @@ -70,8 +70,8 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { @Cacheable(cacheNames = CacheNames.SYS_CONFIG, key = "#configKey") @Override public String selectConfigByKey(String configKey) { - SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper() - .eq(SysConfig::getConfigKey, configKey)); + Sys2Config retConfig = baseMapper.selectOne(new LambdaQueryWrapper() + .eq(Sys2Config::getConfigKey, configKey)); if (ObjectUtil.isNotNull(retConfig)) { return retConfig.getConfigValue(); } @@ -85,9 +85,9 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { */ @Override public boolean selectRegisterEnabled(String tenantId) { - SysConfig retConfig = TenantHelper.dynamic(tenantId, () -> { - return baseMapper.selectOne(new LambdaQueryWrapper() - .eq(SysConfig::getConfigKey, "sys.account.registerUser")); + Sys2Config retConfig = TenantHelper.dynamic(tenantId, () -> { + return baseMapper.selectOne(new LambdaQueryWrapper() + .eq(Sys2Config::getConfigKey, "sys.account.registerUser")); }); if (ObjectUtil.isNull(retConfig)) { return false; @@ -102,20 +102,20 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { * @return 参数配置集合 */ @Override - public List selectConfigList(SysConfigBo config) { - LambdaQueryWrapper lqw = buildQueryWrapper(config); + public List selectConfigList(Sys2ConfigBo config) { + LambdaQueryWrapper lqw = buildQueryWrapper(config); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(SysConfigBo bo) { + private LambdaQueryWrapper buildQueryWrapper(Sys2ConfigBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getConfigName()), SysConfig::getConfigName, bo.getConfigName()); - lqw.eq(StringUtils.isNotBlank(bo.getConfigType()), SysConfig::getConfigType, bo.getConfigType()); - lqw.like(StringUtils.isNotBlank(bo.getConfigKey()), SysConfig::getConfigKey, bo.getConfigKey()); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getConfigName()), Sys2Config::getConfigName, bo.getConfigName()); + lqw.eq(StringUtils.isNotBlank(bo.getConfigType()), Sys2Config::getConfigType, bo.getConfigType()); + lqw.like(StringUtils.isNotBlank(bo.getConfigKey()), Sys2Config::getConfigKey, bo.getConfigKey()); lqw.between(params.get("beginTime") != null && params.get("endTime") != null, - SysConfig::getCreateTime, params.get("beginTime"), params.get("endTime")); - lqw.orderByAsc(SysConfig::getConfigId); + Sys2Config::getCreateTime, params.get("beginTime"), params.get("endTime")); + lqw.orderByAsc(Sys2Config::getConfigId); return lqw; } @@ -127,8 +127,8 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { */ @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey") @Override - public String insertConfig(SysConfigBo bo) { - SysConfig config = MapstructUtils.convert(bo, SysConfig.class); + public String insertConfig(Sys2ConfigBo bo) { + Sys2Config config = MapstructUtils.convert(bo, Sys2Config.class); int row = baseMapper.insert(config); if (row > 0) { return config.getConfigValue(); @@ -144,19 +144,19 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { */ @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey") @Override - public String updateConfig(SysConfigBo bo) { + public String updateConfig(Sys2ConfigBo bo) { int row = 0; - SysConfig config = MapstructUtils.convert(bo, SysConfig.class); + Sys2Config config = MapstructUtils.convert(bo, Sys2Config.class); if (config.getConfigId() != null) { - SysConfig temp = baseMapper.selectById(config.getConfigId()); + Sys2Config temp = baseMapper.selectById(config.getConfigId()); if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey())) { CacheUtils.evict(CacheNames.SYS_CONFIG, temp.getConfigKey()); } row = baseMapper.updateById(config); } else { CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey()); - row = baseMapper.update(config, new LambdaQueryWrapper() - .eq(SysConfig::getConfigKey, config.getConfigKey())); + row = baseMapper.update(config, new LambdaQueryWrapper() + .eq(Sys2Config::getConfigKey, config.getConfigKey())); } if (row > 0) { return config.getConfigValue(); @@ -172,7 +172,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { @Override public void deleteConfigByIds(Long[] configIds) { for (Long configId : configIds) { - SysConfig config = baseMapper.selectById(configId); + Sys2Config config = baseMapper.selectById(configId); if (StringUtils.equals(UserConstants.YES, config.getConfigType())) { throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey())); } @@ -196,9 +196,9 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { * @return 结果 */ @Override - public boolean checkConfigKeyUnique(SysConfigBo config) { + public boolean checkConfigKeyUnique(Sys2ConfigBo config) { long configId = ObjectUtil.isNull(config.getConfigId()) ? -1L : config.getConfigId(); - SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper().eq(SysConfig::getConfigKey, config.getConfigKey())); + Sys2Config info = baseMapper.selectOne(new LambdaQueryWrapper().eq(Sys2Config::getConfigKey, config.getConfigKey())); if (ObjectUtil.isNotNull(info) && info.getConfigId() != configId) { return false; } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysDataScopeServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DataScopeServiceImpl.java similarity index 60% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysDataScopeServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DataScopeServiceImpl.java index 0ea65bfbf..3aa833d74 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysDataScopeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DataScopeServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -7,12 +7,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.system.tenant.domain.SysDept; -import org.dromara.system.tenant.domain.SysRoleDept; -import org.dromara.system.tenant.mapper.SysDeptMapper; -import org.dromara.system.tenant.mapper.SysRoleDeptMapper; -import org.dromara.system.tenant.service.ISysDataScopeService; -import org.springframework.stereotype.Service; +import org.dromara.system.saas.domain.Sys2Dept; +import org.dromara.system.saas.domain.Sys2RoleDept; +import org.dromara.system.saas.mapper.Sys2DeptMapper; +import org.dromara.system.saas.mapper.Sys2RoleDeptMapper; +import org.dromara.system.saas.service.ISys2DataScopeService; import java.util.List; @@ -25,11 +24,11 @@ import java.util.List; * @author Lion Li */ @RequiredArgsConstructor -@Service("sdss") -public class SysDataScopeServiceImpl implements ISysDataScopeService { +//@Service("sdss") 目前数据权限注解没有用，所以不需要用 +public class Sys2DataScopeServiceImpl implements ISys2DataScopeService { - private final SysRoleDeptMapper roleDeptMapper; - private final SysDeptMapper deptMapper; + private final Sys2RoleDeptMapper roleDeptMapper; + private final Sys2DeptMapper deptMapper; /** * 获取角色自定义权限 @@ -42,10 +41,10 @@ public class SysDataScopeServiceImpl implements ISysDataScopeService { if (ObjectUtil.isNull(roleId)) { return "-1"; } - List list = roleDeptMapper.selectList( - new LambdaQueryWrapper() - .select(SysRoleDept::getDeptId) - .eq(SysRoleDept::getRoleId, roleId)); + List list = roleDeptMapper.selectList( + new LambdaQueryWrapper() + .select(Sys2RoleDept::getDeptId) + .eq(Sys2RoleDept::getRoleId, roleId)); if (CollUtil.isNotEmpty(list)) { return StreamUtils.join(list, rd -> Convert.toStr(rd.getDeptId())); } @@ -63,10 +62,10 @@ public class SysDataScopeServiceImpl implements ISysDataScopeService { if (ObjectUtil.isNull(deptId)) { return "-1"; } - List deptList = deptMapper.selectList(new LambdaQueryWrapper() - .select(SysDept::getDeptId) + List deptList = deptMapper.selectList(new LambdaQueryWrapper() + .select(Sys2Dept::getDeptId) .apply(DataBaseHelper.findInSet(deptId, "ancestors"))); - List ids = StreamUtils.toList(deptList, SysDept::getDeptId); + List ids = StreamUtils.toList(deptList, Sys2Dept::getDeptId); ids.add(deptId); if (CollUtil.isNotEmpty(ids)) { return StreamUtils.join(ids, Convert::toStr); diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DeptServiceImpl.java similarity index 65% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysDeptServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DeptServiceImpl.java index 372374289..b8b4208fd 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DeptServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -11,7 +11,7 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.constant.UserConstants; import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DeptService; +import org.dromara.common.core.service.TwoDeptService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; @@ -19,15 +19,15 @@ import org.dromara.common.core.utils.TreeBuildUtils; import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.tenant.domain.SysDept; -import org.dromara.system.tenant.domain.SysRole; -import org.dromara.system.tenant.domain.SysUser; -import org.dromara.system.tenant.domain.bo.SysDeptBo; -import org.dromara.system.tenant.domain.vo.SysDeptVo; -import org.dromara.system.tenant.mapper.SysDeptMapper; -import org.dromara.system.tenant.mapper.SysRoleMapper; -import org.dromara.system.tenant.mapper.SysUserMapper; -import org.dromara.system.tenant.service.ISysDeptService; +import org.dromara.system.saas.domain.Sys2Dept; +import org.dromara.system.saas.domain.Sys2Role; +import org.dromara.system.saas.domain.Sys2User; +import org.dromara.system.saas.domain.bo.Sys2DeptBo; +import org.dromara.system.saas.domain.vo.Sys2DeptVo; +import org.dromara.system.saas.mapper.Sys2DeptMapper; +import org.dromara.system.saas.mapper.Sys2RoleMapper; +import org.dromara.system.saas.mapper.Sys2UserMapper; +import org.dromara.system.saas.service.ISys2DeptService; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -43,11 +43,11 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class SysDeptServiceImpl implements ISysDeptService, DeptService { +public class Sys2DeptServiceImpl implements ISys2DeptService, TwoDeptService { - private final SysDeptMapper baseMapper; - private final SysRoleMapper roleMapper; - private final SysUserMapper userMapper; + private final Sys2DeptMapper baseMapper; + private final Sys2RoleMapper roleMapper; + private final Sys2UserMapper userMapper; /** * 查询部门管理数据 @@ -56,8 +56,8 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { * @return 部门信息集合 */ @Override - public List selectDeptList(SysDeptBo dept) { - LambdaQueryWrapper lqw = buildQueryWrapper(dept); + public List selectDeptList(Sys2DeptBo dept) { + LambdaQueryWrapper lqw = buildQueryWrapper(dept); return baseMapper.selectDeptList(lqw); } @@ -68,26 +68,26 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { * @return 部门树信息集合 */ @Override - public List> selectDeptTreeList(SysDeptBo bo) { + public List> selectDeptTreeList(Sys2DeptBo bo) { // 只查询未禁用部门 bo.setStatus(UserConstants.DEPT_NORMAL); - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - List depts = baseMapper.selectDeptList(lqw); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + List depts = baseMapper.selectDeptList(lqw); return buildDeptTreeSelect(depts); } - private LambdaQueryWrapper buildQueryWrapper(SysDeptBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(SysDept::getDelFlag, UserConstants.DEL_FLAG_NORMAL); - lqw.eq(ObjectUtil.isNotNull(bo.getDeptId()), SysDept::getDeptId, bo.getDeptId()); - lqw.eq(ObjectUtil.isNotNull(bo.getParentId()), SysDept::getParentId, bo.getParentId()); - lqw.like(StringUtils.isNotBlank(bo.getDeptName()), SysDept::getDeptName, bo.getDeptName()); - lqw.like(StringUtils.isNotBlank(bo.getDeptCategory()), SysDept::getDeptCategory, bo.getDeptCategory()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDept::getStatus, bo.getStatus()); - lqw.orderByAsc(SysDept::getAncestors); - lqw.orderByAsc(SysDept::getParentId); - lqw.orderByAsc(SysDept::getOrderNum); - lqw.orderByAsc(SysDept::getDeptId); + private LambdaQueryWrapper buildQueryWrapper(Sys2DeptBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(Sys2Dept::getDelFlag, UserConstants.DEL_FLAG_NORMAL); + lqw.eq(ObjectUtil.isNotNull(bo.getDeptId()), Sys2Dept::getDeptId, bo.getDeptId()); + lqw.eq(ObjectUtil.isNotNull(bo.getParentId()), Sys2Dept::getParentId, bo.getParentId()); + lqw.like(StringUtils.isNotBlank(bo.getDeptName()), Sys2Dept::getDeptName, bo.getDeptName()); + lqw.like(StringUtils.isNotBlank(bo.getDeptCategory()), Sys2Dept::getDeptCategory, bo.getDeptCategory()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Sys2Dept::getStatus, bo.getStatus()); + lqw.orderByAsc(Sys2Dept::getAncestors); + lqw.orderByAsc(Sys2Dept::getParentId); + lqw.orderByAsc(Sys2Dept::getOrderNum); + lqw.orderByAsc(Sys2Dept::getDeptId); return lqw; } @@ -98,7 +98,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { * @return 下拉树结构列表 */ @Override - public List> buildDeptTreeSelect(List depts) { + public List> buildDeptTreeSelect(List depts) { if (CollUtil.isEmpty(depts)) { return CollUtil.newArrayList(); } @@ -117,7 +117,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { */ @Override public List selectDeptListByRoleId(Long roleId) { - SysRole role = roleMapper.selectById(roleId); + Sys2Role role = roleMapper.selectById(roleId); return baseMapper.selectDeptListByRoleId(roleId, role.getDeptCheckStrictly()); } @@ -129,23 +129,23 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { */ @Cacheable(cacheNames = CacheNames.SYS_DEPT, key = "#deptId") @Override - public SysDeptVo selectDeptById(Long deptId) { - SysDeptVo dept = baseMapper.selectVoById(deptId); + public Sys2DeptVo selectDeptById(Long deptId) { + Sys2DeptVo dept = baseMapper.selectVoById(deptId); if (ObjectUtil.isNull(dept)) { return null; } - SysDeptVo parentDept = baseMapper.selectVoOne(new LambdaQueryWrapper() - .select(SysDept::getDeptName).eq(SysDept::getDeptId, dept.getParentId())); + Sys2DeptVo parentDept = baseMapper.selectVoOne(new LambdaQueryWrapper() + .select(Sys2Dept::getDeptName).eq(Sys2Dept::getDeptId, dept.getParentId())); dept.setParentName(ObjectUtil.isNotNull(parentDept) ? parentDept.getDeptName() : null); return dept; } @Override - public List selectDeptByIds(List deptIds) { - return baseMapper.selectDeptList(new LambdaQueryWrapper() - .select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getLeader) - .eq(SysDept::getStatus, UserConstants.DEPT_NORMAL) - .in(CollUtil.isNotEmpty(deptIds), SysDept::getDeptId, deptIds)); + public List selectDeptByIds(List deptIds) { + return baseMapper.selectDeptList(new LambdaQueryWrapper() + .select(Sys2Dept::getDeptId, Sys2Dept::getDeptName, Sys2Dept::getLeader) + .eq(Sys2Dept::getStatus, UserConstants.DEPT_NORMAL) + .in(CollUtil.isNotEmpty(deptIds), Sys2Dept::getDeptId, deptIds)); } /** @@ -158,7 +158,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { public String selectDeptNameByIds(String deptIds) { List list = new ArrayList<>(); for (Long id : StringUtils.splitTo(deptIds, Convert::toLong)) { - SysDeptVo vo = SpringUtils.getAopProxy(this).selectDeptById(id); + Sys2DeptVo vo = SpringUtils.getAopProxy(this).selectDeptById(id); if (ObjectUtil.isNotNull(vo)) { list.add(vo.getDeptName()); } @@ -174,8 +174,8 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { */ @Override public long selectNormalChildrenDeptById(Long deptId) { - return baseMapper.selectCount(new LambdaQueryWrapper() - .eq(SysDept::getStatus, UserConstants.DEPT_NORMAL) + return baseMapper.selectCount(new LambdaQueryWrapper() + .eq(Sys2Dept::getStatus, UserConstants.DEPT_NORMAL) .apply(DataBaseHelper.findInSet(deptId, "ancestors"))); } @@ -187,8 +187,8 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { */ @Override public boolean hasChildByDeptId(Long deptId) { - return baseMapper.exists(new LambdaQueryWrapper() - .eq(SysDept::getParentId, deptId)); + return baseMapper.exists(new LambdaQueryWrapper() + .eq(Sys2Dept::getParentId, deptId)); } /** @@ -199,8 +199,8 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { */ @Override public boolean checkDeptExistUser(Long deptId) { - return userMapper.exists(new LambdaQueryWrapper() - .eq(SysUser::getDeptId, deptId)); + return userMapper.exists(new LambdaQueryWrapper() + .eq(Sys2User::getDeptId, deptId)); } /** @@ -210,11 +210,11 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { * @return 结果 */ @Override - public boolean checkDeptNameUnique(SysDeptBo dept) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysDept::getDeptName, dept.getDeptName()) - .eq(SysDept::getParentId, dept.getParentId()) - .ne(ObjectUtil.isNotNull(dept.getDeptId()), SysDept::getDeptId, dept.getDeptId())); + public boolean checkDeptNameUnique(Sys2DeptBo dept) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(Sys2Dept::getDeptName, dept.getDeptName()) + .eq(Sys2Dept::getParentId, dept.getParentId()) + .ne(ObjectUtil.isNotNull(dept.getDeptId()), Sys2Dept::getDeptId, dept.getDeptId())); return !exist; } @@ -243,13 +243,13 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { * @return 结果 */ @Override - public int insertDept(SysDeptBo bo) { - SysDept info = baseMapper.selectById(bo.getParentId()); + public int insertDept(Sys2DeptBo bo) { + Sys2Dept info = baseMapper.selectById(bo.getParentId()); // 如果父节点不为正常状态,则不允许新增子节点 if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) { throw new ServiceException("部门停用，不允许新增"); } - SysDept dept = MapstructUtils.convert(bo, SysDept.class); + Sys2Dept dept = MapstructUtils.convert(bo, Sys2Dept.class); dept.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + dept.getParentId()); return baseMapper.insert(dept); } @@ -262,13 +262,13 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { */ @CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#bo.deptId") @Override - public int updateDept(SysDeptBo bo) { - SysDept dept = MapstructUtils.convert(bo, SysDept.class); - SysDept oldDept = baseMapper.selectById(dept.getDeptId()); + public int updateDept(Sys2DeptBo bo) { + Sys2Dept dept = MapstructUtils.convert(bo, Sys2Dept.class); + Sys2Dept oldDept = baseMapper.selectById(dept.getDeptId()); if (!oldDept.getParentId().equals(dept.getParentId())) { // 如果是新父部门 则校验是否具有新父部门权限 避免越权 this.checkDeptDataScope(dept.getParentId()); - SysDept newParentDept = baseMapper.selectById(dept.getParentId()); + Sys2Dept newParentDept = baseMapper.selectById(dept.getParentId()); if (ObjectUtil.isNotNull(newParentDept) && ObjectUtil.isNotNull(oldDept)) { String newAncestors = newParentDept.getAncestors() + StringUtils.SEPARATOR + newParentDept.getDeptId(); String oldAncestors = oldDept.getAncestors(); @@ -290,12 +290,12 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { * * @param dept 当前部门 */ - private void updateParentDeptStatusNormal(SysDept dept) { + private void updateParentDeptStatusNormal(Sys2Dept dept) { String ancestors = dept.getAncestors(); Long[] deptIds = Convert.toLongArray(ancestors); - baseMapper.update(null, new LambdaUpdateWrapper() - .set(SysDept::getStatus, UserConstants.DEPT_NORMAL) - .in(SysDept::getDeptId, Arrays.asList(deptIds))); + baseMapper.update(null, new LambdaUpdateWrapper() + .set(Sys2Dept::getStatus, UserConstants.DEPT_NORMAL) + .in(Sys2Dept::getDeptId, Arrays.asList(deptIds))); } /** @@ -306,11 +306,11 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { * @param oldAncestors 旧的父ID集合 */ private void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) { - List children = baseMapper.selectList(new LambdaQueryWrapper() + List children = baseMapper.selectList(new LambdaQueryWrapper() .apply(DataBaseHelper.findInSet(deptId, "ancestors"))); - List list = new ArrayList<>(); - for (SysDept child : children) { - SysDept dept = new SysDept(); + List list = new ArrayList<>(); + for (Sys2Dept child : children) { + Sys2Dept dept = new Sys2Dept(); dept.setDeptId(child.getDeptId()); dept.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors)); list.add(dept); diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DictDataServiceImpl.java similarity index 58% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysDictDataServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DictDataServiceImpl.java index 56acb0de1..a254fed2c 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DictDataServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -7,15 +7,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.system.tenant.domain.SysDictData; +import org.dromara.system.saas.domain.Sys2DictData; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.system.tenant.domain.bo.SysDictDataBo; -import org.dromara.system.tenant.domain.vo.SysDictDataVo; -import org.dromara.system.tenant.mapper.SysDictDataMapper; -import org.dromara.system.tenant.service.ISysDictDataService; +import org.dromara.system.saas.domain.bo.Sys2DictDataBo; +import org.dromara.system.saas.domain.vo.Sys2DictDataVo; +import org.dromara.system.saas.mapper.Sys2DictDataMapper; +import org.dromara.system.saas.service.ISys2DictDataService; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CachePut; import org.springframework.stereotype.Service; @@ -29,14 +29,14 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class SysDictDataServiceImpl implements ISysDictDataService { +public class Sys2DictDataServiceImpl implements ISys2DictDataService { - private final SysDictDataMapper baseMapper; + private final Sys2DictDataMapper baseMapper; @Override - public TableDataInfo selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(dictData); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo selectPageDictDataList(Sys2DictDataBo dictData, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(dictData); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -47,17 +47,17 @@ public class SysDictDataServiceImpl implements ISysDictDataService { * @return 字典数据集合信息 */ @Override - public List selectDictDataList(SysDictDataBo dictData) { - LambdaQueryWrapper lqw = buildQueryWrapper(dictData); + public List selectDictDataList(Sys2DictDataBo dictData) { + LambdaQueryWrapper lqw = buildQueryWrapper(dictData); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(SysDictDataBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getDictSort() != null, SysDictData::getDictSort, bo.getDictSort()); - lqw.like(StringUtils.isNotBlank(bo.getDictLabel()), SysDictData::getDictLabel, bo.getDictLabel()); - lqw.eq(StringUtils.isNotBlank(bo.getDictType()), SysDictData::getDictType, bo.getDictType()); - lqw.orderByAsc(SysDictData::getDictSort); + private LambdaQueryWrapper buildQueryWrapper(Sys2DictDataBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getDictSort() != null, Sys2DictData::getDictSort, bo.getDictSort()); + lqw.like(StringUtils.isNotBlank(bo.getDictLabel()), Sys2DictData::getDictLabel, bo.getDictLabel()); + lqw.eq(StringUtils.isNotBlank(bo.getDictType()), Sys2DictData::getDictType, bo.getDictType()); + lqw.orderByAsc(Sys2DictData::getDictSort); return lqw; } @@ -70,10 +70,10 @@ public class SysDictDataServiceImpl implements ISysDictDataService { */ @Override public String selectDictLabel(String dictType, String dictValue) { - return baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysDictData::getDictLabel) - .eq(SysDictData::getDictType, dictType) - .eq(SysDictData::getDictValue, dictValue)) + return baseMapper.selectOne(new LambdaQueryWrapper() + .select(Sys2DictData::getDictLabel) + .eq(Sys2DictData::getDictType, dictType) + .eq(Sys2DictData::getDictValue, dictValue)) .getDictLabel(); } @@ -84,7 +84,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { * @return 字典数据 */ @Override - public SysDictDataVo selectDictDataById(Long dictCode) { + public Sys2DictDataVo selectDictDataById(Long dictCode) { return baseMapper.selectVoById(dictCode); } @@ -96,7 +96,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { @Override public void deleteDictDataByIds(Long[] dictCodes) { for (Long dictCode : dictCodes) { - SysDictData data = baseMapper.selectById(dictCode); + Sys2DictData data = baseMapper.selectById(dictCode); baseMapper.deleteById(dictCode); CacheUtils.evict(CacheNames.SYS_DICT, data.getDictType()); } @@ -110,8 +110,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService { */ @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") @Override - public List insertDictData(SysDictDataBo bo) { - SysDictData data = MapstructUtils.convert(bo, SysDictData.class); + public List insertDictData(Sys2DictDataBo bo) { + Sys2DictData data = MapstructUtils.convert(bo, Sys2DictData.class); int row = baseMapper.insert(data); if (row > 0) { return baseMapper.selectDictDataByType(data.getDictType()); @@ -127,8 +127,8 @@ public class SysDictDataServiceImpl implements ISysDictDataService { */ @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") @Override - public List updateDictData(SysDictDataBo bo) { - SysDictData data = MapstructUtils.convert(bo, SysDictData.class); + public List updateDictData(Sys2DictDataBo bo) { + Sys2DictData data = MapstructUtils.convert(bo, Sys2DictData.class); int row = baseMapper.updateById(data); if (row > 0) { return baseMapper.selectDictDataByType(data.getDictType()); @@ -143,10 +143,10 @@ public class SysDictDataServiceImpl implements ISysDictDataService { * @return 结果 */ @Override - public boolean checkDictDataUnique(SysDictDataBo dict) { + public boolean checkDictDataUnique(Sys2DictDataBo dict) { Long dictCode = ObjectUtil.isNull(dict.getDictCode()) ? -1L : dict.getDictCode(); - SysDictData entity = baseMapper.selectOne(new LambdaQueryWrapper() - .eq(SysDictData::getDictType, dict.getDictType()).eq(SysDictData::getDictValue, dict.getDictValue())); + Sys2DictData entity = baseMapper.selectOne(new LambdaQueryWrapper() + .eq(Sys2DictData::getDictType, dict.getDictType()).eq(Sys2DictData::getDictValue, dict.getDictValue())); if (ObjectUtil.isNotNull(entity) && !dictCode.equals(entity.getDictCode())) { return false; } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DictTypeServiceImpl.java similarity index 62% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysDictTypeServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DictTypeServiceImpl.java index 7ee22e5fc..7dae2384f 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2DictTypeServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.DictService; +import org.dromara.common.core.service.TwoDictService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StreamUtils; @@ -17,14 +17,14 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.system.tenant.domain.SysDictData; -import org.dromara.system.tenant.domain.SysDictType; -import org.dromara.system.tenant.domain.bo.SysDictTypeBo; -import org.dromara.system.tenant.domain.vo.SysDictDataVo; -import org.dromara.system.tenant.domain.vo.SysDictTypeVo; -import org.dromara.system.tenant.mapper.SysDictDataMapper; -import org.dromara.system.tenant.mapper.SysDictTypeMapper; -import org.dromara.system.tenant.service.ISysDictTypeService; +import org.dromara.system.saas.domain.Sys2DictData; +import org.dromara.system.saas.domain.Sys2DictType; +import org.dromara.system.saas.domain.bo.Sys2DictTypeBo; +import org.dromara.system.saas.domain.vo.Sys2DictDataVo; +import org.dromara.system.saas.domain.vo.Sys2DictTypeVo; +import org.dromara.system.saas.mapper.Sys2DictDataMapper; +import org.dromara.system.saas.mapper.Sys2DictTypeMapper; +import org.dromara.system.saas.service.ISys2DictTypeService; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -43,15 +43,15 @@ import java.util.stream.Collectors; */ @RequiredArgsConstructor @Service -public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService { +public class Sys2DictTypeServiceImpl implements ISys2DictTypeService, TwoDictService { - private final SysDictTypeMapper baseMapper; - private final SysDictDataMapper dictDataMapper; + private final Sys2DictTypeMapper baseMapper; + private final Sys2DictDataMapper dictDataMapper; @Override - public TableDataInfo selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(dictType); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo selectPageDictTypeList(Sys2DictTypeBo dictType, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(dictType); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -62,19 +62,19 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService * @return 字典类型集合信息 */ @Override - public List selectDictTypeList(SysDictTypeBo dictType) { - LambdaQueryWrapper lqw = buildQueryWrapper(dictType); + public List selectDictTypeList(Sys2DictTypeBo dictType) { + LambdaQueryWrapper lqw = buildQueryWrapper(dictType); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(SysDictTypeBo bo) { + private LambdaQueryWrapper buildQueryWrapper(Sys2DictTypeBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getDictName()), SysDictType::getDictName, bo.getDictName()); - lqw.like(StringUtils.isNotBlank(bo.getDictType()), SysDictType::getDictType, bo.getDictType()); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getDictName()), Sys2DictType::getDictName, bo.getDictName()); + lqw.like(StringUtils.isNotBlank(bo.getDictType()), Sys2DictType::getDictType, bo.getDictType()); lqw.between(params.get("beginTime") != null && params.get("endTime") != null, - SysDictType::getCreateTime, params.get("beginTime"), params.get("endTime")); - lqw.orderByAsc(SysDictType::getDictId); + Sys2DictType::getCreateTime, params.get("beginTime"), params.get("endTime")); + lqw.orderByAsc(Sys2DictType::getDictId); return lqw; } @@ -84,7 +84,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService * @return 字典类型集合信息 */ @Override - public List selectDictTypeAll() { + public List selectDictTypeAll() { return baseMapper.selectVoList(); } @@ -96,8 +96,8 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService */ @Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType") @Override - public List selectDictDataByType(String dictType) { - List dictDatas = dictDataMapper.selectDictDataByType(dictType); + public List selectDictDataByType(String dictType) { + List dictDatas = dictDataMapper.selectDictDataByType(dictType); if (CollUtil.isNotEmpty(dictDatas)) { return dictDatas; } @@ -111,7 +111,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService * @return 字典类型 */ @Override - public SysDictTypeVo selectDictTypeById(Long dictId) { + public Sys2DictTypeVo selectDictTypeById(Long dictId) { return baseMapper.selectVoById(dictId); } @@ -122,8 +122,8 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService * @return 字典类型 */ @Override - public SysDictTypeVo selectDictTypeByType(String dictType) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysDictType::getDictType, dictType)); + public Sys2DictTypeVo selectDictTypeByType(String dictType) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(Sys2DictType::getDictType, dictType)); } /** @@ -134,9 +134,9 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService @Override public void deleteDictTypeByIds(Long[] dictIds) { for (Long dictId : dictIds) { - SysDictType dictType = baseMapper.selectById(dictId); - if (dictDataMapper.exists(new LambdaQueryWrapper() - .eq(SysDictData::getDictType, dictType.getDictType()))) { + Sys2DictType dictType = baseMapper.selectById(dictId); + if (dictDataMapper.exists(new LambdaQueryWrapper() + .eq(Sys2DictData::getDictType, dictType.getDictType()))) { throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName())); } CacheUtils.evict(CacheNames.SYS_DICT, dictType.getDictType()); @@ -160,8 +160,8 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService */ @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") @Override - public List insertDictType(SysDictTypeBo bo) { - SysDictType dict = MapstructUtils.convert(bo, SysDictType.class); + public List insertDictType(Sys2DictTypeBo bo) { + Sys2DictType dict = MapstructUtils.convert(bo, Sys2DictType.class); int row = baseMapper.insert(dict); if (row > 0) { // 新增 type 下无 data 数据 返回空防止缓存穿透 @@ -179,12 +179,12 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") @Override @Transactional(rollbackFor = Exception.class) - public List updateDictType(SysDictTypeBo bo) { - SysDictType dict = MapstructUtils.convert(bo, SysDictType.class); - SysDictType oldDict = baseMapper.selectById(dict.getDictId()); - dictDataMapper.update(null, new LambdaUpdateWrapper() - .set(SysDictData::getDictType, dict.getDictType()) - .eq(SysDictData::getDictType, oldDict.getDictType())); + public List updateDictType(Sys2DictTypeBo bo) { + Sys2DictType dict = MapstructUtils.convert(bo, Sys2DictType.class); + Sys2DictType oldDict = baseMapper.selectById(dict.getDictId()); + dictDataMapper.update(null, new LambdaUpdateWrapper() + .set(Sys2DictData::getDictType, dict.getDictType()) + .eq(Sys2DictData::getDictType, oldDict.getDictType())); int row = baseMapper.updateById(dict); if (row > 0) { CacheUtils.evict(CacheNames.SYS_DICT, oldDict.getDictType()); @@ -200,10 +200,10 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService * @return 结果 */ @Override - public boolean checkDictTypeUnique(SysDictTypeBo dictType) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysDictType::getDictType, dictType.getDictType()) - .ne(ObjectUtil.isNotNull(dictType.getDictId()), SysDictType::getDictId, dictType.getDictId())); + public boolean checkDictTypeUnique(Sys2DictTypeBo dictType) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(Sys2DictType::getDictType, dictType.getDictType()) + .ne(ObjectUtil.isNotNull(dictType.getDictId()), Sys2DictType::getDictId, dictType.getDictId())); return !exist; } @@ -217,8 +217,8 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService */ @Override public String getDictLabel(String dictType, String dictValue, String separator) { - List datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); - Map map = StreamUtils.toMap(datas, SysDictDataVo::getDictValue, SysDictDataVo::getDictLabel); + List datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); + Map map = StreamUtils.toMap(datas, Sys2DictDataVo::getDictValue, Sys2DictDataVo::getDictLabel); if (StringUtils.containsAny(dictValue, separator)) { return Arrays.stream(dictValue.split(separator)) .map(v -> map.getOrDefault(v, StringUtils.EMPTY)) @@ -238,8 +238,8 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService */ @Override public String getDictValue(String dictType, String dictLabel, String separator) { - List datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); - Map map = StreamUtils.toMap(datas, SysDictDataVo::getDictLabel, SysDictDataVo::getDictValue); + List datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType); + Map map = StreamUtils.toMap(datas, Sys2DictDataVo::getDictLabel, Sys2DictDataVo::getDictValue); if (StringUtils.containsAny(dictLabel, separator)) { return Arrays.stream(dictLabel.split(separator)) .map(l -> map.getOrDefault(l, StringUtils.EMPTY)) @@ -251,8 +251,8 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService @Override public Map getAllDictByDictType(String dictType) { - List list = selectDictDataByType(dictType); - return StreamUtils.toMap(list, SysDictDataVo::getDictValue, SysDictDataVo::getDictLabel); + List list = selectDictDataByType(dictType); + return StreamUtils.toMap(list, Sys2DictDataVo::getDictValue, Sys2DictDataVo::getDictLabel); } } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysLogininforServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2LogininforServiceImpl.java similarity index 74% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysLogininforServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2LogininforServiceImpl.java index 002431a1e..2771ee243 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysLogininforServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2LogininforServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.useragent.UserAgent; @@ -17,13 +17,13 @@ import org.dromara.common.log.event.LogininforEvent; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.tenant.domain.SysLogininfor; -import org.dromara.system.tenant.domain.bo.SysLogininforBo; -import org.dromara.system.tenant.domain.vo.SysClientVo; -import org.dromara.system.tenant.domain.vo.SysLogininforVo; -import org.dromara.system.tenant.mapper.SysLogininforMapper; -import org.dromara.system.tenant.service.ISysClientService; -import org.dromara.system.tenant.service.ISysLogininforService; +import org.dromara.system.saas.domain.Sys2Logininfor; +import org.dromara.system.saas.domain.bo.Sys2LogininforBo; +import org.dromara.system.saas.domain.vo.Sys2ClientVo; +import org.dromara.system.saas.domain.vo.Sys2LogininforVo; +import org.dromara.system.saas.mapper.Sys2LogininforMapper; +import org.dromara.system.saas.service.ISys2ClientService; +import org.dromara.system.saas.service.ISys2LogininforService; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -41,11 +41,11 @@ import java.util.Map; @RequiredArgsConstructor @Slf4j @Service -public class SysLogininforServiceImpl implements ISysLogininforService { +public class Sys2LogininforServiceImpl implements ISys2LogininforService { - private final SysLogininforMapper baseMapper; + private final Sys2LogininforMapper baseMapper; - private final ISysClientService clientService; + private final ISys2ClientService clientService; /** * 记录登录信息 @@ -60,7 +60,7 @@ public class SysLogininforServiceImpl implements ISysLogininforService { final String ip = ServletUtils.getClientIP(request); // 客户端信息 String clientId = request.getHeader(LoginHelper.CLIENT_KEY); - SysClientVo client = null; + Sys2ClientVo client = null; if (StringUtils.isNotBlank(clientId)) { client = clientService.queryByClientId(clientId); } @@ -79,7 +79,7 @@ public class SysLogininforServiceImpl implements ISysLogininforService { // 获取客户端浏览器 String browser = userAgent.getBrowser().getName(); // 封装对象 - SysLogininforBo logininfor = new SysLogininforBo(); + Sys2LogininforBo logininfor = new Sys2LogininforBo(); logininfor.setTenantId(logininforEvent.getTenantId()); logininfor.setUserName(logininforEvent.getUsername()); if (ObjectUtil.isNotNull(client)) { @@ -109,19 +109,19 @@ public class SysLogininforServiceImpl implements ISysLogininforService { } @Override - public TableDataInfo selectPageLogininforList(SysLogininforBo logininfor, PageQuery pageQuery) { + public TableDataInfo selectPageLogininforList(Sys2LogininforBo logininfor, PageQuery pageQuery) { Map params = logininfor.getParams(); - LambdaQueryWrapper lqw = new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr()) - .eq(StringUtils.isNotBlank(logininfor.getStatus()), SysLogininfor::getStatus, logininfor.getStatus()) - .like(StringUtils.isNotBlank(logininfor.getUserName()), SysLogininfor::getUserName, logininfor.getUserName()) + LambdaQueryWrapper lqw = new LambdaQueryWrapper() + .like(StringUtils.isNotBlank(logininfor.getIpaddr()), Sys2Logininfor::getIpaddr, logininfor.getIpaddr()) + .eq(StringUtils.isNotBlank(logininfor.getStatus()), Sys2Logininfor::getStatus, logininfor.getStatus()) + .like(StringUtils.isNotBlank(logininfor.getUserName()), Sys2Logininfor::getUserName, logininfor.getUserName()) .between(params.get("beginTime") != null && params.get("endTime") != null, - SysLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime")); + Sys2Logininfor::getLoginTime, params.get("beginTime"), params.get("endTime")); if (StringUtils.isBlank(pageQuery.getOrderByColumn())) { pageQuery.setOrderByColumn("info_id"); pageQuery.setIsAsc("desc"); } - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -131,8 +131,8 @@ public class SysLogininforServiceImpl implements ISysLogininforService { * @param bo 访问日志对象 */ @Override - public void insertLogininfor(SysLogininforBo bo) { - SysLogininfor logininfor = MapstructUtils.convert(bo, SysLogininfor.class); + public void insertLogininfor(Sys2LogininforBo bo) { + Sys2Logininfor logininfor = MapstructUtils.convert(bo, Sys2Logininfor.class); logininfor.setLoginTime(new Date()); baseMapper.insert(logininfor); } @@ -144,15 +144,15 @@ public class SysLogininforServiceImpl implements ISysLogininforService { * @return 登录记录集合 */ @Override - public List selectLogininforList(SysLogininforBo logininfor) { + public List selectLogininforList(Sys2LogininforBo logininfor) { Map params = logininfor.getParams(); - return baseMapper.selectVoList(new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr()) - .eq(StringUtils.isNotBlank(logininfor.getStatus()), SysLogininfor::getStatus, logininfor.getStatus()) - .like(StringUtils.isNotBlank(logininfor.getUserName()), SysLogininfor::getUserName, logininfor.getUserName()) + return baseMapper.selectVoList(new LambdaQueryWrapper() + .like(StringUtils.isNotBlank(logininfor.getIpaddr()), Sys2Logininfor::getIpaddr, logininfor.getIpaddr()) + .eq(StringUtils.isNotBlank(logininfor.getStatus()), Sys2Logininfor::getStatus, logininfor.getStatus()) + .like(StringUtils.isNotBlank(logininfor.getUserName()), Sys2Logininfor::getUserName, logininfor.getUserName()) .between(params.get("beginTime") != null && params.get("endTime") != null, - SysLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime")) - .orderByDesc(SysLogininfor::getInfoId)); + Sys2Logininfor::getLoginTime, params.get("beginTime"), params.get("endTime")) + .orderByDesc(Sys2Logininfor::getInfoId)); } /** diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2NoticeServiceImpl.java similarity index 51% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysNoticeServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2NoticeServiceImpl.java index 47e4d1989..fdddf906d 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2NoticeServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -8,14 +8,14 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.tenant.domain.SysNotice; -import org.dromara.system.tenant.domain.SysUser; -import org.dromara.system.tenant.domain.bo.SysNoticeBo; -import org.dromara.system.tenant.domain.vo.SysNoticeVo; -import org.dromara.system.tenant.domain.vo.SysUserVo; -import org.dromara.system.tenant.mapper.SysNoticeMapper; -import org.dromara.system.tenant.mapper.SysUserMapper; -import org.dromara.system.tenant.service.ISysNoticeService; +import org.dromara.system.saas.domain.Sys2Notice; +import org.dromara.system.saas.domain.Sys2User; +import org.dromara.system.saas.domain.bo.Sys2NoticeBo; +import org.dromara.system.saas.domain.vo.Sys2NoticeVo; +import org.dromara.system.saas.domain.vo.Sys2UserVo; +import org.dromara.system.saas.mapper.Sys2NoticeMapper; +import org.dromara.system.saas.mapper.Sys2UserMapper; +import org.dromara.system.saas.service.ISys2NoticeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -29,15 +29,15 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class SysNoticeServiceImpl implements ISysNoticeService { +public class Sys2NoticeServiceImpl implements ISys2NoticeService { - private final SysNoticeMapper baseMapper; - private final SysUserMapper userMapper; + private final Sys2NoticeMapper baseMapper; + private final Sys2UserMapper userMapper; @Override - public TableDataInfo selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(notice); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo selectPageNoticeList(Sys2NoticeBo notice, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(notice); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -48,7 +48,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService { * @return 公告信息 */ @Override - public SysNoticeVo selectNoticeById(Long noticeId) { + public Sys2NoticeVo selectNoticeById(Long noticeId) { return baseMapper.selectVoById(noticeId); } @@ -59,20 +59,20 @@ public class SysNoticeServiceImpl implements ISysNoticeService { * @return 公告集合 */ @Override - public List selectNoticeList(SysNoticeBo notice) { - LambdaQueryWrapper lqw = buildQueryWrapper(notice); + public List selectNoticeList(Sys2NoticeBo notice) { + LambdaQueryWrapper lqw = buildQueryWrapper(notice); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(SysNoticeBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getNoticeTitle()), SysNotice::getNoticeTitle, bo.getNoticeTitle()); - lqw.eq(StringUtils.isNotBlank(bo.getNoticeType()), SysNotice::getNoticeType, bo.getNoticeType()); + private LambdaQueryWrapper buildQueryWrapper(Sys2NoticeBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getNoticeTitle()), Sys2Notice::getNoticeTitle, bo.getNoticeTitle()); + lqw.eq(StringUtils.isNotBlank(bo.getNoticeType()), Sys2Notice::getNoticeType, bo.getNoticeType()); if (StringUtils.isNotBlank(bo.getCreateByName())) { - SysUserVo sysUser = userMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getUserName, bo.getCreateByName())); - lqw.eq(SysNotice::getCreateBy, ObjectUtil.isNotNull(sysUser) ? sysUser.getUserId() : null); + Sys2UserVo sysUser = userMapper.selectVoOne(new LambdaQueryWrapper().eq(Sys2User::getUserName, bo.getCreateByName())); + lqw.eq(Sys2Notice::getCreateBy, ObjectUtil.isNotNull(sysUser) ? sysUser.getUserId() : null); } - lqw.orderByAsc(SysNotice::getNoticeId); + lqw.orderByAsc(Sys2Notice::getNoticeId); return lqw; } @@ -83,8 +83,8 @@ public class SysNoticeServiceImpl implements ISysNoticeService { * @return 结果 */ @Override - public int insertNotice(SysNoticeBo bo) { - SysNotice notice = MapstructUtils.convert(bo, SysNotice.class); + public int insertNotice(Sys2NoticeBo bo) { + Sys2Notice notice = MapstructUtils.convert(bo, Sys2Notice.class); return baseMapper.insert(notice); } @@ -95,8 +95,8 @@ public class SysNoticeServiceImpl implements ISysNoticeService { * @return 结果 */ @Override - public int updateNotice(SysNoticeBo bo) { - SysNotice notice = MapstructUtils.convert(bo, SysNotice.class); + public int updateNotice(Sys2NoticeBo bo) { + Sys2Notice notice = MapstructUtils.convert(bo, Sys2Notice.class); return baseMapper.updateById(notice); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OperLogServiceImpl.java similarity index 64% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysOperLogServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OperLogServiceImpl.java index ea35e1d1c..a22f8b680 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OperLogServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.hutool.core.util.ArrayUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -9,11 +9,11 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.ip.AddressUtils; import org.dromara.common.log.event.OperLogEvent; -import org.dromara.system.tenant.domain.SysOperLog; -import org.dromara.system.tenant.domain.bo.SysOperLogBo; -import org.dromara.system.tenant.domain.vo.SysOperLogVo; -import org.dromara.system.tenant.mapper.SysOperLogMapper; -import org.dromara.system.tenant.service.ISysOperLogService; +import org.dromara.system.saas.domain.Sys2OperLog; +import org.dromara.system.saas.domain.bo.Sys2OperLogBo; +import org.dromara.system.saas.domain.vo.Sys2OperLogVo; +import org.dromara.system.saas.mapper.Sys2OperLogMapper; +import org.dromara.system.saas.service.ISys2OperLogService; import lombok.RequiredArgsConstructor; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; @@ -31,9 +31,9 @@ import java.util.Map; */ @RequiredArgsConstructor @Service -public class SysOperLogServiceImpl implements ISysOperLogService { +public class Sys2OperLogServiceImpl implements ISys2OperLogService { - private final SysOperLogMapper baseMapper; + private final Sys2OperLogMapper baseMapper; /** * 操作日志记录 @@ -43,35 +43,35 @@ public class SysOperLogServiceImpl implements ISysOperLogService { @Async @EventListener public void recordOper(OperLogEvent operLogEvent) { - SysOperLogBo operLog = MapstructUtils.convert(operLogEvent, SysOperLogBo.class); + Sys2OperLogBo operLog = MapstructUtils.convert(operLogEvent, Sys2OperLogBo.class); // 远程查询操作地点 operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp())); insertOperlog(operLog); } @Override - public TableDataInfo selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery) { + public TableDataInfo selectPageOperLogList(Sys2OperLogBo operLog, PageQuery pageQuery) { Map params = operLog.getParams(); - LambdaQueryWrapper lqw = new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(operLog.getOperIp()), SysOperLog::getOperIp, operLog.getOperIp()) - .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle()) + LambdaQueryWrapper lqw = new LambdaQueryWrapper() + .like(StringUtils.isNotBlank(operLog.getOperIp()), Sys2OperLog::getOperIp, operLog.getOperIp()) + .like(StringUtils.isNotBlank(operLog.getTitle()), Sys2OperLog::getTitle, operLog.getTitle()) .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0, - SysOperLog::getBusinessType, operLog.getBusinessType()) + Sys2OperLog::getBusinessType, operLog.getBusinessType()) .func(f -> { if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())) { - f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes())); + f.in(Sys2OperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes())); } }) .eq(operLog.getStatus() != null, - SysOperLog::getStatus, operLog.getStatus()) - .like(StringUtils.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName()) + Sys2OperLog::getStatus, operLog.getStatus()) + .like(StringUtils.isNotBlank(operLog.getOperName()), Sys2OperLog::getOperName, operLog.getOperName()) .between(params.get("beginTime") != null && params.get("endTime") != null, - SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime")); + Sys2OperLog::getOperTime, params.get("beginTime"), params.get("endTime")); if (StringUtils.isBlank(pageQuery.getOrderByColumn())) { pageQuery.setOrderByColumn("oper_id"); pageQuery.setIsAsc("desc"); } - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(page); } @@ -81,8 +81,8 @@ public class SysOperLogServiceImpl implements ISysOperLogService { * @param bo 操作日志对象 */ @Override - public void insertOperlog(SysOperLogBo bo) { - SysOperLog operLog = MapstructUtils.convert(bo, SysOperLog.class); + public void insertOperlog(Sys2OperLogBo bo) { + Sys2OperLog operLog = MapstructUtils.convert(bo, Sys2OperLog.class); operLog.setOperTime(new Date()); baseMapper.insert(operLog); } @@ -94,24 +94,24 @@ public class SysOperLogServiceImpl implements ISysOperLogService { * @return 操作日志集合 */ @Override - public List selectOperLogList(SysOperLogBo operLog) { + public List selectOperLogList(Sys2OperLogBo operLog) { Map params = operLog.getParams(); - return baseMapper.selectVoList(new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(operLog.getOperIp()), SysOperLog::getOperIp, operLog.getOperIp()) - .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle()) + return baseMapper.selectVoList(new LambdaQueryWrapper() + .like(StringUtils.isNotBlank(operLog.getOperIp()), Sys2OperLog::getOperIp, operLog.getOperIp()) + .like(StringUtils.isNotBlank(operLog.getTitle()), Sys2OperLog::getTitle, operLog.getTitle()) .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0, - SysOperLog::getBusinessType, operLog.getBusinessType()) + Sys2OperLog::getBusinessType, operLog.getBusinessType()) .func(f -> { if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())) { - f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes())); + f.in(Sys2OperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes())); } }) .eq(operLog.getStatus() != null && operLog.getStatus() > 0, - SysOperLog::getStatus, operLog.getStatus()) - .like(StringUtils.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName()) + Sys2OperLog::getStatus, operLog.getStatus()) + .like(StringUtils.isNotBlank(operLog.getOperName()), Sys2OperLog::getOperName, operLog.getOperName()) .between(params.get("beginTime") != null && params.get("endTime") != null, - SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime")) - .orderByDesc(SysOperLog::getOperId)); + Sys2OperLog::getOperTime, params.get("beginTime"), params.get("endTime")) + .orderByDesc(Sys2OperLog::getOperId)); } /** @@ -132,7 +132,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService { * @return 操作日志对象 */ @Override - public SysOperLogVo selectOperLogById(Long operId) { + public Sys2OperLogVo selectOperLogById(Long operId) { return baseMapper.selectVoById(operId); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysOssConfigServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OssConfigServiceImpl.java similarity index 56% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysOssConfigServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OssConfigServiceImpl.java index fb28790e6..b5ea8da69 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysOssConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OssConfigServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -18,11 +18,11 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.oss.constant.OssConstant; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.system.tenant.domain.SysOssConfig; -import org.dromara.system.tenant.domain.bo.SysOssConfigBo; -import org.dromara.system.tenant.domain.vo.SysOssConfigVo; -import org.dromara.system.tenant.mapper.SysOssConfigMapper; -import org.dromara.system.tenant.service.ISysOssConfigService; +import org.dromara.system.saas.domain.Sys2OssConfig; +import org.dromara.system.saas.domain.bo.Sys2OssConfigBo; +import org.dromara.system.saas.domain.vo.Sys2OssConfigVo; +import org.dromara.system.saas.mapper.Sys2OssConfigMapper; +import org.dromara.system.saas.service.ISys2OssConfigService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -39,18 +39,18 @@ import java.util.List; @Slf4j @RequiredArgsConstructor @Service -public class SysOssConfigServiceImpl implements ISysOssConfigService { +public class Sys2OssConfigServiceImpl implements ISys2OssConfigService { - private final SysOssConfigMapper baseMapper; + private final Sys2OssConfigMapper baseMapper; /** * 项目启动时，初始化参数到缓存，加载配置类 */ @Override public void init() { - List list = baseMapper.selectList(); + List list = baseMapper.selectList(); // 加载OSS初始化配置 - for (SysOssConfig config : list) { + for (Sys2OssConfig config : list) { String configKey = config.getConfigKey(); if ("0".equals(config.getStatus())) { RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, configKey); @@ -60,30 +60,30 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { } @Override - public SysOssConfigVo queryById(Long ossConfigId) { + public Sys2OssConfigVo queryById(Long ossConfigId) { return baseMapper.selectVoById(ossConfigId); } @Override - public TableDataInfo queryPageList(SysOssConfigBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo queryPageList(Sys2OssConfigBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } - private LambdaQueryWrapper buildQueryWrapper(SysOssConfigBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getConfigKey()), SysOssConfig::getConfigKey, bo.getConfigKey()); - lqw.like(StringUtils.isNotBlank(bo.getBucketName()), SysOssConfig::getBucketName, bo.getBucketName()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysOssConfig::getStatus, bo.getStatus()); - lqw.orderByAsc(SysOssConfig::getOssConfigId); + private LambdaQueryWrapper buildQueryWrapper(Sys2OssConfigBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getConfigKey()), Sys2OssConfig::getConfigKey, bo.getConfigKey()); + lqw.like(StringUtils.isNotBlank(bo.getBucketName()), Sys2OssConfig::getBucketName, bo.getBucketName()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Sys2OssConfig::getStatus, bo.getStatus()); + lqw.orderByAsc(Sys2OssConfig::getOssConfigId); return lqw; } @Override - public Boolean insertByBo(SysOssConfigBo bo) { - SysOssConfig config = MapstructUtils.convert(bo, SysOssConfig.class); + public Boolean insertByBo(Sys2OssConfigBo bo) { + Sys2OssConfig config = MapstructUtils.convert(bo, Sys2OssConfig.class); validEntityBeforeSave(config); boolean flag = baseMapper.insert(config) > 0; if (flag) { @@ -95,15 +95,15 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { } @Override - public Boolean updateByBo(SysOssConfigBo bo) { - SysOssConfig config = MapstructUtils.convert(bo, SysOssConfig.class); + public Boolean updateByBo(Sys2OssConfigBo bo) { + Sys2OssConfig config = MapstructUtils.convert(bo, Sys2OssConfig.class); validEntityBeforeSave(config); - LambdaUpdateWrapper luw = new LambdaUpdateWrapper<>(); - luw.set(ObjectUtil.isNull(config.getPrefix()), SysOssConfig::getPrefix, ""); - luw.set(ObjectUtil.isNull(config.getRegion()), SysOssConfig::getRegion, ""); - luw.set(ObjectUtil.isNull(config.getExt1()), SysOssConfig::getExt1, ""); - luw.set(ObjectUtil.isNull(config.getRemark()), SysOssConfig::getRemark, ""); - luw.eq(SysOssConfig::getOssConfigId, config.getOssConfigId()); + LambdaUpdateWrapper luw = new LambdaUpdateWrapper<>(); + luw.set(ObjectUtil.isNull(config.getPrefix()), Sys2OssConfig::getPrefix, ""); + luw.set(ObjectUtil.isNull(config.getRegion()), Sys2OssConfig::getRegion, ""); + luw.set(ObjectUtil.isNull(config.getExt1()), Sys2OssConfig::getExt1, ""); + luw.set(ObjectUtil.isNull(config.getRemark()), Sys2OssConfig::getRemark, ""); + luw.eq(Sys2OssConfig::getOssConfigId, config.getOssConfigId()); boolean flag = baseMapper.update(config, luw) > 0; if (flag) { // 从数据库查询完整的数据做缓存 @@ -116,7 +116,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(SysOssConfig entity) { + private void validEntityBeforeSave(Sys2OssConfig entity) { if (StringUtils.isNotEmpty(entity.getConfigKey()) && !checkConfigKeyUnique(entity)) { throw new ServiceException("操作配置'" + entity.getConfigKey() + "'失败, 配置key已存在!"); @@ -130,15 +130,15 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { throw new ServiceException("系统内置, 不可删除!"); } } - List list = CollUtil.newArrayList(); + List list = CollUtil.newArrayList(); for (Long configId : ids) { - SysOssConfig config = baseMapper.selectById(configId); + Sys2OssConfig config = baseMapper.selectById(configId); list.add(config); } boolean flag = baseMapper.deleteByIds(ids) > 0; if (flag) { - list.forEach(sysOssConfig -> - CacheUtils.evict(CacheNames.SYS_OSS_CONFIG, sysOssConfig.getConfigKey())); + list.forEach(sys2OssConfig -> + CacheUtils.evict(CacheNames.SYS_OSS_CONFIG, sys2OssConfig.getConfigKey())); } return flag; } @@ -146,11 +146,11 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { /** * 判断configKey是否唯一 */ - private boolean checkConfigKeyUnique(SysOssConfig sysOssConfig) { - long ossConfigId = ObjectUtil.isNull(sysOssConfig.getOssConfigId()) ? -1L : sysOssConfig.getOssConfigId(); - SysOssConfig info = baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey) - .eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey())); + private boolean checkConfigKeyUnique(Sys2OssConfig sys2OssConfig) { + long ossConfigId = ObjectUtil.isNull(sys2OssConfig.getOssConfigId()) ? -1L : sys2OssConfig.getOssConfigId(); + Sys2OssConfig info = baseMapper.selectOne(new LambdaQueryWrapper() + .select(Sys2OssConfig::getOssConfigId, Sys2OssConfig::getConfigKey) + .eq(Sys2OssConfig::getConfigKey, sys2OssConfig.getConfigKey())); if (ObjectUtil.isNotNull(info) && info.getOssConfigId() != ossConfigId) { return false; } @@ -162,13 +162,13 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { */ @Override @Transactional(rollbackFor = Exception.class) - public int updateOssConfigStatus(SysOssConfigBo bo) { - SysOssConfig sysOssConfig = MapstructUtils.convert(bo, SysOssConfig.class); - int row = baseMapper.update(null, new LambdaUpdateWrapper() - .set(SysOssConfig::getStatus, "1")); - row += baseMapper.updateById(sysOssConfig); + public int updateOssConfigStatus(Sys2OssConfigBo bo) { + Sys2OssConfig sys2OssConfig = MapstructUtils.convert(bo, Sys2OssConfig.class); + int row = baseMapper.update(null, new LambdaUpdateWrapper() + .set(Sys2OssConfig::getStatus, "1")); + row += baseMapper.updateById(sys2OssConfig); if (row > 0) { - RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, sysOssConfig.getConfigKey()); + RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, sys2OssConfig.getConfigKey()); } return row; } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OssServiceImpl.java similarity index 70% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysOssServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OssServiceImpl.java index d5d8224f8..9e95e02e9 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysOssServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2OssServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; @@ -11,7 +11,7 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.domain.dto.OssDTO; import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.OssService; +import org.dromara.common.core.service.TwoOssService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StreamUtils; @@ -23,11 +23,11 @@ import org.dromara.common.oss.core.OssClient; import org.dromara.common.oss.entity.UploadResult; import org.dromara.common.oss.enumd.AccessPolicyType; import org.dromara.common.oss.factory.OssFactory; -import org.dromara.system.tenant.domain.SysOss; -import org.dromara.system.tenant.domain.bo.SysOssBo; -import org.dromara.system.tenant.domain.vo.SysOssVo; -import org.dromara.system.tenant.mapper.SysOssMapper; -import org.dromara.system.tenant.service.ISysOssService; +import org.dromara.system.saas.domain.Sys2Oss; +import org.dromara.system.saas.domain.bo.Sys2OssBo; +import org.dromara.system.saas.domain.vo.Sys2OssVo; +import org.dromara.system.saas.mapper.Sys2OssMapper; +import org.dromara.system.saas.service.ISys2OssService; import org.jetbrains.annotations.NotNull; import org.springframework.cache.annotation.Cacheable; import org.springframework.http.MediaType; @@ -48,9 +48,9 @@ import java.util.Map; */ @RequiredArgsConstructor @Service -public class SysOssServiceImpl implements ISysOssService, OssService { +public class Sys2OssServiceImpl implements ISys2OssService, TwoOssService { - private final SysOssMapper baseMapper; + private final Sys2OssMapper baseMapper; /** * 查询OSS对象存储列表 @@ -60,26 +60,26 @@ public class SysOssServiceImpl implements ISysOssService, OssService { * @return 结果 */ @Override - public TableDataInfo queryPageList(SysOssBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - List filterResult = StreamUtils.toList(result.getRecords(), this::matchingUrl); + public TableDataInfo queryPageList(Sys2OssBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + List filterResult = StreamUtils.toList(result.getRecords(), this::matchingUrl); result.setRecords(filterResult); return TableDataInfo.build(result); } /** - * 根据一组 ossIds 获取对应的 SysOssVo 列表 + * 根据一组 ossIds 获取对应的 Sys2OssVo 列表 * * @param ossIds 一组文件在数据库中的唯一标识集合 - * @return 包含 SysOssVo 对象的列表 + * @return 包含 Sys2OssVo 对象的列表 */ @Override - public List listByIds(Collection ossIds) { - List list = new ArrayList<>(); - SysOssServiceImpl ossService = SpringUtils.getAopProxy(this); + public List listByIds(Collection ossIds) { + List list = new ArrayList<>(); + Sys2OssServiceImpl ossService = SpringUtils.getAopProxy(this); for (Long id : ossIds) { - SysOssVo vo = ossService.getById(id); + Sys2OssVo vo = ossService.getById(id); if (ObjectUtil.isNotNull(vo)) { try { list.add(this.matchingUrl(vo)); @@ -101,9 +101,9 @@ public class SysOssServiceImpl implements ISysOssService, OssService { @Override public String selectUrlByIds(String ossIds) { List list = new ArrayList<>(); - SysOssServiceImpl ossService = SpringUtils.getAopProxy(this); + Sys2OssServiceImpl ossService = SpringUtils.getAopProxy(this); for (Long id : StringUtils.splitTo(ossIds, Convert::toLong)) { - SysOssVo vo = ossService.getById(id); + Sys2OssVo vo = ossService.getById(id); if (ObjectUtil.isNotNull(vo)) { try { list.add(this.matchingUrl(vo).getUrl()); @@ -120,7 +120,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService { public List selectByIds(String ossIds) { List list = new ArrayList<>(); for (Long id : StringUtils.splitTo(ossIds, Convert::toLong)) { - SysOssVo vo = SpringUtils.getAopProxy(this).getById(id); + Sys2OssVo vo = SpringUtils.getAopProxy(this).getById(id); if (ObjectUtil.isNotNull(vo)) { try { vo.setUrl(this.matchingUrl(vo).getUrl()); @@ -134,30 +134,30 @@ public class SysOssServiceImpl implements ISysOssService, OssService { return list; } - private LambdaQueryWrapper buildQueryWrapper(SysOssBo bo) { + private LambdaQueryWrapper buildQueryWrapper(Sys2OssBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getFileName()), SysOss::getFileName, bo.getFileName()); - lqw.like(StringUtils.isNotBlank(bo.getOriginalName()), SysOss::getOriginalName, bo.getOriginalName()); - lqw.eq(StringUtils.isNotBlank(bo.getFileSuffix()), SysOss::getFileSuffix, bo.getFileSuffix()); - lqw.eq(StringUtils.isNotBlank(bo.getUrl()), SysOss::getUrl, bo.getUrl()); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getFileName()), Sys2Oss::getFileName, bo.getFileName()); + lqw.like(StringUtils.isNotBlank(bo.getOriginalName()), Sys2Oss::getOriginalName, bo.getOriginalName()); + lqw.eq(StringUtils.isNotBlank(bo.getFileSuffix()), Sys2Oss::getFileSuffix, bo.getFileSuffix()); + lqw.eq(StringUtils.isNotBlank(bo.getUrl()), Sys2Oss::getUrl, bo.getUrl()); lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, - SysOss::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); - lqw.eq(ObjectUtil.isNotNull(bo.getCreateBy()), SysOss::getCreateBy, bo.getCreateBy()); - lqw.eq(StringUtils.isNotBlank(bo.getService()), SysOss::getService, bo.getService()); - lqw.orderByAsc(SysOss::getOssId); + Sys2Oss::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); + lqw.eq(ObjectUtil.isNotNull(bo.getCreateBy()), Sys2Oss::getCreateBy, bo.getCreateBy()); + lqw.eq(StringUtils.isNotBlank(bo.getService()), Sys2Oss::getService, bo.getService()); + lqw.orderByAsc(Sys2Oss::getOssId); return lqw; } /** - * 根据 ossId 从缓存或数据库中获取 SysOssVo 对象 + * 根据 ossId 从缓存或数据库中获取 Sys2OssVo 对象 * * @param ossId 文件在数据库中的唯一标识 - * @return SysOssVo 对象，包含文件信息 + * @return Sys2OssVo 对象，包含文件信息 */ @Cacheable(cacheNames = CacheNames.SYS_OSS, key = "#ossId") @Override - public SysOssVo getById(Long ossId) { + public Sys2OssVo getById(Long ossId) { return baseMapper.selectVoById(ossId); } @@ -170,7 +170,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService { */ @Override public void download(Long ossId, HttpServletResponse response) throws IOException { - SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId); + Sys2OssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId); if (ObjectUtil.isNull(sysOss)) { throw new ServiceException("文件数据不存在!"); } @@ -185,11 +185,11 @@ public class SysOssServiceImpl implements ISysOssService, OssService { * 上传 MultipartFile 到对象存储服务，并保存文件信息到数据库 * * @param file 要上传的 MultipartFile 对象 - * @return 上传成功后的 SysOssVo 对象，包含文件信息 + * @return 上传成功后的 Sys2OssVo 对象，包含文件信息 * @throws ServiceException 如果上传过程中发生异常，则抛出 ServiceException 异常 */ @Override - public SysOssVo upload(MultipartFile file) { + public Sys2OssVo upload(MultipartFile file) { String originalfileName = file.getOriginalFilename(); String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length()); OssClient storage = OssFactory.instance(); @@ -207,10 +207,10 @@ public class SysOssServiceImpl implements ISysOssService, OssService { * 上传文件到对象存储服务，并保存文件信息到数据库 * * @param file 要上传的文件对象 - * @return 上传成功后的 SysOssVo 对象，包含文件信息 + * @return 上传成功后的 Sys2OssVo 对象，包含文件信息 */ @Override - public SysOssVo upload(File file) { + public Sys2OssVo upload(File file) { String originalfileName = file.getName(); String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length()); OssClient storage = OssFactory.instance(); @@ -220,16 +220,16 @@ public class SysOssServiceImpl implements ISysOssService, OssService { } @NotNull - private SysOssVo buildResultEntity(String originalfileName, String suffix, String configKey, UploadResult uploadResult) { - SysOss oss = new SysOss(); + private Sys2OssVo buildResultEntity(String originalfileName, String suffix, String configKey, UploadResult uploadResult) { + Sys2Oss oss = new Sys2Oss(); oss.setUrl(uploadResult.getUrl()); oss.setFileSuffix(suffix); oss.setFileName(uploadResult.getFilename()); oss.setOriginalName(originalfileName); oss.setService(configKey); baseMapper.insert(oss); - SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class); - return this.matchingUrl(sysOssVo); + Sys2OssVo sys2OssVo = MapstructUtils.convert(oss, Sys2OssVo.class); + return this.matchingUrl(sys2OssVo); } /** @@ -244,10 +244,10 @@ public class SysOssServiceImpl implements ISysOssService, OssService { if (isValid) { // 做一些业务上的校验,判断是否需要校验 } - List list = baseMapper.selectBatchIds(ids); - for (SysOss sysOss : list) { - OssClient storage = OssFactory.instance(sysOss.getService()); - storage.delete(sysOss.getUrl()); + List list = baseMapper.selectBatchIds(ids); + for (Sys2Oss sys2Oss : list) { + OssClient storage = OssFactory.instance(sys2Oss.getService()); + storage.delete(sys2Oss.getUrl()); } return baseMapper.deleteByIds(ids) > 0; } @@ -258,7 +258,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService { * @param oss OSS对象 * @return oss 匹配Url的OSS对象 */ - private SysOssVo matchingUrl(SysOssVo oss) { + private Sys2OssVo matchingUrl(Sys2OssVo oss) { OssClient storage = OssFactory.instance(oss.getService()); // 仅修改桶类型为 private 的URL，临时URL时长为120s if (AccessPolicyType.PRIVATE == storage.getAccessPolicy()) { diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysPermissionServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2PermissionServiceImpl.java similarity index 76% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysPermissionServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2PermissionServiceImpl.java index 3f09575e0..c755b7bf3 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysPermissionServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2PermissionServiceImpl.java @@ -1,10 +1,10 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import org.dromara.common.core.constant.TenantConstants; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.tenant.service.ISysMenuService; -import org.dromara.system.tenant.service.ISysPermissionService; -import org.dromara.system.tenant.service.ISysRoleService; +import org.dromara.system.saas.service.ISysSaasMenuService; +import org.dromara.system.saas.service.ISys2PermissionService; +import org.dromara.system.saas.service.ISys2RoleService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -18,10 +18,10 @@ import java.util.Set; */ @RequiredArgsConstructor @Service -public class SysPermissionServiceImpl implements ISysPermissionService { +public class Sys2PermissionServiceImpl implements ISys2PermissionService { - private final ISysRoleService roleService; - private final ISysMenuService menuService; + private final ISys2RoleService roleService; + private final ISysSaasMenuService menuService; /** * 获取角色数据权限 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2PostServiceImpl.java similarity index 61% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysPostServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2PostServiceImpl.java index fe0eb9ae8..bba23b324 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysPostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2PostServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -14,15 +14,15 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.helper.DataBaseHelper; -import org.dromara.system.tenant.domain.SysDept; -import org.dromara.system.tenant.domain.SysPost; -import org.dromara.system.tenant.domain.SysUserPost; -import org.dromara.system.tenant.domain.bo.SysPostBo; -import org.dromara.system.tenant.domain.vo.SysPostVo; -import org.dromara.system.tenant.mapper.SysDeptMapper; -import org.dromara.system.tenant.mapper.SysPostMapper; -import org.dromara.system.tenant.mapper.SysUserPostMapper; -import org.dromara.system.tenant.service.ISysPostService; +import org.dromara.system.saas.domain.Sys2Dept; +import org.dromara.system.saas.domain.Sys2Post; +import org.dromara.system.saas.domain.Sys2UserPost; +import org.dromara.system.saas.domain.bo.Sys2PostBo; +import org.dromara.system.saas.domain.vo.Sys2PostVo; +import org.dromara.system.saas.mapper.Sys2DeptMapper; +import org.dromara.system.saas.mapper.Sys2PostMapper; +import org.dromara.system.saas.mapper.Sys2UserPostMapper; +import org.dromara.system.saas.service.ISys2PostService; import org.springframework.stereotype.Service; import java.util.Arrays; @@ -36,15 +36,15 @@ import java.util.stream.Collectors; */ @RequiredArgsConstructor @Service -public class SysPostServiceImpl implements ISysPostService { +public class Sys2PostServiceImpl implements ISys2PostService { - private final SysPostMapper baseMapper; - private final SysDeptMapper deptMapper; - private final SysUserPostMapper userPostMapper; + private final Sys2PostMapper baseMapper; + private final Sys2DeptMapper deptMapper; + private final Sys2UserPostMapper userPostMapper; @Override - public TableDataInfo selectPagePostList(SysPostBo post, PageQuery pageQuery) { - Page page = baseMapper.selectPagePostList(pageQuery.build(), buildQueryWrapper(post)); + public TableDataInfo selectPagePostList(Sys2PostBo post, PageQuery pageQuery) { + Page page = baseMapper.selectPagePostList(pageQuery.build(), buildQueryWrapper(post)); return TableDataInfo.build(page); } @@ -55,7 +55,7 @@ public class SysPostServiceImpl implements ISysPostService { * @return 岗位信息集合 */ @Override - public List selectPostList(SysPostBo post) { + public List selectPostList(Sys2PostBo post) { return baseMapper.selectVoList(buildQueryWrapper(post)); } @@ -65,27 +65,27 @@ public class SysPostServiceImpl implements ISysPostService { * @param bo 查询条件对象 * @return 构建好的查询包装器 */ - private LambdaQueryWrapper buildQueryWrapper(SysPostBo bo) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.like(StringUtils.isNotBlank(bo.getPostCode()), SysPost::getPostCode, bo.getPostCode()) - .like(StringUtils.isNotBlank(bo.getPostCategory()), SysPost::getPostCategory, bo.getPostCategory()) - .like(StringUtils.isNotBlank(bo.getPostName()), SysPost::getPostName, bo.getPostName()) - .eq(StringUtils.isNotBlank(bo.getStatus()), SysPost::getStatus, bo.getStatus()) - .orderByAsc(SysPost::getPostSort); + private LambdaQueryWrapper buildQueryWrapper(Sys2PostBo bo) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.like(StringUtils.isNotBlank(bo.getPostCode()), Sys2Post::getPostCode, bo.getPostCode()) + .like(StringUtils.isNotBlank(bo.getPostCategory()), Sys2Post::getPostCategory, bo.getPostCategory()) + .like(StringUtils.isNotBlank(bo.getPostName()), Sys2Post::getPostName, bo.getPostName()) + .eq(StringUtils.isNotBlank(bo.getStatus()), Sys2Post::getStatus, bo.getStatus()) + .orderByAsc(Sys2Post::getPostSort); if (ObjectUtil.isNotNull(bo.getDeptId())) { //优先单部门搜索 - wrapper.eq(SysPost::getDeptId, bo.getDeptId()); + wrapper.eq(Sys2Post::getDeptId, bo.getDeptId()); } else if (ObjectUtil.isNotNull(bo.getBelongDeptId())) { //部门树搜索 wrapper.and(x -> { - List deptIds = deptMapper.selectList(new LambdaQueryWrapper() - .select(SysDept::getDeptId) + List deptIds = deptMapper.selectList(new LambdaQueryWrapper() + .select(Sys2Dept::getDeptId) .apply(DataBaseHelper.findInSet(bo.getBelongDeptId(), "ancestors"))) .stream() - .map(SysDept::getDeptId) + .map(Sys2Dept::getDeptId) .collect(Collectors.toList()); deptIds.add(bo.getBelongDeptId()); - x.in(SysPost::getDeptId, deptIds); + x.in(Sys2Post::getDeptId, deptIds); }); } return wrapper; @@ -97,7 +97,7 @@ public class SysPostServiceImpl implements ISysPostService { * @return 岗位列表 */ @Override - public List selectPostAll() { + public List selectPostAll() { return baseMapper.selectVoList(new QueryWrapper<>()); } @@ -108,7 +108,7 @@ public class SysPostServiceImpl implements ISysPostService { * @return 角色对象信息 */ @Override - public SysPostVo selectPostById(Long postId) { + public Sys2PostVo selectPostById(Long postId) { return baseMapper.selectVoById(postId); } @@ -120,8 +120,8 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public List selectPostListByUserId(Long userId) { - List list = baseMapper.selectPostsByUserId(userId); - return StreamUtils.toList(list, SysPostVo::getPostId); + List list = baseMapper.selectPostsByUserId(userId); + return StreamUtils.toList(list, Sys2PostVo::getPostId); } /** @@ -131,11 +131,11 @@ public class SysPostServiceImpl implements ISysPostService { * @return 岗位列表信息 */ @Override - public List selectPostByIds(List postIds) { - return baseMapper.selectVoList(new LambdaQueryWrapper() - .select(SysPost::getPostId, SysPost::getPostName, SysPost::getPostCode) - .eq(SysPost::getStatus, UserConstants.POST_NORMAL) - .in(CollUtil.isNotEmpty(postIds), SysPost::getPostId, postIds)); + public List selectPostByIds(List postIds) { + return baseMapper.selectVoList(new LambdaQueryWrapper() + .select(Sys2Post::getPostId, Sys2Post::getPostName, Sys2Post::getPostCode) + .eq(Sys2Post::getStatus, UserConstants.POST_NORMAL) + .in(CollUtil.isNotEmpty(postIds), Sys2Post::getPostId, postIds)); } /** @@ -145,10 +145,10 @@ public class SysPostServiceImpl implements ISysPostService { * @return 结果 */ @Override - public boolean checkPostNameUnique(SysPostBo post) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysPost::getPostName, post.getPostName()) - .ne(ObjectUtil.isNotNull(post.getPostId()), SysPost::getPostId, post.getPostId())); + public boolean checkPostNameUnique(Sys2PostBo post) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(Sys2Post::getPostName, post.getPostName()) + .ne(ObjectUtil.isNotNull(post.getPostId()), Sys2Post::getPostId, post.getPostId())); return !exist; } @@ -159,10 +159,10 @@ public class SysPostServiceImpl implements ISysPostService { * @return 结果 */ @Override - public boolean checkPostCodeUnique(SysPostBo post) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysPost::getPostCode, post.getPostCode()) - .ne(ObjectUtil.isNotNull(post.getPostId()), SysPost::getPostId, post.getPostId())); + public boolean checkPostCodeUnique(Sys2PostBo post) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(Sys2Post::getPostCode, post.getPostCode()) + .ne(ObjectUtil.isNotNull(post.getPostId()), Sys2Post::getPostId, post.getPostId())); return !exist; } @@ -174,7 +174,7 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public long countUserPostById(Long postId) { - return userPostMapper.selectCount(new LambdaQueryWrapper().eq(SysUserPost::getPostId, postId)); + return userPostMapper.selectCount(new LambdaQueryWrapper().eq(Sys2UserPost::getPostId, postId)); } /** @@ -185,7 +185,7 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public long countPostByDeptId(Long deptId) { - return baseMapper.selectCount(new LambdaQueryWrapper().eq(SysPost::getDeptId, deptId)); + return baseMapper.selectCount(new LambdaQueryWrapper().eq(Sys2Post::getDeptId, deptId)); } /** @@ -208,7 +208,7 @@ public class SysPostServiceImpl implements ISysPostService { @Override public int deletePostByIds(Long[] postIds) { for (Long postId : postIds) { - SysPost post = baseMapper.selectById(postId); + Sys2Post post = baseMapper.selectById(postId); if (countUserPostById(postId) > 0) { throw new ServiceException(String.format("%1$s已分配，不能删除!", post.getPostName())); } @@ -223,8 +223,8 @@ public class SysPostServiceImpl implements ISysPostService { * @return 结果 */ @Override - public int insertPost(SysPostBo bo) { - SysPost post = MapstructUtils.convert(bo, SysPost.class); + public int insertPost(Sys2PostBo bo) { + Sys2Post post = MapstructUtils.convert(bo, Sys2Post.class); return baseMapper.insert(post); } @@ -235,8 +235,8 @@ public class SysPostServiceImpl implements ISysPostService { * @return 结果 */ @Override - public int updatePost(SysPostBo bo) { - SysPost post = MapstructUtils.convert(bo, SysPost.class); + public int updatePost(Sys2PostBo bo) { + Sys2Post post = MapstructUtils.convert(bo, Sys2Post.class); return baseMapper.updateById(post); } } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2RoleServiceImpl.java similarity index 71% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysRoleServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2RoleServiceImpl.java index 915baa888..f33dbd0ea 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2RoleServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; @@ -22,17 +22,17 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.tenant.domain.SysRole; -import org.dromara.system.tenant.domain.SysRoleDept; -import org.dromara.system.tenant.domain.SysRoleMenu; -import org.dromara.system.tenant.domain.SysUserRole; -import org.dromara.system.tenant.domain.bo.SysRoleBo; -import org.dromara.system.tenant.domain.vo.SysRoleVo; -import org.dromara.system.tenant.mapper.SysRoleDeptMapper; -import org.dromara.system.tenant.mapper.SysRoleMapper; -import org.dromara.system.tenant.mapper.SysRoleMenuMapper; -import org.dromara.system.tenant.mapper.SysUserRoleMapper; -import org.dromara.system.tenant.service.ISysRoleService; +import org.dromara.system.saas.domain.Sys2Role; +import org.dromara.system.saas.domain.Sys2RoleDept; +import org.dromara.system.saas.domain.Sys2RoleMenu; +import org.dromara.system.saas.domain.Sys2UserRole; +import org.dromara.system.saas.domain.bo.Sys2RoleBo; +import org.dromara.system.saas.domain.vo.Sys2RoleVo; +import org.dromara.system.saas.mapper.Sys2RoleDeptMapper; +import org.dromara.system.saas.mapper.Sys2RoleMapper; +import org.dromara.system.saas.mapper.Sys2RoleMenuMapper; +import org.dromara.system.saas.mapper.Sys2UserRoleMapper; +import org.dromara.system.saas.service.ISys2RoleService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,16 +45,16 @@ import java.util.*; */ @RequiredArgsConstructor @Service -public class SysRoleServiceImpl implements ISysRoleService { +public class Sys2RoleServiceImpl implements ISys2RoleService { - private final SysRoleMapper baseMapper; - private final SysRoleMenuMapper roleMenuMapper; - private final SysUserRoleMapper userRoleMapper; - private final SysRoleDeptMapper roleDeptMapper; + private final Sys2RoleMapper baseMapper; + private final Sys2RoleMenuMapper roleMenuMapper; + private final Sys2UserRoleMapper userRoleMapper; + private final Sys2RoleDeptMapper roleDeptMapper; @Override - public TableDataInfo selectPageRoleList(SysRoleBo role, PageQuery pageQuery) { - Page page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role)); + public TableDataInfo selectPageRoleList(Sys2RoleBo role, PageQuery pageQuery) { + Page page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role)); return TableDataInfo.build(page); } @@ -65,13 +65,13 @@ public class SysRoleServiceImpl implements ISysRoleService { * @return 角色数据集合信息 */ @Override - public List selectRoleList(SysRoleBo role) { + public List selectRoleList(Sys2RoleBo role) { return baseMapper.selectRoleList(this.buildQueryWrapper(role)); } - private Wrapper buildQueryWrapper(SysRoleBo bo) { + private Wrapper buildQueryWrapper(Sys2RoleBo bo) { Map params = bo.getParams(); - QueryWrapper wrapper = Wrappers.query(); + QueryWrapper wrapper = Wrappers.query(); wrapper.eq("r.del_flag", UserConstants.ROLE_NORMAL) .eq(ObjectUtil.isNotNull(bo.getRoleId()), "r.role_id", bo.getRoleId()) .like(StringUtils.isNotBlank(bo.getRoleName()), "r.role_name", bo.getRoleName()) @@ -90,7 +90,7 @@ public class SysRoleServiceImpl implements ISysRoleService { * @return 角色列表 */ @Override - public List selectRolesByUserId(Long userId) { + public List selectRolesByUserId(Long userId) { return baseMapper.selectRolesByUserId(userId); } @@ -101,12 +101,12 @@ public class SysRoleServiceImpl implements ISysRoleService { * @return 角色列表 */ @Override - public List selectRolesAuthByUserId(Long userId) { - List userRoles = baseMapper.selectRolesByUserId(userId); - List roles = selectRoleAll(); + public List selectRolesAuthByUserId(Long userId) { + List userRoles = baseMapper.selectRolesByUserId(userId); + List roles = selectRoleAll(); // 使用HashSet提高查找效率 - Set userRoleIds = StreamUtils.toSet(userRoles, SysRoleVo::getRoleId); - for (SysRoleVo role : roles) { + Set userRoleIds = StreamUtils.toSet(userRoles, Sys2RoleVo::getRoleId); + for (Sys2RoleVo role : roles) { if (userRoleIds.contains(role.getRoleId())) { role.setFlag(true); } @@ -122,9 +122,9 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public Set selectRolePermissionByUserId(Long userId) { - List perms = baseMapper.selectRolesByUserId(userId); + List perms = baseMapper.selectRolesByUserId(userId); Set permsSet = new HashSet<>(); - for (SysRoleVo perm : perms) { + for (Sys2RoleVo perm : perms) { if (ObjectUtil.isNotNull(perm)) { permsSet.addAll(StringUtils.splitList(perm.getRoleKey().trim())); } @@ -138,8 +138,8 @@ public class SysRoleServiceImpl implements ISysRoleService { * @return 角色列表 */ @Override - public List selectRoleAll() { - return this.selectRoleList(new SysRoleBo()); + public List selectRoleAll() { + return this.selectRoleList(new Sys2RoleBo()); } /** @@ -150,8 +150,8 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public List selectRoleListByUserId(Long userId) { - List list = baseMapper.selectRolesByUserId(userId); - return StreamUtils.toList(list, SysRoleVo::getRoleId); + List list = baseMapper.selectRolesByUserId(userId); + return StreamUtils.toList(list, Sys2RoleVo::getRoleId); } /** @@ -161,7 +161,7 @@ public class SysRoleServiceImpl implements ISysRoleService { * @return 角色对象信息 */ @Override - public SysRoleVo selectRoleById(Long roleId) { + public Sys2RoleVo selectRoleById(Long roleId) { return baseMapper.selectRoleById(roleId); } @@ -172,8 +172,8 @@ public class SysRoleServiceImpl implements ISysRoleService { * @return 角色列表信息 */ @Override - public List selectRoleByIds(List roleIds) { - return baseMapper.selectRoleList(new QueryWrapper() + public List selectRoleByIds(List roleIds) { + return baseMapper.selectRoleList(new QueryWrapper() .eq("r.status", UserConstants.ROLE_NORMAL) .in(CollUtil.isNotEmpty(roleIds), "r.role_id", roleIds)); } @@ -185,10 +185,10 @@ public class SysRoleServiceImpl implements ISysRoleService { * @return 结果 */ @Override - public boolean checkRoleNameUnique(SysRoleBo role) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysRole::getRoleName, role.getRoleName()) - .ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId())); + public boolean checkRoleNameUnique(Sys2RoleBo role) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(Sys2Role::getRoleName, role.getRoleName()) + .ne(ObjectUtil.isNotNull(role.getRoleId()), Sys2Role::getRoleId, role.getRoleId())); return !exist; } @@ -199,10 +199,10 @@ public class SysRoleServiceImpl implements ISysRoleService { * @return 结果 */ @Override - public boolean checkRoleKeyUnique(SysRoleBo role) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysRole::getRoleKey, role.getRoleKey()) - .ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId())); + public boolean checkRoleKeyUnique(Sys2RoleBo role) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(Sys2Role::getRoleKey, role.getRoleKey()) + .ne(ObjectUtil.isNotNull(role.getRoleId()), Sys2Role::getRoleId, role.getRoleId())); return !exist; } @@ -212,7 +212,7 @@ public class SysRoleServiceImpl implements ISysRoleService { * @param role 角色信息 */ @Override - public void checkRoleAllowed(SysRoleBo role) { + public void checkRoleAllowed(Sys2RoleBo role) { if (ObjectUtil.isNotNull(role.getRoleId()) && LoginHelper.isSuperAdmin(role.getRoleId())) { throw new ServiceException("不允许操作超级管理员角色"); } @@ -224,10 +224,10 @@ public class SysRoleServiceImpl implements ISysRoleService { } // 修改不允许修改 管理员标识符 if (ObjectUtil.isNotNull(role.getRoleId())) { - SysRole sysRole = baseMapper.selectById(role.getRoleId()); + Sys2Role sys2Role = baseMapper.selectById(role.getRoleId()); // 如果标识符不相等 判断为修改了管理员标识符 - if (!StringUtils.equals(sysRole.getRoleKey(), role.getRoleKey())) { - if (StringUtils.equalsAny(sysRole.getRoleKey(), keys)) { + if (!StringUtils.equals(sys2Role.getRoleKey(), role.getRoleKey())) { + if (StringUtils.equalsAny(sys2Role.getRoleKey(), keys)) { throw new ServiceException("不允许修改系统内置管理员角色标识符!"); } else if (StringUtils.equalsAny(role.getRoleKey(), keys)) { throw new ServiceException("不允许使用系统内置管理员角色标识符!"); @@ -249,7 +249,7 @@ public class SysRoleServiceImpl implements ISysRoleService { if (LoginHelper.isSuperAdmin()) { return; } - List roles = this.selectRoleList(new SysRoleBo(roleId)); + List roles = this.selectRoleList(new Sys2RoleBo(roleId)); if (CollUtil.isEmpty(roles)) { throw new ServiceException("没有权限访问角色数据！"); } @@ -264,7 +264,7 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public long countUserRoleByRoleId(Long roleId) { - return userRoleMapper.selectCount(new LambdaQueryWrapper().eq(SysUserRole::getRoleId, roleId)); + return userRoleMapper.selectCount(new LambdaQueryWrapper().eq(Sys2UserRole::getRoleId, roleId)); } /** @@ -275,8 +275,8 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override @Transactional(rollbackFor = Exception.class) - public int insertRole(SysRoleBo bo) { - SysRole role = MapstructUtils.convert(bo, SysRole.class); + public int insertRole(Sys2RoleBo bo) { + Sys2Role role = MapstructUtils.convert(bo, Sys2Role.class); // 新增角色信息 baseMapper.insert(role); bo.setRoleId(role.getRoleId()); @@ -291,8 +291,8 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override @Transactional(rollbackFor = Exception.class) - public int updateRole(SysRoleBo bo) { - SysRole role = MapstructUtils.convert(bo, SysRole.class); + public int updateRole(Sys2RoleBo bo) { + Sys2Role role = MapstructUtils.convert(bo, Sys2Role.class); if (UserConstants.ROLE_DISABLE.equals(role.getStatus()) && this.countUserRoleByRoleId(role.getRoleId()) > 0) { throw new ServiceException("角色已分配，不能禁用!"); @@ -300,7 +300,7 @@ public class SysRoleServiceImpl implements ISysRoleService { // 修改角色信息 baseMapper.updateById(role); // 删除角色与菜单关联 - roleMenuMapper.delete(new LambdaQueryWrapper().eq(SysRoleMenu::getRoleId, role.getRoleId())); + roleMenuMapper.delete(new LambdaQueryWrapper().eq(Sys2RoleMenu::getRoleId, role.getRoleId())); return insertRoleMenu(bo); } @@ -317,9 +317,9 @@ public class SysRoleServiceImpl implements ISysRoleService { throw new ServiceException("角色已分配，不能禁用!"); } return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(SysRole::getStatus, status) - .eq(SysRole::getRoleId, roleId)); + new LambdaUpdateWrapper() + .set(Sys2Role::getStatus, status) + .eq(Sys2Role::getRoleId, roleId)); } /** @@ -330,12 +330,12 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override @Transactional(rollbackFor = Exception.class) - public int authDataScope(SysRoleBo bo) { - SysRole role = MapstructUtils.convert(bo, SysRole.class); + public int authDataScope(Sys2RoleBo bo) { + Sys2Role role = MapstructUtils.convert(bo, Sys2Role.class); // 修改角色信息 baseMapper.updateById(role); // 删除角色与部门关联 - roleDeptMapper.delete(new LambdaQueryWrapper().eq(SysRoleDept::getRoleId, role.getRoleId())); + roleDeptMapper.delete(new LambdaQueryWrapper().eq(Sys2RoleDept::getRoleId, role.getRoleId())); // 新增角色和部门信息（数据权限） return insertRoleDept(bo); } @@ -345,12 +345,12 @@ public class SysRoleServiceImpl implements ISysRoleService { * * @param role 角色对象 */ - private int insertRoleMenu(SysRoleBo role) { + private int insertRoleMenu(Sys2RoleBo role) { int rows = 1; // 新增用户与角色管理 - List list = new ArrayList(); + List list = new ArrayList(); for (Long menuId : role.getMenuIds()) { - SysRoleMenu rm = new SysRoleMenu(); + Sys2RoleMenu rm = new Sys2RoleMenu(); rm.setRoleId(role.getRoleId()); rm.setMenuId(menuId); list.add(rm); @@ -366,12 +366,12 @@ public class SysRoleServiceImpl implements ISysRoleService { * * @param role 角色对象 */ - private int insertRoleDept(SysRoleBo role) { + private int insertRoleDept(Sys2RoleBo role) { int rows = 1; // 新增角色与部门（数据权限）管理 - List list = new ArrayList(); + List list = new ArrayList(); for (Long deptId : role.getDeptIds()) { - SysRoleDept rd = new SysRoleDept(); + Sys2RoleDept rd = new Sys2RoleDept(); rd.setRoleId(role.getRoleId()); rd.setDeptId(deptId); list.add(rd); @@ -392,9 +392,9 @@ public class SysRoleServiceImpl implements ISysRoleService { @Transactional(rollbackFor = Exception.class) public int deleteRoleById(Long roleId) { // 删除角色与菜单关联 - roleMenuMapper.delete(new LambdaQueryWrapper().eq(SysRoleMenu::getRoleId, roleId)); + roleMenuMapper.delete(new LambdaQueryWrapper().eq(Sys2RoleMenu::getRoleId, roleId)); // 删除角色与部门关联 - roleDeptMapper.delete(new LambdaQueryWrapper().eq(SysRoleDept::getRoleId, roleId)); + roleDeptMapper.delete(new LambdaQueryWrapper().eq(Sys2RoleDept::getRoleId, roleId)); return baseMapper.deleteById(roleId); } @@ -408,8 +408,8 @@ public class SysRoleServiceImpl implements ISysRoleService { @Transactional(rollbackFor = Exception.class) public int deleteRoleByIds(Long[] roleIds) { for (Long roleId : roleIds) { - SysRole role = baseMapper.selectById(roleId); - checkRoleAllowed(BeanUtil.toBean(role, SysRoleBo.class)); + Sys2Role role = baseMapper.selectById(roleId); + checkRoleAllowed(BeanUtil.toBean(role, Sys2RoleBo.class)); checkRoleDataScope(roleId); if (countUserRoleByRoleId(roleId) > 0) { throw new ServiceException(String.format("%1$s已分配，不能删除!", role.getRoleName())); @@ -417,9 +417,9 @@ public class SysRoleServiceImpl implements ISysRoleService { } List ids = Arrays.asList(roleIds); // 删除角色与菜单关联 - roleMenuMapper.delete(new LambdaQueryWrapper().in(SysRoleMenu::getRoleId, ids)); + roleMenuMapper.delete(new LambdaQueryWrapper().in(Sys2RoleMenu::getRoleId, ids)); // 删除角色与部门关联 - roleDeptMapper.delete(new LambdaQueryWrapper().in(SysRoleDept::getRoleId, ids)); + roleDeptMapper.delete(new LambdaQueryWrapper().in(Sys2RoleDept::getRoleId, ids)); return baseMapper.deleteByIds(ids); } @@ -430,10 +430,10 @@ public class SysRoleServiceImpl implements ISysRoleService { * @return 结果 */ @Override - public int deleteAuthUser(SysUserRole userRole) { - int rows = userRoleMapper.delete(new LambdaQueryWrapper() - .eq(SysUserRole::getRoleId, userRole.getRoleId()) - .eq(SysUserRole::getUserId, userRole.getUserId())); + public int deleteAuthUser(Sys2UserRole userRole) { + int rows = userRoleMapper.delete(new LambdaQueryWrapper() + .eq(Sys2UserRole::getRoleId, userRole.getRoleId()) + .eq(Sys2UserRole::getUserId, userRole.getUserId())); if (rows > 0) { cleanOnlineUserByRole(userRole.getRoleId()); } @@ -449,9 +449,9 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public int deleteAuthUsers(Long roleId, Long[] userIds) { - int rows = userRoleMapper.delete(new LambdaQueryWrapper() - .eq(SysUserRole::getRoleId, roleId) - .in(SysUserRole::getUserId, Arrays.asList(userIds))); + int rows = userRoleMapper.delete(new LambdaQueryWrapper() + .eq(Sys2UserRole::getRoleId, roleId) + .in(Sys2UserRole::getUserId, Arrays.asList(userIds))); if (rows > 0) { cleanOnlineUserByRole(roleId); } @@ -469,8 +469,8 @@ public class SysRoleServiceImpl implements ISysRoleService { public int insertAuthUsers(Long roleId, Long[] userIds) { // 新增用户与角色管理 int rows = 1; - List list = StreamUtils.toList(List.of(userIds), userId -> { - SysUserRole ur = new SysUserRole(); + List list = StreamUtils.toList(List.of(userIds), userId -> { + Sys2UserRole ur = new Sys2UserRole(); ur.setUserId(userId); ur.setRoleId(roleId); return ur; @@ -487,7 +487,7 @@ public class SysRoleServiceImpl implements ISysRoleService { @Override public void cleanOnlineUserByRole(Long roleId) { // 如果角色未绑定用户 直接返回 - Long num = userRoleMapper.selectCount(new LambdaQueryWrapper().eq(SysUserRole::getRoleId, roleId)); + Long num = userRoleMapper.selectCount(new LambdaQueryWrapper().eq(Sys2UserRole::getRoleId, roleId)); if (num == 0) { return; } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysSensitiveServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2SensitiveServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysSensitiveServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2SensitiveServiceImpl.java index 703432fca..0e7793aba 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysSensitiveServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2SensitiveServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.dev33.satoken.stp.StpUtil; import org.dromara.common.core.utils.StringUtils; @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; * @version 3.6.0 */ @Service -public class SysSensitiveServiceImpl implements SensitiveService { +public class Sys2SensitiveServiceImpl implements SensitiveService { /** * 是否脱敏 diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysSocialServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2SocialServiceImpl.java similarity index 54% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysSocialServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2SocialServiceImpl.java index 43017925a..dc884fcac 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysSocialServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2SocialServiceImpl.java @@ -1,15 +1,15 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.system.tenant.domain.SysSocial; -import org.dromara.system.tenant.domain.bo.SysSocialBo; -import org.dromara.system.tenant.domain.vo.SysSocialVo; -import org.dromara.system.tenant.mapper.SysSocialMapper; -import org.dromara.system.tenant.service.ISysSocialService; +import org.dromara.system.saas.domain.Sys2Social; +import org.dromara.system.saas.domain.bo.Sys2SocialBo; +import org.dromara.system.saas.domain.vo.Sys2SocialVo; +import org.dromara.system.saas.mapper.Sys2SocialMapper; +import org.dromara.system.saas.service.ISys2SocialService; import org.springframework.stereotype.Service; import java.util.List; @@ -22,16 +22,16 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class SysSocialServiceImpl implements ISysSocialService { +public class Sys2SocialServiceImpl implements ISys2SocialService { - private final SysSocialMapper baseMapper; + private final Sys2SocialMapper baseMapper; /** * 查询社会化关系 */ @Override - public SysSocialVo queryById(String id) { + public Sys2SocialVo queryById(String id) { return baseMapper.selectVoById(id); } @@ -39,17 +39,17 @@ public class SysSocialServiceImpl implements ISysSocialService { * 授权列表 */ @Override - public List queryList(SysSocialBo bo) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper() - .eq(ObjectUtil.isNotNull(bo.getUserId()), SysSocial::getUserId, bo.getUserId()) - .eq(StringUtils.isNotBlank(bo.getAuthId()), SysSocial::getAuthId, bo.getAuthId()) - .eq(StringUtils.isNotBlank(bo.getSource()), SysSocial::getSource, bo.getSource()); + public List queryList(Sys2SocialBo bo) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper() + .eq(ObjectUtil.isNotNull(bo.getUserId()), Sys2Social::getUserId, bo.getUserId()) + .eq(StringUtils.isNotBlank(bo.getAuthId()), Sys2Social::getAuthId, bo.getAuthId()) + .eq(StringUtils.isNotBlank(bo.getSource()), Sys2Social::getSource, bo.getSource()); return baseMapper.selectVoList(lqw); } @Override - public List queryListByUserId(Long userId) { - return baseMapper.selectVoList(new LambdaQueryWrapper().eq(SysSocial::getUserId, userId)); + public List queryListByUserId(Long userId) { + return baseMapper.selectVoList(new LambdaQueryWrapper().eq(Sys2Social::getUserId, userId)); } @@ -57,8 +57,8 @@ public class SysSocialServiceImpl implements ISysSocialService { * 新增社会化关系 */ @Override - public Boolean insertByBo(SysSocialBo bo) { - SysSocial add = MapstructUtils.convert(bo, SysSocial.class); + public Boolean insertByBo(Sys2SocialBo bo) { + Sys2Social add = MapstructUtils.convert(bo, Sys2Social.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -75,8 +75,8 @@ public class SysSocialServiceImpl implements ISysSocialService { * 更新社会化关系 */ @Override - public Boolean updateByBo(SysSocialBo bo) { - SysSocial update = MapstructUtils.convert(bo, SysSocial.class); + public Boolean updateByBo(Sys2SocialBo bo) { + Sys2Social update = MapstructUtils.convert(bo, Sys2Social.class); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } @@ -84,7 +84,7 @@ public class SysSocialServiceImpl implements ISysSocialService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(SysSocial entity) { + private void validEntityBeforeSave(Sys2Social entity) { //TODO 做一些数据校验,如唯一约束 } @@ -105,8 +105,8 @@ public class SysSocialServiceImpl implements ISysSocialService { * @return 授权信息 */ @Override - public List selectByAuthId(String authId) { - return baseMapper.selectVoList(new LambdaQueryWrapper().eq(SysSocial::getAuthId, authId)); + public List selectByAuthId(String authId) { + return baseMapper.selectVoList(new LambdaQueryWrapper().eq(Sys2Social::getAuthId, authId)); } } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysTenantApplicationServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantApplicationServiceImpl.java similarity index 61% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysTenantApplicationServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantApplicationServiceImpl.java index 3068b2555..df00dc2b0 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysTenantApplicationServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantApplicationServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; -import org.dromara.system.tenant.domain.SysTenantApplication; -import org.dromara.system.tenant.domain.bo.SysTenantApplicationBo; -import org.dromara.system.tenant.domain.vo.SysTenantApplicationVo; -import org.dromara.system.tenant.mapper.SysTenantApplicationMapper; -import org.dromara.system.tenant.service.ISysTenantApplicationService; +import org.dromara.system.saas.domain.Sys2TenantApplication; +import org.dromara.system.saas.domain.bo.Sys2TenantApplicationBo; +import org.dromara.system.saas.domain.vo.Sys2TenantApplicationVo; +import org.dromara.system.saas.mapper.Sys2TenantApplicationMapper; +import org.dromara.system.saas.service.ISys2TenantApplicationService; import org.springframework.stereotype.Service; import java.util.List; @@ -26,9 +26,9 @@ import java.util.Collection; */ @RequiredArgsConstructor @Service -public class SysTenantApplicationServiceImpl implements ISysTenantApplicationService { +public class Sys2TenantApplicationServiceImpl implements ISys2TenantApplicationService { - private final SysTenantApplicationMapper baseMapper; + private final Sys2TenantApplicationMapper baseMapper; /** * 查询租户和应用关联 @@ -37,7 +37,7 @@ public class SysTenantApplicationServiceImpl implements ISysTenantApplicationSer * @return 租户和应用关联 */ @Override - public SysTenantApplicationVo queryById(Long tenantId){ + public Sys2TenantApplicationVo queryById(Long tenantId){ return baseMapper.selectVoById(tenantId); } @@ -49,9 +49,9 @@ public class SysTenantApplicationServiceImpl implements ISysTenantApplicationSer * @return 租户和应用关联分页列表 */ @Override - public TableDataInfo queryPageList(SysTenantApplicationBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo queryPageList(Sys2TenantApplicationBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -62,14 +62,14 @@ public class SysTenantApplicationServiceImpl implements ISysTenantApplicationSer * @return 租户和应用关联列表 */ @Override - public List queryList(SysTenantApplicationBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List queryList(Sys2TenantApplicationBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(SysTenantApplicationBo bo) { + private LambdaQueryWrapper buildQueryWrapper(Sys2TenantApplicationBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); return lqw; } @@ -80,8 +80,8 @@ public class SysTenantApplicationServiceImpl implements ISysTenantApplicationSer * @return 是否新增成功 */ @Override - public Boolean insertByBo(SysTenantApplicationBo bo) { - SysTenantApplication add = MapstructUtils.convert(bo, SysTenantApplication.class); + public Boolean insertByBo(Sys2TenantApplicationBo bo) { + Sys2TenantApplication add = MapstructUtils.convert(bo, Sys2TenantApplication.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -97,8 +97,8 @@ public class SysTenantApplicationServiceImpl implements ISysTenantApplicationSer * @return 是否修改成功 */ @Override - public Boolean updateByBo(SysTenantApplicationBo bo) { - SysTenantApplication update = MapstructUtils.convert(bo, SysTenantApplication.class); + public Boolean updateByBo(Sys2TenantApplicationBo bo) { + Sys2TenantApplication update = MapstructUtils.convert(bo, Sys2TenantApplication.class); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } @@ -106,7 +106,7 @@ public class SysTenantApplicationServiceImpl implements ISysTenantApplicationSer /** * 保存前的数据校验 */ - private void validEntityBeforeSave(SysTenantApplication entity){ + private void validEntityBeforeSave(Sys2TenantApplication entity){ //TODO 做一些数据校验,如唯一约束 } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysTenantPackageServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantPackageServiceImpl.java similarity index 56% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysTenantPackageServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantPackageServiceImpl.java index 8dff1155e..1c3777d6a 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysTenantPackageServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantPackageServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -12,13 +12,13 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.tenant.domain.SysTenant; -import org.dromara.system.tenant.domain.SysTenantPackage; -import org.dromara.system.tenant.domain.bo.SysTenantPackageBo; -import org.dromara.system.tenant.domain.vo.SysTenantPackageVo; -import org.dromara.system.tenant.mapper.SysTenantMapper; -import org.dromara.system.tenant.mapper.SysTenantPackageMapper; -import org.dromara.system.tenant.service.ISysTenantPackageService; +import org.dromara.system.saas.domain.Sys2Tenant; +import org.dromara.system.saas.domain.Sys2TenantPackage; +import org.dromara.system.saas.domain.bo.Sys2TenantPackageBo; +import org.dromara.system.saas.domain.vo.Sys2TenantPackageVo; +import org.dromara.system.saas.mapper.Sys2TenantMapper; +import org.dromara.system.saas.mapper.Sys2TenantPackageMapper; +import org.dromara.system.saas.service.ISys2TenantPackageService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -33,16 +33,16 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class SysTenantPackageServiceImpl implements ISysTenantPackageService { +public class Sys2TenantPackageServiceImpl implements ISys2TenantPackageService { - private final SysTenantPackageMapper baseMapper; - private final SysTenantMapper tenantMapper; + private final Sys2TenantPackageMapper baseMapper; + private final Sys2TenantMapper tenantMapper; /** * 查询租户套餐 */ @Override - public SysTenantPackageVo queryById(Long packageId){ + public Sys2TenantPackageVo queryById(Long packageId){ return baseMapper.selectVoById(packageId); } @@ -50,32 +50,32 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService { * 查询租户套餐列表 */ @Override - public TableDataInfo queryPageList(SysTenantPackageBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo queryPageList(Sys2TenantPackageBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @Override - public List selectList() { - return baseMapper.selectVoList(new LambdaQueryWrapper() - .eq(SysTenantPackage::getStatus, TenantConstants.NORMAL)); + public List selectList() { + return baseMapper.selectVoList(new LambdaQueryWrapper() + .eq(Sys2TenantPackage::getStatus, TenantConstants.NORMAL)); } /** * 查询租户套餐列表 */ @Override - public List queryList(SysTenantPackageBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List queryList(Sys2TenantPackageBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(SysTenantPackageBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getPackageName()), SysTenantPackage::getPackageName, bo.getPackageName()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysTenantPackage::getStatus, bo.getStatus()); - lqw.orderByAsc(SysTenantPackage::getPackageId); + private LambdaQueryWrapper buildQueryWrapper(Sys2TenantPackageBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getPackageName()), Sys2TenantPackage::getPackageName, bo.getPackageName()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Sys2TenantPackage::getStatus, bo.getStatus()); + lqw.orderByAsc(Sys2TenantPackage::getPackageId); return lqw; } @@ -84,8 +84,8 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService { */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean insertByBo(SysTenantPackageBo bo) { - SysTenantPackage add = MapstructUtils.convert(bo, SysTenantPackage.class); + public Boolean insertByBo(Sys2TenantPackageBo bo) { + Sys2TenantPackage add = MapstructUtils.convert(bo, Sys2TenantPackage.class); // 保存菜单id List menuIds = Arrays.asList(bo.getMenuIds()); if (CollUtil.isNotEmpty(menuIds)) { @@ -105,8 +105,8 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService { */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean updateByBo(SysTenantPackageBo bo) { - SysTenantPackage update = MapstructUtils.convert(bo, SysTenantPackage.class); + public Boolean updateByBo(Sys2TenantPackageBo bo) { + Sys2TenantPackage update = MapstructUtils.convert(bo, Sys2TenantPackage.class); // 保存菜单id List menuIds = Arrays.asList(bo.getMenuIds()); if (CollUtil.isNotEmpty(menuIds)) { @@ -121,10 +121,10 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService { * 校验套餐名称是否唯一 */ @Override - public boolean checkPackageNameUnique(SysTenantPackageBo bo) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysTenantPackage::getPackageName, bo.getPackageName()) - .ne(ObjectUtil.isNotNull(bo.getPackageId()), SysTenantPackage::getPackageId, bo.getPackageId())); + public boolean checkPackageNameUnique(Sys2TenantPackageBo bo) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(Sys2TenantPackage::getPackageName, bo.getPackageName()) + .ne(ObjectUtil.isNotNull(bo.getPackageId()), Sys2TenantPackage::getPackageId, bo.getPackageId())); return !exist; } @@ -135,8 +135,8 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService { * @return 结果 */ @Override - public int updatePackageStatus(SysTenantPackageBo bo) { - SysTenantPackage tenantPackage = MapstructUtils.convert(bo, SysTenantPackage.class); + public int updatePackageStatus(Sys2TenantPackageBo bo) { + Sys2TenantPackage tenantPackage = MapstructUtils.convert(bo, Sys2TenantPackage.class); return baseMapper.updateById(tenantPackage); } @@ -147,7 +147,7 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService { @Transactional(rollbackFor = Exception.class) public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if(isValid){ - boolean exists = tenantMapper.exists(new LambdaQueryWrapper().in(SysTenant::getPackageId, ids)); + boolean exists = tenantMapper.exists(new LambdaQueryWrapper().in(Sys2Tenant::getPackageId, ids)); if (exists) { throw new ServiceException("租户套餐已被使用"); } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantServiceImpl.java similarity index 63% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysTenantServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantServiceImpl.java index b9ab0692e..e3961557f 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2TenantServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.convert.Convert; @@ -17,13 +17,11 @@ import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.domain.*; -import org.dromara.system.tenant.domain.bo.SysTenantBo; -import org.dromara.system.tenant.domain.vo.SysTenantVo; -import org.dromara.system.mapper.*; -import org.dromara.system.tenant.service.ISysTenantService; -import org.dromara.system.tenant.domain.*; -import org.dromara.system.tenant.mapper.*; +import org.dromara.system.saas.domain.bo.Sys2TenantBo; +import org.dromara.system.saas.domain.vo.Sys2TenantVo; +import org.dromara.system.saas.service.ISys2TenantService; +import org.dromara.system.saas.domain.*; +import org.dromara.system.saas.mapper.*; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -41,25 +39,25 @@ import java.util.List; */ @RequiredArgsConstructor @Service -public class SysTenantServiceImpl implements ISysTenantService { +public class Sys2TenantServiceImpl implements ISys2TenantService { - private final SysTenantMapper baseMapper; - private final SysTenantPackageMapper tenantPackageMapper; - private final SysUserMapper userMapper; - private final SysDeptMapper deptMapper; - private final SysRoleMapper roleMapper; - private final SysRoleMenuMapper roleMenuMapper; - private final SysRoleDeptMapper roleDeptMapper; - private final SysUserRoleMapper userRoleMapper; - private final SysDictTypeMapper dictTypeMapper; - private final SysDictDataMapper dictDataMapper; - private final SysConfigMapper configMapper; + private final Sys2TenantMapper baseMapper; + private final Sys2TenantPackageMapper tenantPackageMapper; + private final Sys2UserMapper userMapper; + private final Sys2DeptMapper deptMapper; + private final Sys2RoleMapper roleMapper; + private final Sys2RoleMenuMapper roleMenuMapper; + private final Sys2RoleDeptMapper roleDeptMapper; + private final Sys2UserRoleMapper userRoleMapper; + private final Sys2DictTypeMapper dictTypeMapper; + private final Sys2DictDataMapper dictDataMapper; + private final Sys2ConfigMapper configMapper; /** * 查询租户 */ @Override - public SysTenantVo queryById(Long id) { + public Sys2TenantVo queryById(Long id) { return baseMapper.selectVoById(id); } @@ -68,17 +66,17 @@ public class SysTenantServiceImpl implements ISysTenantService { */ @Cacheable(cacheNames = CacheNames.SYS_TENANT, key = "#tenantId") @Override - public SysTenantVo queryByTenantId(String tenantId) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysTenant::getTenantId, tenantId)); + public Sys2TenantVo queryByTenantId(String tenantId) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(Sys2Tenant::getTenantId, tenantId)); } /** * 查询租户列表 */ @Override - public TableDataInfo queryPageList(SysTenantBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + public TableDataInfo queryPageList(Sys2TenantBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -86,26 +84,26 @@ public class SysTenantServiceImpl implements ISysTenantService { * 查询租户列表 */ @Override - public List queryList(SysTenantBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List queryList(Sys2TenantBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(SysTenantBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), SysTenant::getTenantId, bo.getTenantId()); - lqw.like(StringUtils.isNotBlank(bo.getContactUserName()), SysTenant::getContactUserName, bo.getContactUserName()); - lqw.eq(StringUtils.isNotBlank(bo.getContactPhone()), SysTenant::getContactPhone, bo.getContactPhone()); - lqw.like(StringUtils.isNotBlank(bo.getCompanyName()), SysTenant::getCompanyName, bo.getCompanyName()); - lqw.eq(StringUtils.isNotBlank(bo.getLicenseNumber()), SysTenant::getLicenseNumber, bo.getLicenseNumber()); - lqw.eq(StringUtils.isNotBlank(bo.getAddress()), SysTenant::getAddress, bo.getAddress()); - lqw.eq(StringUtils.isNotBlank(bo.getIntro()), SysTenant::getIntro, bo.getIntro()); - lqw.like(StringUtils.isNotBlank(bo.getDomain()), SysTenant::getDomain, bo.getDomain()); - lqw.eq(bo.getPackageId() != null, SysTenant::getPackageId, bo.getPackageId()); - lqw.eq(bo.getExpireTime() != null, SysTenant::getExpireTime, bo.getExpireTime()); - lqw.eq(bo.getAccountCount() != null, SysTenant::getAccountCount, bo.getAccountCount()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysTenant::getStatus, bo.getStatus()); - lqw.orderByAsc(SysTenant::getId); + private LambdaQueryWrapper buildQueryWrapper(Sys2TenantBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), Sys2Tenant::getTenantId, bo.getTenantId()); + lqw.like(StringUtils.isNotBlank(bo.getContactUserName()), Sys2Tenant::getContactUserName, bo.getContactUserName()); + lqw.eq(StringUtils.isNotBlank(bo.getContactPhone()), Sys2Tenant::getContactPhone, bo.getContactPhone()); + lqw.like(StringUtils.isNotBlank(bo.getCompanyName()), Sys2Tenant::getCompanyName, bo.getCompanyName()); + lqw.eq(StringUtils.isNotBlank(bo.getLicenseNumber()), Sys2Tenant::getLicenseNumber, bo.getLicenseNumber()); + lqw.eq(StringUtils.isNotBlank(bo.getAddress()), Sys2Tenant::getAddress, bo.getAddress()); + lqw.eq(StringUtils.isNotBlank(bo.getIntro()), Sys2Tenant::getIntro, bo.getIntro()); + lqw.like(StringUtils.isNotBlank(bo.getDomain()), Sys2Tenant::getDomain, bo.getDomain()); + lqw.eq(bo.getPackageId() != null, Sys2Tenant::getPackageId, bo.getPackageId()); + lqw.eq(bo.getExpireTime() != null, Sys2Tenant::getExpireTime, bo.getExpireTime()); + lqw.eq(bo.getAccountCount() != null, Sys2Tenant::getAccountCount, bo.getAccountCount()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), Sys2Tenant::getStatus, bo.getStatus()); + lqw.orderByAsc(Sys2Tenant::getId); return lqw; } @@ -114,12 +112,12 @@ public class SysTenantServiceImpl implements ISysTenantService { */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean insertByBo(SysTenantBo bo) { - SysTenant add = MapstructUtils.convert(bo, SysTenant.class); + public Boolean insertByBo(Sys2TenantBo bo) { + Sys2Tenant add = MapstructUtils.convert(bo, Sys2Tenant.class); // 获取所有租户编号 List tenantIds = baseMapper.selectObjs( - new LambdaQueryWrapper().select(SysTenant::getTenantId), x -> {return Convert.toStr(x);}); + new LambdaQueryWrapper().select(Sys2Tenant::getTenantId), x -> {return Convert.toStr(x);}); String tenantId = generateTenantId(tenantIds); add.setTenantId(tenantId); boolean flag = baseMapper.insert(add) > 0; @@ -132,7 +130,7 @@ public class SysTenantServiceImpl implements ISysTenantService { Long roleId = createTenantRole(tenantId, bo.getPackageId()); // 创建部门: 公司名是部门名称 - SysDept dept = new SysDept(); + Sys2Dept dept = new Sys2Dept(); dept.setTenantId(tenantId); dept.setDeptName(bo.getCompanyName()); dept.setParentId(Constants.TOP_PARENT_ID); @@ -141,13 +139,13 @@ public class SysTenantServiceImpl implements ISysTenantService { Long deptId = dept.getDeptId(); // 角色和部门关联表 - SysRoleDept roleDept = new SysRoleDept(); + Sys2RoleDept roleDept = new Sys2RoleDept(); roleDept.setRoleId(roleId); roleDept.setDeptId(deptId); roleDeptMapper.insert(roleDept); // 创建系统用户 - SysUser user = new SysUser(); + Sys2User user = new Sys2User(); user.setTenantId(tenantId); user.setUserName(bo.getUsername()); user.setNickName(bo.getUsername()); @@ -155,40 +153,40 @@ public class SysTenantServiceImpl implements ISysTenantService { user.setDeptId(deptId); userMapper.insert(user); //新增系统用户后，默认当前用户为部门的负责人 - SysDept sd = new SysDept(); + Sys2Dept sd = new Sys2Dept(); sd.setLeader(user.getUserId()); sd.setDeptId(deptId); deptMapper.updateById(sd); // 用户和角色关联表 - SysUserRole userRole = new SysUserRole(); + Sys2UserRole userRole = new Sys2UserRole(); userRole.setUserId(user.getUserId()); userRole.setRoleId(roleId); userRoleMapper.insert(userRole); String defaultTenantId = TenantConstants.DEFAULT_TENANT_ID; - List dictTypeList = dictTypeMapper.selectList( - new LambdaQueryWrapper().eq(SysDictType::getTenantId, defaultTenantId)); - List dictDataList = dictDataMapper.selectList( - new LambdaQueryWrapper().eq(SysDictData::getTenantId, defaultTenantId)); - for (SysDictType dictType : dictTypeList) { + List dictTypeList = dictTypeMapper.selectList( + new LambdaQueryWrapper().eq(Sys2DictType::getTenantId, defaultTenantId)); + List dictDataList = dictDataMapper.selectList( + new LambdaQueryWrapper().eq(Sys2DictData::getTenantId, defaultTenantId)); + for (Sys2DictType dictType : dictTypeList) { dictType.setDictId(null); dictType.setTenantId(tenantId); } - for (SysDictData dictData : dictDataList) { + for (Sys2DictData dictData : dictDataList) { dictData.setDictCode(null); dictData.setTenantId(tenantId); } dictTypeMapper.insertBatch(dictTypeList); dictDataMapper.insertBatch(dictDataList); - List sysConfigList = configMapper.selectList( - new LambdaQueryWrapper().eq(SysConfig::getTenantId, defaultTenantId)); - for (SysConfig config : sysConfigList) { + List sys2ConfigList = configMapper.selectList( + new LambdaQueryWrapper().eq(Sys2Config::getTenantId, defaultTenantId)); + for (Sys2Config config : sys2ConfigList) { config.setConfigId(null); config.setTenantId(tenantId); } - configMapper.insertBatch(sysConfigList); + configMapper.insertBatch(sys2ConfigList); return true; } @@ -217,7 +215,7 @@ public class SysTenantServiceImpl implements ISysTenantService { */ private Long createTenantRole(String tenantId, Long packageId) { // 获取租户套餐 - SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); + Sys2TenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); if (ObjectUtil.isNull(tenantPackage)) { throw new ServiceException("套餐不存在"); } @@ -225,7 +223,7 @@ public class SysTenantServiceImpl implements ISysTenantService { List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); // 创建角色 - SysRole role = new SysRole(); + Sys2Role role = new Sys2Role(); role.setTenantId(tenantId); role.setRoleName(TenantConstants.TENANT_ADMIN_ROLE_NAME); role.setRoleKey(TenantConstants.TENANT_ADMIN_ROLE_KEY); @@ -235,9 +233,9 @@ public class SysTenantServiceImpl implements ISysTenantService { Long roleId = role.getRoleId(); // 创建角色菜单 - List roleMenus = new ArrayList<>(menuIds.size()); + List roleMenus = new ArrayList<>(menuIds.size()); menuIds.forEach(menuId -> { - SysRoleMenu roleMenu = new SysRoleMenu(); + Sys2RoleMenu roleMenu = new Sys2RoleMenu(); roleMenu.setRoleId(roleId); roleMenu.setMenuId(menuId); roleMenus.add(roleMenu); @@ -252,8 +250,8 @@ public class SysTenantServiceImpl implements ISysTenantService { */ @CacheEvict(cacheNames = CacheNames.SYS_TENANT, key = "#bo.tenantId") @Override - public Boolean updateByBo(SysTenantBo bo) { - SysTenant tenant = MapstructUtils.convert(bo, SysTenant.class); + public Boolean updateByBo(Sys2TenantBo bo) { + Sys2Tenant tenant = MapstructUtils.convert(bo, Sys2Tenant.class); tenant.setTenantId(null); tenant.setPackageId(null); return baseMapper.updateById(tenant) > 0; @@ -267,8 +265,8 @@ public class SysTenantServiceImpl implements ISysTenantService { */ @CacheEvict(cacheNames = CacheNames.SYS_TENANT, key = "#bo.tenantId") @Override - public int updateTenantStatus(SysTenantBo bo) { - SysTenant tenant = MapstructUtils.convert(bo, SysTenant.class); + public int updateTenantStatus(Sys2TenantBo bo) { + Sys2Tenant tenant = MapstructUtils.convert(bo, Sys2Tenant.class); return baseMapper.updateById(tenant); } @@ -303,10 +301,10 @@ public class SysTenantServiceImpl implements ISysTenantService { * 校验企业名称是否唯一 */ @Override - public boolean checkCompanyNameUnique(SysTenantBo bo) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysTenant::getCompanyName, bo.getCompanyName()) - .ne(ObjectUtil.isNotNull(bo.getTenantId()), SysTenant::getTenantId, bo.getTenantId())); + public boolean checkCompanyNameUnique(Sys2TenantBo bo) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(Sys2Tenant::getCompanyName, bo.getCompanyName()) + .ne(ObjectUtil.isNotNull(bo.getTenantId()), Sys2Tenant::getTenantId, bo.getTenantId())); return !exist; } @@ -315,7 +313,7 @@ public class SysTenantServiceImpl implements ISysTenantService { */ @Override public boolean checkAccountBalance(String tenantId) { - SysTenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId); + Sys2TenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId); // 如果余额为-1代表不限制 if (tenant.getAccountCount() == -1) { return true; @@ -330,7 +328,7 @@ public class SysTenantServiceImpl implements ISysTenantService { */ @Override public boolean checkExpireTime(String tenantId) { - SysTenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId); + Sys2TenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId); // 如果未设置过期时间代表不限制 if (ObjectUtil.isNull(tenant.getExpireTime())) { return true; @@ -345,21 +343,21 @@ public class SysTenantServiceImpl implements ISysTenantService { @Override @Transactional(rollbackFor = Exception.class) public Boolean syncTenantPackage(String tenantId, Long packageId) { - SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); - List roles = roleMapper.selectList( - new LambdaQueryWrapper().eq(SysRole::getTenantId, tenantId)); + Sys2TenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); + List roles = roleMapper.selectList( + new LambdaQueryWrapper().eq(Sys2Role::getTenantId, tenantId)); List roleIds = new ArrayList<>(roles.size() - 1); List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); roles.forEach(item -> { if (TenantConstants.TENANT_ADMIN_ROLE_KEY.equals(item.getRoleKey())) { - List roleMenus = new ArrayList<>(menuIds.size()); + List roleMenus = new ArrayList<>(menuIds.size()); menuIds.forEach(menuId -> { - SysRoleMenu roleMenu = new SysRoleMenu(); + Sys2RoleMenu roleMenu = new Sys2RoleMenu(); roleMenu.setRoleId(item.getRoleId()); roleMenu.setMenuId(menuId); roleMenus.add(roleMenu); }); - roleMenuMapper.delete(new LambdaQueryWrapper().eq(SysRoleMenu::getRoleId, item.getRoleId())); + roleMenuMapper.delete(new LambdaQueryWrapper().eq(Sys2RoleMenu::getRoleId, item.getRoleId())); roleMenuMapper.insertBatch(roleMenus); } else { roleIds.add(item.getRoleId()); @@ -367,7 +365,7 @@ public class SysTenantServiceImpl implements ISysTenantService { }); if (!roleIds.isEmpty()) { roleMenuMapper.delete( - new LambdaQueryWrapper().in(SysRoleMenu::getRoleId, roleIds).notIn(!menuIds.isEmpty(), SysRoleMenu::getMenuId, menuIds)); + new LambdaQueryWrapper().in(Sys2RoleMenu::getRoleId, roleIds).notIn(!menuIds.isEmpty(), Sys2RoleMenu::getMenuId, menuIds)); } return true; } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2UserServiceImpl.java similarity index 64% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysUserServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2UserServiceImpl.java index 03ad6222a..5ccb7130c 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/Sys2UserServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -17,7 +17,7 @@ import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.constant.UserConstants; import org.dromara.common.core.domain.dto.UserDTO; import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.UserService; +import org.dromara.common.core.service.TwoUserService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StreamUtils; @@ -26,16 +26,14 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.domain.*; -import org.dromara.system.tenant.domain.bo.SysUserBo; -import org.dromara.system.tenant.domain.vo.SysPostVo; -import org.dromara.system.tenant.domain.vo.SysRoleVo; -import org.dromara.system.tenant.domain.vo.SysUserExportVo; -import org.dromara.system.tenant.domain.vo.SysUserVo; -import org.dromara.system.mapper.*; -import org.dromara.system.tenant.service.ISysUserService; -import org.dromara.system.tenant.domain.*; -import org.dromara.system.tenant.mapper.*; +import org.dromara.system.saas.domain.bo.Sys2UserBo; +import org.dromara.system.saas.domain.vo.Sys2PostVo; +import org.dromara.system.saas.domain.vo.Sys2RoleVo; +import org.dromara.system.saas.domain.vo.Sys2UserExportVo; +import org.dromara.system.saas.domain.vo.Sys2UserVo; +import org.dromara.system.saas.service.ISys2UserService; +import org.dromara.system.saas.domain.*; +import org.dromara.system.saas.mapper.*; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -53,18 +51,18 @@ import java.util.Map; @Slf4j @RequiredArgsConstructor @Service -public class SysUserServiceImpl implements ISysUserService, UserService { +public class Sys2UserServiceImpl implements ISys2UserService, TwoUserService { - private final SysUserMapper baseMapper; - private final SysDeptMapper deptMapper; - private final SysRoleMapper roleMapper; - private final SysPostMapper postMapper; - private final SysUserRoleMapper userRoleMapper; - private final SysUserPostMapper userPostMapper; + private final Sys2UserMapper baseMapper; + private final Sys2DeptMapper deptMapper; + private final Sys2RoleMapper roleMapper; + private final Sys2PostMapper postMapper; + private final Sys2UserRoleMapper userRoleMapper; + private final Sys2UserPostMapper userPostMapper; @Override - public TableDataInfo selectPageUserList(SysUserBo user, PageQuery pageQuery) { - Page page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user)); + public TableDataInfo selectPageUserList(Sys2UserBo user, PageQuery pageQuery) { + Page page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user)); return TableDataInfo.build(page); } @@ -76,13 +74,13 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户信息集合信息 */ @Override - public List selectUserExportList(SysUserBo user) { + public List selectUserExportList(Sys2UserBo user) { return baseMapper.selectUserExportList(this.buildQueryWrapper(user)); } - private Wrapper buildQueryWrapper(SysUserBo user) { + private Wrapper buildQueryWrapper(Sys2UserBo user) { Map params = user.getParams(); - QueryWrapper wrapper = Wrappers.query(); + QueryWrapper wrapper = Wrappers.query(); wrapper.eq("u.del_flag", UserConstants.USER_NORMAL) .eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId()) .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName()) @@ -91,10 +89,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService { .between(params.get("beginTime") != null && params.get("endTime") != null, "u.create_time", params.get("beginTime"), params.get("endTime")) .and(ObjectUtil.isNotNull(user.getDeptId()), w -> { - List deptList = deptMapper.selectList(new LambdaQueryWrapper() - .select(SysDept::getDeptId) + List deptList = deptMapper.selectList(new LambdaQueryWrapper() + .select(Sys2Dept::getDeptId) .apply(DataBaseHelper.findInSet(user.getDeptId(), "ancestors"))); - List ids = StreamUtils.toList(deptList, SysDept::getDeptId); + List ids = StreamUtils.toList(deptList, Sys2Dept::getDeptId); ids.add(user.getDeptId()); w.in("u.dept_id", ids); }).orderByAsc("u.user_id"); @@ -111,15 +109,15 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户信息集合信息 */ @Override - public TableDataInfo selectAllocatedList(SysUserBo user, PageQuery pageQuery) { - QueryWrapper wrapper = Wrappers.query(); + public TableDataInfo selectAllocatedList(Sys2UserBo user, PageQuery pageQuery) { + QueryWrapper wrapper = Wrappers.query(); wrapper.eq("u.del_flag", UserConstants.USER_NORMAL) .eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId()) .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName()) .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus()) .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber()) .orderByAsc("u.user_id"); - Page page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper); + Page page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper); return TableDataInfo.build(page); } @@ -130,16 +128,16 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户信息集合信息 */ @Override - public TableDataInfo selectUnallocatedList(SysUserBo user, PageQuery pageQuery) { + public TableDataInfo selectUnallocatedList(Sys2UserBo user, PageQuery pageQuery) { List userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId()); - QueryWrapper wrapper = Wrappers.query(); + QueryWrapper wrapper = Wrappers.query(); wrapper.eq("u.del_flag", UserConstants.USER_NORMAL) .and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id")) .notIn(CollUtil.isNotEmpty(userIds), "u.user_id", userIds) .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName()) .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber()) .orderByAsc("u.user_id"); - Page page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper); + Page page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper); return TableDataInfo.build(page); } @@ -150,8 +148,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户对象信息 */ @Override - public SysUserVo selectUserByUserName(String userName) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getUserName, userName)); + public Sys2UserVo selectUserByUserName(String userName) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(Sys2User::getUserName, userName)); } /** @@ -161,8 +159,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户对象信息 */ @Override - public SysUserVo selectUserByPhonenumber(String phonenumber) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysUser::getPhonenumber, phonenumber)); + public Sys2UserVo selectUserByPhonenumber(String phonenumber) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(Sys2User::getPhonenumber, phonenumber)); } /** @@ -172,8 +170,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户对象信息 */ @Override - public SysUserVo selectUserById(Long userId) { - SysUserVo user = baseMapper.selectVoById(userId); + public Sys2UserVo selectUserById(Long userId) { + Sys2UserVo user = baseMapper.selectVoById(userId); if (ObjectUtil.isNull(user)) { return user; } @@ -189,12 +187,12 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户列表信息 */ @Override - public List selectUserByIds(List userIds, Long deptId) { - return baseMapper.selectUserList(new LambdaQueryWrapper() - .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName) - .eq(SysUser::getStatus, UserConstants.USER_NORMAL) - .eq(ObjectUtil.isNotNull(deptId), SysUser::getDeptId, deptId) - .in(CollUtil.isNotEmpty(userIds), SysUser::getUserId, userIds)); + public List selectUserByIds(List userIds, Long deptId) { + return baseMapper.selectUserList(new LambdaQueryWrapper() + .select(Sys2User::getUserId, Sys2User::getUserName, Sys2User::getNickName) + .eq(Sys2User::getStatus, UserConstants.USER_NORMAL) + .eq(ObjectUtil.isNotNull(deptId), Sys2User::getDeptId, deptId) + .in(CollUtil.isNotEmpty(userIds), Sys2User::getUserId, userIds)); } /** @@ -205,11 +203,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService { */ @Override public String selectUserRoleGroup(Long userId) { - List list = roleMapper.selectRolesByUserId(userId); + List list = roleMapper.selectRolesByUserId(userId); if (CollUtil.isEmpty(list)) { return StringUtils.EMPTY; } - return StreamUtils.join(list, SysRoleVo::getRoleName); + return StreamUtils.join(list, Sys2RoleVo::getRoleName); } /** @@ -220,11 +218,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService { */ @Override public String selectUserPostGroup(Long userId) { - List list = postMapper.selectPostsByUserId(userId); + List list = postMapper.selectPostsByUserId(userId); if (CollUtil.isEmpty(list)) { return StringUtils.EMPTY; } - return StreamUtils.join(list, SysPostVo::getPostName); + return StreamUtils.join(list, Sys2PostVo::getPostName); } /** @@ -234,10 +232,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 结果 */ @Override - public boolean checkUserNameUnique(SysUserBo user) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysUser::getUserName, user.getUserName()) - .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())); + public boolean checkUserNameUnique(Sys2UserBo user) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(Sys2User::getUserName, user.getUserName()) + .ne(ObjectUtil.isNotNull(user.getUserId()), Sys2User::getUserId, user.getUserId())); return !exist; } @@ -247,10 +245,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @param user 用户信息 */ @Override - public boolean checkPhoneUnique(SysUserBo user) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysUser::getPhonenumber, user.getPhonenumber()) - .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())); + public boolean checkPhoneUnique(Sys2UserBo user) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(Sys2User::getPhonenumber, user.getPhonenumber()) + .ne(ObjectUtil.isNotNull(user.getUserId()), Sys2User::getUserId, user.getUserId())); return !exist; } @@ -260,10 +258,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @param user 用户信息 */ @Override - public boolean checkEmailUnique(SysUserBo user) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysUser::getEmail, user.getEmail()) - .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())); + public boolean checkEmailUnique(Sys2UserBo user) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(Sys2User::getEmail, user.getEmail()) + .ne(ObjectUtil.isNotNull(user.getUserId()), Sys2User::getUserId, user.getUserId())); return !exist; } @@ -305,11 +303,11 @@ public class SysUserServiceImpl implements ISysUserService, UserService { */ @Override @Transactional(rollbackFor = Exception.class) - public int insertUser(SysUserBo user) { - SysUser sysUser = MapstructUtils.convert(user, SysUser.class); + public int insertUser(Sys2UserBo user) { + Sys2User sys2User = MapstructUtils.convert(user, Sys2User.class); // 新增用户信息 - int rows = baseMapper.insert(sysUser); - user.setUserId(sysUser.getUserId()); + int rows = baseMapper.insert(sys2User); + user.setUserId(sys2User.getUserId()); // 新增用户岗位关联 insertUserPost(user, false); // 新增用户与角色管理 @@ -324,12 +322,12 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 结果 */ @Override - public boolean registerUser(SysUserBo user, String tenantId) { + public boolean registerUser(Sys2UserBo user, String tenantId) { user.setCreateBy(0L); user.setUpdateBy(0L); - SysUser sysUser = MapstructUtils.convert(user, SysUser.class); - sysUser.setTenantId(tenantId); - return baseMapper.insert(sysUser) > 0; + Sys2User sys2User = MapstructUtils.convert(user, Sys2User.class); + sys2User.setTenantId(tenantId); + return baseMapper.insert(sys2User) > 0; } /** @@ -341,14 +339,14 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Override @CacheEvict(cacheNames = CacheNames.SYS_NICKNAME, key = "#user.userId") @Transactional(rollbackFor = Exception.class) - public int updateUser(SysUserBo user) { + public int updateUser(Sys2UserBo user) { // 新增用户与角色管理 insertUserRole(user, true); // 新增用户与岗位管理 insertUserPost(user, true); - SysUser sysUser = MapstructUtils.convert(user, SysUser.class); + Sys2User sys2User = MapstructUtils.convert(user, Sys2User.class); // 防止错误更新后导致的数据误删除 - int flag = baseMapper.updateById(sysUser); + int flag = baseMapper.updateById(sys2User); if (flag < 1) { throw new ServiceException("修改用户" + user.getUserName() + "信息失败"); } @@ -377,9 +375,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Override public int updateUserStatus(Long userId, String status) { return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(SysUser::getStatus, status) - .eq(SysUser::getUserId, userId)); + new LambdaUpdateWrapper() + .set(Sys2User::getStatus, status) + .eq(Sys2User::getUserId, userId)); } /** @@ -390,14 +388,14 @@ public class SysUserServiceImpl implements ISysUserService, UserService { */ @CacheEvict(cacheNames = CacheNames.SYS_NICKNAME, key = "#user.userId") @Override - public int updateUserProfile(SysUserBo user) { + public int updateUserProfile(Sys2UserBo user) { return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(ObjectUtil.isNotNull(user.getNickName()), SysUser::getNickName, user.getNickName()) - .set(SysUser::getPhonenumber, user.getPhonenumber()) - .set(SysUser::getEmail, user.getEmail()) - .set(SysUser::getSex, user.getSex()) - .eq(SysUser::getUserId, user.getUserId())); + new LambdaUpdateWrapper() + .set(ObjectUtil.isNotNull(user.getNickName()), Sys2User::getNickName, user.getNickName()) + .set(Sys2User::getPhonenumber, user.getPhonenumber()) + .set(Sys2User::getEmail, user.getEmail()) + .set(Sys2User::getSex, user.getSex()) + .eq(Sys2User::getUserId, user.getUserId())); } /** @@ -410,9 +408,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Override public boolean updateUserAvatar(Long userId, Long avatar) { return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(SysUser::getAvatar, avatar) - .eq(SysUser::getUserId, userId)) > 0; + new LambdaUpdateWrapper() + .set(Sys2User::getAvatar, avatar) + .eq(Sys2User::getUserId, userId)) > 0; } /** @@ -425,9 +423,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Override public int resetUserPwd(Long userId, String password) { return baseMapper.update(null, - new LambdaUpdateWrapper() - .set(SysUser::getPassword, password) - .eq(SysUser::getUserId, userId)); + new LambdaUpdateWrapper() + .set(Sys2User::getPassword, password) + .eq(Sys2User::getUserId, userId)); } /** @@ -436,7 +434,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @param user 用户对象 * @param clear 清除已存在的关联数据 */ - private void insertUserRole(SysUserBo user, boolean clear) { + private void insertUserRole(Sys2UserBo user, boolean clear) { this.insertUserRole(user.getUserId(), user.getRoleIds(), clear); } @@ -446,16 +444,16 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @param user 用户对象 * @param clear 清除已存在的关联数据 */ - private void insertUserPost(SysUserBo user, boolean clear) { + private void insertUserPost(Sys2UserBo user, boolean clear) { Long[] posts = user.getPostIds(); if (ArrayUtil.isNotEmpty(posts)) { if (clear) { // 删除用户与岗位关联 - userPostMapper.delete(new LambdaQueryWrapper().eq(SysUserPost::getUserId, user.getUserId())); + userPostMapper.delete(new LambdaQueryWrapper().eq(Sys2UserPost::getUserId, user.getUserId())); } // 新增用户与岗位管理 - List list = StreamUtils.toList(List.of(posts), postId -> { - SysUserPost up = new SysUserPost(); + List list = StreamUtils.toList(List.of(posts), postId -> { + Sys2UserPost up = new Sys2UserPost(); up.setUserId(user.getUserId()); up.setPostId(postId); return up; @@ -478,18 +476,18 @@ public class SysUserServiceImpl implements ISysUserService, UserService { roleList.remove(UserConstants.SUPER_ADMIN_ID); } // 判断是否具有此角色的操作权限 - List roles = roleMapper.selectRoleList( - new QueryWrapper().in("r.role_id", roleList)); + List roles = roleMapper.selectRoleList( + new QueryWrapper().in("r.role_id", roleList)); if (CollUtil.isEmpty(roles)) { throw new ServiceException("没有权限访问角色的数据"); } if (clear) { // 删除用户与角色关联 - userRoleMapper.delete(new LambdaQueryWrapper().eq(SysUserRole::getUserId, userId)); + userRoleMapper.delete(new LambdaQueryWrapper().eq(Sys2UserRole::getUserId, userId)); } // 新增用户与角色管理 - List list = StreamUtils.toList(roleList, roleId -> { - SysUserRole ur = new SysUserRole(); + List list = StreamUtils.toList(roleList, roleId -> { + Sys2UserRole ur = new Sys2UserRole(); ur.setUserId(userId); ur.setRoleId(roleId); return ur; @@ -508,9 +506,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Transactional(rollbackFor = Exception.class) public int deleteUserById(Long userId) { // 删除用户与角色关联 - userRoleMapper.delete(new LambdaQueryWrapper().eq(SysUserRole::getUserId, userId)); + userRoleMapper.delete(new LambdaQueryWrapper().eq(Sys2UserRole::getUserId, userId)); // 删除用户与岗位表 - userPostMapper.delete(new LambdaQueryWrapper().eq(SysUserPost::getUserId, userId)); + userPostMapper.delete(new LambdaQueryWrapper().eq(Sys2UserPost::getUserId, userId)); // 防止更新失败导致的数据删除 int flag = baseMapper.deleteById(userId); if (flag < 1) { @@ -534,9 +532,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService { } List ids = List.of(userIds); // 删除用户与角色关联 - userRoleMapper.delete(new LambdaQueryWrapper().in(SysUserRole::getUserId, ids)); + userRoleMapper.delete(new LambdaQueryWrapper().in(Sys2UserRole::getUserId, ids)); // 删除用户与岗位表 - userPostMapper.delete(new LambdaQueryWrapper().in(SysUserPost::getUserId, ids)); + userPostMapper.delete(new LambdaQueryWrapper().in(Sys2UserPost::getUserId, ids)); // 防止更新失败导致的数据删除 int flag = baseMapper.deleteByIds(ids); if (flag < 1) { @@ -552,10 +550,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService { * @return 用户信息集合信息 */ @Override - public List selectUserListByDept(Long deptId) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(SysUser::getDeptId, deptId); - lqw.orderByAsc(SysUser::getUserId); + public List selectUserListByDept(Long deptId) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(Sys2User::getDeptId, deptId); + lqw.orderByAsc(Sys2User::getUserId); return baseMapper.selectVoList(lqw); } @@ -568,9 +566,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId") @Override public String selectUserNameById(Long userId) { - SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysUser::getUserName).eq(SysUser::getUserId, userId)); - return ObjectUtil.isNull(sysUser) ? null : sysUser.getUserName(); + Sys2User sys2User = baseMapper.selectOne(new LambdaQueryWrapper() + .select(Sys2User::getUserName).eq(Sys2User::getUserId, userId)); + return ObjectUtil.isNull(sys2User) ? null : sys2User.getUserName(); } /** @@ -582,9 +580,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Override @Cacheable(cacheNames = CacheNames.SYS_NICKNAME, key = "#userId") public String selectNicknameById(Long userId) { - SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysUser::getNickName).eq(SysUser::getUserId, userId)); - return ObjectUtil.isNull(sysUser) ? null : sysUser.getNickName(); + Sys2User sys2User = baseMapper.selectOne(new LambdaQueryWrapper() + .select(Sys2User::getNickName).eq(Sys2User::getUserId, userId)); + return ObjectUtil.isNull(sys2User) ? null : sys2User.getNickName(); } /** @@ -613,9 +611,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService { */ @Override public String selectPhonenumberById(Long userId) { - SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysUser::getPhonenumber).eq(SysUser::getUserId, userId)); - return ObjectUtil.isNull(sysUser) ? null : sysUser.getPhonenumber(); + Sys2User sys2User = baseMapper.selectOne(new LambdaQueryWrapper() + .select(Sys2User::getPhonenumber).eq(Sys2User::getUserId, userId)); + return ObjectUtil.isNull(sys2User) ? null : sys2User.getPhonenumber(); } /** @@ -626,9 +624,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService { */ @Override public String selectEmailById(Long userId) { - SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysUser::getEmail).eq(SysUser::getUserId, userId)); - return ObjectUtil.isNull(sysUser) ? null : sysUser.getEmail(); + Sys2User sys2User = baseMapper.selectOne(new LambdaQueryWrapper() + .select(Sys2User::getEmail).eq(Sys2User::getUserId, userId)); + return ObjectUtil.isNull(sys2User) ? null : sys2User.getEmail(); } @Override @@ -636,18 +634,18 @@ public class SysUserServiceImpl implements ISysUserService, UserService { if (CollUtil.isEmpty(userIds)) { return List.of(); } - List list = baseMapper.selectVoList(new LambdaQueryWrapper() - .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhonenumber) - .eq(SysUser::getStatus, UserConstants.USER_NORMAL) - .in(CollUtil.isNotEmpty(userIds), SysUser::getUserId, userIds)); + List list = baseMapper.selectVoList(new LambdaQueryWrapper() + .select(Sys2User::getUserId, Sys2User::getUserName, Sys2User::getNickName, Sys2User::getEmail, Sys2User::getPhonenumber) + .eq(Sys2User::getStatus, UserConstants.USER_NORMAL) + .in(CollUtil.isNotEmpty(userIds), Sys2User::getUserId, userIds)); return BeanUtil.copyToList(list, UserDTO.class); } @Override public List selectUserIdsByRoleIds(List roleIds) { - List userRoles = userRoleMapper.selectList( - new LambdaQueryWrapper().in(SysUserRole::getRoleId, roleIds)); - return StreamUtils.toList(userRoles, SysUserRole::getUserId); + List userRoles = userRoleMapper.selectList( + new LambdaQueryWrapper().in(Sys2UserRole::getRoleId, roleIds)); + return StreamUtils.toList(userRoles, Sys2UserRole::getUserId); } @Override @@ -655,9 +653,9 @@ public class SysUserServiceImpl implements ISysUserService, UserService { if (CollUtil.isEmpty(roleIds)) { return List.of(); } - List userRoles = userRoleMapper.selectList( - new LambdaQueryWrapper().in(SysUserRole::getRoleId, roleIds)); - List userIds = StreamUtils.toList(userRoles, SysUserRole::getUserId); + List userRoles = userRoleMapper.selectList( + new LambdaQueryWrapper().in(Sys2UserRole::getRoleId, roleIds)); + List userIds = StreamUtils.toList(userRoles, Sys2UserRole::getUserId); return selectListByIds(userIds); } @@ -666,10 +664,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService { if (CollUtil.isEmpty(deptIds)) { return List.of(); } - List list = baseMapper.selectVoList(new LambdaQueryWrapper() - .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhonenumber) - .eq(SysUser::getStatus, UserConstants.USER_NORMAL) - .in(CollUtil.isNotEmpty(deptIds), SysUser::getDeptId, deptIds)); + List list = baseMapper.selectVoList(new LambdaQueryWrapper() + .select(Sys2User::getUserId, Sys2User::getUserName, Sys2User::getNickName, Sys2User::getEmail, Sys2User::getPhonenumber) + .eq(Sys2User::getStatus, UserConstants.USER_NORMAL) + .in(CollUtil.isNotEmpty(deptIds), Sys2User::getDeptId, deptIds)); return BeanUtil.copyToList(list, UserDTO.class); } } diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java similarity index 61% rename from ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysMenuServiceImpl.java rename to ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java index dcd7418ae..d6c4fd11a 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/java/org/dromara/system/tenant/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.tenant.service.impl; +package org.dromara.system.saas.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; @@ -14,19 +14,13 @@ import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.TreeBuildUtils; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.tenant.domain.SysMenu; -import org.dromara.system.tenant.domain.SysRole; -import org.dromara.system.tenant.domain.SysRoleMenu; -import org.dromara.system.tenant.domain.SysTenantPackage; -import org.dromara.system.tenant.domain.bo.SysMenuBo; -import org.dromara.system.tenant.domain.vo.MetaVo; -import org.dromara.system.tenant.domain.vo.RouterVo; -import org.dromara.system.tenant.domain.vo.SysMenuVo; -import org.dromara.system.tenant.mapper.SysMenuMapper; -import org.dromara.system.tenant.mapper.SysRoleMapper; -import org.dromara.system.tenant.mapper.SysRoleMenuMapper; -import org.dromara.system.tenant.mapper.SysTenantPackageMapper; -import org.dromara.system.tenant.service.ISysMenuService; +import org.dromara.system.saas.domain.*; +import org.dromara.system.saas.domain.bo.SysSaasMenuBo; +import org.dromara.system.saas.domain.vo.TwoMetaVo; +import org.dromara.system.saas.domain.vo.TwoRouterVo; +import org.dromara.system.saas.domain.vo.SysSaasMenuVo; +import org.dromara.system.saas.mapper.*; +import org.dromara.system.saas.service.ISysSaasMenuService; import org.springframework.stereotype.Service; import java.util.*; @@ -38,12 +32,13 @@ import java.util.*; */ @RequiredArgsConstructor @Service -public class SysMenuServiceImpl implements ISysMenuService { +public class SysSaasMenuServiceImpl implements ISysSaasMenuService { - private final SysMenuMapper baseMapper; - private final SysRoleMapper roleMapper; - private final SysRoleMenuMapper roleMenuMapper; - private final SysTenantPackageMapper tenantPackageMapper; + private final SysSaasMenuMapper baseMapper; + private final Sys2ApplicationMapper applicationMapper; + private final Sys2RoleMapper roleMapper; + private final Sys2RoleMenuMapper roleMenuMapper; + private final Sys2TenantPackageMapper tenantPackageMapper; /** * 根据用户查询系统菜单列表 @@ -52,8 +47,8 @@ public class SysMenuServiceImpl implements ISysMenuService { * @return 菜单列表 */ @Override - public List selectMenuList(Long userId) { - return selectMenuList(new SysMenuBo(), userId); + public List selectMenuList(Long userId) { + return selectMenuList(new SysSaasMenuBo(), userId); } /** @@ -63,26 +58,41 @@ public class SysMenuServiceImpl implements ISysMenuService { * @return 菜单列表 */ @Override - public List selectMenuList(SysMenuBo menu, Long userId) { - List menuList; + public List selectMenuList(SysSaasMenuBo menu, Long userId) { + List menuList; // 管理员显示所有菜单信息 if (LoginHelper.isSuperAdmin(userId)) { - menuList = baseMapper.selectVoList(new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName()) - .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible()) - .eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus()) - .orderByAsc(SysMenu::getParentId) - .orderByAsc(SysMenu::getOrderNum)); + menuList = baseMapper.selectVoList(new LambdaQueryWrapper() + .like(StringUtils.isNotBlank(menu.getMenuName()), SysSaasMenu::getMenuName, menu.getMenuName()) + .eq(StringUtils.isNotBlank(menu.getVisible()), SysSaasMenu::getVisible, menu.getVisible()) + .eq(StringUtils.isNotBlank(menu.getStatus()), SysSaasMenu::getStatus, menu.getStatus()) + .orderByAsc(SysSaasMenu::getParentId) + .orderByAsc(SysSaasMenu::getOrderNum)); + + List appIds = menuList.stream().map(SysSaasMenuVo::getApplicationId).distinct().toList(); + if (!appIds.isEmpty()){ + List appList = applicationMapper.selectVoBatchIds(appIds) + .stream() + .map(item -> { + SysSaasMenuVo sysSaasMenuVo = new SysSaasMenuVo(); + sysSaasMenuVo.setMenuName(item.getApplicationName()); + sysSaasMenuVo.setMenuId(item.getApplicationId()); + sysSaasMenuVo.setMenuType("A"); + return sysSaasMenuVo; + }).toList(); + //TODO 继续完善，展示应用后展示菜单 + menuList.addAll(appList); + } } else { - QueryWrapper wrapper = Wrappers.query(); - wrapper.inSql("r.role_id", "select role_id from sys_user_role where user_id = " + userId) + QueryWrapper wrapper = Wrappers.query(); + wrapper.inSql("r.role_id", "select role_id from sys2_user_role where user_id = " + userId) .like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName()) .eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible()) .eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus()) .orderByAsc("m.parent_id") .orderByAsc("m.order_num"); - List list = baseMapper.selectMenuListByUserId(wrapper); - menuList = MapstructUtils.convert(list, SysMenuVo.class); + List list = baseMapper.selectMenuListByUserId(wrapper); + menuList = MapstructUtils.convert(list, SysSaasMenuVo.class); } return menuList; } @@ -130,8 +140,8 @@ public class SysMenuServiceImpl implements ISysMenuService { * @return 菜单列表 */ @Override - public List selectMenuTreeByUserId(Long userId) { - List menus; + public List selectMenuTreeByUserId(Long userId) { + List menus; if (LoginHelper.isSuperAdmin(userId)) { menus = baseMapper.selectMenuTreeAll(); } else { @@ -148,7 +158,7 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public List selectMenuListByRoleId(Long roleId) { - SysRole role = roleMapper.selectById(roleId); + Sys2Role role = roleMapper.selectById(roleId); return baseMapper.selectMenuListByRoleId(roleId, role.getMenuCheckStrictly()); } @@ -160,20 +170,20 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public List selectMenuListByPackageId(Long packageId) { - SysTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); + Sys2TenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); if (CollUtil.isEmpty(menuIds)) { return List.of(); } List parentIds = null; if (tenantPackage.getMenuCheckStrictly()) { - parentIds = baseMapper.selectObjs(new LambdaQueryWrapper() - .select(SysMenu::getParentId) - .in(SysMenu::getMenuId, menuIds), x -> {return Convert.toLong(x);}); + parentIds = baseMapper.selectObjs(new LambdaQueryWrapper() + .select(SysSaasMenu::getParentId) + .in(SysSaasMenu::getMenuId, menuIds), x -> {return Convert.toLong(x);}); } - return baseMapper.selectObjs(new LambdaQueryWrapper() - .in(SysMenu::getMenuId, menuIds) - .notIn(CollUtil.isNotEmpty(parentIds), SysMenu::getMenuId, parentIds), x -> {return Convert.toLong(x);}); + return baseMapper.selectObjs(new LambdaQueryWrapper() + .in(SysSaasMenu::getMenuId, menuIds) + .notIn(CollUtil.isNotEmpty(parentIds), SysSaasMenu::getMenuId, parentIds), x -> {return Convert.toLong(x);}); } /** @@ -184,18 +194,18 @@ public class SysMenuServiceImpl implements ISysMenuService { * @return 路由列表 */ @Override - public List buildMenus(List menus) { - List routers = new LinkedList<>(); - for (SysMenu menu : menus) { + public List buildMenus(List menus) { + List routers = new LinkedList<>(); + for (SysSaasMenu menu : menus) { String name = menu.getRouteName() + menu.getMenuId(); - RouterVo router = new RouterVo(); + TwoRouterVo router = new TwoRouterVo(); router.setHidden("1".equals(menu.getVisible())); router.setName(name); router.setPath(menu.getRouterPath()); router.setComponent(menu.getComponentInfo()); router.setQuery(menu.getQueryParam()); - router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); - List cMenus = menu.getChildren(); + router.setMeta(new TwoMetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); + List cMenus = menu.getChildren(); if (CollUtil.isNotEmpty(cMenus) && UserConstants.TYPE_DIR.equals(menu.getMenuType())) { router.setAlwaysShow(true); router.setRedirect("noRedirect"); @@ -203,26 +213,26 @@ public class SysMenuServiceImpl implements ISysMenuService { } else if (menu.isMenuFrame()) { String frameName = StringUtils.capitalize(menu.getPath()) + menu.getMenuId(); router.setMeta(null); - List childrenList = new ArrayList<>(); - RouterVo children = new RouterVo(); + List childrenList = new ArrayList<>(); + TwoRouterVo children = new TwoRouterVo(); children.setPath(menu.getPath()); children.setComponent(menu.getComponent()); children.setName(frameName); - children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); + children.setMeta(new TwoMetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); children.setQuery(menu.getQueryParam()); childrenList.add(children); router.setChildren(childrenList); } else if (menu.getParentId().intValue() == 0 && menu.isInnerLink()) { - router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon())); + router.setMeta(new TwoMetaVo(menu.getMenuName(), menu.getIcon())); router.setPath("/"); - List childrenList = new ArrayList<>(); - RouterVo children = new RouterVo(); - String routerPath = SysMenu.innerLinkReplaceEach(menu.getPath()); + List childrenList = new ArrayList<>(); + TwoRouterVo children = new TwoRouterVo(); + String routerPath = SysSaasMenu.innerLinkReplaceEach(menu.getPath()); String innerLinkName = StringUtils.capitalize(routerPath) + menu.getMenuId(); children.setPath(routerPath); children.setComponent(UserConstants.INNER_LINK); children.setName(innerLinkName); - children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath())); + children.setMeta(new TwoMetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath())); childrenList.add(children); router.setChildren(childrenList); } @@ -238,7 +248,7 @@ public class SysMenuServiceImpl implements ISysMenuService { * @return 下拉树结构列表 */ @Override - public List> buildMenuTreeSelect(List menus) { + public List> buildMenuTreeSelect(List menus) { if (CollUtil.isEmpty(menus)) { return CollUtil.newArrayList(); } @@ -256,7 +266,7 @@ public class SysMenuServiceImpl implements ISysMenuService { * @return 菜单信息 */ @Override - public SysMenuVo selectMenuById(Long menuId) { + public SysSaasMenuVo selectMenuById(Long menuId) { return baseMapper.selectVoById(menuId); } @@ -268,7 +278,7 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public boolean hasChildByMenuId(Long menuId) { - return baseMapper.exists(new LambdaQueryWrapper().eq(SysMenu::getParentId, menuId)); + return baseMapper.exists(new LambdaQueryWrapper().eq(SysSaasMenu::getParentId, menuId)); } /** @@ -279,7 +289,7 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public boolean checkMenuExistRole(Long menuId) { - return roleMenuMapper.exists(new LambdaQueryWrapper().eq(SysRoleMenu::getMenuId, menuId)); + return roleMenuMapper.exists(new LambdaQueryWrapper().eq(Sys2RoleMenu::getMenuId, menuId)); } /** @@ -289,8 +299,8 @@ public class SysMenuServiceImpl implements ISysMenuService { * @return 结果 */ @Override - public int insertMenu(SysMenuBo bo) { - SysMenu menu = MapstructUtils.convert(bo, SysMenu.class); + public int insertMenu(SysSaasMenuBo bo) { + SysSaasMenu menu = MapstructUtils.convert(bo, SysSaasMenu.class); return baseMapper.insert(menu); } @@ -301,8 +311,8 @@ public class SysMenuServiceImpl implements ISysMenuService { * @return 结果 */ @Override - public int updateMenu(SysMenuBo bo) { - SysMenu menu = MapstructUtils.convert(bo, SysMenu.class); + public int updateMenu(SysSaasMenuBo bo) { + SysSaasMenu menu = MapstructUtils.convert(bo, SysSaasMenu.class); return baseMapper.updateById(menu); } @@ -324,11 +334,11 @@ public class SysMenuServiceImpl implements ISysMenuService { * @return 结果 */ @Override - public boolean checkMenuNameUnique(SysMenuBo menu) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysMenu::getMenuName, menu.getMenuName()) - .eq(SysMenu::getParentId, menu.getParentId()) - .ne(ObjectUtil.isNotNull(menu.getMenuId()), SysMenu::getMenuId, menu.getMenuId())); + public boolean checkMenuNameUnique(SysSaasMenuBo menu) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysSaasMenu::getMenuName, menu.getMenuName()) + .eq(SysSaasMenu::getParentId, menu.getParentId()) + .ne(ObjectUtil.isNotNull(menu.getMenuId()), SysSaasMenu::getMenuId, menu.getMenuId())); return !exist; } @@ -339,9 +349,9 @@ public class SysMenuServiceImpl implements ISysMenuService { * @param parentId 传入的父节点ID * @return String */ - private List getChildPerms(List list, int parentId) { - List returnList = new ArrayList<>(); - for (SysMenu t : list) { + private List getChildPerms(List list, int parentId) { + List returnList = new ArrayList<>(); + for (SysSaasMenu t : list) { // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点 if (t.getParentId() == parentId) { recursionFn(list, t); @@ -354,11 +364,11 @@ public class SysMenuServiceImpl implements ISysMenuService { /** * 递归列表 */ - private void recursionFn(List list, SysMenu t) { + private void recursionFn(List list, SysSaasMenu t) { // 得到子节点列表 - List childList = StreamUtils.filter(list, n -> n.getParentId().equals(t.getMenuId())); + List childList = StreamUtils.filter(list, n -> n.getParentId().equals(t.getMenuId())); t.setChildren(childList); - for (SysMenu tChild : childList) { + for (SysSaasMenu tChild : childList) { // 判断是否有子节点 if (list.stream().anyMatch(n -> n.getParentId().equals(tChild.getMenuId()))) { recursionFn(list, tChild); diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/package-info.md b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/package-info.md rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysApplicationMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysApplicationMapper.xml similarity index 67% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysApplicationMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysApplicationMapper.xml index 965729b8f..d70a6517d 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysApplicationMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysApplicationMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysClientMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysClientMapper.xml similarity index 70% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysClientMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysClientMapper.xml index 5b7cb47aa..271ec3ee5 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysClientMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysClientMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysConfigMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysConfigMapper.xml new file mode 100644 index 000000000..525648a6a --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysConfigMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDeptMapper.xml similarity index 63% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysDeptMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDeptMapper.xml index a4b528bf0..f603daf80 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDeptMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDictDataMapper.xml similarity index 73% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysOperLogMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDictDataMapper.xml index d44b91ff0..8fe321028 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDictDataMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDictTypeMapper.xml similarity index 70% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDictTypeMapper.xml index 803c0ca3b..bee9cbddb 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysDictTypeMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysLogininforMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysLogininforMapper.xml new file mode 100644 index 000000000..bdc476791 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysLogininforMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysNoticeMapper.xml similarity index 71% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysNoticeMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysNoticeMapper.xml index dae4eb5c4..e66646dc9 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysNoticeMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOperLogMapper.xml similarity index 73% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysConfigMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOperLogMapper.xml index d819cbc7a..e4b225ea8 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOperLogMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysOssConfigMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOssConfigMapper.xml similarity index 68% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysOssConfigMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOssConfigMapper.xml index 38404a6c3..009cb8e7b 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysOssConfigMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOssConfigMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysOssMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOssMapper.xml similarity index 70% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysOssMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOssMapper.xml index 6b619b943..1a502a9d5 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysOssMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysOssMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysPostMapper.xml similarity index 64% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysPostMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysPostMapper.xml index 5c1299501..12d428eea 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysPostMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysPostMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysRoleDeptMapper.xml similarity index 70% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysRoleDeptMapper.xml index 71a9295f0..0baf6593e 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysRoleDeptMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysRoleMapper.xml similarity index 78% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysRoleMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysRoleMapper.xml index 7c6f90a07..f46e5c67b 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysRoleMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -19,10 +19,10 @@ r.del_flag, r.create_time, r.remark - from sys_role r - left join sys_user_role sur on sur.role_id = r.role_id - left join sys_user u on u.user_id = sur.user_id - left join sys_dept d on u.dept_id = d.dept_id + from sys2_role r + left join sys2_user_role sur on sur.role_id = r.role_id + left join sys2_user u on u.user_id = sur.user_id + left join sys2_dept d on u.dept_id = d.dept_id select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query_param, m.visible, m.status, m.perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time - from sys_menu m - left join sys_role_menu rm on m.menu_id = rm.menu_id - left join sys_role r on rm.role_id = r.role_id + from sys_saas_menu m + left join sys2_role_menu rm on m.menu_id = rm.menu_id + left join sys2_role r on rm.role_id = r.role_id ${ew.getCustomSqlSegment} @@ -32,21 +32,21 @@ m.icon, m.order_num, m.create_time - from sys_menu m - left join sys_role_menu rm on m.menu_id = rm.menu_id and m.status = '0' - left join sys_role r on rm.role_id = r.role_id and r.status = '0' + from sys_saas_menu m + left join sys2_role_menu rm on m.menu_id = rm.menu_id and m.status = '0' + left join sys2_role r on rm.role_id = r.role_id and r.status = '0' where m.menu_type in ('M', 'C') - and r.role_id in (select role_id from sys_user_role where user_id = #{userId}) + and r.role_id in (select role_id from sys2_user_role where user_id = #{userId}) order by m.parent_id, m.order_num select distinct m.perms - from sys_menu m - left join sys_role_menu rm on m.menu_id = rm.menu_id and m.status = '0' - left join sys_role r on r.role_id = rm.role_id and r.status = '0' - where r.role_id in (select role_id from sys_user_role where user_id = #{userId}) + from sys_saas_menu m + left join sys2_role_menu rm on m.menu_id = rm.menu_id and m.status = '0' + left join sys2_role r on r.role_id = rm.role_id and r.status = '0' + where r.role_id in (select role_id from sys2_user_role where user_id = #{userId}) diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysSocialMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSocialMapper.xml similarity index 69% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysSocialMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSocialMapper.xml index dbd653513..6ee49bee6 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysSocialMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysSocialMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantApplicationMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantApplicationMapper.xml new file mode 100644 index 000000000..6b0406090 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantApplicationMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysTenantMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantMapper.xml similarity index 69% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysTenantMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantMapper.xml index 15b311b78..f9288fb45 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysTenantMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantPackageMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantPackageMapper.xml new file mode 100644 index 000000000..f4927f0c8 --- /dev/null +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysTenantPackageMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysUserMapper.xml similarity index 69% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysUserMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysUserMapper.xml index 2e099fee9..b26db5831 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysUserMapper.xml @@ -2,12 +2,12 @@ - + - + - + @@ -20,7 +20,7 @@ u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark - from sys_user u + from sys2_user u ${ew.getCustomSqlSegment} @@ -33,7 +33,7 @@ u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark - from sys_user u + from sys2_user u ${ew.getCustomSqlSegment} @@ -41,32 +41,32 @@ select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader, u1.user_name as leaderName - from sys_user u - left join sys_dept d on u.dept_id = d.dept_id - left join sys_user u1 on u1.user_id = d.leader + from sys2_user u + left join sys2_dept d on u.dept_id = d.dept_id + left join sys2_user u1 on u1.user_id = d.leader ${ew.getCustomSqlSegment} diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysUserPostMapper.xml similarity index 70% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysUserPostMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysUserPostMapper.xml index 79412f02d..8d5f2f904 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysUserPostMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysUserRoleMapper.xml similarity index 67% rename from ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysUserRoleMapper.xml index 31e1d7645..55c16bfd6 100644 --- a/ruoyi-modules/ruoyi-system-tenant/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/ruoyi-modules/ruoyi-system-saas/src/main/resources/mapper/systemTenant/SysUserRoleMapper.xml @@ -2,11 +2,11 @@ - + diff --git a/script/sql/ry_vue_5.X.sql b/script/sql/ry_vue_5.X.sql index 3e3562d27..f8f4cd8c2 100644 --- a/script/sql/ry_vue_5.X.sql +++ b/script/sql/ry_vue_5.X.sql @@ -402,6 +402,16 @@ insert into sys_menu values('1509', '测试树表修改', '1506', '3', '#', insert into sys_menu values('1510', '测试树表删除', '1506', '4', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:remove', '#', 103, 1, sysdate(), null, null, ''); insert into sys_menu values('1511', '测试树表导出', '1506', '5', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:export', '#', 103, 1, sysdate(), null, null, ''); +-- lizhw 后加 +insert into sys_menu values (1837445872877223939, '多应用菜单管理', '6', '3', 'menu', 'systemSaas/menu/index', '', 1, 0, 'C', '0', '0', 'systemSaas:menu:list', 'tree-table', 103, 1, sysdate(), null, null, '多应用菜单管理菜单'); +-- 菜单管理按钮 +insert into sys_menu values (1837445872877223940, '菜单查询', '6', '1', '', '', '', 1, 0, 'F', '0', '0', 'systemSaas:menu:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values (1837445872877223941, '菜单新增', '6', '2', '', '', '', 1, 0, 'F', '0', '0', 'systemSaas:menu:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values (1837445872877223942, '菜单修改', '6', '3', '', '', '', 1, 0, 'F', '0', '0', 'systemSaas:menu:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values (1837445872877223943, '菜单删除', '6', '4', '', '', '', 1, 0, 'F', '0', '0', 'systemSaas:menu:remove', '#', 103, 1, sysdate(), null, null, ''); + + + -- ---------------------------- -- 6、用户和角色关联表 用户N-1角色 -- ---------------------------- diff --git a/script/sql/tenant/ry_vue_5.X.sql b/script/sql/tenant/ry_vue_5.X.sql index 3e3562d27..b3a0e18eb 100644 --- a/script/sql/tenant/ry_vue_5.X.sql +++ b/script/sql/tenant/ry_vue_5.X.sql @@ -1,7 +1,25 @@ +create table sys_saas_application +( + application_id bigint not null comment 'id' + primary key, + application_name varchar(255) not null comment '应用名称', + application_code varchar(10) not null comment '应用code', + create_dept bigint null comment '创建部门', + create_time datetime null comment '创建时间', + create_by bigint null comment '上传人', + update_time datetime null comment '更新时间', + update_by bigint null comment '更新人', + constraint application_code + unique (application_code), + constraint application_name + unique (application_name) +) + comment '应用'; + -- ---------------------------- -- 第三方平台授权表 -- ---------------------------- -create table sys_social +create table sys2_social ( id bigint not null comment '主键', user_id bigint not null comment '用户ID', @@ -39,7 +57,7 @@ create table sys_social -- ---------------------------- -- 租户表 -- ---------------------------- -create table sys_tenant +create table sys2_tenant ( id bigint(20) not null comment 'id', tenant_id varchar(20) not null comment '租户编号', @@ -69,51 +87,51 @@ create table sys_tenant -- 初始化-租户表数据 -- ---------------------------- -insert into sys_tenant values(1, '000000', '管理组', '15888888888', 'XXX有限公司', null, null, '多租户通用后台管理管理系统', null, null, null, null, -1, '0', '0', 103, 1, sysdate(), null, null); +insert into sys2_tenant values(1, '000000', '管理组', '15888888888', 'XXX有限公司', null, null, '多租户通用后台管理管理系统', null, null, null, null, -1, '0', '0', 103, 1, sysdate(), null, null); -- ---------------------------- -- 租户套餐表 -- ---------------------------- -create table sys_tenant_package ( - package_id bigint(20) not null comment '租户套餐id', - package_name varchar(20) comment '套餐名称', - menu_ids varchar(3000) comment '关联菜单id', - remark varchar(200) comment '备注', - menu_check_strictly tinyint(1) default 1 comment '菜单树选择项是否关联显示', - status char(1) default '0' comment '状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - create_dept bigint(20) comment '创建部门', - create_by bigint(20) comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) comment '更新者', - update_time datetime comment '更新时间', - primary key (package_id) +create table sys2_tenant_package ( + package_id bigint(20) not null comment '租户套餐id', + package_name varchar(20) comment '套餐名称', + menu_ids varchar(3000) comment '关联菜单id', + remark varchar(200) comment '备注', + menu_check_strictly tinyint(1) default 1 comment '菜单树选择项是否关联显示', + status char(1) default '0' comment '状态（0正常 1停用）', + del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', + create_dept bigint(20) comment '创建部门', + create_by bigint(20) comment '创建者', + create_time datetime comment '创建时间', + update_by bigint(20) comment '更新者', + update_time datetime comment '更新时间', + primary key (package_id) ) engine=innodb comment = '租户套餐表'; -- ---------------------------- -- 1、部门表 -- ---------------------------- -create table sys_dept ( - dept_id bigint(20) not null comment '部门id', - tenant_id varchar(20) default '000000' comment '租户编号', - parent_id bigint(20) default 0 comment '父部门id', - ancestors varchar(500) default '' comment '祖级列表', - dept_name varchar(30) default '' comment '部门名称', - dept_category varchar(100) default null comment '部门类别编码', - order_num int(4) default 0 comment '显示顺序', - leader bigint(20) default null comment '负责人', - phone varchar(11) default null comment '联系电话', - email varchar(50) default null comment '邮箱', - status char(1) default '0' comment '部门状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - primary key (dept_id) +create table sys2_dept ( + dept_id bigint(20) not null comment '部门id', + tenant_id varchar(20) default '000000' comment '租户编号', + parent_id bigint(20) default 0 comment '父部门id', + ancestors varchar(500) default '' comment '祖级列表', + dept_name varchar(30) default '' comment '部门名称', + dept_category varchar(100) default null comment '部门类别编码', + order_num int(4) default 0 comment '显示顺序', + leader bigint(20) default null comment '负责人', + phone varchar(11) default null comment '联系电话', + email varchar(50) default null comment '邮箱', + status char(1) default '0' comment '部门状态（0正常 1停用）', + del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', + create_dept bigint(20) default null comment '创建部门', + create_by bigint(20) default null comment '创建者', + create_time datetime comment '创建时间', + update_by bigint(20) default null comment '更新者', + update_time datetime comment '更新时间', + primary key (dept_id) ) engine=innodb comment = '部门表'; -- ---------------------------- @@ -121,57 +139,57 @@ create table sys_dept ( -- ---------------------------- -insert into sys_dept values(100, '000000', 0, '0', 'XXX科技', null,0, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(101, '000000', 100, '0,100', '深圳总公司', null,1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(102, '000000', 100, '0,100', '长沙分公司', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(103, '000000', 101, '0,100,101', '研发部门', null,1, 1, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(104, '000000', 101, '0,100,101', '市场部门', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(105, '000000', 101, '0,100,101', '测试部门', null,3, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(106, '000000', 101, '0,100,101', '财务部门', null,4, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(107, '000000', 101, '0,100,101', '运维部门', null,5, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(108, '000000', 102, '0,100,102', '市场部门', null,1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_dept values(109, '000000', 102, '0,100,102', '财务部门', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); +insert into sys2_dept values(100, '000000', 0, '0', 'XXX科技', null,0, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); +insert into sys2_dept values(101, '000000', 100, '0,100', '深圳总公司', null,1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); +insert into sys2_dept values(102, '000000', 100, '0,100', '长沙分公司', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); +insert into sys2_dept values(103, '000000', 101, '0,100,101', '研发部门', null,1, 1, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); +insert into sys2_dept values(104, '000000', 101, '0,100,101', '市场部门', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); +insert into sys2_dept values(105, '000000', 101, '0,100,101', '测试部门', null,3, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); +insert into sys2_dept values(106, '000000', 101, '0,100,101', '财务部门', null,4, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); +insert into sys2_dept values(107, '000000', 101, '0,100,101', '运维部门', null,5, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); +insert into sys2_dept values(108, '000000', 102, '0,100,102', '市场部门', null,1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); +insert into sys2_dept values(109, '000000', 102, '0,100,102', '财务部门', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -- ---------------------------- -- 2、用户信息表 -- ---------------------------- -create table sys_user ( - user_id bigint(20) not null comment '用户ID', - tenant_id varchar(20) default '000000' comment '租户编号', - dept_id bigint(20) default null comment '部门ID', - user_name varchar(30) not null comment '用户账号', - nick_name varchar(30) not null comment '用户昵称', - user_type varchar(10) default 'sys_user' comment '用户类型（sys_user系统用户）', - email varchar(50) default '' comment '用户邮箱', - phonenumber varchar(11) default '' comment '手机号码', - sex char(1) default '0' comment '用户性别（0男 1女 2未知）', - avatar bigint(20) comment '头像地址', - password varchar(100) default '' comment '密码', - status char(1) default '0' comment '帐号状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - login_ip varchar(128) default '' comment '最后登录IP', - login_date datetime comment '最后登录时间', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (user_id) +create table sys2_user ( + user_id bigint(20) not null comment '用户ID', + tenant_id varchar(20) default '000000' comment '租户编号', + dept_id bigint(20) default null comment '部门ID', + user_name varchar(30) not null comment '用户账号', + nick_name varchar(30) not null comment '用户昵称', + user_type varchar(10) default 'sys2_user' comment '用户类型（sys2_user系统用户）', + email varchar(50) default '' comment '用户邮箱', + phonenumber varchar(11) default '' comment '手机号码', + sex char(1) default '0' comment '用户性别（0男 1女 2未知）', + avatar bigint(20) comment '头像地址', + password varchar(100) default '' comment '密码', + status char(1) default '0' comment '帐号状态（0正常 1停用）', + del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', + login_ip varchar(128) default '' comment '最后登录IP', + login_date datetime comment '最后登录时间', + create_dept bigint(20) default null comment '创建部门', + create_by bigint(20) default null comment '创建者', + create_time datetime comment '创建时间', + update_by bigint(20) default null comment '更新者', + update_time datetime comment '更新时间', + remark varchar(500) default null comment '备注', + primary key (user_id) ) engine=innodb comment = '用户信息表'; -- ---------------------------- -- 初始化-用户信息表数据 -- ---------------------------- -insert into sys_user values(1, '000000', 103, 'admin', '疯狂的狮子Li', 'sys_user', 'crazyLionLi@163.com', '15888888888', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), null, null, '管理员'); -insert into sys_user values(3, '000000', 108, 'test', '本部门及以下 密码666666', 'sys_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), 3, sysdate(), null); -insert into sys_user values(4, '000000', 102, 'test1', '仅本人 密码666666', 'sys_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), 4, sysdate(), null); +insert into sys2_user values(1, '000000', 103, 'admin', '疯狂的狮子Li', 'sys2_user', 'crazyLionLi@163.com', '15888888888', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), null, null, '管理员'); +insert into sys2_user values(3, '000000', 108, 'test', '本部门及以下 密码666666', 'sys2_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), 3, sysdate(), null); +insert into sys2_user values(4, '000000', 102, 'test1', '仅本人 密码666666', 'sys2_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), 4, sysdate(), null); -- ---------------------------- -- 3、岗位信息表 -- ---------------------------- -create table sys_post +create table sys2_post ( post_id bigint(20) not null comment '岗位ID', tenant_id varchar(20) default '000000' comment '租户编号', @@ -193,340 +211,356 @@ create table sys_post -- ---------------------------- -- 初始化-岗位信息表数据 -- ---------------------------- -insert into sys_post values(1, '000000', 103, 'ceo', null, '董事长', 1, '0', 103, 1, sysdate(), null, null, ''); -insert into sys_post values(2, '000000', 100, 'se', null, '项目经理', 2, '0', 103, 1, sysdate(), null, null, ''); -insert into sys_post values(3, '000000', 100, 'hr', null, '人力资源', 3, '0', 103, 1, sysdate(), null, null, ''); -insert into sys_post values(4, '000000', 100, 'user', null, '普通员工', 4, '0', 103, 1, sysdate(), null, null, ''); +insert into sys2_post values(1, '000000', 103, 'ceo', null, '董事长', 1, '0', 103, 1, sysdate(), null, null, ''); +insert into sys2_post values(2, '000000', 100, 'se', null, '项目经理', 2, '0', 103, 1, sysdate(), null, null, ''); +insert into sys2_post values(3, '000000', 100, 'hr', null, '人力资源', 3, '0', 103, 1, sysdate(), null, null, ''); +insert into sys2_post values(4, '000000', 100, 'user', null, '普通员工', 4, '0', 103, 1, sysdate(), null, null, ''); -- ---------------------------- -- 4、角色信息表 -- ---------------------------- -create table sys_role ( - role_id bigint(20) not null comment '角色ID', - tenant_id varchar(20) default '000000' comment '租户编号', - role_name varchar(30) not null comment '角色名称', - role_key varchar(100) not null comment '角色权限字符串', - role_sort int(4) not null comment '显示顺序', - data_scope char(1) default '1' comment '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）', - menu_check_strictly tinyint(1) default 1 comment '菜单树选择项是否关联显示', - dept_check_strictly tinyint(1) default 1 comment '部门树选择项是否关联显示', - status char(1) not null comment '角色状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (role_id) +create table sys2_role ( + role_id bigint(20) not null comment '角色ID', + tenant_id varchar(20) default '000000' comment '租户编号', + role_name varchar(30) not null comment '角色名称', + role_key varchar(100) not null comment '角色权限字符串', + role_sort int(4) not null comment '显示顺序', + data_scope char(1) default '1' comment '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）', + menu_check_strictly tinyint(1) default 1 comment '菜单树选择项是否关联显示', + dept_check_strictly tinyint(1) default 1 comment '部门树选择项是否关联显示', + status char(1) not null comment '角色状态（0正常 1停用）', + del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', + create_dept bigint(20) default null comment '创建部门', + create_by bigint(20) default null comment '创建者', + create_time datetime comment '创建时间', + update_by bigint(20) default null comment '更新者', + update_time datetime comment '更新时间', + remark varchar(500) default null comment '备注', + primary key (role_id) ) engine=innodb comment = '角色信息表'; -- ---------------------------- -- 初始化-角色信息表数据 -- ---------------------------- -insert into sys_role values(1, '000000', '超级管理员', 'superadmin', 1, 1, 1, 1, '0', '0', 103, 1, sysdate(), null, null, '超级管理员'); -insert into sys_role values(3, '000000', '本部门及以下', 'test1', 3, 4, 1, 1, '0', '0', 103, 1, sysdate(), null, null, ''); -insert into sys_role values(4, '000000', '仅本人', 'test2', 4, 5, 1, 1, '0', '0', 103, 1, sysdate(), null, null, ''); +insert into sys2_role values(1, '000000', '超级管理员', 'superadmin', 1, 1, 1, 1, '0', '0', 103, 1, sysdate(), null, null, '超级管理员'); +insert into sys2_role values(3, '000000', '本部门及以下', 'test1', 3, 4, 1, 1, '0', '0', 103, 1, sysdate(), null, null, ''); +insert into sys2_role values(4, '000000', '仅本人', 'test2', 4, 5, 1, 1, '0', '0', 103, 1, sysdate(), null, null, ''); -- ---------------------------- -- 5、菜单权限表 -- ---------------------------- -create table sys_menu ( - menu_id bigint(20) not null comment '菜单ID', - menu_name varchar(50) not null comment '菜单名称', - parent_id bigint(20) default 0 comment '父菜单ID', - order_num int(4) default 0 comment '显示顺序', - path varchar(200) default '' comment '路由地址', - component varchar(255) default null comment '组件路径', - query_param varchar(255) default null comment '路由参数', - is_frame int(1) default 1 comment '是否为外链（0是 1否）', - is_cache int(1) default 0 comment '是否缓存（0缓存 1不缓存）', - menu_type char(1) default '' comment '菜单类型（M目录 C菜单 F按钮）', - visible char(1) default 0 comment '显示状态（0显示 1隐藏）', - status char(1) default 0 comment '菜单状态（0正常 1停用）', - perms varchar(100) default null comment '权限标识', - icon varchar(100) default '#' comment '菜单图标', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default '' comment '备注', - primary key (menu_id) -) engine=innodb comment = '菜单权限表'; +-- ---------------------------- +-- 5、菜单权限表 +-- ---------------------------- +create table sys_saas_menu +( + application_id bigint not null comment '应用id', + menu_id bigint(20) not null comment '菜单ID', + menu_name varchar(50) not null comment '菜单名称', + parent_id bigint(20) default 0 comment '父菜单ID', + order_num int(4) default 0 comment '显示顺序', + path varchar(200) default '' comment '路由地址', + component varchar(255) default null comment '组件路径', + query_param varchar(255) default null comment '路由参数', + is_frame int(1) default 1 comment '是否为外链（0是 1否）', + is_cache int(1) default 0 comment '是否缓存（0缓存 1不缓存）', + menu_type char(1) default '' comment '菜单类型（M目录 C菜单 F按钮）', + visible char(1) default 0 comment '显示状态（0显示 1隐藏）', + status char(1) default 0 comment '菜单状态（0正常 1停用）', + perms varchar(100) default null comment '权限标识', + icon varchar(100) default '#' comment '菜单图标', + create_dept bigint(20) default null comment '创建部门', + create_by bigint(20) default null comment '创建者', + create_time datetime comment '创建时间', + update_by bigint(20) default null comment '更新者', + update_time datetime comment '更新时间', + remark varchar(500) default '' comment '备注', + primary key (application_id, menu_id) +) engine = innodb comment = '菜单权限表'; -- ---------------------------- -- 初始化-菜单信息表数据 -- ---------------------------- -- 一级菜单 -insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 103, 1, sysdate(), null, null, '系统管理目录'); -insert into sys_menu values('6', '租户管理', '0', '2', 'tenant', null, '', 1, 0, 'M', '0', '0', '', 'chart', 103, 1, sysdate(), null, null, '租户管理目录'); -insert into sys_menu values('2', '系统监控', '0', '3', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 103, 1, sysdate(), null, null, '系统监控目录'); -insert into sys_menu values('3', '系统工具', '0', '4', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 103, 1, sysdate(), null, null, '系统工具目录'); -insert into sys_menu values('4', 'PLUS官网', '0', '5', 'https://gitee.com/dromara/RuoYi-Vue-Plus', null, '', 0, 0, 'M', '0', '0', '', 'guide', 103, 1, sysdate(), null, null, 'RuoYi-Vue-Plus官网地址'); -insert into sys_menu values('5', '测试菜单', '0', '5', 'demo', null, '', 1, 0, 'M', '0', '0', '', 'star', 103, 1, sysdate(), null, null, '测试菜单'); +insert into sys_saas_menu values (1837790678245658626,'1', '系统管理', '0', '1', 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 103, 1, sysdate(), null, null, '系统管理目录'); +insert into sys_saas_menu values (1837790678245658626,'6', '租户管理', '0', '2', 'tenant', null, '', 1, 0, 'M', '0', '0', '', 'chart', 103, 1, sysdate(), null, null, '租户管理目录'); +insert into sys_saas_menu values (1837790678245658626,'2', '系统监控', '0', '3', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 103, 1, sysdate(), null, null, '系统监控目录'); +insert into sys_saas_menu values (1837790678245658626,'3', '系统工具', '0', '4', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 103, 1, sysdate(), null, null, '系统工具目录'); +insert into sys_saas_menu values (1837790678245658626,'4', 'PLUS官网', '0', '5', 'https://gitee.com/dromara/RuoYi-Vue-Plus', null, '', 0, 0, 'M', '0', '0', '', 'guide', 103, 1, sysdate(), null, null, 'RuoYi-Vue-Plus官网地址'); +insert into sys_saas_menu values (1837790678245658626,'5', '测试菜单', '0', '5', 'demo', null, '', 1, 0, 'M', '0', '0', '', 'star', 103, 1, sysdate(), null, null, '测试菜单'); -- 二级菜单 -insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 103, 1, sysdate(), null, null, '用户管理菜单'); -insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 103, 1, sysdate(), null, null, '角色管理菜单'); -insert into sys_menu values('102', '菜单管理', '1', '3', 'menu', 'system/menu/index', '', 1, 0, 'C', '0', '0', 'system:menu:list', 'tree-table', 103, 1, sysdate(), null, null, '菜单管理菜单'); -insert into sys_menu values('103', '部门管理', '1', '4', 'dept', 'system/dept/index', '', 1, 0, 'C', '0', '0', 'system:dept:list', 'tree', 103, 1, sysdate(), null, null, '部门管理菜单'); -insert into sys_menu values('104', '岗位管理', '1', '5', 'post', 'system/post/index', '', 1, 0, 'C', '0', '0', 'system:post:list', 'post', 103, 1, sysdate(), null, null, '岗位管理菜单'); -insert into sys_menu values('105', '字典管理', '1', '6', 'dict', 'system/dict/index', '', 1, 0, 'C', '0', '0', 'system:dict:list', 'dict', 103, 1, sysdate(), null, null, '字典管理菜单'); -insert into sys_menu values('106', '参数设置', '1', '7', 'config', 'system/config/index', '', 1, 0, 'C', '0', '0', 'system:config:list', 'edit', 103, 1, sysdate(), null, null, '参数设置菜单'); -insert into sys_menu values('107', '通知公告', '1', '8', 'notice', 'system/notice/index', '', 1, 0, 'C', '0', '0', 'system:notice:list', 'message', 103, 1, sysdate(), null, null, '通知公告菜单'); -insert into sys_menu values('108', '日志管理', '1', '9', 'log', '', '', 1, 0, 'M', '0', '0', '', 'log', 103, 1, sysdate(), null, null, '日志管理菜单'); -insert into sys_menu values('109', '在线用户', '2', '1', 'online', 'monitor/online/index', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 103, 1, sysdate(), null, null, '在线用户菜单'); -insert into sys_menu values('113', '缓存监控', '2', '5', 'cache', 'monitor/cache/index', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis', 103, 1, sysdate(), null, null, '缓存监控菜单'); -insert into sys_menu values('115', '代码生成', '3', '2', 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 103, 1, sysdate(), null, null, '代码生成菜单'); -insert into sys_menu values('121', '租户管理', '6', '1', 'tenant', 'system/tenant/index', '', 1, 0, 'C', '0', '0', 'system:tenant:list', 'list', 103, 1, sysdate(), null, null, '租户管理菜单'); -insert into sys_menu values('122', '租户套餐管理', '6', '2', 'tenantPackage', 'system/tenantPackage/index', '', 1, 0, 'C', '0', '0', 'system:tenantPackage:list', 'form', 103, 1, sysdate(), null, null, '租户套餐管理菜单'); -insert into sys_menu values('123', '客户端管理', '1', '11', 'client', 'system/client/index', '', 1, 0, 'C', '0', '0', 'system:client:list', 'international', 103, 1, sysdate(), null, null, '客户端管理菜单'); +insert into sys_saas_menu values (1837790678245658626,'100', '用户管理', '1', '1', 'user', 'system2/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 103, 1, sysdate(), null, null, '用户管理菜单'); +insert into sys_saas_menu values (1837790678245658626,'101', '角色管理', '1', '2', 'role', 'system2/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 103, 1, sysdate(), null, null, '角色管理菜单'); +insert into sys_saas_menu values (1837790678245658626,'102', '菜单管理', '1', '3', 'menu', 'system2/menu/index', '', 1, 0, 'C', '0', '0', 'system:menu:list', 'tree-table', 103, 1, sysdate(), null, null, '菜单管理菜单'); +insert into sys_saas_menu values (1837790678245658626,'103', '部门管理', '1', '4', 'dept', 'system2/dept/index', '', 1, 0, 'C', '0', '0', 'system:dept:list', 'tree', 103, 1, sysdate(), null, null, '部门管理菜单'); +insert into sys_saas_menu values (1837790678245658626,'104', '岗位管理', '1', '5', 'post', 'system2/post/index', '', 1, 0, 'C', '0', '0', 'system:post:list', 'post', 103, 1, sysdate(), null, null, '岗位管理菜单'); +insert into sys_saas_menu values (1837790678245658626,'105', '字典管理', '1', '6', 'dict', 'system2/dict/index', '', 1, 0, 'C', '0', '0', 'system:dict:list', 'dict', 103, 1, sysdate(), null, null, '字典管理菜单'); +insert into sys_saas_menu values (1837790678245658626,'106', '参数设置', '1', '7', 'config', 'system2/config/index', '', 1, 0, 'C', '0', '0', 'system:config:list', 'edit', 103, 1, sysdate(), null, null, '参数设置菜单'); +insert into sys_saas_menu values (1837790678245658626,'107', '通知公告', '1', '8', 'notice', 'system2/notice/index', '', 1, 0, 'C', '0', '0', 'system:notice:list', 'message', 103, 1, sysdate(), null, null, '通知公告菜单'); +insert into sys_saas_menu values (1837790678245658626,'108', '日志管理', '1', '9', 'log', '', '', 1, 0, 'M', '0', '0', '', 'log', 103, 1, sysdate(), null, null, '日志管理菜单'); +insert into sys_saas_menu values (1837790678245658626,'109', '在线用户', '2', '1', 'online', 'monitor/online/index', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 103, 1, sysdate(), null, null, '在线用户菜单'); +insert into sys_saas_menu values (1837790678245658626,'113', '缓存监控', '2', '5', 'cache', 'monitor/cache/index', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis', 103, 1, sysdate(), null, null, '缓存监控菜单'); +insert into sys_saas_menu values (1837790678245658626,'115', '代码生成', '3', '2', 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 103, 1, sysdate(), null, null, '代码生成菜单'); +insert into sys_saas_menu values (1837790678245658626,'121', '租户管理', '6', '1', 'tenant', 'system/tenant/index', '', 1, 0, 'C', '0', '0', 'system:tenant:list', 'list', 103, 1, sysdate(), null, null, '租户管理菜单'); +insert into sys_saas_menu values (1837790678245658626,'122', '租户套餐管理', '6', '2', 'tenantPackage', 'system/tenantPackage/index', '', 1, 0, 'C', '0', '0', 'system:tenantPackage:list', 'form', 103, 1, sysdate(), null, null, + '租户套餐管理菜单'); +insert into sys_saas_menu values (1837790678245658626,'123', '客户端管理', '1', '11', 'client', 'system/client/index', '', 1, 0, 'C', '0', '0', 'system:client:list', 'international', 103, 1, sysdate(), null, null, '客户端管理菜单'); -- springboot-admin监控 -insert into sys_menu values('117', 'Admin监控', '2', '5', 'Admin', 'monitor/admin/index', '', 1, 0, 'C', '0', '0', 'monitor:admin:list', 'dashboard', 103, 1, sysdate(), null, null, 'Admin监控菜单'); +insert into sys_saas_menu values (1837790678245658626,'117', 'Admin监控', '2', '5', 'Admin', 'monitor/admin/index', '', 1, 0, 'C', '0', '0', 'monitor:admin:list', 'dashboard', 103, 1, sysdate(), null, null, 'Admin监控菜单'); -- oss菜单 -insert into sys_menu values('118', '文件管理', '1', '10', 'oss', 'system/oss/index', '', 1, 0, 'C', '0', '0', 'system:oss:list', 'upload', 103, 1, sysdate(), null, null, '文件管理菜单'); +insert into sys_saas_menu values (1837790678245658626,'118', '文件管理', '1', '10', 'oss', 'system/oss/index', '', 1, 0, 'C', '0', '0', 'system:oss:list', 'upload', 103, 1, sysdate(), null, null, '文件管理菜单'); -- snail-job server控制台 -insert into sys_menu values('120', '任务调度中心', '2', '6', 'snailjob', 'monitor/snailjob/index', '', 1, 0, 'C', '0', '0', 'monitor:snailjob:list', 'job', 103, 1, sysdate(), null, null, 'SnailJob控制台菜单'); +insert into sys_saas_menu values (1837790678245658626,'120', '任务调度中心', '2', '6', 'snailjob', 'monitor/snailjob/index', '', 1, 0, 'C', '0', '0', 'monitor:snailjob:list', 'job', 103, 1, sysdate(), null, null, 'SnailJob控制台菜单'); -- 三级菜单 -insert into sys_menu values('500', '操作日志', '108', '1', 'operlog', 'monitor/operlog/index', '', 1, 0, 'C', '0', '0', 'monitor:operlog:list', 'form', 103, 1, sysdate(), null, null, '操作日志菜单'); -insert into sys_menu values('501', '登录日志', '108', '2', 'logininfor', 'monitor/logininfor/index', '', 1, 0, 'C', '0', '0', 'monitor:logininfor:list', 'logininfor', 103, 1, sysdate(), null, null, '登录日志菜单'); +insert into sys_saas_menu values (1837790678245658626,'500', '操作日志', '108', '1', 'operlog', 'monitor/operlog/index', '', 1, 0, 'C', '0', '0', 'monitor:operlog:list', 'form', 103, 1, sysdate(), null, null, '操作日志菜单'); +insert into sys_saas_menu values (1837790678245658626,'501', '登录日志', '108', '2', 'logininfor', 'monitor/logininfor/index', '', 1, 0, 'C', '0', '0', 'monitor:logininfor:list', 'logininfor', 103, 1, sysdate(), null, null, '登录日志菜单'); -- 用户管理按钮 -insert into sys_menu values('1001', '用户查询', '100', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:user:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1002', '用户新增', '100', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:user:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1003', '用户修改', '100', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1004', '用户删除', '100', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1005', '用户导出', '100', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:user:export', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1006', '用户导入', '100', '6', '', '', '', 1, 0, 'F', '0', '0', 'system:user:import', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1007', '重置密码', '100', '7', '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1001', '用户查询', '100', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:user:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1002', '用户新增', '100', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:user:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1003', '用户修改', '100', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1004', '用户删除', '100', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1005', '用户导出', '100', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:user:export', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1006', '用户导入', '100', '6', '', '', '', 1, 0, 'F', '0', '0', 'system:user:import', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1007', '重置密码', '100', '7', '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd', '#', 103, 1, sysdate(), null, null, ''); -- 角色管理按钮 -insert into sys_menu values('1008', '角色查询', '101', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:role:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1009', '角色新增', '101', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:role:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1010', '角色修改', '101', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1011', '角色删除', '101', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1012', '角色导出', '101', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:role:export', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1008', '角色查询', '101', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:role:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1009', '角色新增', '101', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:role:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1010', '角色修改', '101', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1011', '角色删除', '101', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1012', '角色导出', '101', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:role:export', '#', 103, 1, sysdate(), null, null, ''); -- 菜单管理按钮 -insert into sys_menu values('1013', '菜单查询', '102', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1014', '菜单新增', '102', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1015', '菜单修改', '102', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1016', '菜单删除', '102', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1013', '菜单查询', '102', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1014', '菜单新增', '102', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1015', '菜单修改', '102', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1016', '菜单删除', '102', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove', '#', 103, 1, sysdate(), null, null, ''); -- 部门管理按钮 -insert into sys_menu values('1017', '部门查询', '103', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1018', '部门新增', '103', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1019', '部门修改', '103', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1020', '部门删除', '103', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1017', '部门查询', '103', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1018', '部门新增', '103', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1019', '部门修改', '103', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1020', '部门删除', '103', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove', '#', 103, 1, sysdate(), null, null, ''); -- 岗位管理按钮 -insert into sys_menu values('1021', '岗位查询', '104', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:post:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1022', '岗位新增', '104', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:post:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1023', '岗位修改', '104', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1024', '岗位删除', '104', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1025', '岗位导出', '104', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:post:export', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1021', '岗位查询', '104', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:post:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1022', '岗位新增', '104', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:post:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1023', '岗位修改', '104', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1024', '岗位删除', '104', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1025', '岗位导出', '104', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:post:export', '#', 103, 1, sysdate(), null, null, ''); -- 字典管理按钮 -insert into sys_menu values('1026', '字典查询', '105', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1027', '字典新增', '105', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1028', '字典修改', '105', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1029', '字典删除', '105', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1030', '字典导出', '105', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1026', '字典查询', '105', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1027', '字典新增', '105', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1028', '字典修改', '105', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1029', '字典删除', '105', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1030', '字典导出', '105', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export', '#', 103, 1, sysdate(), null, null, ''); -- 参数设置按钮 -insert into sys_menu values('1031', '参数查询', '106', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1032', '参数新增', '106', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1033', '参数修改', '106', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1034', '参数删除', '106', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1035', '参数导出', '106', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1031', '参数查询', '106', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1032', '参数新增', '106', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1033', '参数修改', '106', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1034', '参数删除', '106', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1035', '参数导出', '106', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export', '#', 103, 1, sysdate(), null, null, ''); -- 通知公告按钮 -insert into sys_menu values('1036', '公告查询', '107', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1037', '公告新增', '107', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1038', '公告修改', '107', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1039', '公告删除', '107', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1036', '公告查询', '107', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1037', '公告新增', '107', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1038', '公告修改', '107', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1039', '公告删除', '107', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove', '#', 103, 1, sysdate(), null, null, ''); -- 操作日志按钮 -insert into sys_menu values('1040', '操作查询', '500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1041', '操作删除', '500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1042', '日志导出', '500', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:export', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1040', '操作查询', '500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1041', '操作删除', '500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1042', '日志导出', '500', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:export', '#', 103, 1, sysdate(), null, null, ''); -- 登录日志按钮 -insert into sys_menu values('1043', '登录查询', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1044', '登录删除', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1045', '日志导出', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1050', '账户解锁', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1043', '登录查询', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1044', '登录删除', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1045', '日志导出', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1050', '账户解锁', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock', '#', 103, 1, sysdate(), null, null, ''); -- 在线用户按钮 -insert into sys_menu values('1046', '在线查询', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1047', '批量强退', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1048', '单条强退', '109', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1046', '在线查询', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1047', '批量强退', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1048', '单条强退', '109', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 103, 1, sysdate(), null, null, ''); -- 代码生成按钮 -insert into sys_menu values('1055', '生成查询', '115', '1', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1056', '生成修改', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1057', '生成删除', '115', '3', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1058', '导入代码', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1059', '预览代码', '115', '4', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1060', '生成代码', '115', '5', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1055', '生成查询', '115', '1', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1056', '生成修改', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1057', '生成删除', '115', '3', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1058', '导入代码', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1059', '预览代码', '115', '4', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1060', '生成代码', '115', '5', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code', '#', 103, 1, sysdate(), null, null, ''); -- oss相关按钮 -insert into sys_menu values('1600', '文件查询', '118', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1601', '文件上传', '118', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:upload', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1602', '文件下载', '118', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:download', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1603', '文件删除', '118', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1620', '配置列表', '118', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:list', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1621', '配置添加', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1622', '配置编辑', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1623', '配置删除', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1600', '文件查询', '118', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1601', '文件上传', '118', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:upload', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1602', '文件下载', '118', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:download', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1603', '文件删除', '118', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1620', '配置列表', '118', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:list', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1621', '配置添加', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1622', '配置编辑', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1623', '配置删除', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:remove', '#', 103, 1, sysdate(), null, null, ''); -- 租户管理相关按钮 -insert into sys_menu values ('1606', '租户查询', '121', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('1607', '租户新增', '121', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('1608', '租户修改', '121', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('1609', '租户删除', '121', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('1610', '租户导出', '121', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:export', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1606', '租户查询', '121', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1607', '租户新增', '121', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1608', '租户修改', '121', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1609', '租户删除', '121', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1610', '租户导出', '121', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:export', '#', 103, 1, sysdate(), null, null, ''); -- 租户套餐管理相关按钮 -insert into sys_menu values ('1611', '租户套餐查询', '122', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('1612', '租户套餐新增', '122', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('1613', '租户套餐修改', '122', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('1614', '租户套餐删除', '122', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values ('1615', '租户套餐导出', '122', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:export', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1611', '租户套餐查询', '122', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1612', '租户套餐新增', '122', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1613', '租户套餐修改', '122', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1614', '租户套餐删除', '122', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1615', '租户套餐导出', '122', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:export', '#', 103, 1, sysdate(), null, null, ''); -- 客户端管理按钮 -insert into sys_menu values('1061', '客户端管理查询', '123', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1062', '客户端管理新增', '123', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1063', '客户端管理修改', '123', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1064', '客户端管理删除', '123', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1065', '客户端管理导出', '123', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:export', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1061', '客户端管理查询', '123', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1062', '客户端管理新增', '123', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1063', '客户端管理修改', '123', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1064', '客户端管理删除', '123', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1065', '客户端管理导出', '123', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:export', '#', 103, 1, sysdate(), null, null, ''); -- 测试菜单 -insert into sys_menu values('1500', '测试单表', '5', '1', 'demo', 'demo/demo/index', '', 1, 0, 'C', '0', '0', 'demo:demo:list', '#', 103, 1, sysdate(), null, null, '测试单表菜单'); -insert into sys_menu values('1501', '测试单表查询', '1500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1502', '测试单表新增', '1500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1503', '测试单表修改', '1500', '3', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1504', '测试单表删除', '1500', '4', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1505', '测试单表导出', '1500', '5', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:export', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1506', '测试树表', '5', '1', 'tree', 'demo/tree/index', '', 1, 0, 'C', '0', '0', 'demo:tree:list', '#', 103, 1, sysdate(), null, null, '测试树表菜单'); -insert into sys_menu values('1507', '测试树表查询', '1506', '1', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1508', '测试树表新增', '1506', '2', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1509', '测试树表修改', '1506', '3', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1510', '测试树表删除', '1506', '4', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_menu values('1511', '测试树表导出', '1506', '5', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:export', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1500', '测试单表', '5', '1', 'demo', 'demo/demo/index', '', 1, 0, 'C', '0', '0', 'demo:demo:list', '#', 103, 1, sysdate(), null, null, '测试单表菜单'); +insert into sys_saas_menu values (1837790678245658626,'1501', '测试单表查询', '1500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1502', '测试单表新增', '1500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1503', '测试单表修改', '1500', '3', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1504', '测试单表删除', '1500', '4', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1505', '测试单表导出', '1500', '5', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:export', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1506', '测试树表', '5', '1', 'tree', 'demo/tree/index', '', 1, 0, 'C', '0', '0', 'demo:tree:list', '#', 103, 1, sysdate(), null, null, '测试树表菜单'); +insert into sys_saas_menu values (1837790678245658626,'1507', '测试树表查询', '1506', '1', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1508', '测试树表新增', '1506', '2', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1509', '测试树表修改', '1506', '3', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1510', '测试树表删除', '1506', '4', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:remove', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_saas_menu values (1837790678245658626,'1511', '测试树表导出', '1506', '5', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:export', '#', 103, 1, sysdate(), null, null, ''); + + +-- lizhw后加的 +insert into sys_menu values (1837445872877223939, '多应用菜单管理', '6', '3', 'menu', 'system2/menu/index', '', 1, 0, 'C', '0', '0', 'system2:menu:list', 'tree-table', 103, 1, sysdate(), null, null, '多应用菜单管理菜单'); +-- 多应用菜单管理 +insert into sys_menu values (1837445872877223940, '多应用菜单查询', '6', '1', '', '', '', 1, 0, 'F', '0', '0', 'system2:menu:query', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values (1837445872877223941, '多应用菜单新增', '6', '2', '', '', '', 1, 0, 'F', '0', '0', 'system2:menu:add', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values (1837445872877223942, '多应用菜单修改', '6', '3', '', '', '', 1, 0, 'F', '0', '0', 'system2:menu:edit', '#', 103, 1, sysdate(), null, null, ''); +insert into sys_menu values (1837445872877223943, '多应用菜单删除', '6', '4', '', '', '', 1, 0, 'F', '0', '0', 'system2:menu:remove', '#', 103, 1, sysdate(), null, null, ''); + -- ---------------------------- -- 6、用户和角色关联表 用户N-1角色 -- ---------------------------- -create table sys_user_role ( - user_id bigint(20) not null comment '用户ID', - role_id bigint(20) not null comment '角色ID', - primary key(user_id, role_id) +create table sys2_user_role ( + user_id bigint(20) not null comment '用户ID', + role_id bigint(20) not null comment '角色ID', + primary key(user_id, role_id) ) engine=innodb comment = '用户和角色关联表'; -- ---------------------------- -- 初始化-用户和角色关联表数据 -- ---------------------------- -insert into sys_user_role values ('1', '1'); -insert into sys_user_role values ('3', '3'); -insert into sys_user_role values ('4', '4'); +insert into sys2_user_role values ('1', '1'); +insert into sys2_user_role values ('3', '3'); +insert into sys2_user_role values ('4', '4'); -- ---------------------------- -- 7、角色和菜单关联表 角色1-N菜单 -- ---------------------------- -create table sys_role_menu ( - role_id bigint(20) not null comment '角色ID', - menu_id bigint(20) not null comment '菜单ID', - primary key(role_id, menu_id) +create table sys2_role_menu ( + role_id bigint(20) not null comment '角色ID', + menu_id bigint(20) not null comment '菜单ID', + primary key(role_id, menu_id) ) engine=innodb comment = '角色和菜单关联表'; -- ---------------------------- -- 初始化-角色和菜单关联表数据 -- ---------------------------- -insert into sys_role_menu values ('3', '1'); -insert into sys_role_menu values ('3', '5'); -insert into sys_role_menu values ('3', '100'); -insert into sys_role_menu values ('3', '101'); -insert into sys_role_menu values ('3', '102'); -insert into sys_role_menu values ('3', '103'); -insert into sys_role_menu values ('3', '104'); -insert into sys_role_menu values ('3', '105'); -insert into sys_role_menu values ('3', '106'); -insert into sys_role_menu values ('3', '107'); -insert into sys_role_menu values ('3', '108'); -insert into sys_role_menu values ('3', '500'); -insert into sys_role_menu values ('3', '501'); -insert into sys_role_menu values ('3', '1001'); -insert into sys_role_menu values ('3', '1002'); -insert into sys_role_menu values ('3', '1003'); -insert into sys_role_menu values ('3', '1004'); -insert into sys_role_menu values ('3', '1005'); -insert into sys_role_menu values ('3', '1006'); -insert into sys_role_menu values ('3', '1007'); -insert into sys_role_menu values ('3', '1008'); -insert into sys_role_menu values ('3', '1009'); -insert into sys_role_menu values ('3', '1010'); -insert into sys_role_menu values ('3', '1011'); -insert into sys_role_menu values ('3', '1012'); -insert into sys_role_menu values ('3', '1013'); -insert into sys_role_menu values ('3', '1014'); -insert into sys_role_menu values ('3', '1015'); -insert into sys_role_menu values ('3', '1016'); -insert into sys_role_menu values ('3', '1017'); -insert into sys_role_menu values ('3', '1018'); -insert into sys_role_menu values ('3', '1019'); -insert into sys_role_menu values ('3', '1020'); -insert into sys_role_menu values ('3', '1021'); -insert into sys_role_menu values ('3', '1022'); -insert into sys_role_menu values ('3', '1023'); -insert into sys_role_menu values ('3', '1024'); -insert into sys_role_menu values ('3', '1025'); -insert into sys_role_menu values ('3', '1026'); -insert into sys_role_menu values ('3', '1027'); -insert into sys_role_menu values ('3', '1028'); -insert into sys_role_menu values ('3', '1029'); -insert into sys_role_menu values ('3', '1030'); -insert into sys_role_menu values ('3', '1031'); -insert into sys_role_menu values ('3', '1032'); -insert into sys_role_menu values ('3', '1033'); -insert into sys_role_menu values ('3', '1034'); -insert into sys_role_menu values ('3', '1035'); -insert into sys_role_menu values ('3', '1036'); -insert into sys_role_menu values ('3', '1037'); -insert into sys_role_menu values ('3', '1038'); -insert into sys_role_menu values ('3', '1039'); -insert into sys_role_menu values ('3', '1040'); -insert into sys_role_menu values ('3', '1041'); -insert into sys_role_menu values ('3', '1042'); -insert into sys_role_menu values ('3', '1043'); -insert into sys_role_menu values ('3', '1044'); -insert into sys_role_menu values ('3', '1045'); -insert into sys_role_menu values ('3', '1500'); -insert into sys_role_menu values ('3', '1501'); -insert into sys_role_menu values ('3', '1502'); -insert into sys_role_menu values ('3', '1503'); -insert into sys_role_menu values ('3', '1504'); -insert into sys_role_menu values ('3', '1505'); -insert into sys_role_menu values ('3', '1506'); -insert into sys_role_menu values ('3', '1507'); -insert into sys_role_menu values ('3', '1508'); -insert into sys_role_menu values ('3', '1509'); -insert into sys_role_menu values ('3', '1510'); -insert into sys_role_menu values ('3', '1511'); -insert into sys_role_menu values ('4', '5'); -insert into sys_role_menu values ('4', '1500'); -insert into sys_role_menu values ('4', '1501'); -insert into sys_role_menu values ('4', '1502'); -insert into sys_role_menu values ('4', '1503'); -insert into sys_role_menu values ('4', '1504'); -insert into sys_role_menu values ('4', '1505'); -insert into sys_role_menu values ('4', '1506'); -insert into sys_role_menu values ('4', '1507'); -insert into sys_role_menu values ('4', '1508'); -insert into sys_role_menu values ('4', '1509'); -insert into sys_role_menu values ('4', '1510'); -insert into sys_role_menu values ('4', '1511'); +insert into sys2_role_menu values ('3', '1'); +insert into sys2_role_menu values ('3', '5'); +insert into sys2_role_menu values ('3', '100'); +insert into sys2_role_menu values ('3', '101'); +insert into sys2_role_menu values ('3', '102'); +insert into sys2_role_menu values ('3', '103'); +insert into sys2_role_menu values ('3', '104'); +insert into sys2_role_menu values ('3', '105'); +insert into sys2_role_menu values ('3', '106'); +insert into sys2_role_menu values ('3', '107'); +insert into sys2_role_menu values ('3', '108'); +insert into sys2_role_menu values ('3', '500'); +insert into sys2_role_menu values ('3', '501'); +insert into sys2_role_menu values ('3', '1001'); +insert into sys2_role_menu values ('3', '1002'); +insert into sys2_role_menu values ('3', '1003'); +insert into sys2_role_menu values ('3', '1004'); +insert into sys2_role_menu values ('3', '1005'); +insert into sys2_role_menu values ('3', '1006'); +insert into sys2_role_menu values ('3', '1007'); +insert into sys2_role_menu values ('3', '1008'); +insert into sys2_role_menu values ('3', '1009'); +insert into sys2_role_menu values ('3', '1010'); +insert into sys2_role_menu values ('3', '1011'); +insert into sys2_role_menu values ('3', '1012'); +insert into sys2_role_menu values ('3', '1013'); +insert into sys2_role_menu values ('3', '1014'); +insert into sys2_role_menu values ('3', '1015'); +insert into sys2_role_menu values ('3', '1016'); +insert into sys2_role_menu values ('3', '1017'); +insert into sys2_role_menu values ('3', '1018'); +insert into sys2_role_menu values ('3', '1019'); +insert into sys2_role_menu values ('3', '1020'); +insert into sys2_role_menu values ('3', '1021'); +insert into sys2_role_menu values ('3', '1022'); +insert into sys2_role_menu values ('3', '1023'); +insert into sys2_role_menu values ('3', '1024'); +insert into sys2_role_menu values ('3', '1025'); +insert into sys2_role_menu values ('3', '1026'); +insert into sys2_role_menu values ('3', '1027'); +insert into sys2_role_menu values ('3', '1028'); +insert into sys2_role_menu values ('3', '1029'); +insert into sys2_role_menu values ('3', '1030'); +insert into sys2_role_menu values ('3', '1031'); +insert into sys2_role_menu values ('3', '1032'); +insert into sys2_role_menu values ('3', '1033'); +insert into sys2_role_menu values ('3', '1034'); +insert into sys2_role_menu values ('3', '1035'); +insert into sys2_role_menu values ('3', '1036'); +insert into sys2_role_menu values ('3', '1037'); +insert into sys2_role_menu values ('3', '1038'); +insert into sys2_role_menu values ('3', '1039'); +insert into sys2_role_menu values ('3', '1040'); +insert into sys2_role_menu values ('3', '1041'); +insert into sys2_role_menu values ('3', '1042'); +insert into sys2_role_menu values ('3', '1043'); +insert into sys2_role_menu values ('3', '1044'); +insert into sys2_role_menu values ('3', '1045'); +insert into sys2_role_menu values ('3', '1500'); +insert into sys2_role_menu values ('3', '1501'); +insert into sys2_role_menu values ('3', '1502'); +insert into sys2_role_menu values ('3', '1503'); +insert into sys2_role_menu values ('3', '1504'); +insert into sys2_role_menu values ('3', '1505'); +insert into sys2_role_menu values ('3', '1506'); +insert into sys2_role_menu values ('3', '1507'); +insert into sys2_role_menu values ('3', '1508'); +insert into sys2_role_menu values ('3', '1509'); +insert into sys2_role_menu values ('3', '1510'); +insert into sys2_role_menu values ('3', '1511'); +insert into sys2_role_menu values ('4', '5'); +insert into sys2_role_menu values ('4', '1500'); +insert into sys2_role_menu values ('4', '1501'); +insert into sys2_role_menu values ('4', '1502'); +insert into sys2_role_menu values ('4', '1503'); +insert into sys2_role_menu values ('4', '1504'); +insert into sys2_role_menu values ('4', '1505'); +insert into sys2_role_menu values ('4', '1506'); +insert into sys2_role_menu values ('4', '1507'); +insert into sys2_role_menu values ('4', '1508'); +insert into sys2_role_menu values ('4', '1509'); +insert into sys2_role_menu values ('4', '1510'); +insert into sys2_role_menu values ('4', '1511'); -- ---------------------------- -- 8、角色和部门关联表 角色1-N部门 -- ---------------------------- -create table sys_role_dept ( - role_id bigint(20) not null comment '角色ID', - dept_id bigint(20) not null comment '部门ID', - primary key(role_id, dept_id) +create table sys2_role_dept ( + role_id bigint(20) not null comment '角色ID', + dept_id bigint(20) not null comment '部门ID', + primary key(role_id, dept_id) ) engine=innodb comment = '角色和部门关联表'; -- ---------------------------- -- 9、用户与岗位关联表 用户1-N岗位 -- ---------------------------- -create table sys_user_post +create table sys2_user_post ( user_id bigint(20) not null comment '用户ID', post_id bigint(20) not null comment '岗位ID', @@ -536,41 +570,41 @@ create table sys_user_post -- ---------------------------- -- 初始化-用户与岗位关联表数据 -- ---------------------------- -insert into sys_user_post values ('1', '1'); +insert into sys2_user_post values ('1', '1'); -- ---------------------------- -- 10、操作日志记录 -- ---------------------------- -create table sys_oper_log ( - oper_id bigint(20) not null comment '日志主键', - tenant_id varchar(20) default '000000' comment '租户编号', - title varchar(50) default '' comment '模块标题', - business_type int(2) default 0 comment '业务类型（0其它 1新增 2修改 3删除）', - method varchar(100) default '' comment '方法名称', - request_method varchar(10) default '' comment '请求方式', - operator_type int(1) default 0 comment '操作类别（0其它 1后台用户 2手机端用户）', - oper_name varchar(50) default '' comment '操作人员', - dept_name varchar(50) default '' comment '部门名称', - oper_url varchar(255) default '' comment '请求URL', - oper_ip varchar(128) default '' comment '主机地址', - oper_location varchar(255) default '' comment '操作地点', - oper_param varchar(2000) default '' comment '请求参数', - json_result varchar(2000) default '' comment '返回参数', - status int(1) default 0 comment '操作状态（0正常 1异常）', - error_msg varchar(2000) default '' comment '错误消息', - oper_time datetime comment '操作时间', - cost_time bigint(20) default 0 comment '消耗时间', - primary key (oper_id), - key idx_sys_oper_log_bt (business_type), - key idx_sys_oper_log_s (status), - key idx_sys_oper_log_ot (oper_time) +create table sys2_oper_log ( + oper_id bigint(20) not null comment '日志主键', + tenant_id varchar(20) default '000000' comment '租户编号', + title varchar(50) default '' comment '模块标题', + business_type int(2) default 0 comment '业务类型（0其它 1新增 2修改 3删除）', + method varchar(100) default '' comment '方法名称', + request_method varchar(10) default '' comment '请求方式', + operator_type int(1) default 0 comment '操作类别（0其它 1后台用户 2手机端用户）', + oper_name varchar(50) default '' comment '操作人员', + dept_name varchar(50) default '' comment '部门名称', + oper_url varchar(255) default '' comment '请求URL', + oper_ip varchar(128) default '' comment '主机地址', + oper_location varchar(255) default '' comment '操作地点', + oper_param varchar(2000) default '' comment '请求参数', + json_result varchar(2000) default '' comment '返回参数', + status int(1) default 0 comment '操作状态（0正常 1异常）', + error_msg varchar(2000) default '' comment '错误消息', + oper_time datetime comment '操作时间', + cost_time bigint(20) default 0 comment '消耗时间', + primary key (oper_id), + key idx_sys2_oper_log_bt (business_type), + key idx_sys2_oper_log_s (status), + key idx_sys2_oper_log_ot (oper_time) ) engine=innodb comment = '操作日志记录'; -- ---------------------------- -- 11、字典类型表 -- ---------------------------- -create table sys_dict_type +create table sys2_dict_type ( dict_id bigint(20) not null comment '字典主键', tenant_id varchar(20) default '000000' comment '租户编号', @@ -586,22 +620,22 @@ create table sys_dict_type unique (tenant_id, dict_type) ) engine=innodb comment = '字典类型表'; -insert into sys_dict_type values(1, '000000', '用户性别', 'sys_user_sex', 103, 1, sysdate(), null, null, '用户性别列表'); -insert into sys_dict_type values(2, '000000', '菜单状态', 'sys_show_hide', 103, 1, sysdate(), null, null, '菜单状态列表'); -insert into sys_dict_type values(3, '000000', '系统开关', 'sys_normal_disable', 103, 1, sysdate(), null, null, '系统开关列表'); -insert into sys_dict_type values(6, '000000', '系统是否', 'sys_yes_no', 103, 1, sysdate(), null, null, '系统是否列表'); -insert into sys_dict_type values(7, '000000', '通知类型', 'sys_notice_type', 103, 1, sysdate(), null, null, '通知类型列表'); -insert into sys_dict_type values(8, '000000', '通知状态', 'sys_notice_status', 103, 1, sysdate(), null, null, '通知状态列表'); -insert into sys_dict_type values(9, '000000', '操作类型', 'sys_oper_type', 103, 1, sysdate(), null, null, '操作类型列表'); -insert into sys_dict_type values(10, '000000', '系统状态', 'sys_common_status', 103, 1, sysdate(), null, null, '登录状态列表'); -insert into sys_dict_type values(11, '000000', '授权类型', 'sys_grant_type', 103, 1, sysdate(), null, null, '认证授权类型'); -insert into sys_dict_type values(12, '000000', '设备类型', 'sys_device_type', 103, 1, sysdate(), null, null, '客户端设备类型'); +insert into sys2_dict_type values(1, '000000', '用户性别', 'sys2_user_sex', 103, 1, sysdate(), null, null, '用户性别列表'); +insert into sys2_dict_type values(2, '000000', '菜单状态', 'sys2_show_hide', 103, 1, sysdate(), null, null, '菜单状态列表'); +insert into sys2_dict_type values(3, '000000', '系统开关', 'sys2_normal_disable', 103, 1, sysdate(), null, null, '系统开关列表'); +insert into sys2_dict_type values(6, '000000', '系统是否', 'sys2_yes_no', 103, 1, sysdate(), null, null, '系统是否列表'); +insert into sys2_dict_type values(7, '000000', '通知类型', 'sys2_notice_type', 103, 1, sysdate(), null, null, '通知类型列表'); +insert into sys2_dict_type values(8, '000000', '通知状态', 'sys2_notice_status', 103, 1, sysdate(), null, null, '通知状态列表'); +insert into sys2_dict_type values(9, '000000', '操作类型', 'sys2_oper_type', 103, 1, sysdate(), null, null, '操作类型列表'); +insert into sys2_dict_type values(10, '000000', '系统状态', 'sys2_common_status', 103, 1, sysdate(), null, null, '登录状态列表'); +insert into sys2_dict_type values(11, '000000', '授权类型', 'sys2_grant_type', 103, 1, sysdate(), null, null, '认证授权类型'); +insert into sys2_dict_type values(12, '000000', '设备类型', 'sys2_device_type', 103, 1, sysdate(), null, null, '客户端设备类型'); -- ---------------------------- -- 12、字典数据表 -- ---------------------------- -create table sys_dict_data +create table sys2_dict_data ( dict_code bigint(20) not null comment '字典编码', tenant_id varchar(20) default '000000' comment '租户编号', @@ -621,315 +655,188 @@ create table sys_dict_data primary key (dict_code) ) engine=innodb comment = '字典数据表'; -insert into sys_dict_data values(1, '000000', 1, '男', '0', 'sys_user_sex', '', '', 'Y', 103, 1, sysdate(), null, null, '性别男'); -insert into sys_dict_data values(2, '000000', 2, '女', '1', 'sys_user_sex', '', '', 'N', 103, 1, sysdate(), null, null, '性别女'); -insert into sys_dict_data values(3, '000000', 3, '未知', '2', 'sys_user_sex', '', '', 'N', 103, 1, sysdate(), null, null, '性别未知'); -insert into sys_dict_data values(4, '000000', 1, '显示', '0', 'sys_show_hide', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '显示菜单'); -insert into sys_dict_data values(5, '000000', 2, '隐藏', '1', 'sys_show_hide', '', 'danger', 'N', 103, 1, sysdate(), null, null, '隐藏菜单'); -insert into sys_dict_data values(6, '000000', 1, '正常', '0', 'sys_normal_disable', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '正常状态'); -insert into sys_dict_data values(7, '000000', 2, '停用', '1', 'sys_normal_disable', '', 'danger', 'N', 103, 1, sysdate(), null, null, '停用状态'); -insert into sys_dict_data values(12, '000000', 1, '是', 'Y', 'sys_yes_no', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '系统默认是'); -insert into sys_dict_data values(13, '000000', 2, '否', 'N', 'sys_yes_no', '', 'danger', 'N', 103, 1, sysdate(), null, null, '系统默认否'); -insert into sys_dict_data values(14, '000000', 1, '通知', '1', 'sys_notice_type', '', 'warning', 'Y', 103, 1, sysdate(), null, null, '通知'); -insert into sys_dict_data values(15, '000000', 2, '公告', '2', 'sys_notice_type', '', 'success', 'N', 103, 1, sysdate(), null, null, '公告'); -insert into sys_dict_data values(16, '000000', 1, '正常', '0', 'sys_notice_status', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '正常状态'); -insert into sys_dict_data values(17, '000000', 2, '关闭', '1', 'sys_notice_status', '', 'danger', 'N', 103, 1, sysdate(), null, null, '关闭状态'); -insert into sys_dict_data values(29, '000000', 99, '其他', '0', 'sys_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '其他操作'); -insert into sys_dict_data values(18, '000000', 1, '新增', '1', 'sys_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '新增操作'); -insert into sys_dict_data values(19, '000000', 2, '修改', '2', 'sys_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '修改操作'); -insert into sys_dict_data values(20, '000000', 3, '删除', '3', 'sys_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '删除操作'); -insert into sys_dict_data values(21, '000000', 4, '授权', '4', 'sys_oper_type', '', 'primary', 'N', 103, 1, sysdate(), null, null, '授权操作'); -insert into sys_dict_data values(22, '000000', 5, '导出', '5', 'sys_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '导出操作'); -insert into sys_dict_data values(23, '000000', 6, '导入', '6', 'sys_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '导入操作'); -insert into sys_dict_data values(24, '000000', 7, '强退', '7', 'sys_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '强退操作'); -insert into sys_dict_data values(25, '000000', 8, '生成代码', '8', 'sys_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '生成操作'); -insert into sys_dict_data values(26, '000000', 9, '清空数据', '9', 'sys_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '清空操作'); -insert into sys_dict_data values(27, '000000', 1, '成功', '0', 'sys_common_status', '', 'primary', 'N', 103, 1, sysdate(), null, null, '正常状态'); -insert into sys_dict_data values(28, '000000', 2, '失败', '1', 'sys_common_status', '', 'danger', 'N', 103, 1, sysdate(), null, null, '停用状态'); -insert into sys_dict_data values(30, '000000', 0, '密码认证', 'password', 'sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '密码认证'); -insert into sys_dict_data values(31, '000000', 0, '短信认证', 'sms', 'sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '短信认证'); -insert into sys_dict_data values(32, '000000', 0, '邮件认证', 'email', 'sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '邮件认证'); -insert into sys_dict_data values(33, '000000', 0, '小程序认证', 'xcx', 'sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '小程序认证'); -insert into sys_dict_data values(34, '000000', 0, '三方登录认证', 'social', 'sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '三方登录认证'); -insert into sys_dict_data values(35, '000000', 0, 'PC', 'pc', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, 'PC'); -insert into sys_dict_data values(36, '000000', 0, '安卓', 'android', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '安卓'); -insert into sys_dict_data values(37, '000000', 0, 'iOS', 'ios', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, 'iOS'); -insert into sys_dict_data values(38, '000000', 0, '小程序', 'xcx', 'sys_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '小程序'); +insert into sys2_dict_data values(1, '000000', 1, '男', '0', 'sys2_user_sex', '', '', 'Y', 103, 1, sysdate(), null, null, '性别男'); +insert into sys2_dict_data values(2, '000000', 2, '女', '1', 'sys2_user_sex', '', '', 'N', 103, 1, sysdate(), null, null, '性别女'); +insert into sys2_dict_data values(3, '000000', 3, '未知', '2', 'sys2_user_sex', '', '', 'N', 103, 1, sysdate(), null, null, '性别未知'); +insert into sys2_dict_data values(4, '000000', 1, '显示', '0', 'sys2_show_hide', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '显示菜单'); +insert into sys2_dict_data values(5, '000000', 2, '隐藏', '1', 'sys2_show_hide', '', 'danger', 'N', 103, 1, sysdate(), null, null, '隐藏菜单'); +insert into sys2_dict_data values(6, '000000', 1, '正常', '0', 'sys2_normal_disable', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '正常状态'); +insert into sys2_dict_data values(7, '000000', 2, '停用', '1', 'sys2_normal_disable', '', 'danger', 'N', 103, 1, sysdate(), null, null, '停用状态'); +insert into sys2_dict_data values(12, '000000', 1, '是', 'Y', 'sys2_yes_no', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '系统默认是'); +insert into sys2_dict_data values(13, '000000', 2, '否', 'N', 'sys2_yes_no', '', 'danger', 'N', 103, 1, sysdate(), null, null, '系统默认否'); +insert into sys2_dict_data values(14, '000000', 1, '通知', '1', 'sys2_notice_type', '', 'warning', 'Y', 103, 1, sysdate(), null, null, '通知'); +insert into sys2_dict_data values(15, '000000', 2, '公告', '2', 'sys2_notice_type', '', 'success', 'N', 103, 1, sysdate(), null, null, '公告'); +insert into sys2_dict_data values(16, '000000', 1, '正常', '0', 'sys2_notice_status', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '正常状态'); +insert into sys2_dict_data values(17, '000000', 2, '关闭', '1', 'sys2_notice_status', '', 'danger', 'N', 103, 1, sysdate(), null, null, '关闭状态'); +insert into sys2_dict_data values(29, '000000', 99, '其他', '0', 'sys2_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '其他操作'); +insert into sys2_dict_data values(18, '000000', 1, '新增', '1', 'sys2_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '新增操作'); +insert into sys2_dict_data values(19, '000000', 2, '修改', '2', 'sys2_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '修改操作'); +insert into sys2_dict_data values(20, '000000', 3, '删除', '3', 'sys2_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '删除操作'); +insert into sys2_dict_data values(21, '000000', 4, '授权', '4', 'sys2_oper_type', '', 'primary', 'N', 103, 1, sysdate(), null, null, '授权操作'); +insert into sys2_dict_data values(22, '000000', 5, '导出', '5', 'sys2_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '导出操作'); +insert into sys2_dict_data values(23, '000000', 6, '导入', '6', 'sys2_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '导入操作'); +insert into sys2_dict_data values(24, '000000', 7, '强退', '7', 'sys2_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '强退操作'); +insert into sys2_dict_data values(25, '000000', 8, '生成代码', '8', 'sys2_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '生成操作'); +insert into sys2_dict_data values(26, '000000', 9, '清空数据', '9', 'sys2_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '清空操作'); +insert into sys2_dict_data values(27, '000000', 1, '成功', '0', 'sys2_common_status', '', 'primary', 'N', 103, 1, sysdate(), null, null, '正常状态'); +insert into sys2_dict_data values(28, '000000', 2, '失败', '1', 'sys2_common_status', '', 'danger', 'N', 103, 1, sysdate(), null, null, '停用状态'); +insert into sys2_dict_data values(30, '000000', 0, '密码认证', 'password', 'sys2_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '密码认证'); +insert into sys2_dict_data values(31, '000000', 0, '短信认证', 'sms', 'sys2_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '短信认证'); +insert into sys2_dict_data values(32, '000000', 0, '邮件认证', 'email', 'sys2_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '邮件认证'); +insert into sys2_dict_data values(33, '000000', 0, '小程序认证', 'xcx', 'sys2_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '小程序认证'); +insert into sys2_dict_data values(34, '000000', 0, '三方登录认证', 'social', 'sys2_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '三方登录认证'); +insert into sys2_dict_data values(35, '000000', 0, 'PC', 'pc', 'sys2_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, 'PC'); +insert into sys2_dict_data values(36, '000000', 0, '安卓', 'android', 'sys2_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '安卓'); +insert into sys2_dict_data values(37, '000000', 0, 'iOS', 'ios', 'sys2_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, 'iOS'); +insert into sys2_dict_data values(38, '000000', 0, '小程序', 'xcx', 'sys2_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '小程序'); -- ---------------------------- -- 13、参数配置表 -- ---------------------------- -create table sys_config ( - config_id bigint(20) not null comment '参数主键', - tenant_id varchar(20) default '000000' comment '租户编号', - config_name varchar(100) default '' comment '参数名称', - config_key varchar(100) default '' comment '参数键名', - config_value varchar(500) default '' comment '参数键值', - config_type char(1) default 'N' comment '系统内置（Y是 N否）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (config_id) +create table sys2_config ( + config_id bigint(20) not null comment '参数主键', + tenant_id varchar(20) default '000000' comment '租户编号', + config_name varchar(100) default '' comment '参数名称', + config_key varchar(100) default '' comment '参数键名', + config_value varchar(500) default '' comment '参数键值', + config_type char(1) default 'N' comment '系统内置（Y是 N否）', + create_dept bigint(20) default null comment '创建部门', + create_by bigint(20) default null comment '创建者', + create_time datetime comment '创建时间', + update_by bigint(20) default null comment '更新者', + update_time datetime comment '更新时间', + remark varchar(500) default null comment '备注', + primary key (config_id) ) engine=innodb comment = '参数配置表'; -insert into sys_config values(1, '000000', '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 103, 1, sysdate(), null, null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' ); -insert into sys_config values(2, '000000', '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 103, 1, sysdate(), null, null, '初始化密码 123456' ); -insert into sys_config values(3, '000000', '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 103, 1, sysdate(), null, null, '深色主题theme-dark，浅色主题theme-light' ); -insert into sys_config values(5, '000000', '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 103, 1, sysdate(), null, null, '是否开启注册用户功能（true开启，false关闭）'); -insert into sys_config values(11, '000000', 'OSS预览列表资源开关', 'sys.oss.previewListResource', 'true', 'Y', 103, 1, sysdate(), null, null, 'true:开启, false:关闭'); +insert into sys2_config values(1, '000000', '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 103, 1, sysdate(), null, null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' ); +insert into sys2_config values(2, '000000', '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 103, 1, sysdate(), null, null, '初始化密码 123456' ); +insert into sys2_config values(3, '000000', '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 103, 1, sysdate(), null, null, '深色主题theme-dark，浅色主题theme-light' ); +insert into sys2_config values(5, '000000', '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 103, 1, sysdate(), null, null, '是否开启注册用户功能（true开启，false关闭）'); +insert into sys2_config values(11, '000000', 'OSS预览列表资源开关', 'sys.oss.previewListResource', 'true', 'Y', 103, 1, sysdate(), null, null, 'true:开启, false:关闭'); -- ---------------------------- -- 14、系统访问记录 -- ---------------------------- -create table sys_logininfor ( - info_id bigint(20) not null comment '访问ID', - tenant_id varchar(20) default '000000' comment '租户编号', - user_name varchar(50) default '' comment '用户账号', - client_key varchar(32) default '' comment '客户端', - device_type varchar(32) default '' comment '设备类型', - ipaddr varchar(128) default '' comment '登录IP地址', - login_location varchar(255) default '' comment '登录地点', - browser varchar(50) default '' comment '浏览器类型', - os varchar(50) default '' comment '操作系统', - status char(1) default '0' comment '登录状态（0成功 1失败）', - msg varchar(255) default '' comment '提示消息', - login_time datetime comment '访问时间', - primary key (info_id), - key idx_sys_logininfor_s (status), - key idx_sys_logininfor_lt (login_time) +create table sys2_logininfor ( + info_id bigint(20) not null comment '访问ID', + tenant_id varchar(20) default '000000' comment '租户编号', + user_name varchar(50) default '' comment '用户账号', + client_key varchar(32) default '' comment '客户端', + device_type varchar(32) default '' comment '设备类型', + ipaddr varchar(128) default '' comment '登录IP地址', + login_location varchar(255) default '' comment '登录地点', + browser varchar(50) default '' comment '浏览器类型', + os varchar(50) default '' comment '操作系统', + status char(1) default '0' comment '登录状态（0成功 1失败）', + msg varchar(255) default '' comment '提示消息', + login_time datetime comment '访问时间', + primary key (info_id), + key idx_sys2_logininfor_s (status), + key idx_sys2_logininfor_lt (login_time) ) engine=innodb comment = '系统访问记录'; -- ---------------------------- -- 17、通知公告表 -- ---------------------------- -create table sys_notice ( - notice_id bigint(20) not null comment '公告ID', - tenant_id varchar(20) default '000000' comment '租户编号', - notice_title varchar(50) not null comment '公告标题', - notice_type char(1) not null comment '公告类型（1通知 2公告）', - notice_content longblob default null comment '公告内容', - status char(1) default '0' comment '公告状态（0正常 1关闭）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(255) default null comment '备注', - primary key (notice_id) +create table sys2_notice ( + notice_id bigint(20) not null comment '公告ID', + tenant_id varchar(20) default '000000' comment '租户编号', + notice_title varchar(50) not null comment '公告标题', + notice_type char(1) not null comment '公告类型（1通知 2公告）', + notice_content longblob default null comment '公告内容', + status char(1) default '0' comment '公告状态（0正常 1关闭）', + create_dept bigint(20) default null comment '创建部门', + create_by bigint(20) default null comment '创建者', + create_time datetime comment '创建时间', + update_by bigint(20) default null comment '更新者', + update_time datetime comment '更新时间', + remark varchar(255) default null comment '备注', + primary key (notice_id) ) engine=innodb comment = '通知公告表'; -- ---------------------------- -- 初始化-公告信息表数据 -- ---------------------------- -insert into sys_notice values('1', '000000', '温馨提醒：2018-07-01 新版本发布啦', '2', '新版本内容', '0', 103, 1, sysdate(), null, null, '管理员'); -insert into sys_notice values('2', '000000', '维护通知：2018-07-01 系统凌晨维护', '1', '维护内容', '0', 103, 1, sysdate(), null, null, '管理员'); - - --- ---------------------------- --- 18、代码生成业务表 --- ---------------------------- -create table gen_table ( - table_id bigint(20) not null comment '编号', - data_name varchar(200) default '' comment '数据源名称', - table_name varchar(200) default '' comment '表名称', - table_comment varchar(500) default '' comment '表描述', - sub_table_name varchar(64) default null comment '关联子表的表名', - sub_table_fk_name varchar(64) default null comment '子表关联的外键名', - class_name varchar(100) default '' comment '实体类名称', - tpl_category varchar(200) default 'crud' comment '使用的模板（crud单表操作 tree树表操作）', - package_name varchar(100) comment '生成包路径', - module_name varchar(30) comment '生成模块名', - business_name varchar(30) comment '生成业务名', - function_name varchar(50) comment '生成功能名', - function_author varchar(50) comment '生成功能作者', - gen_type char(1) default '0' comment '生成代码方式（0zip压缩包 1自定义路径）', - gen_path varchar(200) default '/' comment '生成路径（不填默认项目路径）', - options varchar(1000) comment '其它生成选项', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (table_id) -) engine=innodb comment = '代码生成业务表'; - - --- ---------------------------- --- 19、代码生成业务表字段 --- ---------------------------- -create table gen_table_column ( - column_id bigint(20) not null comment '编号', - table_id bigint(20) comment '归属表编号', - column_name varchar(200) comment '列名称', - column_comment varchar(500) comment '列描述', - column_type varchar(100) comment '列类型', - java_type varchar(500) comment 'JAVA类型', - java_field varchar(200) comment 'JAVA字段名', - is_pk char(1) comment '是否主键（1是）', - is_increment char(1) comment '是否自增（1是）', - is_required char(1) comment '是否必填（1是）', - is_insert char(1) comment '是否为插入字段（1是）', - is_edit char(1) comment '是否编辑字段（1是）', - is_list char(1) comment '是否列表字段（1是）', - is_query char(1) comment '是否查询字段（1是）', - query_type varchar(200) default 'EQ' comment '查询方式（等于、不等于、大于、小于、范围）', - html_type varchar(200) comment '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）', - dict_type varchar(200) default '' comment '字典类型', - sort int comment '排序', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - primary key (column_id) -) engine=innodb comment = '代码生成业务表字段'; +insert into sys2_notice values('1', '000000', '温馨提醒：2018-07-01 新版本发布啦', '2', '新版本内容', '0', 103, 1, sysdate(), null, null, '管理员'); +insert into sys2_notice values('2', '000000', '维护通知：2018-07-01 系统凌晨维护', '1', '维护内容', '0', 103, 1, sysdate(), null, null, '管理员'); -- ---------------------------- -- OSS对象存储表 -- ---------------------------- -create table sys_oss ( - oss_id bigint(20) not null comment '对象存储主键', - tenant_id varchar(20) default '000000' comment '租户编号', - file_name varchar(255) not null default '' comment '文件名', - original_name varchar(255) not null default '' comment '原名', - file_suffix varchar(10) not null default '' comment '文件后缀名', - url varchar(500) not null comment 'URL地址', - create_dept bigint(20) default null comment '创建部门', - create_time datetime default null comment '创建时间', - create_by bigint(20) default null comment '上传人', - update_time datetime default null comment '更新时间', - update_by bigint(20) default null comment '更新人', - service varchar(20) not null default 'minio' comment '服务商', - primary key (oss_id) +create table sys2_oss ( + oss_id bigint(20) not null comment '对象存储主键', + tenant_id varchar(20) default '000000' comment '租户编号', + file_name varchar(255) not null default '' comment '文件名', + original_name varchar(255) not null default '' comment '原名', + file_suffix varchar(10) not null default '' comment '文件后缀名', + url varchar(500) not null comment 'URL地址', + create_dept bigint(20) default null comment '创建部门', + create_time datetime default null comment '创建时间', + create_by bigint(20) default null comment '上传人', + update_time datetime default null comment '更新时间', + update_by bigint(20) default null comment '更新人', + service varchar(20) not null default 'minio' comment '服务商', + primary key (oss_id) ) engine=innodb comment ='OSS对象存储表'; -- ---------------------------- -- OSS对象存储动态配置表 -- ---------------------------- -create table sys_oss_config ( - oss_config_id bigint(20) not null comment '主键', - tenant_id varchar(20) default '000000'comment '租户编号', - config_key varchar(20) not null default '' comment '配置key', - access_key varchar(255) default '' comment 'accessKey', - secret_key varchar(255) default '' comment '秘钥', - bucket_name varchar(255) default '' comment '桶名称', - prefix varchar(255) default '' comment '前缀', - endpoint varchar(255) default '' comment '访问站点', - domain varchar(255) default '' comment '自定义域名', - is_https char(1) default 'N' comment '是否https（Y=是,N=否）', - region varchar(255) default '' comment '域', - access_policy char(1) not null default '1' comment '桶权限类型(0=private 1=public 2=custom)', - status char(1) default '1' comment '是否默认（0=是,1=否）', - ext1 varchar(255) default '' comment '扩展字段', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime default null comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime default null comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (oss_config_id) +create table sys2_oss_config ( + oss_config_id bigint(20) not null comment '主键', + tenant_id varchar(20) default '000000'comment '租户编号', + config_key varchar(20) not null default '' comment '配置key', + access_key varchar(255) default '' comment 'accessKey', + secret_key varchar(255) default '' comment '秘钥', + bucket_name varchar(255) default '' comment '桶名称', + prefix varchar(255) default '' comment '前缀', + endpoint varchar(255) default '' comment '访问站点', + domain varchar(255) default '' comment '自定义域名', + is_https char(1) default 'N' comment '是否https（Y=是,N=否）', + region varchar(255) default '' comment '域', + access_policy char(1) not null default '1' comment '桶权限类型(0=private 1=public 2=custom)', + status char(1) default '1' comment '是否默认（0=是,1=否）', + ext1 varchar(255) default '' comment '扩展字段', + create_dept bigint(20) default null comment '创建部门', + create_by bigint(20) default null comment '创建者', + create_time datetime default null comment '创建时间', + update_by bigint(20) default null comment '更新者', + update_time datetime default null comment '更新时间', + remark varchar(500) default null comment '备注', + primary key (oss_config_id) ) engine=innodb comment='对象存储配置表'; -insert into sys_oss_config values (1, '000000', 'minio', 'ruoyi', 'ruoyi123', 'ruoyi', '', '127.0.0.1:9000', '','N', '', '1' ,'0', '', 103, 1, sysdate(), 1, sysdate(), null); -insert into sys_oss_config values (2, '000000', 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 's3-cn-north-1.qiniucs.com', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); -insert into sys_oss_config values (3, '000000', 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'oss-cn-beijing.aliyuncs.com', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); -insert into sys_oss_config values (4, '000000', 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1250000000', '', 'cos.ap-beijing.myqcloud.com', '','N', 'ap-beijing', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); -insert into sys_oss_config values (5, '000000', 'image', 'ruoyi', 'ruoyi123', 'ruoyi', 'image', '127.0.0.1:9000', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); +insert into sys2_oss_config values (1, '000000', 'minio', 'ruoyi', 'ruoyi123', 'ruoyi', '', '127.0.0.1:9000', '','N', '', '1' ,'0', '', 103, 1, sysdate(), 1, sysdate(), null); +insert into sys2_oss_config values (2, '000000', 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 's3-cn-north-1.qiniucs.com', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); +insert into sys2_oss_config values (3, '000000', 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'oss-cn-beijing.aliyuncs.com', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); +insert into sys2_oss_config values (4, '000000', 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1250000000', '', 'cos.ap-beijing.myqcloud.com', '','N', 'ap-beijing', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); +insert into sys2_oss_config values (5, '000000', 'image', 'ruoyi', 'ruoyi123', 'ruoyi', 'image', '127.0.0.1:9000', '','N', '', '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null); -- ---------------------------- -- 系统授权表 -- ---------------------------- -create table sys_client ( - id bigint(20) not null comment 'id', - client_id varchar(64) default null comment '客户端id', - client_key varchar(32) default null comment '客户端key', - client_secret varchar(255) default null comment '客户端秘钥', - grant_type varchar(255) default null comment '授权类型', - device_type varchar(32) default null comment '设备类型', - active_timeout int(11) default 1800 comment 'token活跃超时时间', - timeout int(11) default 604800 comment 'token固定超时', - status char(1) default '0' comment '状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime default null comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime default null comment '更新时间', - primary key (id) +create table sys2_client ( + id bigint(20) not null comment 'id', + client_id varchar(64) default null comment '客户端id', + client_key varchar(32) default null comment '客户端key', + client_secret varchar(255) default null comment '客户端秘钥', + grant_type varchar(255) default null comment '授权类型', + device_type varchar(32) default null comment '设备类型', + active_timeout int(11) default 1800 comment 'token活跃超时时间', + timeout int(11) default 604800 comment 'token固定超时', + status char(1) default '0' comment '状态（0正常 1停用）', + del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', + create_dept bigint(20) default null comment '创建部门', + create_by bigint(20) default null comment '创建者', + create_time datetime default null comment '创建时间', + update_by bigint(20) default null comment '更新者', + update_time datetime default null comment '更新时间', + primary key (id) ) engine=innodb comment='系统授权表'; -insert into sys_client values (1, 'e5cd7e4891bf95d1d19206ce24a7b32e', 'pc', 'pc123', 'password,social', 'pc', 1800, 604800, 0, 0, 103, 1, sysdate(), 1, sysdate()); -insert into sys_client values (2, '428a8310cd442757ae699df5d894f051', 'app', 'app123', 'password,sms,social', 'android', 1800, 604800, 0, 0, 103, 1, sysdate(), 1, sysdate()); - - -CREATE TABLE test_demo -( - id bigint(0) NOT NULL COMMENT '主键', - tenant_id varchar(20) NULL DEFAULT '000000' COMMENT '租户编号', - dept_id bigint(0) NULL DEFAULT NULL COMMENT '部门id', - user_id bigint(0) NULL DEFAULT NULL COMMENT '用户id', - order_num int(0) NULL DEFAULT 0 COMMENT '排序号', - test_key varchar(255) NULL DEFAULT NULL COMMENT 'key键', - value varchar(255) NULL DEFAULT NULL COMMENT '值', - version int(0) NULL DEFAULT 0 COMMENT '版本', - create_dept bigint(0) NULL DEFAULT NULL COMMENT '创建部门', - create_time datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - create_by bigint(0) NULL DEFAULT NULL COMMENT '创建人', - update_time datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - update_by bigint(0) NULL DEFAULT NULL COMMENT '更新人', - del_flag int(0) NULL DEFAULT 0 COMMENT '删除标志', - PRIMARY KEY (id) USING BTREE -) ENGINE = InnoDB COMMENT = '测试单表'; - -CREATE TABLE test_tree -( - id bigint(0) NOT NULL COMMENT '主键', - tenant_id varchar(20) NULL DEFAULT '000000' COMMENT '租户编号', - parent_id bigint(0) NULL DEFAULT 0 COMMENT '父id', - dept_id bigint(0) NULL DEFAULT NULL COMMENT '部门id', - user_id bigint(0) NULL DEFAULT NULL COMMENT '用户id', - tree_name varchar(255) NULL DEFAULT NULL COMMENT '值', - version int(0) NULL DEFAULT 0 COMMENT '版本', - create_dept bigint(0) NULL DEFAULT NULL COMMENT '创建部门', - create_time datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - create_by bigint(0) NULL DEFAULT NULL COMMENT '创建人', - update_time datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - update_by bigint(0) NULL DEFAULT NULL COMMENT '更新人', - del_flag int(0) NULL DEFAULT 0 COMMENT '删除标志', - PRIMARY KEY (id) USING BTREE -) ENGINE = InnoDB COMMENT = '测试树表'; - -INSERT INTO test_demo VALUES (1, '000000', 102, 4, 1, '测试数据权限', '测试', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (2, '000000', 102, 3, 2, '子节点1', '111', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (3, '000000', 102, 3, 3, '子节点2', '222', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (4, '000000', 108, 4, 4, '测试数据', 'demo', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (5, '000000', 108, 3, 13, '子节点11', '1111', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (6, '000000', 108, 3, 12, '子节点22', '2222', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (7, '000000', 108, 3, 11, '子节点33', '3333', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (8, '000000', 108, 3, 10, '子节点44', '4444', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (9, '000000', 108, 3, 9, '子节点55', '5555', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (10, '000000', 108, 3, 8, '子节点66', '6666', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (11, '000000', 108, 3, 7, '子节点77', '7777', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (12, '000000', 108, 3, 6, '子节点88', '8888', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_demo VALUES (13, '000000', 108, 3, 5, '子节点99', '9999', 0, 103, sysdate(), 1, NULL, NULL, 0); - -INSERT INTO test_tree VALUES (1, '000000', 0, 102, 4, '测试数据权限', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (2, '000000', 1, 102, 3, '子节点1', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (3, '000000', 2, 102, 3, '子节点2', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (4, '000000', 0, 108, 4, '测试树1', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (5, '000000', 4, 108, 3, '子节点11', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (6, '000000', 4, 108, 3, '子节点22', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (7, '000000', 4, 108, 3, '子节点33', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (8, '000000', 5, 108, 3, '子节点44', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (9, '000000', 6, 108, 3, '子节点55', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (10, '000000', 7, 108, 3, '子节点66', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (11, '000000', 7, 108, 3, '子节点77', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (12, '000000', 10, 108, 3, '子节点88', 0, 103, sysdate(), 1, NULL, NULL, 0); -INSERT INTO test_tree VALUES (13, '000000', 10, 108, 3, '子节点99', 0, 103, sysdate(), 1, NULL, NULL, 0); +insert into sys2_client values (1, 'e5cd7e4891bf95d1d19206ce24a7b32e', 'pc', 'pc123', 'password,social', 'pc', 1800, 604800, 0, 0, 103, 1, sysdate(), 1, sysdate()); +insert into sys2_client values (2, '428a8310cd442757ae699df5d894f051', 'app', 'app123', 'password,sms,social', 'android', 1800, 604800, 0, 0, 103, 1, sysdate(), 1, sysdate()); \ No newline at end of file