From 438d6755f57d986edb95873d8d7f13e3af2e899e Mon Sep 17 00:00:00 2001 From: admin <1752476835@qq.com> Date: Thu, 5 Sep 2024 17:29:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/starry/admin/common/aspect/DataScopeAspect.java | 4 ++-- .../main/java/com/starry/admin/common/aspect/LogAspect.java | 2 +- .../starry/admin/common/component/PermissionService.java | 2 +- .../main/java/com/starry/admin/common/domain/LoginUser.java | 2 +- .../java/com/starry/admin/common/domain/TreeSelect.java | 4 ++-- .../admin/common/security/config/SpringSecurityConfig.java | 2 +- .../com/starry/admin/common/security/entity/JwtUser.java | 2 +- .../security/filter/JwtAuthenticationTokenFilter.java | 2 +- .../starry/admin/common/task/ClerkWagesSettlementTask.java | 2 +- .../admin/common/task/OrderRankingSettlementTask.java | 2 +- .../java/com/starry/admin/manager/factory/AsyncFactory.java | 2 +- .../modules/clerk/service/IPlayClerkLevelInfoService.java | 2 +- .../clerk/service/impl/PlayClerkLevelInfoServiceImpl.java | 2 +- .../modules/custom/service/IPlayCustomLevelInfoService.java | 2 +- .../custom/service/impl/PlayCustomLevelInfoServiceImpl.java | 2 +- .../controller/PlayPersonnelAdminInfoController.java | 2 +- .../controller/PlayPersonnelGroupInfoController.java | 2 +- .../controller/PlayPersonnelUserInfoController.java | 2 +- .../controller/PlayPersonnelWaiterInfoController.java | 2 +- .../admin/modules/system/controller/CacheController.java | 2 +- .../admin/modules/system/controller/LoginController.java | 4 ++-- .../admin/modules/system/controller/ServerController.java | 2 +- .../admin/modules/system/controller/SysDeptController.java | 2 +- .../admin/modules/system/controller/SysDictController.java | 2 +- .../modules/system/controller/SysDictDataController.java | 2 +- .../modules/system/controller/SysLoginLogController.java | 4 ++-- .../admin/modules/system/controller/SysMenuController.java | 2 +- .../system/controller/SysOperationLogController.java | 2 +- .../admin/modules/system/controller/SysRoleController.java | 6 +++--- .../admin/modules/system/controller/SysSmsController.java | 2 +- .../modules/system/controller/SysTenantController.java | 2 +- .../system/controller/SysTenantPackageController.java | 2 +- .../admin/modules/system/controller/SysUserController.java | 4 ++-- .../modules/system/controller/UserOnlineController.java | 2 +- .../system/mapper/SysAdministrativeAreaDictInfoMapper.java | 2 +- .../starry/admin/modules/system/mapper/SysDeptMapper.java | 2 +- .../admin/modules/system/mapper/SysDictDataMapper.java | 2 +- .../starry/admin/modules/system/mapper/SysDictMapper.java | 2 +- .../admin/modules/system/mapper/SysLoginLogMapper.java | 4 ++-- .../starry/admin/modules/system/mapper/SysMenuMapper.java | 2 +- .../admin/modules/system/mapper/SysOperationLogMapper.java | 2 +- .../admin/modules/system/mapper/SysRoleDeptMapper.java | 2 +- .../starry/admin/modules/system/mapper/SysRoleMapper.java | 2 +- .../admin/modules/system/mapper/SysRoleMenuMapper.java | 2 +- .../starry/admin/modules/system/mapper/SysTenantMapper.java | 2 +- .../admin/modules/system/mapper/SysTenantPackageMapper.java | 2 +- .../starry/admin/modules/system/mapper/SysUserMapper.java | 2 +- .../admin/modules/system/mapper/SysUserRoleMapper.java | 2 +- .../admin/modules/system/{ => module}/entity/Cache.java | 2 +- .../admin/modules/system/{ => module}/entity/Cpu.java | 2 +- .../admin/modules/system/{ => module}/entity/Jvm.java | 2 +- .../admin/modules/system/{ => module}/entity/Mem.java | 2 +- .../admin/modules/system/{ => module}/entity/Server.java | 2 +- .../admin/modules/system/{ => module}/entity/Sys.java | 2 +- .../entity/SysAdministrativeAreaDictInfoEntity.java | 2 +- .../modules/system/{ => module}/entity/SysDeptEntity.java | 2 +- .../system/{ => module}/entity/SysDictDataEntity.java | 2 +- .../modules/system/{ => module}/entity/SysDictEntity.java | 2 +- .../admin/modules/system/{ => module}/entity/SysFile.java | 2 +- .../system/{ => module}/entity/SysLoginLogEntity.java | 2 +- .../modules/system/{ => module}/entity/SysLoginLogVo.java | 2 +- .../modules/system/{ => module}/entity/SysMenuEntity.java | 2 +- .../system/{ => module}/entity/SysOperationLogEntity.java | 2 +- .../system/{ => module}/entity/SysRoleDeptEntity.java | 2 +- .../modules/system/{ => module}/entity/SysRoleEntity.java | 2 +- .../system/{ => module}/entity/SysRoleMenuEntity.java | 2 +- .../modules/system/{ => module}/entity/SysTenantEntity.java | 2 +- .../system/{ => module}/entity/SysTenantPackageEntity.java | 2 +- .../modules/system/{ => module}/entity/SysUserEntity.java | 2 +- .../system/{ => module}/entity/SysUserRoleEntity.java | 2 +- .../modules/system/{ => module}/entity/UserOnline.java | 2 +- .../service/ISysAdministrativeAreaDictInfoService.java | 2 +- .../admin/modules/system/service/ISysDictDataService.java | 2 +- .../admin/modules/system/service/ISysDictService.java | 2 +- .../admin/modules/system/service/ISysLoginLogService.java | 4 ++-- .../modules/system/service/ISysOperationLogService.java | 2 +- .../modules/system/service/ISysTenantPackageService.java | 2 +- .../admin/modules/system/service/ISysTenantService.java | 2 +- .../starry/admin/modules/system/service/LoginService.java | 2 +- .../starry/admin/modules/system/service/SysDeptService.java | 2 +- .../starry/admin/modules/system/service/SysMenuService.java | 2 +- .../admin/modules/system/service/SysRoleMenuService.java | 2 +- .../starry/admin/modules/system/service/SysRoleService.java | 4 ++-- .../admin/modules/system/service/SysUserRoleService.java | 2 +- .../starry/admin/modules/system/service/SysUserService.java | 2 +- .../admin/modules/system/service/UserOnlineService.java | 2 +- .../admin/modules/system/service/impl/LoginServiceImpl.java | 4 ++-- .../impl/SysAdministrativeAreaDictInfoServiceImpl.java | 2 +- .../modules/system/service/impl/SysDeptServiceImpl.java | 4 ++-- .../modules/system/service/impl/SysDictDataServiceImpl.java | 2 +- .../modules/system/service/impl/SysDictServiceImpl.java | 4 ++-- .../modules/system/service/impl/SysLoginLogServiceImpl.java | 4 ++-- .../modules/system/service/impl/SysMenuServiceImpl.java | 6 +++--- .../system/service/impl/SysOperationLogServiceImpl.java | 2 +- .../modules/system/service/impl/SysRoleMenuServiceImpl.java | 2 +- .../modules/system/service/impl/SysRoleServiceImpl.java | 1 + .../system/service/impl/SysTenantPackageServiceImpl.java | 2 +- .../service/impl/SysTenantRechargeInfoServiceImpl.java | 3 +-- .../modules/system/service/impl/SysTenantServiceImpl.java | 1 + .../modules/system/service/impl/SysUserRoleServiceImpl.java | 2 +- .../modules/system/service/impl/SysUserServiceImpl.java | 6 +++--- .../modules/system/service/impl/UserOnlineServiceImpl.java | 2 +- .../com/starry/admin/modules/system/vo/SysRoleAddVo.java | 2 +- .../starry/admin/modules/system/vo/SysUserEntityListVo.java | 2 +- .../com/starry/admin/modules/system/vo/SysUserQueryVo.java | 4 ++-- .../admin/modules/weichat/service/WxCustomMpService.java | 2 +- .../src/main/java/com/starry/admin/utils/DictUtils.java | 2 +- .../src/main/java/com/starry/admin/utils/SecurityUtils.java | 2 +- .../src/main/resources/mapper/platform/SysTenantMapper.xml | 2 +- .../resources/mapper/platform/SysTenantPackageMapper.xml | 2 +- .../src/main/resources/mapper/system/SysDeptMapper.xml | 2 +- .../src/main/resources/mapper/system/SysDictDataMapper.xml | 4 ++-- .../src/main/resources/mapper/system/SysDictMapper.xml | 2 +- .../src/main/resources/mapper/system/SysLoginLogMapper.xml | 2 +- .../src/main/resources/mapper/system/SysMenuMapper.xml | 6 +++--- .../main/resources/mapper/system/SysOperationLogMapper.xml | 2 +- .../src/main/resources/mapper/system/SysRoleDeptMapper.xml | 2 +- .../src/main/resources/mapper/system/SysRoleMapper.xml | 2 +- .../src/main/resources/mapper/system/SysRoleMenuMapper.xml | 2 +- .../src/main/resources/mapper/system/SysUserMapper.xml | 6 +++--- .../src/main/resources/mapper/system/SysUserRoleMapper.xml | 2 +- 121 files changed, 145 insertions(+), 144 deletions(-) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/Cache.java (93%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/Cpu.java (96%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/Jvm.java (97%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/Mem.java (94%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/Server.java (99%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/Sys.java (89%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/SysAdministrativeAreaDictInfoEntity.java (95%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/SysDeptEntity.java (96%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/SysDictDataEntity.java (96%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/SysDictEntity.java (94%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/SysFile.java (91%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/SysLoginLogEntity.java (97%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/SysLoginLogVo.java (96%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/SysMenuEntity.java (97%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/SysOperationLogEntity.java (97%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/SysRoleDeptEntity.java (94%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/SysRoleEntity.java (97%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/SysRoleMenuEntity.java (94%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/SysTenantEntity.java (98%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/SysTenantPackageEntity.java (95%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/SysUserEntity.java (98%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/SysUserRoleEntity.java (94%) rename play-admin/src/main/java/com/starry/admin/modules/system/{ => module}/entity/UserOnline.java (91%) diff --git a/play-admin/src/main/java/com/starry/admin/common/aspect/DataScopeAspect.java b/play-admin/src/main/java/com/starry/admin/common/aspect/DataScopeAspect.java index 90aeb15..5ee6c3d 100644 --- a/play-admin/src/main/java/com/starry/admin/common/aspect/DataScopeAspect.java +++ b/play-admin/src/main/java/com/starry/admin/common/aspect/DataScopeAspect.java @@ -3,8 +3,8 @@ package com.starry.admin.common.aspect; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import com.starry.admin.common.domain.LoginUser; -import com.starry.admin.modules.system.entity.SysRoleEntity; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysRoleEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import com.starry.admin.utils.SecurityUtils; import com.starry.common.annotation.DataScope; import com.starry.common.context.CustomSecurityContextHolder; diff --git a/play-admin/src/main/java/com/starry/admin/common/aspect/LogAspect.java b/play-admin/src/main/java/com/starry/admin/common/aspect/LogAspect.java index 31929e4..acbcaba 100644 --- a/play-admin/src/main/java/com/starry/admin/common/aspect/LogAspect.java +++ b/play-admin/src/main/java/com/starry/admin/common/aspect/LogAspect.java @@ -3,7 +3,7 @@ package com.starry.admin.common.aspect; import cn.hutool.extra.servlet.ServletUtil; import com.alibaba.fastjson2.JSON; import com.starry.admin.common.domain.LoginUser; -import com.starry.admin.modules.system.entity.SysOperationLogEntity; +import com.starry.admin.modules.system.module.entity.SysOperationLogEntity; import com.starry.admin.modules.system.service.ISysOperationLogService; import com.starry.admin.utils.SecurityUtils; import com.starry.common.annotation.Log; diff --git a/play-admin/src/main/java/com/starry/admin/common/component/PermissionService.java b/play-admin/src/main/java/com/starry/admin/common/component/PermissionService.java index 451a4cd..0249e40 100644 --- a/play-admin/src/main/java/com/starry/admin/common/component/PermissionService.java +++ b/play-admin/src/main/java/com/starry/admin/common/component/PermissionService.java @@ -2,7 +2,7 @@ package com.starry.admin.common.component; import com.starry.admin.common.domain.LoginUser; -import com.starry.admin.modules.system.entity.SysRoleEntity; +import com.starry.admin.modules.system.module.entity.SysRoleEntity; import com.starry.admin.utils.SecurityUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/play-admin/src/main/java/com/starry/admin/common/domain/LoginUser.java b/play-admin/src/main/java/com/starry/admin/common/domain/LoginUser.java index c682103..b729eeb 100644 --- a/play-admin/src/main/java/com/starry/admin/common/domain/LoginUser.java +++ b/play-admin/src/main/java/com/starry/admin/common/domain/LoginUser.java @@ -1,6 +1,6 @@ package com.starry.admin.common.domain; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import lombok.Data; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; diff --git a/play-admin/src/main/java/com/starry/admin/common/domain/TreeSelect.java b/play-admin/src/main/java/com/starry/admin/common/domain/TreeSelect.java index be304d0..062f11c 100644 --- a/play-admin/src/main/java/com/starry/admin/common/domain/TreeSelect.java +++ b/play-admin/src/main/java/com/starry/admin/common/domain/TreeSelect.java @@ -1,8 +1,8 @@ package com.starry.admin.common.domain; import com.fasterxml.jackson.annotation.JsonInclude; -import com.starry.admin.modules.system.entity.SysDeptEntity; -import com.starry.admin.modules.system.entity.SysMenuEntity; +import com.starry.admin.modules.system.module.entity.SysDeptEntity; +import com.starry.admin.modules.system.module.entity.SysMenuEntity; import lombok.Data; import java.io.Serializable; diff --git a/play-admin/src/main/java/com/starry/admin/common/security/config/SpringSecurityConfig.java b/play-admin/src/main/java/com/starry/admin/common/security/config/SpringSecurityConfig.java index c52030c..9f124ad 100644 --- a/play-admin/src/main/java/com/starry/admin/common/security/config/SpringSecurityConfig.java +++ b/play-admin/src/main/java/com/starry/admin/common/security/config/SpringSecurityConfig.java @@ -6,7 +6,7 @@ import com.starry.admin.common.security.filter.JwtAuthenticationTokenFilter; import com.starry.admin.common.security.handler.CustomAccessDeniedHandler; import com.starry.admin.common.security.handler.CustomAuthenticationEntryPoint; import com.starry.admin.common.security.handler.CustomLogoutSuccessHandler; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import com.starry.admin.modules.system.service.SysMenuService; import com.starry.admin.modules.system.service.SysUserService; import org.springframework.context.annotation.Bean; diff --git a/play-admin/src/main/java/com/starry/admin/common/security/entity/JwtUser.java b/play-admin/src/main/java/com/starry/admin/common/security/entity/JwtUser.java index ef173fe..36b4aed 100644 --- a/play-admin/src/main/java/com/starry/admin/common/security/entity/JwtUser.java +++ b/play-admin/src/main/java/com/starry/admin/common/security/entity/JwtUser.java @@ -1,6 +1,6 @@ package com.starry.admin.common.security.entity; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; diff --git a/play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java b/play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java index 3724f45..e3ff1db 100644 --- a/play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java +++ b/play-admin/src/main/java/com/starry/admin/common/security/filter/JwtAuthenticationTokenFilter.java @@ -11,7 +11,7 @@ import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity; import com.starry.admin.modules.clerk.service.impl.PlayClerkUserInfoServiceImpl; import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity; import com.starry.admin.modules.custom.service.impl.PlayCustomUserInfoServiceImpl; -import com.starry.admin.modules.system.entity.SysTenantEntity; +import com.starry.admin.modules.system.module.entity.SysTenantEntity; import com.starry.admin.modules.system.service.ISysTenantService; import com.starry.admin.modules.system.service.SysUserService; import com.starry.admin.modules.weichat.service.WxTokenService; diff --git a/play-admin/src/main/java/com/starry/admin/common/task/ClerkWagesSettlementTask.java b/play-admin/src/main/java/com/starry/admin/common/task/ClerkWagesSettlementTask.java index 89f6687..e9e7093 100644 --- a/play-admin/src/main/java/com/starry/admin/common/task/ClerkWagesSettlementTask.java +++ b/play-admin/src/main/java/com/starry/admin/common/task/ClerkWagesSettlementTask.java @@ -8,7 +8,7 @@ import com.starry.admin.modules.clerk.service.IPlayClerkWagesDetailsInfoService; import com.starry.admin.modules.clerk.service.IPlayClerkWagesInfoService; import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity; import com.starry.admin.modules.order.service.IPlayOrderInfoService; -import com.starry.admin.modules.system.entity.SysTenantEntity; +import com.starry.admin.modules.system.module.entity.SysTenantEntity; import com.starry.admin.modules.system.service.ISysTenantService; import com.starry.admin.utils.SecurityUtils; import com.starry.common.utils.IdUtils; diff --git a/play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java b/play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java index 94fe753..48c60db 100644 --- a/play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java +++ b/play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java @@ -6,7 +6,7 @@ import com.starry.admin.modules.clerk.service.IPlayClerkRankingInfoService; import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService; import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity; import com.starry.admin.modules.order.service.IPlayOrderInfoService; -import com.starry.admin.modules.system.entity.SysTenantEntity; +import com.starry.admin.modules.system.module.entity.SysTenantEntity; import com.starry.admin.modules.system.service.ISysTenantService; import com.starry.admin.utils.SecurityUtils; import com.starry.common.utils.IdUtils; diff --git a/play-admin/src/main/java/com/starry/admin/manager/factory/AsyncFactory.java b/play-admin/src/main/java/com/starry/admin/manager/factory/AsyncFactory.java index c18c997..d60ca55 100644 --- a/play-admin/src/main/java/com/starry/admin/manager/factory/AsyncFactory.java +++ b/play-admin/src/main/java/com/starry/admin/manager/factory/AsyncFactory.java @@ -3,7 +3,7 @@ package com.starry.admin.manager.factory; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; -import com.starry.admin.modules.system.entity.SysLoginLogEntity; +import com.starry.admin.modules.system.module.entity.SysLoginLogEntity; import com.starry.admin.modules.system.service.ISysLoginLogService; import com.starry.common.constant.Constants; import com.starry.common.utils.ServletUtils; diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkLevelInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkLevelInfoService.java index e3e682a..96ef971 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkLevelInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkLevelInfoService.java @@ -3,7 +3,7 @@ package com.starry.admin.modules.clerk.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity; -import com.starry.admin.modules.system.entity.SysTenantEntity; +import com.starry.admin.modules.system.module.entity.SysTenantEntity; import java.util.List; diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkLevelInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkLevelInfoServiceImpl.java index 533e93b..2c83e4c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkLevelInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkLevelInfoServiceImpl.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.starry.admin.modules.clerk.mapper.PlayClerkLevelInfoMapper; import com.starry.admin.modules.clerk.module.entity.PlayClerkLevelInfoEntity; import com.starry.admin.modules.clerk.service.IPlayClerkLevelInfoService; -import com.starry.admin.modules.system.entity.SysTenantEntity; +import com.starry.admin.modules.system.module.entity.SysTenantEntity; import com.starry.common.utils.IdUtils; import org.springframework.stereotype.Service; diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomLevelInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomLevelInfoService.java index f3fb4b8..1a34386 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomLevelInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomLevelInfoService.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.custom.service; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.custom.module.entity.PlayCustomLevelInfoEntity; -import com.starry.admin.modules.system.entity.SysTenantEntity; +import com.starry.admin.modules.system.module.entity.SysTenantEntity; import java.util.List; diff --git a/play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomLevelInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomLevelInfoServiceImpl.java index cbdfac9..d9a5c6d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomLevelInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomLevelInfoServiceImpl.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.starry.admin.modules.custom.mapper.PlayCustomLevelInfoMapper; import com.starry.admin.modules.custom.module.entity.PlayCustomLevelInfoEntity; import com.starry.admin.modules.custom.service.IPlayCustomLevelInfoService; -import com.starry.admin.modules.system.entity.SysTenantEntity; +import com.starry.admin.modules.system.module.entity.SysTenantEntity; import com.starry.common.utils.IdUtils; import org.springframework.stereotype.Service; diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelAdminInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelAdminInfoController.java index fda32ba..6d50837 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelAdminInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelAdminInfoController.java @@ -8,7 +8,7 @@ import com.starry.admin.modules.personnel.module.vo.PlayPersonnelAdminInfoEditBa import com.starry.admin.modules.personnel.module.vo.PlayPersonnelAdminInfoQueryVo; import com.starry.admin.modules.personnel.module.vo.PlayPersonnelAdminInfoReturnVo; import com.starry.admin.modules.personnel.service.IPlayPersonnelAdminInfoService; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import com.starry.admin.modules.system.service.SysRoleService; import com.starry.admin.modules.system.service.SysUserRoleService; import com.starry.admin.modules.system.service.SysUserService; diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelGroupInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelGroupInfoController.java index b7ca072..cbc6140 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelGroupInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelGroupInfoController.java @@ -10,7 +10,7 @@ import com.starry.admin.modules.personnel.module.vo.PlayPersonnelGroupInfoEditBa import com.starry.admin.modules.personnel.module.vo.PlayPersonnelGroupInfoQueryVo; import com.starry.admin.modules.personnel.module.vo.PlayPersonnelGroupInfoReturnVo; import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import com.starry.admin.modules.system.service.SysRoleService; import com.starry.admin.modules.system.service.SysUserRoleService; import com.starry.admin.modules.system.service.SysUserService; diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelUserInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelUserInfoController.java index e03aab9..1c21e81 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelUserInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelUserInfoController.java @@ -3,7 +3,7 @@ package com.starry.admin.modules.personnel.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.starry.admin.modules.personnel.module.vo.PlayPersonnelUserInfoQueryVo; import com.starry.admin.modules.personnel.module.vo.PlayPersonnelUserInfoReturnVo; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import com.starry.admin.modules.system.service.SysUserService; import com.starry.common.result.R; import org.springframework.validation.annotation.Validated; diff --git a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelWaiterInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelWaiterInfoController.java index 8f70011..127b86a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelWaiterInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/personnel/controller/PlayPersonnelWaiterInfoController.java @@ -8,7 +8,7 @@ import com.starry.admin.modules.personnel.module.vo.PlayPersonnelWaiterInfoEditB import com.starry.admin.modules.personnel.module.vo.PlayPersonnelWaiterInfoQueryVo; import com.starry.admin.modules.personnel.module.vo.PlayPersonnelWaiterInfoReturnVo; import com.starry.admin.modules.personnel.service.IPlayPersonnelWaiterInfoService; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import com.starry.admin.modules.system.service.SysRoleService; import com.starry.admin.modules.system.service.SysUserRoleService; import com.starry.admin.modules.system.service.SysUserService; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/CacheController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/CacheController.java index e275a64..1d9e187 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/CacheController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/CacheController.java @@ -1,7 +1,7 @@ package com.starry.admin.modules.system.controller; -import com.starry.admin.modules.system.entity.Cache; +import com.starry.admin.modules.system.module.entity.Cache; import com.starry.common.constant.CacheConstants; import com.starry.common.result.R; import com.starry.common.utils.StringUtils; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/LoginController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/LoginController.java index 4087726..54ebd04 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/LoginController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/LoginController.java @@ -3,8 +3,8 @@ package com.starry.admin.modules.system.controller; import com.starry.admin.common.component.JwtToken; import com.starry.admin.common.domain.LoginUser; -import com.starry.admin.modules.system.entity.SysMenuEntity; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysMenuEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import com.starry.admin.modules.system.service.LoginService; import com.starry.admin.modules.system.service.SysMenuService; import com.starry.admin.modules.system.vo.LoginVo; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/ServerController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/ServerController.java index 1ccfc72..0a36c8e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/ServerController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/ServerController.java @@ -1,7 +1,7 @@ package com.starry.admin.modules.system.controller; -import com.starry.admin.modules.system.entity.Server; +import com.starry.admin.modules.system.module.entity.Server; import com.starry.common.result.R; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDeptController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDeptController.java index 2f0acd3..f6ebcfc 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDeptController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDeptController.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.controller; import com.starry.admin.common.domain.TreeSelect; -import com.starry.admin.modules.system.entity.SysDeptEntity; +import com.starry.admin.modules.system.module.entity.SysDeptEntity; import com.starry.admin.modules.system.service.SysDeptService; import com.starry.common.constant.UserConstants; import com.starry.common.result.R; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDictController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDictController.java index ae949c7..4cb4546 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDictController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDictController.java @@ -1,7 +1,7 @@ package com.starry.admin.modules.system.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.starry.admin.modules.system.entity.SysDictEntity; +import com.starry.admin.modules.system.module.entity.SysDictEntity; import com.starry.admin.modules.system.service.ISysDictService; import com.starry.admin.modules.system.vo.SysDictVo; import com.starry.common.annotation.Log; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDictDataController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDictDataController.java index 48fd72e..16bacc6 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDictDataController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysDictDataController.java @@ -1,7 +1,7 @@ package com.starry.admin.modules.system.controller; import cn.hutool.core.collection.CollectionUtil; -import com.starry.admin.modules.system.entity.SysDictDataEntity; +import com.starry.admin.modules.system.module.entity.SysDictDataEntity; import com.starry.admin.modules.system.service.ISysDictDataService; import com.starry.admin.modules.system.vo.SysDictDataVo; import com.starry.common.annotation.Log; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysLoginLogController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysLoginLogController.java index 3cc4465..e08e99c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysLoginLogController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysLoginLogController.java @@ -2,8 +2,8 @@ package com.starry.admin.modules.system.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.starry.admin.modules.system.entity.SysLoginLogEntity; -import com.starry.admin.modules.system.entity.SysLoginLogVo; +import com.starry.admin.modules.system.module.entity.SysLoginLogEntity; +import com.starry.admin.modules.system.module.entity.SysLoginLogVo; import com.starry.admin.modules.system.service.ISysLoginLogService; import com.starry.admin.utils.ExcelUtils; import com.starry.common.annotation.Log; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysMenuController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysMenuController.java index a1363eb..654d9da 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysMenuController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysMenuController.java @@ -4,7 +4,7 @@ package com.starry.admin.modules.system.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.starry.admin.common.domain.TreeSelect; -import com.starry.admin.modules.system.entity.SysMenuEntity; +import com.starry.admin.modules.system.module.entity.SysMenuEntity; import com.starry.admin.modules.system.service.SysMenuService; import com.starry.admin.modules.system.vo.SimpleMenu; import com.starry.admin.utils.SecurityUtils; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysOperationLogController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysOperationLogController.java index 28f9b4d..6587666 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysOperationLogController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysOperationLogController.java @@ -1,7 +1,7 @@ package com.starry.admin.modules.system.controller; -import com.starry.admin.modules.system.entity.SysOperationLogEntity; +import com.starry.admin.modules.system.module.entity.SysOperationLogEntity; import com.starry.admin.modules.system.service.ISysOperationLogService; import com.starry.admin.modules.system.vo.SysOperationLogVo; import com.starry.admin.utils.ExcelUtils; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysRoleController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysRoleController.java index 0d06a61..60aa544 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysRoleController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysRoleController.java @@ -3,9 +3,9 @@ package com.starry.admin.modules.system.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.starry.admin.modules.system.entity.SysDeptEntity; -import com.starry.admin.modules.system.entity.SysRoleEntity; -import com.starry.admin.modules.system.entity.SysUserRoleEntity; +import com.starry.admin.modules.system.module.entity.SysDeptEntity; +import com.starry.admin.modules.system.module.entity.SysRoleEntity; +import com.starry.admin.modules.system.module.entity.SysUserRoleEntity; import com.starry.admin.modules.system.service.SysDeptService; import com.starry.admin.modules.system.service.SysRoleService; import com.starry.admin.modules.system.service.SysUserService; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysSmsController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysSmsController.java index 4333dd2..7d2e04b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysSmsController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysSmsController.java @@ -1,6 +1,6 @@ package com.starry.admin.modules.system.controller; -import com.starry.admin.modules.system.entity.SysTenantEntity; +import com.starry.admin.modules.system.module.entity.SysTenantEntity; import com.starry.admin.modules.system.service.ISysTenantService; import com.starry.admin.utils.SmsUtils; import com.starry.common.result.R; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantController.java index 1a5b190..8910eee 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantController.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService; import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity; import com.starry.admin.modules.order.service.IPlayOrderInfoService; -import com.starry.admin.modules.system.entity.SysTenantEntity; +import com.starry.admin.modules.system.module.entity.SysTenantEntity; import com.starry.admin.modules.system.service.ISysTenantService; import com.starry.admin.modules.system.vo.SysTenantAddVo; import com.starry.admin.modules.system.vo.SysTenantQueryVo; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantPackageController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantPackageController.java index 863e3f5..57d99e4 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantPackageController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysTenantPackageController.java @@ -1,6 +1,6 @@ package com.starry.admin.modules.system.controller; -import com.starry.admin.modules.system.entity.SysTenantPackageEntity; +import com.starry.admin.modules.system.module.entity.SysTenantPackageEntity; import com.starry.admin.modules.system.service.ISysTenantPackageService; import com.starry.admin.modules.system.vo.SimplePackage; import com.starry.admin.modules.system.vo.SysTenantPackageVo; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysUserController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysUserController.java index 5764406..ffebb79 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysUserController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysUserController.java @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.starry.admin.common.component.JwtToken; import com.starry.admin.common.domain.LoginUser; import com.starry.admin.common.oss.service.IOssFileService; -import com.starry.admin.modules.system.entity.SysRoleEntity; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysRoleEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import com.starry.admin.modules.system.service.SysRoleService; import com.starry.admin.modules.system.service.SysUserService; import com.starry.admin.modules.system.vo.*; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/UserOnlineController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/UserOnlineController.java index e432d8f..ed75bfb 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/UserOnlineController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/UserOnlineController.java @@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.starry.admin.common.domain.LoginUser; -import com.starry.admin.modules.system.entity.UserOnline; +import com.starry.admin.modules.system.module.entity.UserOnline; import com.starry.admin.modules.system.service.UserOnlineService; import com.starry.common.annotation.Log; import com.starry.common.constant.CacheConstants; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysAdministrativeAreaDictInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysAdministrativeAreaDictInfoMapper.java index cc2b6d9..c2b8f84 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysAdministrativeAreaDictInfoMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysAdministrativeAreaDictInfoMapper.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.starry.admin.modules.system.entity.SysAdministrativeAreaDictInfoEntity; +import com.starry.admin.modules.system.module.entity.SysAdministrativeAreaDictInfoEntity; import org.apache.ibatis.annotations.Mapper; ; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDeptMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDeptMapper.java index d166c3e..fa9b707 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDeptMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDeptMapper.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.starry.admin.modules.system.entity.SysDeptEntity; +import com.starry.admin.modules.system.module.entity.SysDeptEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDictDataMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDictDataMapper.java index 2b19388..e0b00c2 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDictDataMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDictDataMapper.java @@ -3,7 +3,7 @@ package com.starry.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.starry.admin.modules.system.entity.SysDictDataEntity; +import com.starry.admin.modules.system.module.entity.SysDictDataEntity; import com.starry.admin.modules.system.vo.SysDictDataVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDictMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDictMapper.java index b2990ec..1b85c65 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDictMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysDictMapper.java @@ -3,7 +3,7 @@ package com.starry.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.starry.admin.modules.system.entity.SysDictEntity; +import com.starry.admin.modules.system.module.entity.SysDictEntity; import com.starry.admin.modules.system.vo.SysDictVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysLoginLogMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysLoginLogMapper.java index 6952fba..b3cd1d4 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysLoginLogMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysLoginLogMapper.java @@ -3,8 +3,8 @@ package com.starry.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.starry.admin.modules.system.entity.SysLoginLogEntity; -import com.starry.admin.modules.system.entity.SysLoginLogVo; +import com.starry.admin.modules.system.module.entity.SysLoginLogEntity; +import com.starry.admin.modules.system.module.entity.SysLoginLogVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysMenuMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysMenuMapper.java index 78c62ab..125e2db 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysMenuMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysMenuMapper.java @@ -3,7 +3,7 @@ package com.starry.admin.modules.system.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.starry.admin.modules.system.entity.SysMenuEntity; +import com.starry.admin.modules.system.module.entity.SysMenuEntity; import com.starry.admin.modules.system.vo.SimpleMenu; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysOperationLogMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysOperationLogMapper.java index 4eff571..725af50 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysOperationLogMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysOperationLogMapper.java @@ -3,7 +3,7 @@ package com.starry.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.starry.admin.modules.system.entity.SysOperationLogEntity; +import com.starry.admin.modules.system.module.entity.SysOperationLogEntity; import com.starry.admin.modules.system.vo.SysOperationLogVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleDeptMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleDeptMapper.java index 0835d80..3e01a0a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleDeptMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleDeptMapper.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.starry.admin.modules.system.entity.SysRoleDeptEntity; +import com.starry.admin.modules.system.module.entity.SysRoleDeptEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleMapper.java index 1288979..3a9bebb 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleMapper.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.starry.admin.modules.system.entity.SysRoleEntity; +import com.starry.admin.modules.system.module.entity.SysRoleEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleMenuMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleMenuMapper.java index 95f5c7a..8daab4a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleMenuMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysRoleMenuMapper.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.starry.admin.modules.system.entity.SysRoleMenuEntity; +import com.starry.admin.modules.system.module.entity.SysRoleMenuEntity; import org.apache.ibatis.annotations.Mapper; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantMapper.java index 7b48a26..41051d8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantMapper.java @@ -3,7 +3,7 @@ package com.starry.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.starry.admin.modules.system.entity.SysTenantEntity; +import com.starry.admin.modules.system.module.entity.SysTenantEntity; import com.starry.admin.modules.system.vo.SysTenantQueryVo; import com.starry.admin.modules.system.vo.TenantResultVo; import org.apache.ibatis.annotations.Param; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantPackageMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantPackageMapper.java index 0f755de..734f14e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantPackageMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysTenantPackageMapper.java @@ -3,7 +3,7 @@ package com.starry.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.starry.admin.modules.system.entity.SysTenantPackageEntity; +import com.starry.admin.modules.system.module.entity.SysTenantPackageEntity; import com.starry.admin.modules.system.vo.SimplePackage; import com.starry.admin.modules.system.vo.SysTenantPackageVo; import org.apache.ibatis.annotations.Param; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysUserMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysUserMapper.java index 359ae19..30c1932 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysUserMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysUserMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.base.MPJBaseMapper; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import com.starry.admin.modules.system.vo.RoleUserResultVo; import com.starry.admin.modules.system.vo.SysUserQueryVo; import com.starry.admin.modules.system.vo.UserQueryVo; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysUserRoleMapper.java b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysUserRoleMapper.java index 8b52a13..da12e34 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysUserRoleMapper.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/mapper/SysUserRoleMapper.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.starry.admin.modules.system.entity.SysUserRoleEntity; +import com.starry.admin.modules.system.module.entity.SysUserRoleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/Cache.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Cache.java similarity index 93% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/Cache.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Cache.java index 59b8415..fa6ad90 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/Cache.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Cache.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.starry.common.utils.StringUtils; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/Cpu.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Cpu.java similarity index 96% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/Cpu.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Cpu.java index 3a1be0c..6df20c7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/Cpu.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Cpu.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.starry.common.utils.Arith; import lombok.Data; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/Jvm.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Jvm.java similarity index 97% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/Jvm.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Jvm.java index 660d923..b25cac9 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/Jvm.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Jvm.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import cn.hutool.core.date.DateUtil; import com.starry.common.utils.Arith; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/Mem.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Mem.java similarity index 94% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/Mem.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Mem.java index 94ee46c..c725885 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/Mem.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Mem.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.starry.common.utils.Arith; import lombok.Data; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/Server.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Server.java similarity index 99% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/Server.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Server.java index b9c4e3a..6a6d15b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/Server.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Server.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.starry.common.utils.Arith; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/Sys.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Sys.java similarity index 89% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/Sys.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Sys.java index 4a9a415..1b2416b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/Sys.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/Sys.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import lombok.Data; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysAdministrativeAreaDictInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysAdministrativeAreaDictInfoEntity.java similarity index 95% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/SysAdministrativeAreaDictInfoEntity.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysAdministrativeAreaDictInfoEntity.java index 789bc50..41ad6e8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysAdministrativeAreaDictInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysAdministrativeAreaDictInfoEntity.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysDeptEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysDeptEntity.java similarity index 96% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/SysDeptEntity.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysDeptEntity.java index abcd501..b6fa096 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysDeptEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysDeptEntity.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysDictDataEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysDictDataEntity.java similarity index 96% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/SysDictDataEntity.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysDictDataEntity.java index fd2cf74..37e7d7e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysDictDataEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysDictDataEntity.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysDictEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysDictEntity.java similarity index 94% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/SysDictEntity.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysDictEntity.java index ca0624a..30cb8ee 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysDictEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysDictEntity.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysFile.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysFile.java similarity index 91% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/SysFile.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysFile.java index f0ab855..8497474 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysFile.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysFile.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import lombok.Data; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysLoginLogEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysLoginLogEntity.java similarity index 97% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/SysLoginLogEntity.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysLoginLogEntity.java index 88ba388..295975b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysLoginLogEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysLoginLogEntity.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysLoginLogVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysLoginLogVo.java similarity index 96% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/SysLoginLogVo.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysLoginLogVo.java index 23d3825..dbeea8a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysLoginLogVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysLoginLogVo.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysMenuEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysMenuEntity.java similarity index 97% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/SysMenuEntity.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysMenuEntity.java index a72926c..53ddd15 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysMenuEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysMenuEntity.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysOperationLogEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysOperationLogEntity.java similarity index 97% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/SysOperationLogEntity.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysOperationLogEntity.java index 07ff316..1387f31 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysOperationLogEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysOperationLogEntity.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysRoleDeptEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleDeptEntity.java similarity index 94% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/SysRoleDeptEntity.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleDeptEntity.java index 1c080fa..8268d2d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysRoleDeptEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleDeptEntity.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysRoleEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleEntity.java similarity index 97% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/SysRoleEntity.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleEntity.java index bf0a847..d8113e5 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysRoleEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleEntity.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysRoleMenuEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleMenuEntity.java similarity index 94% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/SysRoleMenuEntity.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleMenuEntity.java index fad492b..d23bd81 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysRoleMenuEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysRoleMenuEntity.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysTenantEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysTenantEntity.java similarity index 98% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/SysTenantEntity.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysTenantEntity.java index 9153d0c..9764b88 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysTenantEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysTenantEntity.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysTenantPackageEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysTenantPackageEntity.java similarity index 95% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/SysTenantPackageEntity.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysTenantPackageEntity.java index 50ce0c5..c0adb43 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysTenantPackageEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysTenantPackageEntity.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysUserEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysUserEntity.java similarity index 98% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/SysUserEntity.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysUserEntity.java index d69c101..8ac4e85 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysUserEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysUserEntity.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysUserRoleEntity.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysUserRoleEntity.java similarity index 94% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/SysUserRoleEntity.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysUserRoleEntity.java index 4c8b809..a82c0fa 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/SysUserRoleEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/SysUserRoleEntity.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/entity/UserOnline.java b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/UserOnline.java similarity index 91% rename from play-admin/src/main/java/com/starry/admin/modules/system/entity/UserOnline.java rename to play-admin/src/main/java/com/starry/admin/modules/system/module/entity/UserOnline.java index fcb0e52..cc7a491 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/entity/UserOnline.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/module/entity/UserOnline.java @@ -1,4 +1,4 @@ -package com.starry.admin.modules.system.entity; +package com.starry.admin.modules.system.module.entity; import lombok.Data; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysAdministrativeAreaDictInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysAdministrativeAreaDictInfoService.java index f25bf8d..7951bad 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysAdministrativeAreaDictInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysAdministrativeAreaDictInfoService.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.starry.admin.modules.system.entity.SysAdministrativeAreaDictInfoEntity; +import com.starry.admin.modules.system.module.entity.SysAdministrativeAreaDictInfoEntity; import com.starry.admin.modules.system.vo.AdministrativeAreaQueryReturnVo; import java.util.List; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysDictDataService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysDictDataService.java index 90dbef5..836e0be 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysDictDataService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysDictDataService.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.starry.admin.modules.system.entity.SysDictDataEntity; +import com.starry.admin.modules.system.module.entity.SysDictDataEntity; import com.starry.admin.modules.system.vo.SysDictDataVo; import java.util.List; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysDictService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysDictService.java index 8bbd65c..1be6428 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysDictService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysDictService.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.starry.admin.modules.system.entity.SysDictEntity; +import com.starry.admin.modules.system.module.entity.SysDictEntity; import com.starry.admin.modules.system.vo.SysDictVo; import java.util.List; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysLoginLogService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysLoginLogService.java index e5470d8..49b331e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysLoginLogService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysLoginLogService.java @@ -2,8 +2,8 @@ package com.starry.admin.modules.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.starry.admin.modules.system.entity.SysLoginLogEntity; -import com.starry.admin.modules.system.entity.SysLoginLogVo; +import com.starry.admin.modules.system.module.entity.SysLoginLogEntity; +import com.starry.admin.modules.system.module.entity.SysLoginLogVo; /** * 系统访问日志表Service接口 diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysOperationLogService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysOperationLogService.java index c8c882f..8477ad9 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysOperationLogService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysOperationLogService.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.starry.admin.modules.system.entity.SysOperationLogEntity; +import com.starry.admin.modules.system.module.entity.SysOperationLogEntity; import com.starry.admin.modules.system.vo.SysOperationLogVo; /** diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantPackageService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantPackageService.java index 8457516..fb68571 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantPackageService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantPackageService.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.starry.admin.modules.system.entity.SysTenantPackageEntity; +import com.starry.admin.modules.system.module.entity.SysTenantPackageEntity; import com.starry.admin.modules.system.vo.SimplePackage; import com.starry.admin.modules.system.vo.SysTenantPackageVo; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantService.java index 4e04339..04c3909 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/ISysTenantService.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.starry.admin.modules.system.entity.SysTenantEntity; +import com.starry.admin.modules.system.module.entity.SysTenantEntity; import com.starry.admin.modules.system.vo.SysTenantQueryVo; import com.starry.common.result.R; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/LoginService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/LoginService.java index 6a6cc06..45a9208 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/LoginService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/LoginService.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.service; import com.starry.admin.common.domain.LoginUser; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import java.util.Set; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysDeptService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysDeptService.java index bc8f1ac..62cd9db 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysDeptService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysDeptService.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.common.domain.TreeSelect; -import com.starry.admin.modules.system.entity.SysDeptEntity; +import com.starry.admin.modules.system.module.entity.SysDeptEntity; import java.util.List; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysMenuService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysMenuService.java index 576c3a7..fd41514 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysMenuService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysMenuService.java @@ -3,7 +3,7 @@ package com.starry.admin.modules.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.common.domain.TreeSelect; -import com.starry.admin.modules.system.entity.SysMenuEntity; +import com.starry.admin.modules.system.module.entity.SysMenuEntity; import com.starry.admin.modules.system.vo.RouterVo; import com.starry.admin.modules.system.vo.SimpleMenu; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleMenuService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleMenuService.java index 42d3760..45b19a7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleMenuService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleMenuService.java @@ -1,7 +1,7 @@ package com.starry.admin.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.starry.admin.modules.system.entity.SysRoleMenuEntity; +import com.starry.admin.modules.system.module.entity.SysRoleMenuEntity; /** diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java index c1d002c..0d17d3e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysRoleService.java @@ -2,8 +2,8 @@ package com.starry.admin.modules.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.starry.admin.modules.system.entity.SysRoleEntity; -import com.starry.admin.modules.system.entity.SysUserRoleEntity; +import com.starry.admin.modules.system.module.entity.SysRoleEntity; +import com.starry.admin.modules.system.module.entity.SysUserRoleEntity; import java.util.List; import java.util.Set; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserRoleService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserRoleService.java index 02d7e16..b735d1f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserRoleService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserRoleService.java @@ -1,7 +1,7 @@ package com.starry.admin.modules.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.starry.admin.modules.system.entity.SysUserRoleEntity; +import com.starry.admin.modules.system.module.entity.SysUserRoleEntity; /** diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserService.java index 697465e..4b5b371 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/SysUserService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.personnel.module.vo.PlayPersonnelUserInfoQueryVo; import com.starry.admin.modules.personnel.module.vo.PlayPersonnelUserInfoReturnVo; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import com.starry.admin.modules.system.vo.*; import java.util.List; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/UserOnlineService.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/UserOnlineService.java index c0c730b..dce527e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/UserOnlineService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/UserOnlineService.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.service; import com.starry.admin.common.domain.LoginUser; -import com.starry.admin.modules.system.entity.UserOnline; +import com.starry.admin.modules.system.module.entity.UserOnline; /** * @author admin diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/LoginServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/LoginServiceImpl.java index 62980cc..c47ca3b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/LoginServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/LoginServiceImpl.java @@ -8,8 +8,8 @@ import com.starry.admin.common.exception.ServiceException; import com.starry.admin.common.security.entity.JwtUser; import com.starry.admin.manager.AsyncManager; import com.starry.admin.manager.factory.AsyncFactory; -import com.starry.admin.modules.system.entity.SysTenantEntity; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysTenantEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import com.starry.admin.modules.system.service.*; import com.starry.admin.utils.SecurityUtils; import com.starry.common.constant.Constants; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysAdministrativeAreaDictInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysAdministrativeAreaDictInfoServiceImpl.java index a6a8f69..166f0a1 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysAdministrativeAreaDictInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysAdministrativeAreaDictInfoServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.starry.admin.modules.system.entity.SysAdministrativeAreaDictInfoEntity; +import com.starry.admin.modules.system.module.entity.SysAdministrativeAreaDictInfoEntity; import com.starry.admin.modules.system.mapper.SysAdministrativeAreaDictInfoMapper; import com.starry.admin.modules.system.service.ISysAdministrativeAreaDictInfoService; import com.starry.admin.modules.system.vo.AdministrativeAreaQueryReturnVo; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysDeptServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysDeptServiceImpl.java index 4f3e92d..0d402d9 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysDeptServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysDeptServiceImpl.java @@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.starry.admin.common.domain.TreeSelect; -import com.starry.admin.modules.system.entity.SysDeptEntity; -import com.starry.admin.modules.system.entity.SysRoleEntity; +import com.starry.admin.modules.system.module.entity.SysDeptEntity; +import com.starry.admin.modules.system.module.entity.SysRoleEntity; import com.starry.admin.modules.system.mapper.SysDeptMapper; import com.starry.admin.modules.system.mapper.SysRoleMapper; import com.starry.admin.modules.system.service.SysDeptService; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysDictDataServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysDictDataServiceImpl.java index 8a4636e..216e57c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysDictDataServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysDictDataServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.starry.admin.modules.system.entity.SysDictDataEntity; +import com.starry.admin.modules.system.module.entity.SysDictDataEntity; import com.starry.admin.modules.system.mapper.SysDictDataMapper; import com.starry.admin.modules.system.service.ISysDictDataService; import com.starry.admin.modules.system.vo.SysDictDataVo; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysDictServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysDictServiceImpl.java index 9c0c0e0..83704fb 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysDictServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysDictServiceImpl.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.starry.admin.modules.system.entity.SysDictDataEntity; -import com.starry.admin.modules.system.entity.SysDictEntity; +import com.starry.admin.modules.system.module.entity.SysDictDataEntity; +import com.starry.admin.modules.system.module.entity.SysDictEntity; import com.starry.admin.modules.system.mapper.SysDictDataMapper; import com.starry.admin.modules.system.mapper.SysDictMapper; import com.starry.admin.modules.system.service.ISysDictService; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysLoginLogServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysLoginLogServiceImpl.java index 2ee35b5..2787751 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysLoginLogServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysLoginLogServiceImpl.java @@ -3,8 +3,8 @@ package com.starry.admin.modules.system.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.starry.admin.modules.system.entity.SysLoginLogEntity; -import com.starry.admin.modules.system.entity.SysLoginLogVo; +import com.starry.admin.modules.system.module.entity.SysLoginLogEntity; +import com.starry.admin.modules.system.module.entity.SysLoginLogVo; import com.starry.admin.modules.system.mapper.SysLoginLogMapper; import com.starry.admin.modules.system.service.ISysLoginLogService; import org.springframework.stereotype.Service; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysMenuServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysMenuServiceImpl.java index 7c35d4f..b76961d 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysMenuServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysMenuServiceImpl.java @@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.starry.admin.common.domain.TreeSelect; -import com.starry.admin.modules.system.entity.SysMenuEntity; -import com.starry.admin.modules.system.entity.SysRoleEntity; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysMenuEntity; +import com.starry.admin.modules.system.module.entity.SysRoleEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import com.starry.admin.modules.system.mapper.SysMenuMapper; import com.starry.admin.modules.system.mapper.SysRoleMapper; import com.starry.admin.modules.system.service.SysMenuService; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysOperationLogServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysOperationLogServiceImpl.java index 5e86759..ff2a0c3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysOperationLogServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysOperationLogServiceImpl.java @@ -3,7 +3,7 @@ package com.starry.admin.modules.system.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.starry.admin.modules.system.entity.SysOperationLogEntity; +import com.starry.admin.modules.system.module.entity.SysOperationLogEntity; import com.starry.admin.modules.system.mapper.SysOperationLogMapper; import com.starry.admin.modules.system.service.ISysOperationLogService; import com.starry.admin.modules.system.vo.SysOperationLogVo; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleMenuServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleMenuServiceImpl.java index 1a0937f..ec02fd3 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleMenuServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleMenuServiceImpl.java @@ -1,7 +1,7 @@ package com.starry.admin.modules.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.starry.admin.modules.system.entity.SysRoleMenuEntity; +import com.starry.admin.modules.system.module.entity.SysRoleMenuEntity; import com.starry.admin.modules.system.mapper.SysRoleMenuMapper; import com.starry.admin.modules.system.service.SysRoleMenuService; import org.springframework.stereotype.Service; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java index 349f979..8511f92 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysRoleServiceImpl.java @@ -11,6 +11,7 @@ import com.starry.admin.modules.system.mapper.SysRoleDeptMapper; import com.starry.admin.modules.system.mapper.SysRoleMapper; import com.starry.admin.modules.system.mapper.SysRoleMenuMapper; import com.starry.admin.modules.system.mapper.SysUserRoleMapper; +import com.starry.admin.modules.system.module.entity.*; import com.starry.admin.modules.system.service.SysRoleMenuService; import com.starry.admin.modules.system.service.SysRoleService; import com.starry.admin.modules.system.service.SysUserRoleService; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysTenantPackageServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysTenantPackageServiceImpl.java index 3ae7099..bfc059f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysTenantPackageServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysTenantPackageServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.starry.admin.common.exception.CustomException; -import com.starry.admin.modules.system.entity.SysTenantPackageEntity; +import com.starry.admin.modules.system.module.entity.SysTenantPackageEntity; import com.starry.admin.modules.system.mapper.SysTenantPackageMapper; import com.starry.admin.modules.system.service.ISysTenantPackageService; import com.starry.admin.modules.system.service.ISysTenantService; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysTenantRechargeInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysTenantRechargeInfoServiceImpl.java index 346b5dc..ec79995 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysTenantRechargeInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysTenantRechargeInfoServiceImpl.java @@ -5,14 +5,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.starry.admin.modules.system.entity.SysTenantEntity; +import com.starry.admin.modules.system.module.entity.SysTenantEntity; import com.starry.admin.modules.system.mapper.SysTenantRechargeInfoMapper; import com.starry.admin.modules.system.module.entity.SysTenantRechargeInfoEntity; import com.starry.admin.modules.system.module.vo.SysTenantRechargeInfoQueryVo; import com.starry.admin.modules.system.module.vo.SysTenantRechargeInfoReturnVo; import com.starry.admin.modules.system.service.ISysTenantRechargeInfoService; import com.starry.common.utils.IdUtils; -import com.starry.common.utils.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysTenantServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysTenantServiceImpl.java index b2d8504..336abf5 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysTenantServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysTenantServiceImpl.java @@ -16,6 +16,7 @@ import com.starry.admin.modules.custom.service.IPlayCustomLevelInfoService; import com.starry.admin.modules.shop.service.IPlayCommodityInfoService; import com.starry.admin.modules.system.entity.*; import com.starry.admin.modules.system.mapper.*; +import com.starry.admin.modules.system.module.entity.*; import com.starry.admin.modules.system.service.ISysTenantService; import com.starry.admin.modules.system.service.SysRoleMenuService; import com.starry.admin.modules.system.vo.SysTenantQueryVo; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserRoleServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserRoleServiceImpl.java index 8b7a28a..d3d9354 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserRoleServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserRoleServiceImpl.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.starry.admin.modules.system.entity.SysUserRoleEntity; +import com.starry.admin.modules.system.module.entity.SysUserRoleEntity; import com.starry.admin.modules.system.mapper.SysUserRoleMapper; import com.starry.admin.modules.system.service.SysUserRoleService; import com.starry.admin.modules.system.service.SysUserService; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserServiceImpl.java index 75b6a45..c19e98c 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/SysUserServiceImpl.java @@ -18,9 +18,9 @@ import com.starry.admin.modules.personnel.module.vo.PlayPersonnelUserInfoReturnV import com.starry.admin.modules.personnel.service.IPlayPersonnelAdminInfoService; import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService; import com.starry.admin.modules.personnel.service.IPlayPersonnelWaiterInfoService; -import com.starry.admin.modules.system.entity.SysRoleEntity; -import com.starry.admin.modules.system.entity.SysUserEntity; -import com.starry.admin.modules.system.entity.SysUserRoleEntity; +import com.starry.admin.modules.system.module.entity.SysRoleEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysUserRoleEntity; import com.starry.admin.modules.system.mapper.SysRoleMapper; import com.starry.admin.modules.system.mapper.SysUserMapper; import com.starry.admin.modules.system.service.SysUserRoleService; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/UserOnlineServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/UserOnlineServiceImpl.java index bfd9e03..b622a73 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/UserOnlineServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/service/impl/UserOnlineServiceImpl.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.system.service.impl; import com.starry.admin.common.domain.LoginUser; -import com.starry.admin.modules.system.entity.UserOnline; +import com.starry.admin.modules.system.module.entity.UserOnline; import com.starry.admin.modules.system.service.UserOnlineService; import com.starry.common.utils.StringUtils; import org.springframework.stereotype.Service; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysRoleAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysRoleAddVo.java index 495806d..64d8b71 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysRoleAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysRoleAddVo.java @@ -1,6 +1,6 @@ package com.starry.admin.modules.system.vo; -import com.starry.admin.modules.system.entity.SysRoleEntity; +import com.starry.admin.modules.system.module.entity.SysRoleEntity; import com.starry.common.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserEntityListVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserEntityListVo.java index 4e38e32..ecf3121 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserEntityListVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserEntityListVo.java @@ -1,7 +1,7 @@ package com.starry.admin.modules.system.vo; import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserQueryVo.java index 2cdcc40..f5db5db 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/vo/SysUserQueryVo.java @@ -1,7 +1,7 @@ package com.starry.admin.modules.system.vo; -import com.starry.admin.modules.system.entity.SysDeptEntity; -import com.starry.admin.modules.system.entity.SysRoleEntity; +import com.starry.admin.modules.system.module.entity.SysDeptEntity; +import com.starry.admin.modules.system.module.entity.SysRoleEntity; import com.starry.common.domain.BasePageEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java index 4756bd6..e6915fa 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java @@ -16,7 +16,7 @@ import com.starry.admin.modules.order.module.entity.PlayOrderComplaintInfoEntity import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity; import com.starry.admin.modules.personnel.module.entity.PlayPersonnelAdminInfoEntity; import com.starry.admin.modules.personnel.service.IPlayPersonnelAdminInfoService; -import com.starry.admin.modules.system.entity.SysTenantEntity; +import com.starry.admin.modules.system.module.entity.SysTenantEntity; import com.starry.admin.modules.system.service.impl.SysTenantServiceImpl; import com.starry.admin.utils.SecurityUtils; import lombok.extern.slf4j.Slf4j; diff --git a/play-admin/src/main/java/com/starry/admin/utils/DictUtils.java b/play-admin/src/main/java/com/starry/admin/utils/DictUtils.java index 2879d37..834f556 100644 --- a/play-admin/src/main/java/com/starry/admin/utils/DictUtils.java +++ b/play-admin/src/main/java/com/starry/admin/utils/DictUtils.java @@ -1,7 +1,7 @@ package com.starry.admin.utils; import com.alibaba.fastjson2.JSONArray; -import com.starry.admin.modules.system.entity.SysDictDataEntity; +import com.starry.admin.modules.system.module.entity.SysDictDataEntity; import com.starry.common.constant.CacheConstants; import com.starry.common.redis.RedisCache; import com.starry.common.utils.SpringUtils; diff --git a/play-admin/src/main/java/com/starry/admin/utils/SecurityUtils.java b/play-admin/src/main/java/com/starry/admin/utils/SecurityUtils.java index 1d52bd8..b9797b2 100644 --- a/play-admin/src/main/java/com/starry/admin/utils/SecurityUtils.java +++ b/play-admin/src/main/java/com/starry/admin/utils/SecurityUtils.java @@ -3,7 +3,7 @@ package com.starry.admin.utils; import com.starry.admin.common.domain.LoginUser; import com.starry.admin.common.security.entity.JwtUser; -import com.starry.admin.modules.system.entity.SysUserEntity; +import com.starry.admin.modules.system.module.entity.SysUserEntity; import com.starry.common.context.CustomSecurityContextHolder; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/play-admin/src/main/resources/mapper/platform/SysTenantMapper.xml b/play-admin/src/main/resources/mapper/platform/SysTenantMapper.xml index 924ff5b..c647bff 100644 --- a/play-admin/src/main/resources/mapper/platform/SysTenantMapper.xml +++ b/play-admin/src/main/resources/mapper/platform/SysTenantMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/play-admin/src/main/resources/mapper/platform/SysTenantPackageMapper.xml b/play-admin/src/main/resources/mapper/platform/SysTenantPackageMapper.xml index d7bcb8f..98450c7 100644 --- a/play-admin/src/main/resources/mapper/platform/SysTenantPackageMapper.xml +++ b/play-admin/src/main/resources/mapper/platform/SysTenantPackageMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/play-admin/src/main/resources/mapper/system/SysDeptMapper.xml b/play-admin/src/main/resources/mapper/system/SysDeptMapper.xml index 880dd54..91a99d3 100644 --- a/play-admin/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/play-admin/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/play-admin/src/main/resources/mapper/system/SysDictDataMapper.xml b/play-admin/src/main/resources/mapper/system/SysDictDataMapper.xml index 4dacee6..4df50d4 100644 --- a/play-admin/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/play-admin/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -40,7 +40,7 @@ + - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.router_query,m.permission, m.visible, m.status, m.menu_code, m.is_frame, m.menu_type, m.icon, m.sort, m.created_time from sys_menu m diff --git a/play-admin/src/main/resources/mapper/system/SysOperationLogMapper.xml b/play-admin/src/main/resources/mapper/system/SysOperationLogMapper.xml index 465ea82..5ea7f0d 100644 --- a/play-admin/src/main/resources/mapper/system/SysOperationLogMapper.xml +++ b/play-admin/src/main/resources/mapper/system/SysOperationLogMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/play-admin/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/play-admin/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 220e045..af74edc 100644 --- a/play-admin/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/play-admin/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/play-admin/src/main/resources/mapper/system/SysRoleMapper.xml b/play-admin/src/main/resources/mapper/system/SysRoleMapper.xml index 72b4bcd..b1623c7 100644 --- a/play-admin/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/play-admin/src/main/resources/mapper/system/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/play-admin/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/play-admin/src/main/resources/mapper/system/SysRoleMenuMapper.xml index 643e4c1..d998afd 100644 --- a/play-admin/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/play-admin/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/play-admin/src/main/resources/mapper/system/SysUserMapper.xml b/play-admin/src/main/resources/mapper/system/SysUserMapper.xml index 4b9bfd7..2b2042b 100644 --- a/play-admin/src/main/resources/mapper/system/SysUserMapper.xml +++ b/play-admin/src/main/resources/mapper/system/SysUserMapper.xml @@ -2,7 +2,7 @@ - + @@ -23,14 +23,14 @@ - + + ofType="com.starry.admin.modules.system.module.entity.SysRoleEntity"> diff --git a/play-admin/src/main/resources/mapper/system/SysUserRoleMapper.xml b/play-admin/src/main/resources/mapper/system/SysUserRoleMapper.xml index 457aa68..a57af31 100644 --- a/play-admin/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/play-admin/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - +