From dca3e67730b0cf680c2fa48a169a850c2db21a03 Mon Sep 17 00:00:00 2001 From: b2baccline <23131013+b2baccline@users.noreply.github.com> Date: Tue, 13 Apr 2021 15:31:24 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E8=B0=83=E6=95=B4=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=90=8D=EF=BC=8Csys=20=3D>=20system?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ballcat/admin/UpmsAutoConfiguration.java | 2 +- .../config/AdminFillMetaObjectHandle.java | 2 +- .../log/handler/AdminOperationLogHandler.java | 2 +- .../notify/event/StationNotifyPushEvent.java | 2 +- .../AnnouncementLoginEventListener.java | 2 +- .../modules/notify/push/MailNotifyPusher.java | 2 +- .../notify/push/NotifyPushExecutor.java | 2 +- .../modules/notify/push/NotifyPusher.java | 2 +- .../modules/notify/push/SmsNotifyPusher.java | 2 +- .../notify/push/StationNotifyPusher.java | 2 +- .../notify/recipient/AllRecipientFilter.java | 4 +- .../notify/recipient/RecipientFilter.java | 2 +- .../notify/recipient/RecipientHandler.java | 2 +- .../SpecifyOrganizationRecipientFilter.java | 4 +- .../recipient/SpecifyRoleRecipientFilter.java | 4 +- .../recipient/SpecifyUserRecipientFilter.java | 4 +- .../SpecifyUserTypeRecipientFilter.java | 4 +- .../service/impl/AnnouncementServiceImpl.java | 2 +- .../checker/AdminRuleProperties.java | 2 +- .../checker/AdminUserChecker.java | 4 +- .../checker/AdminUserCheckerImpl.java | 4 +- .../controller/AuthController.java | 2 +- .../controller/LovController.java | 41 +++++++++-------- .../controller/SysConfigController.java | 24 +++++----- .../controller/SysDictController.java | 36 +++++++-------- .../controller/SysMenuController.java | 24 +++++----- .../controller/SysOrganizationController.java | 20 ++++---- .../controller/SysRoleController.java | 46 +++++++++---------- .../controller/SysUserController.java | 44 +++++++++--------- .../converter/LovConverter.java | 8 ++-- .../converter/OperationLogConverter.java | 2 +- .../converter/SysConfigConverter.java | 6 +-- .../converter/SysDictConverter.java | 6 +-- .../converter/SysDictItemConverter.java | 8 ++-- .../converter/SysMenuConverter.java | 8 ++-- .../converter/SysOrganizationConverter.java | 8 ++-- .../converter/SysRoleConverter.java | 8 ++-- .../converter/SysUserConverter.java | 10 ++-- .../{lov => system}/enums/HttpMethod.java | 2 +- .../enums/HttpParamsPosition.java | 2 +- .../modules/{lov => system}/enums/Tag.java | 2 +- .../event/DictChangeEvent.java | 2 +- .../{lov => system}/event/LovChangeEvent.java | 2 +- .../event/UserChangeEvent.java | 4 +- .../manager/SysDictManager.java | 24 +++++----- .../{lov => system}/mapper/LovBodyMapper.java | 4 +- .../{lov => system}/mapper/LovMapper.java | 10 ++-- .../mapper/LovSearchMapper.java | 4 +- .../mapper/SysConfigMapper.java | 10 ++-- .../mapper/SysDictItemMapper.java | 8 ++-- .../{sys => system}/mapper/SysDictMapper.java | 10 ++-- .../{sys => system}/mapper/SysMenuMapper.java | 6 +-- .../mapper/SysOrganizationMapper.java | 4 +- .../{sys => system}/mapper/SysRoleMapper.java | 10 ++-- .../mapper/SysRoleMenuMapper.java | 4 +- .../{sys => system}/mapper/SysUserMapper.java | 8 ++-- .../mapper/SysUserRoleMapper.java | 10 ++-- .../{lov => system}/model/dto/LovDTO.java | 12 ++--- .../model/dto/SysOrganizationDTO.java | 2 +- .../model/dto/SysRoleUpdateDTO.java | 2 +- .../{sys => system}/model/dto/SysUserDTO.java | 2 +- .../model/dto/SysUserPassDTO.java | 2 +- .../model/dto/SysUserScope.java | 2 +- .../model/dto/UserInfoDTO.java | 4 +- .../{lov => system}/model/entity/Lov.java | 10 ++-- .../{lov => system}/model/entity/LovBody.java | 2 +- .../model/entity/LovSearch.java | 6 +-- .../model/entity/LovSelectOptions.java | 2 +- .../model/entity/SysConfig.java | 2 +- .../{sys => system}/model/entity/SysDict.java | 2 +- .../model/entity/SysDictItem.java | 2 +- .../{sys => system}/model/entity/SysMenu.java | 2 +- .../model/entity/SysOrganization.java | 2 +- .../{sys => system}/model/entity/SysRole.java | 2 +- .../model/entity/SysRoleMenu.java | 2 +- .../{sys => system}/model/entity/SysUser.java | 2 +- .../model/entity/SysUserRole.java | 2 +- .../{lov => system}/model/qo/LovQO.java | 6 +-- .../model/qo/RoleBindUserQO.java | 2 +- .../{sys => system}/model/qo/SysConfigQO.java | 2 +- .../{sys => system}/model/qo/SysDictQO.java | 2 +- .../{sys => system}/model/qo/SysMenuQO.java | 2 +- .../model/qo/SysOrganizationQO.java | 2 +- .../{sys => system}/model/qo/SysRoleQO.java | 2 +- .../{sys => system}/model/qo/SysUserQO.java | 2 +- .../{sys => system}/model/vo/DictDataVO.java | 2 +- .../{sys => system}/model/vo/DictItemVO.java | 2 +- .../{lov => system}/model/vo/LovInfoVO.java | 10 ++-- .../{lov => system}/model/vo/LovPageVO.java | 6 +-- .../model/vo/RoleBindUserVO.java | 2 +- .../model/vo/SysConfigPageVO.java | 2 +- .../model/vo/SysDictItemPageVO.java | 2 +- .../model/vo/SysDictPageVO.java | 2 +- .../model/vo/SysMenuPageVO.java | 2 +- .../model/vo/SysMenuRouterVO.java | 2 +- .../model/vo/SysOrganizationTree.java | 2 +- .../model/vo/SysRolePageVO.java | 2 +- .../{sys => system}/model/vo/SysUserInfo.java | 2 +- .../model/vo/SysUserPageVO.java | 2 +- .../{sys => system}/service/FileService.java | 2 +- .../service/LovBodyService.java | 4 +- .../service/LovSearchService.java | 4 +- .../{lov => system}/service/LovService.java | 12 ++--- .../service/SysConfigService.java | 8 ++-- .../service/SysDictItemService.java | 6 +-- .../service/SysDictService.java | 8 ++-- .../service/SysMenuService.java | 6 +-- .../service/SysOrganizationService.java | 8 ++-- .../service/SysRoleMenuService.java | 4 +- .../service/SysRoleService.java | 8 ++-- .../service/SysUserRoleService.java | 10 ++-- .../service/SysUserService.java | 14 +++--- .../service/impl/FileServiceImpl.java | 4 +- .../service/impl/LovBodyServiceImpl.java | 8 ++-- .../service/impl/LovSearchServiceImpl.java | 8 ++-- .../service/impl/LovServiceImpl.java | 22 ++++----- .../service/impl/SysConfigServiceImpl.java | 12 ++--- .../service/impl/SysDictItemServiceImpl.java | 10 ++-- .../service/impl/SysDictServiceImpl.java | 12 ++--- .../service/impl/SysMenuServiceImpl.java | 12 ++--- .../impl/SysOrganizationServiceImpl.java | 14 +++--- .../service/impl/SysRoleMenuServiceImpl.java | 8 ++-- .../service/impl/SysRoleServiceImpl.java | 14 +++--- .../service/impl/SysUserRoleServiceImpl.java | 14 +++--- .../service/impl/SysUserServiceImpl.java | 28 +++++------ .../ListLovSelectOptionTypeHandler.java | 4 +- .../admin/oauth/CustomTokenEnhancer.java | 4 +- .../ballcat/admin/oauth/SysUserDetails.java | 2 +- .../oauth/SysUserDetailsServiceImpl.java | 6 +-- .../admin/oauth/UserInfoCoordinator.java | 2 +- .../admin/oauth/util/SecurityUtils.java | 2 +- .../main/resources/mapper/sys/RoleMapper.xml | 2 +- .../resources/mapper/sys/SysMenuMapper.xml | 6 +-- .../mapper/sys/SysOrganizationMapper.xml | 4 +- .../resources/mapper/sys/SysUserMapper.xml | 6 +-- .../mapper/sys/SysUserRoleMapper.xml | 6 +-- .../distribute/PushEventListener.java | 11 +++-- .../UserAttributeHandshakeInterceptor.java | 2 +- 138 files changed, 464 insertions(+), 460 deletions(-) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/checker/AdminRuleProperties.java (87%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/checker/AdminUserChecker.java (78%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/checker/AdminUserCheckerImpl.java (88%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/controller/AuthController.java (97%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/controller/LovController.java (80%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/controller/SysConfigController.java (78%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/controller/SysDictController.java (81%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/controller/SysMenuController.java (83%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/controller/SysOrganizationController.java (79%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/controller/SysRoleController.java (77%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/controller/SysUserController.java (84%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/converter/LovConverter.java (69%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/converter/OperationLogConverter.java (91%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/converter/SysConfigConverter.java (67%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/converter/SysDictConverter.java (66%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/converter/SysDictItemConverter.java (67%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/converter/SysMenuConverter.java (67%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/converter/SysOrganizationConverter.java (68%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/converter/SysRoleConverter.java (66%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/converter/SysUserConverter.java (69%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/enums/HttpMethod.java (83%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/enums/HttpParamsPosition.java (86%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/enums/Tag.java (80%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/event/DictChangeEvent.java (86%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/event/LovChangeEvent.java (88%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/event/UserChangeEvent.java (71%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/manager/SysDictManager.java (88%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/mapper/LovBodyMapper.java (87%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/mapper/LovMapper.java (82%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/mapper/LovSearchMapper.java (87%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/mapper/SysConfigMapper.java (77%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/mapper/SysDictItemMapper.java (88%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/mapper/SysDictMapper.java (86%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/mapper/SysMenuMapper.java (88%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/mapper/SysOrganizationMapper.java (90%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/mapper/SysRoleMapper.java (82%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/mapper/SysRoleMenuMapper.java (86%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/mapper/SysUserMapper.java (94%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/mapper/SysUserRoleMapper.java (89%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/model/dto/LovDTO.java (81%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/dto/SysOrganizationDTO.java (93%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/dto/SysRoleUpdateDTO.java (92%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/dto/SysUserDTO.java (96%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/dto/SysUserPassDTO.java (94%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/dto/SysUserScope.java (82%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/dto/UserInfoDTO.java (85%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/model/entity/Lov.java (86%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/model/entity/LovBody.java (95%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/model/entity/LovSearch.java (89%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/model/entity/LovSelectOptions.java (84%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/entity/SysConfig.java (96%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/entity/SysDict.java (96%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/entity/SysDictItem.java (96%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/entity/SysMenu.java (97%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/entity/SysOrganization.java (96%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/entity/SysRole.java (96%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/entity/SysRoleMenu.java (93%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/entity/SysUser.java (97%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/entity/SysUserRole.java (92%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/model/qo/LovQO.java (78%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/qo/RoleBindUserQO.java (91%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/qo/SysConfigQO.java (90%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/qo/SysDictQO.java (89%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/qo/SysMenuQO.java (92%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/qo/SysOrganizationQO.java (87%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/qo/SysRoleQO.java (90%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/qo/SysUserQO.java (95%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/vo/DictDataVO.java (91%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/vo/DictItemVO.java (91%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/model/vo/LovInfoVO.java (81%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/model/vo/LovPageVO.java (87%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/vo/RoleBindUserVO.java (93%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/vo/SysConfigPageVO.java (94%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/vo/SysDictItemPageVO.java (96%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/vo/SysDictPageVO.java (95%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/vo/SysMenuPageVO.java (97%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/vo/SysMenuRouterVO.java (96%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/vo/SysOrganizationTree.java (97%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/vo/SysRolePageVO.java (94%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/vo/SysUserInfo.java (93%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/model/vo/SysUserPageVO.java (96%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/FileService.java (91%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/service/LovBodyService.java (80%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/service/LovSearchService.java (80%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/service/LovService.java (79%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/SysConfigService.java (72%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/SysDictItemService.java (81%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/SysDictService.java (80%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/SysMenuService.java (74%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/SysOrganizationService.java (80%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/SysRoleMenuService.java (85%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/SysRoleService.java (73%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/SysUserRoleService.java (81%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/SysUserService.java (87%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/impl/FileServiceImpl.java (88%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/service/impl/LovBodyServiceImpl.java (73%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/service/impl/LovSearchServiceImpl.java (73%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/service/impl/LovServiceImpl.java (84%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/impl/SysConfigServiceImpl.java (71%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/impl/SysDictItemServiceImpl.java (78%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/impl/SysDictServiceImpl.java (79%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/impl/SysMenuServiceImpl.java (80%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/impl/SysOrganizationServiceImpl.java (88%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/impl/SysRoleMenuServiceImpl.java (84%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/impl/SysRoleServiceImpl.java (76%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/impl/SysUserRoleServiceImpl.java (90%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{sys => system}/service/impl/SysUserServiceImpl.java (90%) rename ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/{lov => system}/typehandler/ListLovSelectOptionTypeHandler.java (91%) diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/UpmsAutoConfiguration.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/UpmsAutoConfiguration.java index ab745aa5..2faeff87 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/UpmsAutoConfiguration.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/UpmsAutoConfiguration.java @@ -3,7 +3,7 @@ package com.hccake.ballcat.admin; import com.anji.captcha.service.CaptchaService; import com.hccake.ballcat.admin.constants.SecurityConst; import com.hccake.ballcat.admin.modules.notify.push.MailNotifyPusher; -import com.hccake.ballcat.admin.modules.sys.checker.AdminRuleProperties; +import com.hccake.ballcat.admin.modules.system.checker.AdminRuleProperties; import com.hccake.ballcat.admin.oauth.UserInfoCoordinator; import com.hccake.ballcat.admin.oauth.filter.LoginCaptchaFilter; import com.hccake.ballcat.common.mail.MailAutoConfiguration; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/config/AdminFillMetaObjectHandle.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/config/AdminFillMetaObjectHandle.java index 9b6870fd..dcafb2d9 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/config/AdminFillMetaObjectHandle.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/config/AdminFillMetaObjectHandle.java @@ -1,6 +1,6 @@ package com.hccake.ballcat.admin.config; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import com.hccake.ballcat.admin.oauth.util.SecurityUtils; import com.hccake.ballcat.common.conf.mybatis.FillMetaObjectHandle; import lombok.extern.slf4j.Slf4j; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/handler/AdminOperationLogHandler.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/handler/AdminOperationLogHandler.java index 826635b9..3c4a42c2 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/handler/AdminOperationLogHandler.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/handler/AdminOperationLogHandler.java @@ -2,7 +2,7 @@ package com.hccake.ballcat.admin.modules.log.handler; import com.hccake.ballcat.admin.modules.log.model.entity.AdminOperationLog; import com.hccake.ballcat.admin.modules.log.service.OperationLogAdminService; -import com.hccake.ballcat.admin.modules.sys.converter.OperationLogConverter; +import com.hccake.ballcat.admin.modules.system.converter.OperationLogConverter; import com.hccake.ballcat.commom.log.operation.model.OperationLogDTO; import com.hccake.ballcat.commom.log.operation.service.OperationLogHandler; import lombok.RequiredArgsConstructor; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/event/StationNotifyPushEvent.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/event/StationNotifyPushEvent.java index 1ae47701..162a4361 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/event/StationNotifyPushEvent.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/event/StationNotifyPushEvent.java @@ -1,7 +1,7 @@ package com.hccake.ballcat.admin.modules.notify.event; import com.hccake.ballcat.admin.modules.notify.model.domain.NotifyInfo; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/listener/AnnouncementLoginEventListener.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/listener/AnnouncementLoginEventListener.java index 2fe89644..90a9589a 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/listener/AnnouncementLoginEventListener.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/listener/AnnouncementLoginEventListener.java @@ -6,7 +6,7 @@ import com.hccake.ballcat.admin.modules.notify.model.entity.UserAnnouncement; import com.hccake.ballcat.admin.modules.notify.recipient.RecipientHandler; import com.hccake.ballcat.admin.modules.notify.service.AnnouncementService; import com.hccake.ballcat.admin.modules.notify.service.UserAnnouncementService; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import com.hccake.ballcat.admin.oauth.SysUserDetails; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/MailNotifyPusher.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/MailNotifyPusher.java index 559a8b7b..217ab018 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/MailNotifyPusher.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/MailNotifyPusher.java @@ -3,7 +3,7 @@ package com.hccake.ballcat.admin.modules.notify.push; import cn.hutool.core.util.StrUtil; import com.hccake.ballcat.admin.constants.NotifyChannel; import com.hccake.ballcat.admin.modules.notify.model.domain.NotifyInfo; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import com.hccake.ballcat.common.mail.model.MailDetails; import com.hccake.ballcat.common.mail.sender.MailSender; import lombok.RequiredArgsConstructor; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/NotifyPushExecutor.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/NotifyPushExecutor.java index 35cc2e82..2c3981d5 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/NotifyPushExecutor.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/NotifyPushExecutor.java @@ -3,7 +3,7 @@ package com.hccake.ballcat.admin.modules.notify.push; import cn.hutool.core.collection.CollectionUtil; import com.hccake.ballcat.admin.modules.notify.model.domain.NotifyInfo; import com.hccake.ballcat.admin.modules.notify.recipient.RecipientHandler; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/NotifyPusher.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/NotifyPusher.java index 188e1881..9c6045bf 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/NotifyPusher.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/NotifyPusher.java @@ -1,7 +1,7 @@ package com.hccake.ballcat.admin.modules.notify.push; import com.hccake.ballcat.admin.modules.notify.model.domain.NotifyInfo; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import java.util.List; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/SmsNotifyPusher.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/SmsNotifyPusher.java index 7901b101..a1b5b688 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/SmsNotifyPusher.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/SmsNotifyPusher.java @@ -3,7 +3,7 @@ package com.hccake.ballcat.admin.modules.notify.push; import cn.hutool.core.util.StrUtil; import com.hccake.ballcat.admin.constants.NotifyChannel; import com.hccake.ballcat.admin.modules.notify.model.domain.NotifyInfo; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import com.hccake.ballcat.common.util.HtmlUtils; import org.springframework.stereotype.Component; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/StationNotifyPusher.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/StationNotifyPusher.java index d28499f8..4959bcce 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/StationNotifyPusher.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/push/StationNotifyPusher.java @@ -3,7 +3,7 @@ package com.hccake.ballcat.admin.modules.notify.push; import com.hccake.ballcat.admin.constants.NotifyChannel; import com.hccake.ballcat.admin.modules.notify.event.StationNotifyPushEvent; import com.hccake.ballcat.admin.modules.notify.model.domain.NotifyInfo; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import lombok.RequiredArgsConstructor; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Component; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/AllRecipientFilter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/AllRecipientFilter.java index d48ef192..1aae6022 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/AllRecipientFilter.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/AllRecipientFilter.java @@ -1,8 +1,8 @@ package com.hccake.ballcat.admin.modules.notify.recipient; import com.hccake.ballcat.admin.constants.NotifyRecipientFilterType; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; -import com.hccake.ballcat.admin.modules.sys.service.SysUserService; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.service.SysUserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/RecipientFilter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/RecipientFilter.java index f938503c..039499e0 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/RecipientFilter.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/RecipientFilter.java @@ -1,6 +1,6 @@ package com.hccake.ballcat.admin.modules.notify.recipient; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import java.util.List; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/RecipientHandler.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/RecipientHandler.java index 903c8bd8..80d94343 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/RecipientHandler.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/RecipientHandler.java @@ -1,6 +1,6 @@ package com.hccake.ballcat.admin.modules.notify.recipient; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyOrganizationRecipientFilter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyOrganizationRecipientFilter.java index 40022369..8b36946d 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyOrganizationRecipientFilter.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyOrganizationRecipientFilter.java @@ -1,8 +1,8 @@ package com.hccake.ballcat.admin.modules.notify.recipient; import com.hccake.ballcat.admin.constants.NotifyRecipientFilterType; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; -import com.hccake.ballcat.admin.modules.sys.service.SysUserService; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.service.SysUserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyRoleRecipientFilter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyRoleRecipientFilter.java index 5c0a71df..ae6b6964 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyRoleRecipientFilter.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyRoleRecipientFilter.java @@ -2,8 +2,8 @@ package com.hccake.ballcat.admin.modules.notify.recipient; import cn.hutool.core.collection.CollectionUtil; import com.hccake.ballcat.admin.constants.NotifyRecipientFilterType; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; -import com.hccake.ballcat.admin.modules.sys.service.SysUserService; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.service.SysUserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyUserRecipientFilter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyUserRecipientFilter.java index 1d43ee4e..15d7c1d7 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyUserRecipientFilter.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyUserRecipientFilter.java @@ -1,8 +1,8 @@ package com.hccake.ballcat.admin.modules.notify.recipient; import com.hccake.ballcat.admin.constants.NotifyRecipientFilterType; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; -import com.hccake.ballcat.admin.modules.sys.service.SysUserService; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.service.SysUserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyUserTypeRecipientFilter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyUserTypeRecipientFilter.java index 75073cda..93bf48fa 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyUserTypeRecipientFilter.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/recipient/SpecifyUserTypeRecipientFilter.java @@ -1,8 +1,8 @@ package com.hccake.ballcat.admin.modules.notify.recipient; import com.hccake.ballcat.admin.constants.NotifyRecipientFilterType; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; -import com.hccake.ballcat.admin.modules.sys.service.SysUserService; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.service.SysUserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/impl/AnnouncementServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/impl/AnnouncementServiceImpl.java index be464d0f..3948d826 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/impl/AnnouncementServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/impl/AnnouncementServiceImpl.java @@ -16,7 +16,7 @@ import com.hccake.ballcat.admin.modules.notify.model.entity.Announcement; import com.hccake.ballcat.admin.modules.notify.model.qo.AnnouncementQO; import com.hccake.ballcat.admin.modules.notify.model.vo.AnnouncementPageVO; import com.hccake.ballcat.admin.modules.notify.service.AnnouncementService; -import com.hccake.ballcat.admin.modules.sys.service.FileService; +import com.hccake.ballcat.admin.modules.system.service.FileService; import com.hccake.ballcat.common.core.constant.enums.BooleanEnum; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/checker/AdminRuleProperties.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/checker/AdminRuleProperties.java similarity index 87% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/checker/AdminRuleProperties.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/checker/AdminRuleProperties.java index cf22ec4f..a35ad2d6 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/checker/AdminRuleProperties.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/checker/AdminRuleProperties.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.checker; +package com.hccake.ballcat.admin.modules.system.checker; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/checker/AdminUserChecker.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/checker/AdminUserChecker.java similarity index 78% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/checker/AdminUserChecker.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/checker/AdminUserChecker.java index 759ffb58..77265499 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/checker/AdminUserChecker.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/checker/AdminUserChecker.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.admin.modules.sys.checker; +package com.hccake.ballcat.admin.modules.system.checker; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; /** * 超级管理员账户规则配置 diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/checker/AdminUserCheckerImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/checker/AdminUserCheckerImpl.java similarity index 88% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/checker/AdminUserCheckerImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/checker/AdminUserCheckerImpl.java index 8ecb291c..f6854a88 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/checker/AdminUserCheckerImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/checker/AdminUserCheckerImpl.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.admin.modules.sys.checker; +package com.hccake.ballcat.admin.modules.system.checker; import cn.hutool.core.util.StrUtil; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import com.hccake.ballcat.admin.oauth.util.SecurityUtils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/AuthController.java similarity index 97% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/AuthController.java index 67939159..0d03ae38 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/AuthController.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.controller; +package com.hccake.ballcat.admin.modules.system.controller; import cn.hutool.core.util.StrUtil; import com.hccake.ballcat.common.model.result.R; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/controller/LovController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/LovController.java similarity index 80% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/controller/LovController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/LovController.java index c2e7eda6..d8fd1d93 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/controller/LovController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/LovController.java @@ -1,14 +1,14 @@ -package com.hccake.ballcat.admin.modules.lov.controller; +package com.hccake.ballcat.admin.modules.system.controller; -import com.hccake.ballcat.admin.modules.lov.converter.LovConverter; -import com.hccake.ballcat.admin.modules.lov.model.dto.LovDTO; -import com.hccake.ballcat.admin.modules.lov.model.entity.Lov; -import com.hccake.ballcat.admin.modules.lov.model.qo.LovQO; -import com.hccake.ballcat.admin.modules.lov.model.vo.LovInfoVO; -import com.hccake.ballcat.admin.modules.lov.model.vo.LovPageVO; -import com.hccake.ballcat.admin.modules.lov.service.LovBodyService; -import com.hccake.ballcat.admin.modules.lov.service.LovSearchService; -import com.hccake.ballcat.admin.modules.lov.service.LovService; +import com.hccake.ballcat.admin.modules.system.converter.LovConverter; +import com.hccake.ballcat.admin.modules.system.model.dto.LovDTO; +import com.hccake.ballcat.admin.modules.system.model.entity.Lov; +import com.hccake.ballcat.admin.modules.system.model.qo.LovQO; +import com.hccake.ballcat.admin.modules.system.model.vo.LovInfoVO; +import com.hccake.ballcat.admin.modules.system.model.vo.LovPageVO; +import com.hccake.ballcat.admin.modules.system.service.LovBodyService; +import com.hccake.ballcat.admin.modules.system.service.LovSearchService; +import com.hccake.ballcat.admin.modules.system.service.LovService; import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging; @@ -18,10 +18,6 @@ import com.hccake.ballcat.common.model.result.BaseResultCode; import com.hccake.ballcat.common.model.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; @@ -33,13 +29,18 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** * @author lingting 2020-08-10 16:40 */ @RestController @RequiredArgsConstructor -@RequestMapping("/lov") -@Api(value = "lov", tags = "lov管理") +@RequestMapping("/system/lov") +@Api(value = "system-lov", tags = "弹窗选择器") public class LovController { private final LovService lovService; @@ -56,7 +57,7 @@ public class LovController { */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page") - @PreAuthorize("@per.hasPermission('sys:lov:read')") + @PreAuthorize("@per.hasPermission('system:lov:read')") public R> getLovPage(PageParam pageParam, LovQO qo) { return R.ok(lovService.queryPage(pageParam, qo)); } @@ -93,7 +94,7 @@ public class LovController { @ApiOperation(value = "新增lov", notes = "新增lov") @CreateOperationLogging(msg = "新增lov") @PutMapping - @PreAuthorize("@per.hasPermission('sys:lov:add')") + @PreAuthorize("@per.hasPermission('system:lov:add')") public R save(@RequestBody LovDTO dto) { return lovService.save(dto.toLov(), dto.getBodyList(), dto.getSearchList()) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新增lov失败!"); @@ -107,7 +108,7 @@ public class LovController { @ApiOperation(value = "修改lov", notes = "修改lov") @UpdateOperationLogging(msg = "修改lov") @PostMapping - @PreAuthorize("@per.hasPermission('sys:lov:edit')") + @PreAuthorize("@per.hasPermission('system:lov:edit')") public R updateById(@RequestBody LovDTO dto) { return lovService.update(dto.toLov(), dto.getBodyList(), dto.getSearchList()) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改lov失败"); @@ -121,7 +122,7 @@ public class LovController { @ApiOperation(value = "通过id删除lov", notes = "通过id删除lov") @DeleteOperationLogging(msg = "通过id删除lov") @DeleteMapping("/{id}") - @PreAuthorize("@per.hasPermission('sys:lov:del')") + @PreAuthorize("@per.hasPermission('system:lov:del')") public R removeById(@PathVariable Integer id) { return lovService.remove(id) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "通过id删除lov失败"); } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysConfigController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysConfigController.java similarity index 78% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysConfigController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysConfigController.java index 609667e6..89709257 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysConfigController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysConfigController.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.admin.modules.sys.controller; +package com.hccake.ballcat.admin.modules.system.controller; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysConfigQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysConfigPageVO; -import com.hccake.ballcat.admin.modules.sys.service.SysConfigService; +import com.hccake.ballcat.admin.modules.system.model.entity.SysConfig; +import com.hccake.ballcat.admin.modules.system.model.qo.SysConfigQO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysConfigPageVO; +import com.hccake.ballcat.admin.modules.system.service.SysConfigService; import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging; @@ -24,8 +24,8 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequiredArgsConstructor -@RequestMapping("sys/config") -@Api(value = "sys/config", tags = "系统配置") +@RequestMapping("/system/config") +@Api(value = "system-config", tags = "系统配置") public class SysConfigController { private final SysConfigService sysConfigService; @@ -38,7 +38,7 @@ public class SysConfigController { */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page") - @PreAuthorize("@per.hasPermission('sys:config:read')") + @PreAuthorize("@per.hasPermission('system:config:read')") public R> getSysConfigPage(PageParam pageParam, SysConfigQO sysConfigQO) { return R.ok(sysConfigService.queryPage(pageParam, sysConfigQO)); } @@ -50,7 +50,7 @@ public class SysConfigController { */ @ApiOperation(value = "通过id查询", notes = "通过id查询") @GetMapping("/{id}") - @PreAuthorize("@per.hasPermission('sys:config:read')") + @PreAuthorize("@per.hasPermission('system:config:read')") public R getById(@PathVariable("id") Integer id) { return R.ok(sysConfigService.getById(id)); } @@ -63,7 +63,7 @@ public class SysConfigController { @ApiOperation(value = "新增系统配置表", notes = "新增系统配置表") @CreateOperationLogging(msg = "新增系统配置表") @PostMapping - @PreAuthorize("@per.hasPermission('sys:config:add')") + @PreAuthorize("@per.hasPermission('system:config:add')") public R save(@RequestBody SysConfig sysConfig) { return R.ok(sysConfigService.save(sysConfig)); } @@ -76,7 +76,7 @@ public class SysConfigController { @ApiOperation(value = "修改系统配置表", notes = "修改系统配置表") @UpdateOperationLogging(msg = "修改系统配置表") @PutMapping - @PreAuthorize("@per.hasPermission('sys:config:edit')") + @PreAuthorize("@per.hasPermission('system:config:edit')") public R updateById(@RequestBody SysConfig sysConfig) { return R.ok(sysConfigService.updateById(sysConfig)); } @@ -89,7 +89,7 @@ public class SysConfigController { @ApiOperation(value = "通过id删除系统配置表", notes = "通过id删除系统配置表") @DeleteOperationLogging(msg = "通过id删除系统配置表") @DeleteMapping("/{id}") - @PreAuthorize("@per.hasPermission('sys:config:del')") + @PreAuthorize("@per.hasPermission('system:config:del')") public R removeById(@PathVariable Integer id) { return R.ok(sysConfigService.removeById(id)); } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysDictController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysDictController.java similarity index 81% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysDictController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysDictController.java index fb46b974..75b32333 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysDictController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysDictController.java @@ -1,12 +1,12 @@ -package com.hccake.ballcat.admin.modules.sys.controller; +package com.hccake.ballcat.admin.modules.system.controller; -import com.hccake.ballcat.admin.modules.sys.manager.SysDictManager; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.DictDataVO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemPageVO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictPageVO; +import com.hccake.ballcat.admin.modules.system.manager.SysDictManager; +import com.hccake.ballcat.admin.modules.system.model.entity.SysDict; +import com.hccake.ballcat.admin.modules.system.model.entity.SysDictItem; +import com.hccake.ballcat.admin.modules.system.model.qo.SysDictQO; +import com.hccake.ballcat.admin.modules.system.model.vo.DictDataVO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysDictItemPageVO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysDictPageVO; import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging; @@ -31,8 +31,8 @@ import java.util.Map; */ @RestController @RequiredArgsConstructor -@RequestMapping("/sys/dict") -@Api(value = "/sys/dict", tags = "字典表管理") +@RequestMapping("/system/dict") +@Api(value = "system-dict", tags = "字典表管理") public class SysDictController { private final SysDictManager sysDictManager; @@ -65,7 +65,7 @@ public class SysDictController { */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/page") - @PreAuthorize("@per.hasPermission('sys:dict:read')") + @PreAuthorize("@per.hasPermission('system:dict:read')") public R> getSysDictPage(PageParam pageParam, SysDictQO sysDictQO) { return R.ok(sysDictManager.dictPage(pageParam, sysDictQO)); } @@ -78,7 +78,7 @@ public class SysDictController { @ApiOperation(value = "新增字典表", notes = "新增字典表") @CreateOperationLogging(msg = "新增字典表") @PostMapping - @PreAuthorize("@per.hasPermission('sys:dict:add')") + @PreAuthorize("@per.hasPermission('system:dict:add')") public R save(@RequestBody SysDict sysDict) { return sysDictManager.dictSave(sysDict) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新增字典表失败"); } @@ -91,7 +91,7 @@ public class SysDictController { @ApiOperation(value = "修改字典表", notes = "修改字典表") @UpdateOperationLogging(msg = "修改字典表") @PutMapping - @PreAuthorize("@per.hasPermission('sys:dict:edit')") + @PreAuthorize("@per.hasPermission('system:dict:edit')") public R updateById(@RequestBody SysDict sysDict) { return sysDictManager.updateDictById(sysDict) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改字典表失败"); @@ -105,7 +105,7 @@ public class SysDictController { @ApiOperation(value = "通过id删除字典表", notes = "通过id删除字典表") @DeleteOperationLogging(msg = "通过id删除字典表") @DeleteMapping("/{id}") - @PreAuthorize("@per.hasPermission('sys:dict:del')") + @PreAuthorize("@per.hasPermission('system:dict:del')") public R removeById(@PathVariable Integer id) { return sysDictManager.removeDictById(id) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "通过id删除字典表失败"); @@ -119,7 +119,7 @@ public class SysDictController { */ @ApiOperation(value = "分页查询", notes = "分页查询") @GetMapping("/item/page") - @PreAuthorize("@per.hasPermission('sys:dict:read')") + @PreAuthorize("@per.hasPermission('system:dict:read')") public R> getSysDictItemPage(PageParam pageParam, @RequestParam("dictCode") String dictCode) { return R.ok(sysDictManager.dictItemPage(pageParam, dictCode)); @@ -133,7 +133,7 @@ public class SysDictController { @ApiOperation(value = "新增字典项", notes = "新增字典项") @CreateOperationLogging(msg = "新增字典项") @PostMapping("item") - @PreAuthorize("@per.hasPermission('sys:dict:add')") + @PreAuthorize("@per.hasPermission('system:dict:add')") public R saveItem(@RequestBody SysDictItem sysDictItem) { return sysDictManager.saveDictItem(sysDictItem) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新增字典项失败"); @@ -147,7 +147,7 @@ public class SysDictController { @ApiOperation(value = "修改字典项", notes = "修改字典项") @UpdateOperationLogging(msg = "修改字典项") @PutMapping("item") - @PreAuthorize("@per.hasPermission('sys:dict:edit')") + @PreAuthorize("@per.hasPermission('system:dict:edit')") public R updateItemById(@RequestBody SysDictItem sysDictItem) { return sysDictManager.updateDictItemById(sysDictItem) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改字典项失败"); @@ -161,7 +161,7 @@ public class SysDictController { @ApiOperation(value = "通过id删除字典项", notes = "通过id删除字典项") @DeleteOperationLogging(msg = "通过id删除字典项") @DeleteMapping("/item/{id}") - @PreAuthorize("@per.hasPermission('sys:dict:del')") + @PreAuthorize("@per.hasPermission('system:dict:del')") public R removeItemById(@PathVariable Integer id) { return sysDictManager.removeDictItemById(id) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "通过id删除字典项失败"); diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysMenuController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysMenuController.java similarity index 83% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysMenuController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysMenuController.java index e9a5678c..4c816e0e 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysMenuController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysMenuController.java @@ -1,12 +1,12 @@ -package com.hccake.ballcat.admin.modules.sys.controller; +package com.hccake.ballcat.admin.modules.system.controller; import cn.hutool.core.collection.CollectionUtil; import com.hccake.ballcat.admin.constants.SysPermissionConst; -import com.hccake.ballcat.admin.modules.sys.converter.SysMenuConverter; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysMenu; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysMenuQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysMenuRouterVO; -import com.hccake.ballcat.admin.modules.sys.service.SysMenuService; +import com.hccake.ballcat.admin.modules.system.converter.SysMenuConverter; +import com.hccake.ballcat.admin.modules.system.model.entity.SysMenu; +import com.hccake.ballcat.admin.modules.system.model.qo.SysMenuQO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysMenuRouterVO; +import com.hccake.ballcat.admin.modules.system.service.SysMenuService; import com.hccake.ballcat.admin.oauth.SysUserDetails; import com.hccake.ballcat.admin.oauth.domain.UserResources; import com.hccake.ballcat.admin.oauth.util.SecurityUtils; @@ -31,8 +31,8 @@ import java.util.stream.Collectors; */ @RestController @RequiredArgsConstructor -@RequestMapping("/sys/sysmenu") -@Api(value = "sysmenu", tags = "菜单权限管理") +@RequestMapping("/system/menu") +@Api(value = "system-menu", tags = "菜单权限管理") public class SysMenuController { private final SysMenuService sysMenuService; @@ -73,7 +73,7 @@ public class SysMenuController { */ @ApiOperation(value = "查询菜单列表", notes = "查询菜单列表") @GetMapping("/list") - @PreAuthorize("@per.hasPermission('sys:sysmenu:read')") + @PreAuthorize("@per.hasPermission('system:menu:read')") public R> getSysMenuPage(SysMenuQO sysMenuQO) { return R.ok(sysMenuService.listOrderBySort(sysMenuQO)); } @@ -86,7 +86,7 @@ public class SysMenuController { @ApiOperation(value = "新增菜单权限", notes = "新增菜单权限") @CreateOperationLogging(msg = "新增菜单权限") @PostMapping - @PreAuthorize("@per.hasPermission('sys:sysmenu:add')") + @PreAuthorize("@per.hasPermission('system:menu:add')") public R save(@RequestBody SysMenu sysMenu) { return sysMenuService.save(sysMenu) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新增菜单权限失败"); } @@ -99,7 +99,7 @@ public class SysMenuController { @ApiOperation(value = "修改菜单权限", notes = "修改菜单权限") @UpdateOperationLogging(msg = "修改菜单权限") @PutMapping - @PreAuthorize("@per.hasPermission('sys:sysmenu:edit')") + @PreAuthorize("@per.hasPermission('system:menu:edit')") public R updateById(@RequestBody SysMenu sysMenu) { return sysMenuService.updateById(sysMenu) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改菜单权限失败"); } @@ -112,7 +112,7 @@ public class SysMenuController { @ApiOperation(value = "通过id删除菜单权限", notes = "通过id删除菜单权限") @DeleteOperationLogging(msg = "通过id删除菜单权限") @DeleteMapping("/{id}") - @PreAuthorize("@per.hasPermission('sys:sysmenu:del')") + @PreAuthorize("@per.hasPermission('system:menu:del')") public R removeById(@PathVariable Integer id) { return sysMenuService.removeById(id) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "通过id删除菜单权限失败"); } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysOrganizationController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysOrganizationController.java similarity index 79% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysOrganizationController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysOrganizationController.java index becd0dfb..70ffcc7a 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysOrganizationController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysOrganizationController.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.modules.sys.controller; +package com.hccake.ballcat.admin.modules.system.controller; -import com.hccake.ballcat.admin.modules.sys.model.dto.SysOrganizationDTO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysOrganizationTree; -import com.hccake.ballcat.admin.modules.sys.service.SysOrganizationService; +import com.hccake.ballcat.admin.modules.system.model.dto.SysOrganizationDTO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysOrganizationTree; +import com.hccake.ballcat.admin.modules.system.service.SysOrganizationService; import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging; @@ -23,8 +23,8 @@ import java.util.List; */ @RestController @RequiredArgsConstructor -@RequestMapping("/sys/organization") -@Api(value = "organization", tags = "组织架构管理") +@RequestMapping("/system/organization") +@Api(value = "system-organization", tags = "组织架构管理") public class SysOrganizationController { private final SysOrganizationService sysOrganizationService; @@ -35,7 +35,7 @@ public class SysOrganizationController { */ @ApiOperation(value = "组织架构树查询", notes = "组织架构树查询") @GetMapping("/tree") - @PreAuthorize("@per.hasPermission('sys:organization:read')") + @PreAuthorize("@per.hasPermission('system:organization:read')") public R> getOrganizationTree() { return R.ok(sysOrganizationService.listTree()); } @@ -48,7 +48,7 @@ public class SysOrganizationController { @ApiOperation(value = "新增组织架构", notes = "新增组织架构") @CreateOperationLogging(msg = "新增组织架构") @PostMapping - @PreAuthorize("@per.hasPermission('sys:organization:add')") + @PreAuthorize("@per.hasPermission('system:organization:add')") public R save(@RequestBody SysOrganizationDTO sysOrganizationDTO) { return sysOrganizationService.create(sysOrganizationDTO) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新增组织架构失败"); @@ -62,7 +62,7 @@ public class SysOrganizationController { @ApiOperation(value = "修改组织架构", notes = "修改组织架构") @UpdateOperationLogging(msg = "修改组织架构") @PutMapping - @PreAuthorize("@per.hasPermission('sys:organization:edit')") + @PreAuthorize("@per.hasPermission('system:organization:edit')") public R updateById(@RequestBody SysOrganizationDTO sysOrganizationDTO) { return sysOrganizationService.update(sysOrganizationDTO) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改组织架构失败"); @@ -76,7 +76,7 @@ public class SysOrganizationController { @ApiOperation(value = "通过id删除组织架构", notes = "通过id删除组织架构") @DeleteOperationLogging(msg = "通过id删除组织架构") @DeleteMapping("/{id}") - @PreAuthorize("@per.hasPermission('sys:organization:del')") + @PreAuthorize("@per.hasPermission('system:organization:del')") public R removeById(@PathVariable Integer id) { return sysOrganizationService.removeById(id) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "通过id删除组织架构失败"); diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysRoleController.java similarity index 77% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysRoleController.java index 72b1853b..123e43f1 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysRoleController.java @@ -1,18 +1,18 @@ -package com.hccake.ballcat.admin.modules.sys.controller; +package com.hccake.ballcat.admin.modules.system.controller; import com.hccake.ballcat.admin.constants.SysRoleConst; -import com.hccake.ballcat.admin.modules.sys.converter.SysRoleConverter; -import com.hccake.ballcat.admin.modules.sys.model.dto.SysRoleUpdateDTO; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysMenu; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; -import com.hccake.ballcat.admin.modules.sys.model.qo.RoleBindUserQO; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysRoleQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.RoleBindUserVO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysRolePageVO; -import com.hccake.ballcat.admin.modules.sys.service.SysMenuService; -import com.hccake.ballcat.admin.modules.sys.service.SysRoleMenuService; -import com.hccake.ballcat.admin.modules.sys.service.SysRoleService; -import com.hccake.ballcat.admin.modules.sys.service.SysUserRoleService; +import com.hccake.ballcat.admin.modules.system.converter.SysRoleConverter; +import com.hccake.ballcat.admin.modules.system.model.dto.SysRoleUpdateDTO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysMenu; +import com.hccake.ballcat.admin.modules.system.model.entity.SysRole; +import com.hccake.ballcat.admin.modules.system.model.qo.RoleBindUserQO; +import com.hccake.ballcat.admin.modules.system.model.qo.SysRoleQO; +import com.hccake.ballcat.admin.modules.system.model.vo.RoleBindUserVO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysRolePageVO; +import com.hccake.ballcat.admin.modules.system.service.SysMenuService; +import com.hccake.ballcat.admin.modules.system.service.SysRoleMenuService; +import com.hccake.ballcat.admin.modules.system.service.SysRoleService; +import com.hccake.ballcat.admin.modules.system.service.SysUserRoleService; import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging; @@ -35,8 +35,8 @@ import java.util.stream.Collectors; * @author Hccake */ @RestController -@RequestMapping("/sysrole") -@Api(value = "sysrole", tags = "角色管理模块") +@RequestMapping("/system/role") +@Api(value = "system-role", tags = "角色管理模块") @RequiredArgsConstructor public class SysRoleController { @@ -54,7 +54,7 @@ public class SysRoleController { * @return PageResult 分页结果 */ @GetMapping("/page") - @PreAuthorize("@per.hasPermission('sys:sysrole:read')") + @PreAuthorize("@per.hasPermission('system:role:read')") public R> getRolePage(PageParam pageParam, SysRoleQO sysRoleQo) { return R.ok(sysRoleService.queryPage(pageParam, sysRoleQo)); } @@ -65,7 +65,7 @@ public class SysRoleController { * @return 角色信息 */ @GetMapping("/{id}") - @PreAuthorize("@per.hasPermission('sys:sysrole:read')") + @PreAuthorize("@per.hasPermission('system:role:read')") public R getById(@PathVariable Integer id) { return R.ok(sysRoleService.getById(id)); } @@ -78,7 +78,7 @@ public class SysRoleController { @ApiOperation(value = "新增系统角色", notes = "新增系统角色") @CreateOperationLogging(msg = "新增系统角色") @PostMapping - @PreAuthorize("@per.hasPermission('sys:sysrole:add')") + @PreAuthorize("@per.hasPermission('system:role:add')") public R save(@Valid @RequestBody SysRole sysRole) { return R.ok(sysRoleService.save(sysRole)); } @@ -91,7 +91,7 @@ public class SysRoleController { @ApiOperation(value = "修改系统角色", notes = "修改系统角色") @UpdateOperationLogging(msg = "修改系统角色") @PutMapping - @PreAuthorize("@per.hasPermission('sys:sysrole:edit')") + @PreAuthorize("@per.hasPermission('system:role:edit')") public R update(@Valid @RequestBody SysRoleUpdateDTO roleUpdateDTO) { SysRole sysRole = SysRoleConverter.INSTANCE.dtoToPo(roleUpdateDTO); return R.ok(sysRoleService.updateById(sysRole)); @@ -105,7 +105,7 @@ public class SysRoleController { @DeleteMapping("/{id}") @ApiOperation(value = "通过id删除系统角色", notes = "通过id删除系统角色") @DeleteOperationLogging(msg = "通过id删除系统角色") - @PreAuthorize("@per.hasPermission('sys:sysrole:del')") + @PreAuthorize("@per.hasPermission('system:role:del')") public R removeById(@PathVariable Integer id) { SysRole oldRole = sysRoleService.getById(id); if (SysRoleConst.Type.SYSTEM.getValue().equals(oldRole.getType())) { @@ -132,7 +132,7 @@ public class SysRoleController { @PutMapping("/permission/code/{roleCode}") @ApiOperation(value = "更新角色权限", notes = "更新角色权限") @UpdateOperationLogging(msg = "更新角色权限") - @PreAuthorize("@per.hasPermission('sys:sysrole:grant')") + @PreAuthorize("@per.hasPermission('system:role:grant')") public R savePermissionIds(@PathVariable String roleCode, @RequestBody Integer[] permissionIds) { return R.ok(sysRoleMenuService.saveRoleMenus(roleCode, permissionIds)); } @@ -165,7 +165,7 @@ public class SysRoleController { */ @GetMapping("/user/page") @ApiOperation(value = "查看已授权指定角色的用户列表", notes = "查看已授权指定角色的用户列表") - @PreAuthorize("@per.hasPermission('sys:sysrole:grant')") + @PreAuthorize("@per.hasPermission('system:role:grant')") public R> queryUserPageByRoleCode(PageParam pageParam, @Valid RoleBindUserQO roleBindUserQO) { return R.ok(sysUserRoleService.queryUserPageByRoleCode(pageParam, roleBindUserQO)); @@ -177,7 +177,7 @@ public class SysRoleController { */ @DeleteMapping("/user") @ApiOperation(value = "解绑与用户绑定关系", notes = "解绑与用户绑定关系") - @PreAuthorize("@per.hasPermission('sys:sysrole:grant')") + @PreAuthorize("@per.hasPermission('system:role:grant')") public R unbindRoleUser(@RequestParam Integer userId, @RequestParam String roleCode) { return R.ok(sysUserRoleService.unbindRoleUser(userId, roleCode)); } diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysUserController.java similarity index 84% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysUserController.java index 9c3b21cf..fe9955be 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/controller/SysUserController.java @@ -1,16 +1,16 @@ -package com.hccake.ballcat.admin.modules.sys.controller; +package com.hccake.ballcat.admin.modules.system.controller; import cn.hutool.core.collection.CollectionUtil; import com.hccake.ballcat.admin.constants.SysUserConst; -import com.hccake.ballcat.admin.modules.sys.model.dto.SysUserDTO; -import com.hccake.ballcat.admin.modules.sys.model.dto.SysUserPassDTO; -import com.hccake.ballcat.admin.modules.sys.model.dto.SysUserScope; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysUserQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserPageVO; -import com.hccake.ballcat.admin.modules.sys.service.SysUserRoleService; -import com.hccake.ballcat.admin.modules.sys.service.SysUserService; +import com.hccake.ballcat.admin.modules.system.model.dto.SysUserDTO; +import com.hccake.ballcat.admin.modules.system.model.dto.SysUserPassDTO; +import com.hccake.ballcat.admin.modules.system.model.dto.SysUserScope; +import com.hccake.ballcat.admin.modules.system.model.entity.SysRole; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.qo.SysUserQO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysUserPageVO; +import com.hccake.ballcat.admin.modules.system.service.SysUserRoleService; +import com.hccake.ballcat.admin.modules.system.service.SysUserService; import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging; import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging; @@ -47,8 +47,8 @@ import java.util.List; @Slf4j @Validated @RestController -@RequestMapping("/sysuser") -@Api(value = "sysuser", tags = "用户管理模块") +@RequestMapping("/system/user") +@Api(value = "system-user", tags = "用户管理模块") @RequiredArgsConstructor public class SysUserController { @@ -68,7 +68,7 @@ public class SysUserController { * @return 用户集合 */ @GetMapping("/page") - @PreAuthorize("@per.hasPermission('sys:sysuser:read')") + @PreAuthorize("@per.hasPermission('system:user:read')") public R> getUserPage(PageParam pageParam, SysUserQO qo) { return R.ok(sysUserService.queryPage(pageParam, qo)); } @@ -78,7 +78,7 @@ public class SysUserController { * @return 用户SelectData */ @GetMapping("/select") - @PreAuthorize("@per.hasPermission('sys:sysuser:read')") + @PreAuthorize("@per.hasPermission('system:user:read')") public R>> listSelectData( @RequestParam(value = "userTypes", required = false) List userTypes) { return R.ok(sysUserService.listSelectData(userTypes)); @@ -92,7 +92,7 @@ public class SysUserController { @PostMapping @ApiOperation(value = "新增系统用户", notes = "新增系统用户") @CreateOperationLogging(msg = "新增系统用户") - @PreAuthorize("@per.hasPermission('sys:sysuser:add')") + @PreAuthorize("@per.hasPermission('system:user:add')") public R addSysUser(@Valid @RequestBody SysUserDTO sysUserDTO) { SysUser user = sysUserService.getByUsername(sysUserDTO.getUsername()); if (user != null) { @@ -113,7 +113,7 @@ public class SysUserController { @PutMapping @ApiOperation(value = "修改系统用户", notes = "修改系统用户") @UpdateOperationLogging(msg = "修改系统用户") - @PreAuthorize("@per.hasPermission('sys:sysuser:edit')") + @PreAuthorize("@per.hasPermission('system:user:edit')") public R updateUserInfo(@Valid @RequestBody SysUserDTO sysUserDto) { return sysUserService.updateSysUser(sysUserDto) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "修改系统用户失败"); @@ -125,7 +125,7 @@ public class SysUserController { @DeleteMapping("/{userId}") @ApiOperation(value = "通过id删除系统用户", notes = "通过id删除系统用户") @DeleteOperationLogging(msg = "通过id删除系统用户") - @PreAuthorize("@per.hasPermission('sys:sysuser:del')") + @PreAuthorize("@per.hasPermission('system:user:del')") public R deleteByUserId(@PathVariable Integer userId) { return sysUserService.deleteByUserId(userId) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "删除系统用户失败"); @@ -136,7 +136,7 @@ public class SysUserController { * @param userId userId */ @GetMapping("/scope/{userId}") - @PreAuthorize("@per.hasPermission('sys:sysuser:grant')") + @PreAuthorize("@per.hasPermission('system:user:grant')") public R getUserRoleIds(@PathVariable Integer userId) { List roleList = sysUserRoleService.listRoles(userId); @@ -160,7 +160,7 @@ public class SysUserController { @PutMapping("/scope/{userId}") @ApiOperation(value = "系统用户授权", notes = "系统用户授权") @UpdateOperationLogging(msg = "系统用户授权") - @PreAuthorize("@per.hasPermission('sys:sysuser:grant')") + @PreAuthorize("@per.hasPermission('system:user:grant')") public R updateUserScope(@PathVariable Integer userId, @RequestBody SysUserScope sysUserScope) { return sysUserService.updateUserScope(userId, sysUserScope) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "系统用户授权失败"); @@ -172,7 +172,7 @@ public class SysUserController { @PutMapping("/pass/{userId}") @ApiOperation(value = "修改系统用户密码", notes = "修改系统用户密码") @UpdateOperationLogging(msg = "修改系统用户密码") - @PreAuthorize("@per.hasPermission('sys:sysuser:pass')") + @PreAuthorize("@per.hasPermission('system:user:pass')") public R updateUserPass(@PathVariable Integer userId, @RequestBody SysUserPassDTO sysUserPassDTO) { String pass = sysUserPassDTO.getPass(); if (!pass.equals(sysUserPassDTO.getConfirmPass())) { @@ -191,7 +191,7 @@ public class SysUserController { @PutMapping("/status") @ApiOperation(value = "批量修改用户状态", notes = "批量修改用户状态") @UpdateOperationLogging(msg = "批量修改用户状态") - @PreAuthorize("@per.hasPermission('sys:sysuser:edit')") + @PreAuthorize("@per.hasPermission('system:user:edit')") public R updateUserStatus(@NotEmpty(message = "用户ID不能为空") @RequestBody List userIds, @NotNull(message = "用户状态不能为空") @RequestParam Integer status) { @@ -205,7 +205,7 @@ public class SysUserController { @ApiOperation(value = "修改系统用户头像", notes = "修改系统用户头像") @UpdateOperationLogging(msg = "修改系统用户头像") - @PreAuthorize("@per.hasPermission('sys:sysuser:edit')") + @PreAuthorize("@per.hasPermission('system:user:edit')") @PostMapping("/avatar") public R updateAvatar(@RequestParam("file") MultipartFile file, @RequestParam("userId") Integer userId) { String objectName; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/converter/LovConverter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/LovConverter.java similarity index 69% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/converter/LovConverter.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/LovConverter.java index 2f102692..98484bc7 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/converter/LovConverter.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/LovConverter.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.modules.lov.converter; +package com.hccake.ballcat.admin.modules.system.converter; -import com.hccake.ballcat.admin.modules.lov.model.entity.Lov; -import com.hccake.ballcat.admin.modules.lov.model.vo.LovInfoVO; -import com.hccake.ballcat.admin.modules.lov.model.vo.LovPageVO; +import com.hccake.ballcat.admin.modules.system.model.entity.Lov; +import com.hccake.ballcat.admin.modules.system.model.vo.LovInfoVO; +import com.hccake.ballcat.admin.modules.system.model.vo.LovPageVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/OperationLogConverter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/OperationLogConverter.java similarity index 91% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/OperationLogConverter.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/OperationLogConverter.java index 078fb222..e8087af5 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/OperationLogConverter.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/OperationLogConverter.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.converter; +package com.hccake.ballcat.admin.modules.system.converter; import com.hccake.ballcat.admin.modules.log.model.entity.AdminOperationLog; import com.hccake.ballcat.commom.log.operation.model.OperationLogDTO; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysConfigConverter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysConfigConverter.java similarity index 67% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysConfigConverter.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysConfigConverter.java index c501e2cd..3352bbc1 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysConfigConverter.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysConfigConverter.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.admin.modules.sys.converter; +package com.hccake.ballcat.admin.modules.system.converter; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysConfigPageVO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysConfig; +import com.hccake.ballcat.admin.modules.system.model.vo.SysConfigPageVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysDictConverter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysDictConverter.java similarity index 66% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysDictConverter.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysDictConverter.java index 700fbb65..4c087578 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysDictConverter.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysDictConverter.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.admin.modules.sys.converter; +package com.hccake.ballcat.admin.modules.system.converter; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictPageVO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysDict; +import com.hccake.ballcat.admin.modules.system.model.vo.SysDictPageVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysDictItemConverter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysDictItemConverter.java similarity index 67% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysDictItemConverter.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysDictItemConverter.java index 183c9251..3f1a2ac3 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysDictItemConverter.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysDictItemConverter.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.modules.sys.converter; +package com.hccake.ballcat.admin.modules.system.converter; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem; -import com.hccake.ballcat.admin.modules.sys.model.vo.DictItemVO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemPageVO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysDictItem; +import com.hccake.ballcat.admin.modules.system.model.vo.DictItemVO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysDictItemPageVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysMenuConverter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysMenuConverter.java similarity index 67% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysMenuConverter.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysMenuConverter.java index 92910dfd..cfbd48f0 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysMenuConverter.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysMenuConverter.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.modules.sys.converter; +package com.hccake.ballcat.admin.modules.system.converter; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysMenu; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysMenuRouterVO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysMenuPageVO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysMenu; +import com.hccake.ballcat.admin.modules.system.model.vo.SysMenuRouterVO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysMenuPageVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysOrganizationConverter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysOrganizationConverter.java similarity index 68% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysOrganizationConverter.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysOrganizationConverter.java index 699b59f5..858e9a21 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysOrganizationConverter.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysOrganizationConverter.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.modules.sys.converter; +package com.hccake.ballcat.admin.modules.system.converter; -import com.hccake.ballcat.admin.modules.sys.model.dto.SysOrganizationDTO; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysOrganization; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysOrganizationTree; +import com.hccake.ballcat.admin.modules.system.model.dto.SysOrganizationDTO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysOrganization; +import com.hccake.ballcat.admin.modules.system.model.vo.SysOrganizationTree; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysRoleConverter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysRoleConverter.java similarity index 66% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysRoleConverter.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysRoleConverter.java index dd20c816..d255815a 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysRoleConverter.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysRoleConverter.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.modules.sys.converter; +package com.hccake.ballcat.admin.modules.system.converter; -import com.hccake.ballcat.admin.modules.sys.model.dto.SysRoleUpdateDTO; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysRolePageVO; +import com.hccake.ballcat.admin.modules.system.model.dto.SysRoleUpdateDTO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysRole; +import com.hccake.ballcat.admin.modules.system.model.vo.SysRolePageVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysUserConverter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysUserConverter.java similarity index 69% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysUserConverter.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysUserConverter.java index 8f30c746..7edab52f 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/converter/SysUserConverter.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/converter/SysUserConverter.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.admin.modules.sys.converter; +package com.hccake.ballcat.admin.modules.system.converter; -import com.hccake.ballcat.admin.modules.sys.model.dto.SysUserDTO; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserInfo; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserPageVO; +import com.hccake.ballcat.admin.modules.system.model.dto.SysUserDTO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.vo.SysUserInfo; +import com.hccake.ballcat.admin.modules.system.model.vo.SysUserPageVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/enums/HttpMethod.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/enums/HttpMethod.java similarity index 83% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/enums/HttpMethod.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/enums/HttpMethod.java index 4b1f0465..6e16fad8 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/enums/HttpMethod.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/enums/HttpMethod.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.lov.enums; +package com.hccake.ballcat.admin.modules.system.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/enums/HttpParamsPosition.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/enums/HttpParamsPosition.java similarity index 86% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/enums/HttpParamsPosition.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/enums/HttpParamsPosition.java index 84678a0f..bd8a8c33 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/enums/HttpParamsPosition.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/enums/HttpParamsPosition.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.lov.enums; +package com.hccake.ballcat.admin.modules.system.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/enums/Tag.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/enums/Tag.java similarity index 80% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/enums/Tag.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/enums/Tag.java index 304acf07..263f3fdd 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/enums/Tag.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/enums/Tag.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.lov.enums; +package com.hccake.ballcat.admin.modules.system.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/event/DictChangeEvent.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/event/DictChangeEvent.java similarity index 86% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/event/DictChangeEvent.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/event/DictChangeEvent.java index e0533280..700979ec 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/event/DictChangeEvent.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/event/DictChangeEvent.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.event; +package com.hccake.ballcat.admin.modules.system.event; import lombok.Getter; import org.springframework.context.ApplicationEvent; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/event/LovChangeEvent.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/event/LovChangeEvent.java similarity index 88% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/event/LovChangeEvent.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/event/LovChangeEvent.java index 09f491b6..77b83e5f 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/event/LovChangeEvent.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/event/LovChangeEvent.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.lov.event; +package com.hccake.ballcat.admin.modules.system.event; import lombok.Getter; import org.springframework.context.ApplicationEvent; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/event/UserChangeEvent.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/event/UserChangeEvent.java similarity index 71% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/event/UserChangeEvent.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/event/UserChangeEvent.java index c9a20799..5ea128dc 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/event/UserChangeEvent.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/event/UserChangeEvent.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.admin.modules.sys.event; +package com.hccake.ballcat.admin.modules.system.event; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import lombok.Getter; import org.springframework.context.ApplicationEvent; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/manager/SysDictManager.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/manager/SysDictManager.java similarity index 88% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/manager/SysDictManager.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/manager/SysDictManager.java index 198111e9..d12cb306 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/manager/SysDictManager.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/manager/SysDictManager.java @@ -1,18 +1,18 @@ -package com.hccake.ballcat.admin.modules.sys.manager; +package com.hccake.ballcat.admin.modules.system.manager; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.IdUtil; -import com.hccake.ballcat.admin.modules.sys.converter.SysDictItemConverter; -import com.hccake.ballcat.admin.modules.sys.event.DictChangeEvent; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.DictDataVO; -import com.hccake.ballcat.admin.modules.sys.model.vo.DictItemVO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemPageVO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictPageVO; -import com.hccake.ballcat.admin.modules.sys.service.SysDictItemService; -import com.hccake.ballcat.admin.modules.sys.service.SysDictService; +import com.hccake.ballcat.admin.modules.system.converter.SysDictItemConverter; +import com.hccake.ballcat.admin.modules.system.event.DictChangeEvent; +import com.hccake.ballcat.admin.modules.system.model.entity.SysDict; +import com.hccake.ballcat.admin.modules.system.model.entity.SysDictItem; +import com.hccake.ballcat.admin.modules.system.model.qo.SysDictQO; +import com.hccake.ballcat.admin.modules.system.model.vo.DictDataVO; +import com.hccake.ballcat.admin.modules.system.model.vo.DictItemVO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysDictItemPageVO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysDictPageVO; +import com.hccake.ballcat.admin.modules.system.service.SysDictItemService; +import com.hccake.ballcat.admin.modules.system.service.SysDictService; import com.hccake.ballcat.common.core.constant.enums.BooleanEnum; import com.hccake.ballcat.common.core.exception.BusinessException; import com.hccake.ballcat.common.model.domain.PageParam; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovBodyMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/LovBodyMapper.java similarity index 87% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovBodyMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/LovBodyMapper.java index 34f59c32..da5861a1 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovBodyMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/LovBodyMapper.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.modules.lov.mapper; +package com.hccake.ballcat.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.admin.modules.lov.model.entity.LovBody; +import com.hccake.ballcat.admin.modules.system.model.entity.LovBody; import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; import java.util.List; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/LovMapper.java similarity index 82% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/LovMapper.java index 7d081077..abbf7535 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/LovMapper.java @@ -1,11 +1,11 @@ -package com.hccake.ballcat.admin.modules.lov.mapper; +package com.hccake.ballcat.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hccake.ballcat.admin.modules.lov.converter.LovConverter; -import com.hccake.ballcat.admin.modules.lov.model.entity.Lov; -import com.hccake.ballcat.admin.modules.lov.model.qo.LovQO; -import com.hccake.ballcat.admin.modules.lov.model.vo.LovPageVO; +import com.hccake.ballcat.admin.modules.system.converter.LovConverter; +import com.hccake.ballcat.admin.modules.system.model.entity.Lov; +import com.hccake.ballcat.admin.modules.system.model.qo.LovQO; +import com.hccake.ballcat.admin.modules.system.model.vo.LovPageVO; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovSearchMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/LovSearchMapper.java similarity index 87% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovSearchMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/LovSearchMapper.java index a9184d94..af06b12f 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovSearchMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/LovSearchMapper.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.modules.lov.mapper; +package com.hccake.ballcat.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.admin.modules.lov.model.entity.LovSearch; +import com.hccake.ballcat.admin.modules.system.model.entity.LovSearch; import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; import java.util.List; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysConfigMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysConfigMapper.java similarity index 77% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysConfigMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysConfigMapper.java index 5e7e0fc4..da336cdf 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysConfigMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysConfigMapper.java @@ -1,11 +1,11 @@ -package com.hccake.ballcat.admin.modules.sys.mapper; +package com.hccake.ballcat.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hccake.ballcat.admin.modules.sys.converter.SysConfigConverter; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysConfigQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysConfigPageVO; +import com.hccake.ballcat.admin.modules.system.converter.SysConfigConverter; +import com.hccake.ballcat.admin.modules.system.model.entity.SysConfig; +import com.hccake.ballcat.admin.modules.system.model.qo.SysConfigQO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysConfigPageVO; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictItemMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysDictItemMapper.java similarity index 88% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictItemMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysDictItemMapper.java index 7218d259..15be6cef 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictItemMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysDictItemMapper.java @@ -1,12 +1,12 @@ -package com.hccake.ballcat.admin.modules.sys.mapper; +package com.hccake.ballcat.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.admin.modules.sys.converter.SysDictItemConverter; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemPageVO; +import com.hccake.ballcat.admin.modules.system.converter.SysDictItemConverter; +import com.hccake.ballcat.admin.modules.system.model.entity.SysDictItem; +import com.hccake.ballcat.admin.modules.system.model.vo.SysDictItemPageVO; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysDictMapper.java similarity index 86% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysDictMapper.java index 24b99f21..c8fa29e7 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysDictMapper.java @@ -1,12 +1,12 @@ -package com.hccake.ballcat.admin.modules.sys.mapper; +package com.hccake.ballcat.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.admin.modules.sys.converter.SysDictConverter; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictPageVO; +import com.hccake.ballcat.admin.modules.system.converter.SysDictConverter; +import com.hccake.ballcat.admin.modules.system.model.entity.SysDict; +import com.hccake.ballcat.admin.modules.system.model.qo.SysDictQO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysDictPageVO; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysMenuMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysMenuMapper.java similarity index 88% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysMenuMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysMenuMapper.java index 58980164..5e20b33c 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysMenuMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysMenuMapper.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.modules.sys.mapper; +package com.hccake.ballcat.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysMenu; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysMenuQO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysMenu; +import com.hccake.ballcat.admin.modules.system.model.qo.SysMenuQO; import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; import com.hccake.extend.mybatis.plus.toolkit.WrappersX; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysOrganizationMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysOrganizationMapper.java similarity index 90% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysOrganizationMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysOrganizationMapper.java index acc55500..409f7027 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysOrganizationMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysOrganizationMapper.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.admin.modules.sys.mapper; +package com.hccake.ballcat.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysOrganization; +import com.hccake.ballcat.admin.modules.system.model.entity.SysOrganization; import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; import org.apache.ibatis.annotations.Param; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysRoleMapper.java similarity index 82% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysRoleMapper.java index 26c12689..e79bd265 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysRoleMapper.java @@ -1,13 +1,13 @@ -package com.hccake.ballcat.admin.modules.sys.mapper; +package com.hccake.ballcat.admin.modules.system.mapper; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hccake.ballcat.admin.modules.sys.converter.SysRoleConverter; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysRoleQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysRolePageVO; +import com.hccake.ballcat.admin.modules.system.converter.SysRoleConverter; +import com.hccake.ballcat.admin.modules.system.model.entity.SysRole; +import com.hccake.ballcat.admin.modules.system.model.qo.SysRoleQO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysRolePageVO; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.ballcat.common.model.domain.SelectData; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMenuMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysRoleMenuMapper.java similarity index 86% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMenuMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysRoleMenuMapper.java index 6580c442..dfc527aa 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMenuMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysRoleMenuMapper.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.admin.modules.sys.mapper; +package com.hccake.ballcat.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysRoleMenu; +import com.hccake.ballcat.admin.modules.system.model.entity.SysRoleMenu; import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; import java.io.Serializable; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysUserMapper.java similarity index 94% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysUserMapper.java index cb118c18..1431cd25 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysUserMapper.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.mapper; +package com.hccake.ballcat.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysUserQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserPageVO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.qo.SysUserQO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysUserPageVO; import com.hccake.ballcat.common.core.constant.GlobalConstants; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserRoleMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysUserRoleMapper.java similarity index 89% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserRoleMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysUserRoleMapper.java index eb55ffd4..2e59f5c0 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserRoleMapper.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/mapper/SysUserRoleMapper.java @@ -1,12 +1,12 @@ -package com.hccake.ballcat.admin.modules.sys.mapper; +package com.hccake.ballcat.admin.modules.system.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUserRole; -import com.hccake.ballcat.admin.modules.sys.model.qo.RoleBindUserQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.RoleBindUserVO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysRole; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUserRole; +import com.hccake.ballcat.admin.modules.system.model.qo.RoleBindUserQO; +import com.hccake.ballcat.admin.modules.system.model.vo.RoleBindUserVO; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/dto/LovDTO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/LovDTO.java similarity index 81% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/dto/LovDTO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/LovDTO.java index 12182f25..9ba78059 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/dto/LovDTO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/LovDTO.java @@ -1,11 +1,11 @@ -package com.hccake.ballcat.admin.modules.lov.model.dto; +package com.hccake.ballcat.admin.modules.system.model.dto; import com.baomidou.mybatisplus.annotation.TableField; -import com.hccake.ballcat.admin.modules.lov.enums.HttpMethod; -import com.hccake.ballcat.admin.modules.lov.enums.HttpParamsPosition; -import com.hccake.ballcat.admin.modules.lov.model.entity.Lov; -import com.hccake.ballcat.admin.modules.lov.model.entity.LovBody; -import com.hccake.ballcat.admin.modules.lov.model.entity.LovSearch; +import com.hccake.ballcat.admin.modules.system.enums.HttpMethod; +import com.hccake.ballcat.admin.modules.system.enums.HttpParamsPosition; +import com.hccake.ballcat.admin.modules.system.model.entity.Lov; +import com.hccake.ballcat.admin.modules.system.model.entity.LovBody; +import com.hccake.ballcat.admin.modules.system.model.entity.LovSearch; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysOrganizationDTO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysOrganizationDTO.java similarity index 93% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysOrganizationDTO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysOrganizationDTO.java index 940e53e8..2bf02ba8 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysOrganizationDTO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysOrganizationDTO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.dto; +package com.hccake.ballcat.admin.modules.system.model.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysRoleUpdateDTO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysRoleUpdateDTO.java similarity index 92% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysRoleUpdateDTO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysRoleUpdateDTO.java index 2c8f4291..c7638633 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysRoleUpdateDTO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysRoleUpdateDTO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.dto; +package com.hccake.ballcat.admin.modules.system.model.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import io.swagger.annotations.ApiModel; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserDTO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysUserDTO.java similarity index 96% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserDTO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysUserDTO.java index cd664fc4..88754cf9 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserDTO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysUserDTO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.dto; +package com.hccake.ballcat.admin.modules.system.model.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import com.hccake.ballcat.common.desensitize.json.annotation.JsonRegexDesensitize; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserPassDTO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysUserPassDTO.java similarity index 94% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserPassDTO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysUserPassDTO.java index 1eed2761..d664beb5 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserPassDTO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysUserPassDTO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.dto; +package com.hccake.ballcat.admin.modules.system.model.dto; import com.hccake.ballcat.common.desensitize.json.annotation.JsonRegexDesensitize; import com.hccake.ballcat.common.desensitize.enums.RegexDesensitizationTypeEnum; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserScope.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysUserScope.java similarity index 82% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserScope.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysUserScope.java index 2e55085d..79cd55dd 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserScope.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/SysUserScope.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.dto; +package com.hccake.ballcat.admin.modules.system.model.dto; import lombok.Data; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/UserInfoDTO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/UserInfoDTO.java similarity index 85% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/UserInfoDTO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/UserInfoDTO.java index f92f3c01..c9483daf 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/UserInfoDTO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/dto/UserInfoDTO.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.admin.modules.sys.model.dto; +package com.hccake.ballcat.admin.modules.system.model.dto; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/Lov.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/Lov.java similarity index 86% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/Lov.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/Lov.java index 26dd0daf..4d585e87 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/Lov.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/Lov.java @@ -1,11 +1,11 @@ -package com.hccake.ballcat.admin.modules.lov.model.entity; +package com.hccake.ballcat.admin.modules.system.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.hccake.ballcat.admin.modules.lov.enums.HttpMethod; -import com.hccake.ballcat.admin.modules.lov.enums.HttpParamsPosition; +import com.hccake.ballcat.admin.modules.system.enums.HttpMethod; +import com.hccake.ballcat.admin.modules.system.enums.HttpParamsPosition; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,12 +16,14 @@ import javax.validation.constraints.Pattern; import java.time.LocalDateTime; /** + * list of value 值列表，又名弹窗选择器 + * * @author lingting 2020/7/5 16:04 */ @Data @TableName("sys_lov") @Accessors(chain = true) -@ApiModel(value = "lov模块") +@ApiModel(value = "弹窗选择器") public class Lov { @TableId diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/LovBody.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/LovBody.java similarity index 95% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/LovBody.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/LovBody.java index 24df9784..34048519 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/LovBody.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/LovBody.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.lov.model.entity; +package com.hccake.ballcat.admin.modules.system.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/LovSearch.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/LovSearch.java similarity index 89% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/LovSearch.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/LovSearch.java index 19113bbe..46887c38 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/LovSearch.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/LovSearch.java @@ -1,11 +1,11 @@ -package com.hccake.ballcat.admin.modules.lov.model.entity; +package com.hccake.ballcat.admin.modules.system.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.hccake.ballcat.admin.modules.lov.enums.Tag; -import com.hccake.ballcat.admin.modules.lov.typehandler.ListLovSelectOptionTypeHandler; +import com.hccake.ballcat.admin.modules.system.enums.Tag; +import com.hccake.ballcat.admin.modules.system.typehandler.ListLovSelectOptionTypeHandler; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/LovSelectOptions.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/LovSelectOptions.java similarity index 84% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/LovSelectOptions.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/LovSelectOptions.java index ae4aa23b..d4587cf6 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/entity/LovSelectOptions.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/LovSelectOptions.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.lov.model.entity; +package com.hccake.ballcat.admin.modules.system.model.entity; import io.swagger.annotations.ApiModel; import lombok.Getter; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysConfig.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysConfig.java similarity index 96% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysConfig.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysConfig.java index 14bfec25..06e4bc86 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysConfig.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysConfig.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.entity; +package com.hccake.ballcat.admin.modules.system.model.entity; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysDict.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysDict.java similarity index 96% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysDict.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysDict.java index 9ba5f576..dfee1e59 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysDict.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysDict.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.entity; +package com.hccake.ballcat.admin.modules.system.model.entity; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysDictItem.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysDictItem.java similarity index 96% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysDictItem.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysDictItem.java index 1c27ce0f..60d17c83 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysDictItem.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysDictItem.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.entity; +package com.hccake.ballcat.admin.modules.system.model.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysMenu.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysMenu.java similarity index 97% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysMenu.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysMenu.java index 92f00c7d..e4df0f09 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysMenu.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysMenu.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.entity; +package com.hccake.ballcat.admin.modules.system.model.entity; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysOrganization.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysOrganization.java similarity index 96% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysOrganization.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysOrganization.java index 96542607..969d7671 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysOrganization.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysOrganization.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.entity; +package com.hccake.ballcat.admin.modules.system.model.entity; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysRole.java similarity index 96% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysRole.java index a25f7d12..7e7f8fec 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysRole.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.entity; +package com.hccake.ballcat.admin.modules.system.model.entity; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRoleMenu.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysRoleMenu.java similarity index 93% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRoleMenu.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysRoleMenu.java index 2cd6f959..abeb31f3 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRoleMenu.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.entity; +package com.hccake.ballcat.admin.modules.system.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysUser.java similarity index 97% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysUser.java index e8f8b1a2..2147e5ed 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysUser.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.entity; +package com.hccake.ballcat.admin.modules.system.model.entity; import com.baomidou.mybatisplus.annotation.*; import com.hccake.extend.mybatis.plus.alias.TableAlias; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUserRole.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysUserRole.java similarity index 92% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUserRole.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysUserRole.java index afd6e1b2..c86837cf 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUserRole.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/entity/SysUserRole.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.entity; +package com.hccake.ballcat.admin.modules.system.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/qo/LovQO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/LovQO.java similarity index 78% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/qo/LovQO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/LovQO.java index 15a68651..6693b61e 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/qo/LovQO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/LovQO.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.admin.modules.lov.model.qo; +package com.hccake.ballcat.admin.modules.system.model.qo; -import com.hccake.ballcat.admin.modules.lov.enums.HttpMethod; -import com.hccake.ballcat.admin.modules.lov.enums.HttpParamsPosition; +import com.hccake.ballcat.admin.modules.system.enums.HttpMethod; +import com.hccake.ballcat.admin.modules.system.enums.HttpParamsPosition; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/RoleBindUserQO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/RoleBindUserQO.java similarity index 91% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/RoleBindUserQO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/RoleBindUserQO.java index e506c11d..04a42825 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/RoleBindUserQO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/RoleBindUserQO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.qo; +package com.hccake.ballcat.admin.modules.system.model.qo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysConfigQO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysConfigQO.java similarity index 90% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysConfigQO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysConfigQO.java index f138b7b9..76d4b34e 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysConfigQO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysConfigQO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.qo; +package com.hccake.ballcat.admin.modules.system.model.qo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysDictQO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysDictQO.java similarity index 89% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysDictQO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysDictQO.java index 08aad0a3..cd7a6d6d 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysDictQO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysDictQO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.qo; +package com.hccake.ballcat.admin.modules.system.model.qo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysMenuQO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysMenuQO.java similarity index 92% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysMenuQO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysMenuQO.java index e25c295f..0b1b643a 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysMenuQO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysMenuQO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.qo; +package com.hccake.ballcat.admin.modules.system.model.qo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysOrganizationQO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysOrganizationQO.java similarity index 87% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysOrganizationQO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysOrganizationQO.java index 161e11bc..81a740b0 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysOrganizationQO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysOrganizationQO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.qo; +package com.hccake.ballcat.admin.modules.system.model.qo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysRoleQO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysRoleQO.java similarity index 90% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysRoleQO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysRoleQO.java index 8f585af2..374352e3 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysRoleQO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysRoleQO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.qo; +package com.hccake.ballcat.admin.modules.system.model.qo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysUserQO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysUserQO.java similarity index 95% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysUserQO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysUserQO.java index 9692834f..bdc0ff99 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysUserQO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/qo/SysUserQO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.qo; +package com.hccake.ballcat.admin.modules.system.model.qo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictDataVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/DictDataVO.java similarity index 91% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictDataVO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/DictDataVO.java index ecde634b..4d150a42 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictDataVO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/DictDataVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.vo; +package com.hccake.ballcat.admin.modules.system.model.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictItemVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/DictItemVO.java similarity index 91% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictItemVO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/DictItemVO.java index 93851af6..d3586306 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/DictItemVO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/DictItemVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.vo; +package com.hccake.ballcat.admin.modules.system.model.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/vo/LovInfoVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/LovInfoVO.java similarity index 81% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/vo/LovInfoVO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/LovInfoVO.java index 18be19c2..5efb5dc6 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/vo/LovInfoVO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/LovInfoVO.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.admin.modules.lov.model.vo; +package com.hccake.ballcat.admin.modules.system.model.vo; import com.baomidou.mybatisplus.annotation.TableField; -import com.hccake.ballcat.admin.modules.lov.enums.HttpMethod; -import com.hccake.ballcat.admin.modules.lov.enums.HttpParamsPosition; -import com.hccake.ballcat.admin.modules.lov.model.entity.LovBody; -import com.hccake.ballcat.admin.modules.lov.model.entity.LovSearch; +import com.hccake.ballcat.admin.modules.system.enums.HttpMethod; +import com.hccake.ballcat.admin.modules.system.enums.HttpParamsPosition; +import com.hccake.ballcat.admin.modules.system.model.entity.LovBody; +import com.hccake.ballcat.admin.modules.system.model.entity.LovSearch; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/vo/LovPageVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/LovPageVO.java similarity index 87% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/vo/LovPageVO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/LovPageVO.java index a0938c0c..18cfed3d 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/model/vo/LovPageVO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/LovPageVO.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.admin.modules.lov.model.vo; +package com.hccake.ballcat.admin.modules.system.model.vo; -import com.hccake.ballcat.admin.modules.lov.enums.HttpMethod; -import com.hccake.ballcat.admin.modules.lov.enums.HttpParamsPosition; +import com.hccake.ballcat.admin.modules.system.enums.HttpMethod; +import com.hccake.ballcat.admin.modules.system.enums.HttpParamsPosition; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/RoleBindUserVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/RoleBindUserVO.java similarity index 93% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/RoleBindUserVO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/RoleBindUserVO.java index 0ef84205..5c51e6f7 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/RoleBindUserVO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/RoleBindUserVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.vo; +package com.hccake.ballcat.admin.modules.system.model.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysConfigPageVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysConfigPageVO.java similarity index 94% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysConfigPageVO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysConfigPageVO.java index a8739e21..7dea3672 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysConfigPageVO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysConfigPageVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.vo; +package com.hccake.ballcat.admin.modules.system.model.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysDictItemPageVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysDictItemPageVO.java similarity index 96% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysDictItemPageVO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysDictItemPageVO.java index 4ec6a02b..83ed7575 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysDictItemPageVO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysDictItemPageVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.vo; +package com.hccake.ballcat.admin.modules.system.model.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysDictPageVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysDictPageVO.java similarity index 95% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysDictPageVO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysDictPageVO.java index 68226603..b7051599 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysDictPageVO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysDictPageVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.vo; +package com.hccake.ballcat.admin.modules.system.model.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysMenuPageVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysMenuPageVO.java similarity index 97% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysMenuPageVO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysMenuPageVO.java index b15ab027..d36271b2 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysMenuPageVO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysMenuPageVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.vo; +package com.hccake.ballcat.admin.modules.system.model.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysMenuRouterVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysMenuRouterVO.java similarity index 96% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysMenuRouterVO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysMenuRouterVO.java index afb526f2..7acb93ed 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysMenuRouterVO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysMenuRouterVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.vo; +package com.hccake.ballcat.admin.modules.system.model.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysOrganizationTree.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysOrganizationTree.java similarity index 97% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysOrganizationTree.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysOrganizationTree.java index 266f2f1d..eea1d3b8 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysOrganizationTree.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysOrganizationTree.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.vo; +package com.hccake.ballcat.admin.modules.system.model.vo; import com.hccake.ballcat.common.model.tree.TreeNode; import io.swagger.annotations.ApiModel; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysRolePageVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysRolePageVO.java similarity index 94% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysRolePageVO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysRolePageVO.java index a5b8f8ab..a2d33194 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysRolePageVO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysRolePageVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.vo; +package com.hccake.ballcat.admin.modules.system.model.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysUserInfo.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysUserInfo.java similarity index 93% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysUserInfo.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysUserInfo.java index ebfb98ae..0faaa1d4 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysUserInfo.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysUserInfo.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.vo; +package com.hccake.ballcat.admin.modules.system.model.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysUserPageVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysUserPageVO.java similarity index 96% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysUserPageVO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysUserPageVO.java index 2e18da51..63fd7ff4 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysUserPageVO.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/model/vo/SysUserPageVO.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.model.vo; +package com.hccake.ballcat.admin.modules.system.model.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/FileService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/FileService.java similarity index 91% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/FileService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/FileService.java index 8eebe4f1..b75a68e0 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/FileService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/FileService.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.service; +package com.hccake.ballcat.admin.modules.system.service; import org.springframework.web.multipart.MultipartFile; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovBodyService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/LovBodyService.java similarity index 80% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovBodyService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/LovBodyService.java index dcc4a993..599af6d5 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovBodyService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/LovBodyService.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.admin.modules.lov.service; +package com.hccake.ballcat.admin.modules.system.service; -import com.hccake.ballcat.admin.modules.lov.model.entity.LovBody; +import com.hccake.ballcat.admin.modules.system.model.entity.LovBody; import com.hccake.extend.mybatis.plus.service.ExtendService; import java.util.List; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovSearchService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/LovSearchService.java similarity index 80% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovSearchService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/LovSearchService.java index 5c705275..874f6231 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovSearchService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/LovSearchService.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.admin.modules.lov.service; +package com.hccake.ballcat.admin.modules.system.service; -import com.hccake.ballcat.admin.modules.lov.model.entity.LovSearch; +import com.hccake.ballcat.admin.modules.system.model.entity.LovSearch; import com.hccake.extend.mybatis.plus.service.ExtendService; import java.util.List; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/LovService.java similarity index 79% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/LovService.java index abff285f..32e2d6e8 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/LovService.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.admin.modules.lov.service; +package com.hccake.ballcat.admin.modules.system.service; -import com.hccake.ballcat.admin.modules.lov.model.entity.Lov; -import com.hccake.ballcat.admin.modules.lov.model.entity.LovBody; -import com.hccake.ballcat.admin.modules.lov.model.entity.LovSearch; -import com.hccake.ballcat.admin.modules.lov.model.qo.LovQO; -import com.hccake.ballcat.admin.modules.lov.model.vo.LovPageVO; +import com.hccake.ballcat.admin.modules.system.model.entity.Lov; +import com.hccake.ballcat.admin.modules.system.model.entity.LovBody; +import com.hccake.ballcat.admin.modules.system.model.entity.LovSearch; +import com.hccake.ballcat.admin.modules.system.model.qo.LovQO; +import com.hccake.ballcat.admin.modules.system.model.vo.LovPageVO; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.extend.mybatis.plus.service.ExtendService; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysConfigService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysConfigService.java similarity index 72% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysConfigService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysConfigService.java index 6f3ce073..ff685e14 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysConfigService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysConfigService.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.modules.sys.service; +package com.hccake.ballcat.admin.modules.system.service; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysConfigQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysConfigPageVO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysConfig; +import com.hccake.ballcat.admin.modules.system.model.qo.SysConfigQO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysConfigPageVO; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.extend.mybatis.plus.service.ExtendService; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysDictItemService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysDictItemService.java similarity index 81% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysDictItemService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysDictItemService.java index 99fcd8ec..a35d8e83 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysDictItemService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysDictItemService.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.admin.modules.sys.service; +package com.hccake.ballcat.admin.modules.system.service; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemPageVO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysDictItem; +import com.hccake.ballcat.admin.modules.system.model.vo.SysDictItemPageVO; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.extend.mybatis.plus.service.ExtendService; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysDictService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysDictService.java similarity index 80% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysDictService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysDictService.java index efc3e9b3..5b372239 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysDictService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysDictService.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.modules.sys.service; +package com.hccake.ballcat.admin.modules.system.service; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictPageVO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysDict; +import com.hccake.ballcat.admin.modules.system.model.qo.SysDictQO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysDictPageVO; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.extend.mybatis.plus.service.ExtendService; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysMenuService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysMenuService.java similarity index 74% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysMenuService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysMenuService.java index e2d4d2ce..5e6efe33 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysMenuService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysMenuService.java @@ -1,7 +1,7 @@ -package com.hccake.ballcat.admin.modules.sys.service; +package com.hccake.ballcat.admin.modules.system.service; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysMenu; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysMenuQO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysMenu; +import com.hccake.ballcat.admin.modules.system.model.qo.SysMenuQO; import com.hccake.extend.mybatis.plus.service.ExtendService; import java.util.List; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysOrganizationService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysOrganizationService.java similarity index 80% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysOrganizationService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysOrganizationService.java index b663301f..35b0bd96 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysOrganizationService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysOrganizationService.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.modules.sys.service; +package com.hccake.ballcat.admin.modules.system.service; -import com.hccake.ballcat.admin.modules.sys.model.dto.SysOrganizationDTO; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysOrganization; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysOrganizationTree; +import com.hccake.ballcat.admin.modules.system.model.dto.SysOrganizationDTO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysOrganization; +import com.hccake.ballcat.admin.modules.system.model.vo.SysOrganizationTree; import com.hccake.extend.mybatis.plus.service.ExtendService; import java.util.List; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRoleMenuService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysRoleMenuService.java similarity index 85% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRoleMenuService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysRoleMenuService.java index 19c4bb9d..1ebf22bd 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRoleMenuService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysRoleMenuService.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.admin.modules.sys.service; +package com.hccake.ballcat.admin.modules.system.service; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysRoleMenu; +import com.hccake.ballcat.admin.modules.system.model.entity.SysRoleMenu; import com.hccake.extend.mybatis.plus.service.ExtendService; import java.io.Serializable; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRoleService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysRoleService.java similarity index 73% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRoleService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysRoleService.java index fa068457..ec30e003 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRoleService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysRoleService.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.modules.sys.service; +package com.hccake.ballcat.admin.modules.system.service; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysRoleQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysRolePageVO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysRole; +import com.hccake.ballcat.admin.modules.system.model.qo.SysRoleQO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysRolePageVO; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.ballcat.common.model.domain.SelectData; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserRoleService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysUserRoleService.java similarity index 81% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserRoleService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysUserRoleService.java index a42d77d1..fcc32405 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserRoleService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysUserRoleService.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.admin.modules.sys.service; +package com.hccake.ballcat.admin.modules.system.service; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUserRole; -import com.hccake.ballcat.admin.modules.sys.model.qo.RoleBindUserQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.RoleBindUserVO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysRole; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUserRole; +import com.hccake.ballcat.admin.modules.system.model.qo.RoleBindUserQO; +import com.hccake.ballcat.admin.modules.system.model.vo.RoleBindUserVO; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.extend.mybatis.plus.service.ExtendService; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysUserService.java similarity index 87% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysUserService.java index 55c34ac1..7a4e5461 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserService.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/SysUserService.java @@ -1,11 +1,11 @@ -package com.hccake.ballcat.admin.modules.sys.service; +package com.hccake.ballcat.admin.modules.system.service; -import com.hccake.ballcat.admin.modules.sys.model.dto.SysUserDTO; -import com.hccake.ballcat.admin.modules.sys.model.dto.SysUserScope; -import com.hccake.ballcat.admin.modules.sys.model.dto.UserInfoDTO; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysUserQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserPageVO; +import com.hccake.ballcat.admin.modules.system.model.dto.SysUserDTO; +import com.hccake.ballcat.admin.modules.system.model.dto.SysUserScope; +import com.hccake.ballcat.admin.modules.system.model.dto.UserInfoDTO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.qo.SysUserQO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysUserPageVO; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.ballcat.common.model.domain.SelectData; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/FileServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/FileServiceImpl.java similarity index 88% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/FileServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/FileServiceImpl.java index 03c63849..e4f6ba25 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/FileServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/FileServiceImpl.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.admin.modules.sys.service.impl; +package com.hccake.ballcat.admin.modules.system.service.impl; -import com.hccake.ballcat.admin.modules.sys.service.FileService; +import com.hccake.ballcat.admin.modules.system.service.FileService; import com.hccake.ballcat.commom.storage.FileStorageClient; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovBodyServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/LovBodyServiceImpl.java similarity index 73% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovBodyServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/LovBodyServiceImpl.java index 65ae417a..5eabc7ac 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovBodyServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/LovBodyServiceImpl.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.modules.lov.service.impl; +package com.hccake.ballcat.admin.modules.system.service.impl; -import com.hccake.ballcat.admin.modules.lov.mapper.LovBodyMapper; -import com.hccake.ballcat.admin.modules.lov.model.entity.LovBody; -import com.hccake.ballcat.admin.modules.lov.service.LovBodyService; +import com.hccake.ballcat.admin.modules.system.mapper.LovBodyMapper; +import com.hccake.ballcat.admin.modules.system.model.entity.LovBody; +import com.hccake.ballcat.admin.modules.system.service.LovBodyService; import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovSearchServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/LovSearchServiceImpl.java similarity index 73% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovSearchServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/LovSearchServiceImpl.java index 847acc44..4e34c84b 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovSearchServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/LovSearchServiceImpl.java @@ -1,8 +1,8 @@ -package com.hccake.ballcat.admin.modules.lov.service.impl; +package com.hccake.ballcat.admin.modules.system.service.impl; -import com.hccake.ballcat.admin.modules.lov.mapper.LovSearchMapper; -import com.hccake.ballcat.admin.modules.lov.model.entity.LovSearch; -import com.hccake.ballcat.admin.modules.lov.service.LovSearchService; +import com.hccake.ballcat.admin.modules.system.mapper.LovSearchMapper; +import com.hccake.ballcat.admin.modules.system.model.entity.LovSearch; +import com.hccake.ballcat.admin.modules.system.service.LovSearchService; import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/LovServiceImpl.java similarity index 84% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/LovServiceImpl.java index 45d55e64..0f11497b 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/LovServiceImpl.java @@ -1,17 +1,17 @@ -package com.hccake.ballcat.admin.modules.lov.service.impl; +package com.hccake.ballcat.admin.modules.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; -import com.hccake.ballcat.admin.modules.lov.event.LovChangeEvent; -import com.hccake.ballcat.admin.modules.lov.mapper.LovMapper; -import com.hccake.ballcat.admin.modules.lov.model.entity.Lov; -import com.hccake.ballcat.admin.modules.lov.model.entity.LovBody; -import com.hccake.ballcat.admin.modules.lov.model.entity.LovSearch; -import com.hccake.ballcat.admin.modules.lov.model.qo.LovQO; -import com.hccake.ballcat.admin.modules.lov.model.vo.LovPageVO; -import com.hccake.ballcat.admin.modules.lov.service.LovBodyService; -import com.hccake.ballcat.admin.modules.lov.service.LovSearchService; -import com.hccake.ballcat.admin.modules.lov.service.LovService; +import com.hccake.ballcat.admin.modules.system.event.LovChangeEvent; +import com.hccake.ballcat.admin.modules.system.mapper.LovMapper; +import com.hccake.ballcat.admin.modules.system.model.entity.Lov; +import com.hccake.ballcat.admin.modules.system.model.entity.LovBody; +import com.hccake.ballcat.admin.modules.system.model.entity.LovSearch; +import com.hccake.ballcat.admin.modules.system.model.qo.LovQO; +import com.hccake.ballcat.admin.modules.system.model.vo.LovPageVO; +import com.hccake.ballcat.admin.modules.system.service.LovBodyService; +import com.hccake.ballcat.admin.modules.system.service.LovSearchService; +import com.hccake.ballcat.admin.modules.system.service.LovService; import com.hccake.ballcat.common.core.exception.BusinessException; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysConfigServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysConfigServiceImpl.java similarity index 71% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysConfigServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysConfigServiceImpl.java index af78d174..92895b3e 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysConfigServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysConfigServiceImpl.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.admin.modules.sys.service.impl; +package com.hccake.ballcat.admin.modules.system.service.impl; -import com.hccake.ballcat.admin.modules.sys.mapper.SysConfigMapper; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysConfigQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysConfigPageVO; -import com.hccake.ballcat.admin.modules.sys.service.SysConfigService; +import com.hccake.ballcat.admin.modules.system.mapper.SysConfigMapper; +import com.hccake.ballcat.admin.modules.system.model.entity.SysConfig; +import com.hccake.ballcat.admin.modules.system.model.qo.SysConfigQO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysConfigPageVO; +import com.hccake.ballcat.admin.modules.system.service.SysConfigService; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysDictItemServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysDictItemServiceImpl.java similarity index 78% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysDictItemServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysDictItemServiceImpl.java index 3d4aab24..b9d79e24 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysDictItemServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysDictItemServiceImpl.java @@ -1,9 +1,9 @@ -package com.hccake.ballcat.admin.modules.sys.service.impl; +package com.hccake.ballcat.admin.modules.system.service.impl; -import com.hccake.ballcat.admin.modules.sys.mapper.SysDictItemMapper; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemPageVO; -import com.hccake.ballcat.admin.modules.sys.service.SysDictItemService; +import com.hccake.ballcat.admin.modules.system.mapper.SysDictItemMapper; +import com.hccake.ballcat.admin.modules.system.model.entity.SysDictItem; +import com.hccake.ballcat.admin.modules.system.model.vo.SysDictItemPageVO; +import com.hccake.ballcat.admin.modules.system.service.SysDictItemService; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysDictServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysDictServiceImpl.java similarity index 79% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysDictServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysDictServiceImpl.java index 8a05e329..fd13302e 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysDictServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysDictServiceImpl.java @@ -1,11 +1,11 @@ -package com.hccake.ballcat.admin.modules.sys.service.impl; +package com.hccake.ballcat.admin.modules.system.service.impl; import cn.hutool.core.util.IdUtil; -import com.hccake.ballcat.admin.modules.sys.mapper.SysDictMapper; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictPageVO; -import com.hccake.ballcat.admin.modules.sys.service.SysDictService; +import com.hccake.ballcat.admin.modules.system.mapper.SysDictMapper; +import com.hccake.ballcat.admin.modules.system.model.entity.SysDict; +import com.hccake.ballcat.admin.modules.system.model.qo.SysDictQO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysDictPageVO; +import com.hccake.ballcat.admin.modules.system.service.SysDictService; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysMenuServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysMenuServiceImpl.java similarity index 80% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysMenuServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysMenuServiceImpl.java index 9da911cd..633bfdf2 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysMenuServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysMenuServiceImpl.java @@ -1,11 +1,11 @@ -package com.hccake.ballcat.admin.modules.sys.service.impl; +package com.hccake.ballcat.admin.modules.system.service.impl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.admin.modules.sys.mapper.SysMenuMapper; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysMenu; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysMenuQO; -import com.hccake.ballcat.admin.modules.sys.service.SysMenuService; -import com.hccake.ballcat.admin.modules.sys.service.SysRoleMenuService; +import com.hccake.ballcat.admin.modules.system.mapper.SysMenuMapper; +import com.hccake.ballcat.admin.modules.system.model.entity.SysMenu; +import com.hccake.ballcat.admin.modules.system.model.qo.SysMenuQO; +import com.hccake.ballcat.admin.modules.system.service.SysMenuService; +import com.hccake.ballcat.admin.modules.system.service.SysRoleMenuService; import com.hccake.ballcat.common.core.exception.BusinessException; import com.hccake.ballcat.common.model.result.BaseResultCode; import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysOrganizationServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysOrganizationServiceImpl.java similarity index 88% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysOrganizationServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysOrganizationServiceImpl.java index 3a8550a8..d25a6ce9 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysOrganizationServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysOrganizationServiceImpl.java @@ -1,13 +1,13 @@ -package com.hccake.ballcat.admin.modules.sys.service.impl; +package com.hccake.ballcat.admin.modules.system.service.impl; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.admin.modules.sys.mapper.SysOrganizationMapper; -import com.hccake.ballcat.admin.modules.sys.converter.SysOrganizationConverter; -import com.hccake.ballcat.admin.modules.sys.model.dto.SysOrganizationDTO; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysOrganization; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysOrganizationTree; -import com.hccake.ballcat.admin.modules.sys.service.SysOrganizationService; +import com.hccake.ballcat.admin.modules.system.mapper.SysOrganizationMapper; +import com.hccake.ballcat.admin.modules.system.converter.SysOrganizationConverter; +import com.hccake.ballcat.admin.modules.system.model.dto.SysOrganizationDTO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysOrganization; +import com.hccake.ballcat.admin.modules.system.model.vo.SysOrganizationTree; +import com.hccake.ballcat.admin.modules.system.service.SysOrganizationService; import com.hccake.ballcat.common.core.constant.GlobalConstants; import com.hccake.ballcat.common.util.TreeUtils; import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleMenuServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysRoleMenuServiceImpl.java similarity index 84% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleMenuServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysRoleMenuServiceImpl.java index fe4cbf4e..2d6631d9 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleMenuServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysRoleMenuServiceImpl.java @@ -1,10 +1,10 @@ -package com.hccake.ballcat.admin.modules.sys.service.impl; +package com.hccake.ballcat.admin.modules.system.service.impl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.admin.modules.sys.mapper.SysRoleMenuMapper; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysRoleMenu; -import com.hccake.ballcat.admin.modules.sys.service.SysRoleMenuService; +import com.hccake.ballcat.admin.modules.system.mapper.SysRoleMenuMapper; +import com.hccake.ballcat.admin.modules.system.model.entity.SysRoleMenu; +import com.hccake.ballcat.admin.modules.system.service.SysRoleMenuService; import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysRoleServiceImpl.java similarity index 76% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysRoleServiceImpl.java index 302a2f91..fe3231e1 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysRoleServiceImpl.java @@ -1,12 +1,12 @@ -package com.hccake.ballcat.admin.modules.sys.service.impl; +package com.hccake.ballcat.admin.modules.system.service.impl; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.admin.modules.sys.mapper.SysRoleMapper; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysRoleQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysRolePageVO; -import com.hccake.ballcat.admin.modules.sys.service.SysRoleMenuService; -import com.hccake.ballcat.admin.modules.sys.service.SysRoleService; +import com.hccake.ballcat.admin.modules.system.mapper.SysRoleMapper; +import com.hccake.ballcat.admin.modules.system.model.entity.SysRole; +import com.hccake.ballcat.admin.modules.system.model.qo.SysRoleQO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysRolePageVO; +import com.hccake.ballcat.admin.modules.system.service.SysRoleMenuService; +import com.hccake.ballcat.admin.modules.system.service.SysRoleService; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.ballcat.common.model.domain.SelectData; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserRoleServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysUserRoleServiceImpl.java similarity index 90% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserRoleServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysUserRoleServiceImpl.java index 9e94a818..9bbc3766 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserRoleServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysUserRoleServiceImpl.java @@ -1,14 +1,14 @@ -package com.hccake.ballcat.admin.modules.sys.service.impl; +package com.hccake.ballcat.admin.modules.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.ballcat.admin.modules.sys.mapper.SysUserRoleMapper; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUserRole; -import com.hccake.ballcat.admin.modules.sys.model.qo.RoleBindUserQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.RoleBindUserVO; -import com.hccake.ballcat.admin.modules.sys.service.SysUserRoleService; +import com.hccake.ballcat.admin.modules.system.mapper.SysUserRoleMapper; +import com.hccake.ballcat.admin.modules.system.model.entity.SysRole; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUserRole; +import com.hccake.ballcat.admin.modules.system.model.qo.RoleBindUserQO; +import com.hccake.ballcat.admin.modules.system.model.vo.RoleBindUserVO; +import com.hccake.ballcat.admin.modules.system.service.SysUserRoleService; import com.hccake.ballcat.common.core.exception.BusinessException; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysUserServiceImpl.java similarity index 90% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysUserServiceImpl.java index 32d3b146..7a59d337 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin.modules.sys.service.impl; +package com.hccake.ballcat.admin.modules.system.service.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Assert; @@ -6,19 +6,19 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.hccake.ballcat.admin.constants.SysUserConst; -import com.hccake.ballcat.admin.modules.sys.checker.AdminUserChecker; -import com.hccake.ballcat.admin.modules.sys.event.UserChangeEvent; -import com.hccake.ballcat.admin.modules.sys.mapper.SysUserMapper; -import com.hccake.ballcat.admin.modules.sys.converter.SysUserConverter; -import com.hccake.ballcat.admin.modules.sys.model.dto.SysUserDTO; -import com.hccake.ballcat.admin.modules.sys.model.dto.SysUserScope; -import com.hccake.ballcat.admin.modules.sys.model.dto.UserInfoDTO; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysMenu; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; -import com.hccake.ballcat.admin.modules.sys.model.qo.SysUserQO; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserPageVO; -import com.hccake.ballcat.admin.modules.sys.service.*; +import com.hccake.ballcat.admin.modules.system.checker.AdminUserChecker; +import com.hccake.ballcat.admin.modules.system.event.UserChangeEvent; +import com.hccake.ballcat.admin.modules.system.mapper.SysUserMapper; +import com.hccake.ballcat.admin.modules.system.converter.SysUserConverter; +import com.hccake.ballcat.admin.modules.system.model.dto.SysUserDTO; +import com.hccake.ballcat.admin.modules.system.model.dto.SysUserScope; +import com.hccake.ballcat.admin.modules.system.model.dto.UserInfoDTO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysMenu; +import com.hccake.ballcat.admin.modules.system.model.entity.SysRole; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.qo.SysUserQO; +import com.hccake.ballcat.admin.modules.system.model.vo.SysUserPageVO; +import com.hccake.ballcat.admin.modules.system.service.*; import com.hccake.ballcat.common.model.domain.PageParam; import com.hccake.ballcat.common.model.domain.PageResult; import com.hccake.ballcat.common.model.domain.SelectData; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/typehandler/ListLovSelectOptionTypeHandler.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/typehandler/ListLovSelectOptionTypeHandler.java similarity index 91% rename from ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/typehandler/ListLovSelectOptionTypeHandler.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/typehandler/ListLovSelectOptionTypeHandler.java index eeb741a3..8134105e 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/typehandler/ListLovSelectOptionTypeHandler.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/system/typehandler/ListLovSelectOptionTypeHandler.java @@ -1,6 +1,6 @@ -package com.hccake.ballcat.admin.modules.lov.typehandler; +package com.hccake.ballcat.admin.modules.system.typehandler; -import com.hccake.ballcat.admin.modules.lov.model.entity.LovSelectOptions; +import com.hccake.ballcat.admin.modules.system.model.entity.LovSelectOptions; import com.hccake.ballcat.common.util.JsonUtils; import com.hccake.ballcat.common.util.json.TypeReference; import org.apache.ibatis.type.JdbcType; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/CustomTokenEnhancer.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/CustomTokenEnhancer.java index f63216cb..2f0d9fb3 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/CustomTokenEnhancer.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/CustomTokenEnhancer.java @@ -1,7 +1,7 @@ package com.hccake.ballcat.admin.oauth; -import com.hccake.ballcat.admin.modules.sys.converter.SysUserConverter; -import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserInfo; +import com.hccake.ballcat.admin.modules.system.converter.SysUserConverter; +import com.hccake.ballcat.admin.modules.system.model.vo.SysUserInfo; import com.hccake.ballcat.admin.oauth.domain.UserResources; import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken; import org.springframework.security.oauth2.common.OAuth2AccessToken; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetails.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetails.java index d20f30dc..2d5ee18f 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetails.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetails.java @@ -1,7 +1,7 @@ package com.hccake.ballcat.admin.oauth; import com.hccake.ballcat.admin.constants.SysUserConst; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import com.hccake.ballcat.admin.oauth.domain.UserAttributes; import com.hccake.ballcat.admin.oauth.domain.UserResources; import com.hccake.ballcat.common.core.constant.GlobalConstants; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java index b90b003b..2d91cdf0 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java @@ -1,9 +1,9 @@ package com.hccake.ballcat.admin.oauth; import cn.hutool.core.collection.CollectionUtil; -import com.hccake.ballcat.admin.modules.sys.model.dto.UserInfoDTO; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; -import com.hccake.ballcat.admin.modules.sys.service.SysUserService; +import com.hccake.ballcat.admin.modules.system.model.dto.UserInfoDTO; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.service.SysUserService; import com.hccake.ballcat.admin.oauth.domain.UserAttributes; import com.hccake.ballcat.admin.oauth.domain.UserResources; import lombok.RequiredArgsConstructor; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/UserInfoCoordinator.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/UserInfoCoordinator.java index 9ac0f695..59b229c1 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/UserInfoCoordinator.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/UserInfoCoordinator.java @@ -1,6 +1,6 @@ package com.hccake.ballcat.admin.oauth; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import com.hccake.ballcat.admin.oauth.domain.DefaultUserAttributes; import com.hccake.ballcat.admin.oauth.domain.DefaultUserResources; import com.hccake.ballcat.admin.oauth.domain.UserAttributes; diff --git a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/util/SecurityUtils.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/util/SecurityUtils.java index 8b389109..f6f221c8 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/util/SecurityUtils.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/util/SecurityUtils.java @@ -1,7 +1,7 @@ package com.hccake.ballcat.admin.oauth.util; import com.hccake.ballcat.admin.constants.SecurityConst; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import com.hccake.ballcat.admin.oauth.SysUserDetails; import lombok.experimental.UtilityClass; import org.springframework.security.core.Authentication; diff --git a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RoleMapper.xml b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RoleMapper.xml index b445884e..6fa8daf4 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RoleMapper.xml +++ b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RoleMapper.xml @@ -1,6 +1,6 @@ - + + + + - SELECT FROM diff --git a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserRoleMapper.xml b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserRoleMapper.xml index 414aca07..da5df83f 100644 --- a/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserRoleMapper.xml +++ b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserRoleMapper.xml @@ -1,8 +1,8 @@ - + - SELECT r.id, r.name, r.code FROM @@ -16,7 +16,7 @@ - SELECT su.user_id, su.username, su.nickname, so.name as organization_name FROM diff --git a/ballcat-admin/ballcat-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/distribute/PushEventListener.java b/ballcat-admin/ballcat-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/distribute/PushEventListener.java index efdaa356..6e3b5354 100644 --- a/ballcat-admin/ballcat-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/distribute/PushEventListener.java +++ b/ballcat-admin/ballcat-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/distribute/PushEventListener.java @@ -1,27 +1,28 @@ package com.hccake.ballcat.admin.websocket.distribute; -import com.hccake.ballcat.admin.modules.lov.event.LovChangeEvent; import com.hccake.ballcat.admin.modules.notify.event.AnnouncementCloseEvent; import com.hccake.ballcat.admin.modules.notify.event.StationNotifyPushEvent; import com.hccake.ballcat.admin.modules.notify.model.domain.AnnouncementNotifyInfo; import com.hccake.ballcat.admin.modules.notify.model.domain.NotifyInfo; import com.hccake.ballcat.admin.modules.notify.model.entity.UserAnnouncement; import com.hccake.ballcat.admin.modules.notify.service.UserAnnouncementService; -import com.hccake.ballcat.admin.modules.sys.event.DictChangeEvent; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.event.DictChangeEvent; +import com.hccake.ballcat.admin.modules.system.event.LovChangeEvent; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import com.hccake.ballcat.admin.websocket.message.AnnouncementCloseMessage; import com.hccake.ballcat.admin.websocket.message.AnnouncementPushMessage; import com.hccake.ballcat.admin.websocket.message.DictChangeMessage; import com.hccake.ballcat.admin.websocket.message.LovChangeMessage; import com.hccake.ballcat.common.util.JsonUtils; -import java.util.ArrayList; -import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; +import java.util.ArrayList; +import java.util.List; + /** * @author Hccake 2021/1/5 * @version 1.0 diff --git a/ballcat-admin/ballcat-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/user/UserAttributeHandshakeInterceptor.java b/ballcat-admin/ballcat-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/user/UserAttributeHandshakeInterceptor.java index 645b7924..2bbfa9d1 100644 --- a/ballcat-admin/ballcat-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/user/UserAttributeHandshakeInterceptor.java +++ b/ballcat-admin/ballcat-admin-websocket/src/main/java/com/hccake/ballcat/admin/websocket/user/UserAttributeHandshakeInterceptor.java @@ -1,6 +1,6 @@ package com.hccake.ballcat.admin.websocket.user; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; +import com.hccake.ballcat.admin.modules.system.model.entity.SysUser; import com.hccake.ballcat.admin.oauth.util.SecurityUtils; import com.hccake.ballcat.admin.websocket.constant.AdminWebSocketConstants; import lombok.RequiredArgsConstructor;