From ef5eae3aa0eba563a5f42463758e7132cf4a1a03 Mon Sep 17 00:00:00 2001 From: wanggeng888 <450292408@qq.com> Date: Fri, 12 Feb 2021 15:32:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9F=BA=E7=A1=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dictionary/IDictionaryCheckService.java | 14 ++ .../controller/api/AreaController.java | 8 +- .../controller/api/DataController.java | 8 +- .../controller/app/api/AreaAppController.java | 6 +- .../controller/app/api/DataAppController.java | 6 +- .../controller/route/AreaRouteController.java | 45 +++++ .../controller/route/DataRouteController.java | 45 +++++ .../wechat/AreaWechatController.java | 6 +- .../wechat/DataWechatController.java | 6 +- .../dictionary/dao/IAreaDao.java | 11 +- .../dictionary/dao/IDataDao.java | 11 +- .../dictionary/pojo/dtos/AreaDTO.java | 2 +- .../dictionary/pojo/dtos/DataDTO.java | 2 +- .../dictionary/pojo/vos/AreaVO.java | 19 ++- .../dictionary/pojo/vos/DataVO.java | 2 +- .../dictionary/service/IAreaService.java | 6 +- .../dictionary/service/IDataService.java | 9 +- .../service/impl/AreaServiceImpl.java | 10 +- .../service/impl/DataServiceImpl.java | 10 +- .../startup/ModuleDictionaryStartUp.java | 45 +++++ .../controller/route/AreaRouteController.java | 53 ------ .../controller/route/DataRouteController.java | 53 ------ .../resources/mybatis/mapper/area-mapper.xml | 33 +++- .../resources/mybatis/mapper/data-mapper.xml | 25 ++- .../resources/templates/area/list-tree.html | 10 +- .../main/resources/templates/area/list.html | 6 +- .../main/resources/templates/area/save.html | 7 +- .../main/resources/templates/area/update.html | 7 +- .../{datadictionary => data}/list-tree.html | 2 +- .../{datadictionary => data}/list.html | 6 +- .../{datadictionary => data}/save.html | 7 +- .../{datadictionary => data}/update.html | 7 +- .../FileMediaAppMaxDurationProperties.java | 2 +- ...FileMediaBackendMaxDurationProperties.java | 2 +- .../FileMediaBaseMaxDurationProperties.java | 2 +- .../FileMediaMaxDurationProperties.java | 2 +- .../FileMediaWechatMaxDurationProperties.java | 2 +- .../config/properties/FileProperties.java | 2 +- .../file/controller/api/FileController.java | 12 +- .../controller/app/api/FileAppController.java | 10 +- .../controller/route/FileRouteController.java | 6 +- .../wechat/FileWechatController.java | 10 +- .../file/dao/IFileDao.java | 6 +- .../file/enums/UploadTypeEnum.java | 2 +- .../error/AbstractErrorExcelHandler.java | 4 +- .../file/pojo/dtos/FileDTO.java | 2 +- .../file/pojo/dtos/FileInfoDTO.java | 2 +- .../file/service/IFileService.java | 8 +- .../file/service/impl/FileServiceImpl.java | 14 +- .../file/startup/ModuleFileStartUp.java | 4 +- .../resources/mybatis/mapper/file-mapper.xml | 6 +- .../controller/api/PermissionController.java | 6 +- .../permission/dao/IPermissionDao.java | 2 +- .../permission/enums/PermissionTypeEnum.java | 2 +- .../permission/pojo/vos/PermissionVO.java | 2 +- .../service/IPermissionService.java | 4 +- .../service/impl/PermissionServiceImpl.java | 8 +- .../mybatis/mapper/permission-mapper.xml | 2 +- .../controller/api/DepartmentController.java | 12 +- .../api/DepartmentUserController.java | 2 +- .../route/DepartmentRouteController.java | 2 +- .../dao/IDepartmentAdjustmentDao.java | 2 +- .../department/dao/IDepartmentDao.java | 2 +- .../dao/IDepartmentUserAdjustmentDao.java | 2 +- .../department/dao/IDepartmentUserDao.java | 2 +- .../enmus/DepartmentAdjustmentTypeEnum.java | 2 +- .../listener/excel/DepartmentExcel.java | 2 +- .../listener/excel/DepartmentExcelError.java | 2 +- .../excel/DepartmentExcelListener.java | 2 +- .../department/pojo/vos/DepartmentVO.java | 2 +- .../pojo/vos/MergeDepartmentInfoVO.java | 2 +- .../pojo/vos/MergeNewDepartmentInfoVO.java | 2 +- .../pojo/vos/SplitDepartmentInfoVO.java | 2 +- .../pojo/vos/SplitDepartmentVO.java | 2 +- .../service/IDepartmentAdjustmentService.java | 4 +- .../service/IDepartmentService.java | 10 +- .../IDepartmentUserAdjustmentService.java | 2 +- .../service/IDepartmentUserService.java | 2 +- .../impl/DepartmentAdjustmentServiceImpl.java | 12 +- .../service/impl/DepartmentServiceImpl.java | 28 ++-- .../DepartmentUserAdjustmentServiceImpl.java | 6 +- .../impl/DepartmentUserServiceImpl.java | 10 +- .../mapper/department-adjustment-mapper.xml | 2 +- .../mybatis/mapper/department-mapper.xml | 2 +- .../department-user-adjustment-mapper.xml | 2 +- .../mybatis/mapper/department-user-mapper.xml | 2 +- .../group/controller/api/GroupController.java | 6 +- .../group/dao/IGroupDao.java | 4 +- .../group/pojo/pos/GroupPO.java | 2 +- .../group/pojo/vos/GroupVO.java | 2 +- .../group/service/IGroupService.java | 2 +- .../group/service/impl/GroupServiceImpl.java | 6 +- .../resources/mybatis/mapper/group-mapper.xml | 2 +- .../menu/controller/api/MenuController.java | 85 ++-------- .../controller/route/MenuRouteController.java | 2 +- .../menu/dao/IMenuDao.java | 2 +- .../wgink/module/menu/pojo/vos/MenuVO.java | 115 +++++++++++++ .../menu/service/IMenuService.java | 22 +-- .../menu/service/impl/MenuServiceImpl.java | 31 ++-- .../menu/startup/ServiceMenuStartUp.java | 77 ++++++++- .../wgink/service/menu/pojo/vos/MenuVO.java | 155 ------------------ .../resources/mybatis/mapper/menu-mapper.xml | 6 +- .../main/resources/templates/menu/list.html | 11 +- .../main/resources/templates/menu/save.html | 3 +- .../main/resources/templates/menu/update.html | 3 +- .../controller/api/OauthClientController.java | 6 +- .../oauth/client/dao/IOauthClientDao.java | 2 +- .../oauth/client/pojo/vos/OauthClientVO.java | 2 +- .../client/service/IOauthClientService.java | 2 +- .../service/impl/OauthClientServiceImpl.java | 6 +- .../mybatis/mapper/oauthclient-mapper.xml | 2 +- .../controller/api/PositionController.java | 6 +- .../position/dao/IPositionDao.java | 2 +- .../position/pojo/vos/PositionVO.java | 2 +- .../position/service/IPositionService.java | 2 +- .../service/impl/PositionServiceImpl.java | 6 +- .../mybatis/mapper/position-mapper.xml | 2 +- .../role/controller/api/RoleController.java | 10 +- .../controller/api/RoleGroupController.java | 2 +- .../role/dao/IRoleDao.java | 4 +- .../role/dao/IRoleGroupDao.java | 2 +- .../role/dao/IRoleMenuDao.java | 2 +- .../role/dao/IRolePermissionDao.java | 2 +- .../role/pojo/pos/RolePO.java | 2 +- .../role/pojo/vos/RoleDataAuthorityVO.java | 2 +- .../role/pojo/vos/RolePermissionVO.java | 2 +- .../role/pojo/vos/RoleUserAuthorityVO.java | 2 +- .../pojo/vos/RoleUserAuthorizationVO.java | 2 +- .../role/pojo/vos/RoleVO.java | 2 +- .../role/service/IRoleGroupService.java | 2 +- .../role/service/IRoleMenuService.java | 2 +- .../role/service/IRolePermissionService.java | 4 +- .../role/service/IRoleService.java | 4 +- .../service/impl/RoleGroupServiceImpl.java | 2 +- .../service/impl/RoleMenuServiceImpl.java | 4 +- .../impl/RolePermissionServiceImpl.java | 10 +- .../role/service/impl/RoleServiceImpl.java | 20 +-- .../mybatis/mapper/role-permission-mapper.xml | 2 +- .../user/controller/api/UserController.java | 10 +- .../controller/route/UserRouteController.java | 2 +- .../user/dao/IUserDao.java | 4 +- .../user/excel/UserExcel.java | 2 +- .../user/excel/UserExcelError.java | 2 +- .../user/excel/UserExcelListener.java | 2 +- .../user/pojo/pos/UserPO.java | 2 +- .../user/pojo/vos/RestPasswordVO.java | 2 +- .../user/pojo/vos/UpdateUsernameVO.java | 2 +- .../user/pojo/vos/UserVO.java | 2 +- .../user/service/IUserService.java | 8 +- .../user/service/impl/UserServiceImpl.java | 22 +-- .../user/startup/ServiceUserStartUp.java | 5 +- .../resources/mybatis/mapper/user-mapper.xml | 4 +- 152 files changed, 774 insertions(+), 690 deletions(-) create mode 100644 basic-interface/src/main/java/ink/wgink/interfaces/dictionary/IDictionaryCheckService.java rename module-dictionary/src/main/java/ink/wgink/{service => module}/dictionary/controller/api/AreaController.java (97%) rename module-dictionary/src/main/java/ink/wgink/{service => module}/dictionary/controller/api/DataController.java (96%) rename module-dictionary/src/main/java/ink/wgink/{service => module}/dictionary/controller/app/api/AreaAppController.java (98%) rename module-dictionary/src/main/java/ink/wgink/{service => module}/dictionary/controller/app/api/DataAppController.java (98%) create mode 100644 module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/route/AreaRouteController.java create mode 100644 module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/route/DataRouteController.java rename module-dictionary/src/main/java/ink/wgink/{service => module}/dictionary/controller/wechat/AreaWechatController.java (96%) rename module-dictionary/src/main/java/ink/wgink/{service => module}/dictionary/controller/wechat/DataWechatController.java (96%) rename module-dictionary/src/main/java/ink/wgink/{service => module}/dictionary/dao/IAreaDao.java (90%) rename module-dictionary/src/main/java/ink/wgink/{service => module}/dictionary/dao/IDataDao.java (90%) rename module-dictionary/src/main/java/ink/wgink/{service => module}/dictionary/pojo/dtos/AreaDTO.java (99%) rename module-dictionary/src/main/java/ink/wgink/{service => module}/dictionary/pojo/dtos/DataDTO.java (98%) rename module-dictionary/src/main/java/ink/wgink/{service => module}/dictionary/pojo/vos/AreaVO.java (87%) rename module-dictionary/src/main/java/ink/wgink/{service => module}/dictionary/pojo/vos/DataVO.java (97%) rename module-dictionary/src/main/java/ink/wgink/{service => module}/dictionary/service/IAreaService.java (92%) rename module-dictionary/src/main/java/ink/wgink/{service => module}/dictionary/service/IDataService.java (86%) rename module-dictionary/src/main/java/ink/wgink/{service => module}/dictionary/service/impl/AreaServiceImpl.java (93%) rename module-dictionary/src/main/java/ink/wgink/{service => module}/dictionary/service/impl/DataServiceImpl.java (94%) create mode 100644 module-dictionary/src/main/java/ink/wgink/module/dictionary/startup/ModuleDictionaryStartUp.java delete mode 100644 module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/route/AreaRouteController.java delete mode 100644 module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/route/DataRouteController.java rename module-dictionary/src/main/resources/templates/{datadictionary => data}/list-tree.html (98%) rename module-dictionary/src/main/resources/templates/{datadictionary => data}/list.html (97%) rename module-dictionary/src/main/resources/templates/{datadictionary => data}/save.html (96%) rename module-dictionary/src/main/resources/templates/{datadictionary => data}/update.html (96%) rename module-file/src/main/java/ink/wgink/{service => module}/file/config/properties/FileMediaAppMaxDurationProperties.java (88%) rename module-file/src/main/java/ink/wgink/{service => module}/file/config/properties/FileMediaBackendMaxDurationProperties.java (88%) rename module-file/src/main/java/ink/wgink/{service => module}/file/config/properties/FileMediaBaseMaxDurationProperties.java (95%) rename module-file/src/main/java/ink/wgink/{service => module}/file/config/properties/FileMediaMaxDurationProperties.java (96%) rename module-file/src/main/java/ink/wgink/{service => module}/file/config/properties/FileMediaWechatMaxDurationProperties.java (88%) rename module-file/src/main/java/ink/wgink/{service => module}/file/config/properties/FileProperties.java (98%) rename module-file/src/main/java/ink/wgink/{service => module}/file/controller/api/FileController.java (95%) rename module-file/src/main/java/ink/wgink/{service => module}/file/controller/app/api/FileAppController.java (95%) rename module-file/src/main/java/ink/wgink/{service => module}/file/controller/route/FileRouteController.java (97%) rename module-file/src/main/java/ink/wgink/{service => module}/file/controller/wechat/FileWechatController.java (95%) rename module-file/src/main/java/ink/wgink/{service => module}/file/dao/IFileDao.java (93%) rename module-file/src/main/java/ink/wgink/{service => module}/file/enums/UploadTypeEnum.java (90%) rename module-file/src/main/java/ink/wgink/{service => module}/file/excel/error/AbstractErrorExcelHandler.java (94%) rename module-file/src/main/java/ink/wgink/{service => module}/file/pojo/dtos/FileDTO.java (98%) rename module-file/src/main/java/ink/wgink/{service => module}/file/pojo/dtos/FileInfoDTO.java (97%) rename module-file/src/main/java/ink/wgink/{service => module}/file/service/IFileService.java (96%) rename module-file/src/main/java/ink/wgink/{service => module}/file/service/impl/FileServiceImpl.java (98%) rename module-file/src/main/java/ink/wgink/{service => module}/file/startup/ModuleFileStartUp.java (92%) rename module-permission/src/main/java/ink/wgink/{service => module}/permission/controller/api/PermissionController.java (96%) rename module-permission/src/main/java/ink/wgink/{service => module}/permission/dao/IPermissionDao.java (97%) rename module-permission/src/main/java/ink/wgink/{service => module}/permission/enums/PermissionTypeEnum.java (93%) rename module-permission/src/main/java/ink/wgink/{service => module}/permission/pojo/vos/PermissionVO.java (98%) rename module-permission/src/main/java/ink/wgink/{service => module}/permission/service/IPermissionService.java (94%) rename module-permission/src/main/java/ink/wgink/{service => module}/permission/service/impl/PermissionServiceImpl.java (93%) rename service-department/src/main/java/ink/wgink/{service => module}/department/controller/api/DepartmentController.java (96%) rename service-department/src/main/java/ink/wgink/{service => module}/department/controller/api/DepartmentUserController.java (92%) rename service-department/src/main/java/ink/wgink/{service => module}/department/controller/route/DepartmentRouteController.java (97%) rename service-department/src/main/java/ink/wgink/{service => module}/department/dao/IDepartmentAdjustmentDao.java (93%) rename service-department/src/main/java/ink/wgink/{service => module}/department/dao/IDepartmentDao.java (98%) rename service-department/src/main/java/ink/wgink/{service => module}/department/dao/IDepartmentUserAdjustmentDao.java (93%) rename service-department/src/main/java/ink/wgink/{service => module}/department/dao/IDepartmentUserDao.java (96%) rename service-department/src/main/java/ink/wgink/{service => module}/department/enmus/DepartmentAdjustmentTypeEnum.java (93%) rename service-department/src/main/java/ink/wgink/{service => module}/department/listener/excel/DepartmentExcel.java (98%) rename service-department/src/main/java/ink/wgink/{service => module}/department/listener/excel/DepartmentExcelError.java (98%) rename service-department/src/main/java/ink/wgink/{service => module}/department/listener/excel/DepartmentExcelListener.java (96%) rename service-department/src/main/java/ink/wgink/{service => module}/department/pojo/vos/DepartmentVO.java (99%) rename service-department/src/main/java/ink/wgink/{service => module}/department/pojo/vos/MergeDepartmentInfoVO.java (96%) rename service-department/src/main/java/ink/wgink/{service => module}/department/pojo/vos/MergeNewDepartmentInfoVO.java (96%) rename service-department/src/main/java/ink/wgink/{service => module}/department/pojo/vos/SplitDepartmentInfoVO.java (95%) rename service-department/src/main/java/ink/wgink/{service => module}/department/pojo/vos/SplitDepartmentVO.java (96%) rename service-department/src/main/java/ink/wgink/{service => module}/department/service/IDepartmentAdjustmentService.java (91%) rename service-department/src/main/java/ink/wgink/{service => module}/department/service/IDepartmentService.java (94%) rename service-department/src/main/java/ink/wgink/{service => module}/department/service/IDepartmentUserAdjustmentService.java (91%) rename service-department/src/main/java/ink/wgink/{service => module}/department/service/IDepartmentUserService.java (97%) rename service-department/src/main/java/ink/wgink/{service => module}/department/service/impl/DepartmentAdjustmentServiceImpl.java (86%) rename service-department/src/main/java/ink/wgink/{service => module}/department/service/impl/DepartmentServiceImpl.java (97%) rename service-department/src/main/java/ink/wgink/{service => module}/department/service/impl/DepartmentUserAdjustmentServiceImpl.java (80%) rename service-department/src/main/java/ink/wgink/{service => module}/department/service/impl/DepartmentUserServiceImpl.java (93%) rename service-group/src/main/java/ink/wgink/{service => module}/group/controller/api/GroupController.java (98%) rename service-group/src/main/java/ink/wgink/{service => module}/group/dao/IGroupDao.java (96%) rename service-group/src/main/java/ink/wgink/{service => module}/group/pojo/pos/GroupPO.java (96%) rename service-group/src/main/java/ink/wgink/{service => module}/group/pojo/vos/GroupVO.java (97%) rename service-group/src/main/java/ink/wgink/{service => module}/group/service/IGroupService.java (98%) rename service-group/src/main/java/ink/wgink/{service => module}/group/service/impl/GroupServiceImpl.java (97%) rename service-menu/src/main/java/ink/wgink/{service => module}/menu/controller/api/MenuController.java (67%) rename service-menu/src/main/java/ink/wgink/{service => module}/menu/controller/route/MenuRouteController.java (96%) rename service-menu/src/main/java/ink/wgink/{service => module}/menu/dao/IMenuDao.java (98%) create mode 100644 service-menu/src/main/java/ink/wgink/module/menu/pojo/vos/MenuVO.java rename service-menu/src/main/java/ink/wgink/{service => module}/menu/service/IMenuService.java (66%) rename service-menu/src/main/java/ink/wgink/{service => module}/menu/service/impl/MenuServiceImpl.java (94%) rename service-menu/src/main/java/ink/wgink/{service => module}/menu/startup/ServiceMenuStartUp.java (72%) delete mode 100644 service-menu/src/main/java/ink/wgink/service/menu/pojo/vos/MenuVO.java rename service-oauth-client/src/main/java/ink/wgink/{service => module}/oauth/client/controller/api/OauthClientController.java (98%) rename service-oauth-client/src/main/java/ink/wgink/{service => module}/oauth/client/dao/IOauthClientDao.java (98%) rename service-oauth-client/src/main/java/ink/wgink/{service => module}/oauth/client/pojo/vos/OauthClientVO.java (99%) rename service-oauth-client/src/main/java/ink/wgink/{service => module}/oauth/client/service/IOauthClientService.java (98%) rename service-oauth-client/src/main/java/ink/wgink/{service => module}/oauth/client/service/impl/OauthClientServiceImpl.java (96%) rename service-position/src/main/java/ink/wgink/{service => module}/position/controller/api/PositionController.java (97%) rename service-position/src/main/java/ink/wgink/{service => module}/position/dao/IPositionDao.java (98%) rename service-position/src/main/java/ink/wgink/{service => module}/position/pojo/vos/PositionVO.java (97%) rename service-position/src/main/java/ink/wgink/{service => module}/position/service/IPositionService.java (98%) rename service-position/src/main/java/ink/wgink/{service => module}/position/service/impl/PositionServiceImpl.java (96%) rename service-role/src/main/java/ink/wgink/{service => module}/role/controller/api/RoleController.java (97%) rename service-role/src/main/java/ink/wgink/{service => module}/role/controller/api/RoleGroupController.java (98%) rename service-role/src/main/java/ink/wgink/{service => module}/role/dao/IRoleDao.java (98%) rename service-role/src/main/java/ink/wgink/{service => module}/role/dao/IRoleGroupDao.java (94%) rename service-role/src/main/java/ink/wgink/{service => module}/role/dao/IRoleMenuDao.java (89%) rename service-role/src/main/java/ink/wgink/{service => module}/role/dao/IRolePermissionDao.java (97%) rename service-role/src/main/java/ink/wgink/{service => module}/role/pojo/pos/RolePO.java (98%) rename service-role/src/main/java/ink/wgink/{service => module}/role/pojo/vos/RoleDataAuthorityVO.java (97%) rename service-role/src/main/java/ink/wgink/{service => module}/role/pojo/vos/RolePermissionVO.java (97%) rename service-role/src/main/java/ink/wgink/{service => module}/role/pojo/vos/RoleUserAuthorityVO.java (97%) rename service-role/src/main/java/ink/wgink/{service => module}/role/pojo/vos/RoleUserAuthorizationVO.java (95%) rename service-role/src/main/java/ink/wgink/{service => module}/role/pojo/vos/RoleVO.java (97%) rename service-role/src/main/java/ink/wgink/{service => module}/role/service/IRoleGroupService.java (93%) rename service-role/src/main/java/ink/wgink/{service => module}/role/service/IRoleMenuService.java (88%) rename service-role/src/main/java/ink/wgink/{service => module}/role/service/IRolePermissionService.java (91%) rename service-role/src/main/java/ink/wgink/{service => module}/role/service/IRoleService.java (98%) rename service-role/src/main/java/ink/wgink/{service => module}/role/service/impl/RoleGroupServiceImpl.java (95%) rename service-role/src/main/java/ink/wgink/{service => module}/role/service/impl/RoleMenuServiceImpl.java (82%) rename service-role/src/main/java/ink/wgink/{service => module}/role/service/impl/RolePermissionServiceImpl.java (94%) rename service-role/src/main/java/ink/wgink/{service => module}/role/service/impl/RoleServiceImpl.java (97%) rename service-user/src/main/java/ink/wgink/{service => module}/user/controller/api/UserController.java (96%) rename service-user/src/main/java/ink/wgink/{service => module}/user/controller/route/UserRouteController.java (97%) rename service-user/src/main/java/ink/wgink/{service => module}/user/dao/IUserDao.java (96%) rename service-user/src/main/java/ink/wgink/{service => module}/user/excel/UserExcel.java (98%) rename service-user/src/main/java/ink/wgink/{service => module}/user/excel/UserExcelError.java (98%) rename service-user/src/main/java/ink/wgink/{service => module}/user/excel/UserExcelListener.java (97%) rename service-user/src/main/java/ink/wgink/{service => module}/user/pojo/pos/UserPO.java (99%) rename service-user/src/main/java/ink/wgink/{service => module}/user/pojo/vos/RestPasswordVO.java (96%) rename service-user/src/main/java/ink/wgink/{service => module}/user/pojo/vos/UpdateUsernameVO.java (97%) rename service-user/src/main/java/ink/wgink/{service => module}/user/pojo/vos/UserVO.java (98%) rename service-user/src/main/java/ink/wgink/{service => module}/user/service/IUserService.java (89%) rename service-user/src/main/java/ink/wgink/{service => module}/user/service/impl/UserServiceImpl.java (93%) rename service-user/src/main/java/ink/wgink/{service => module}/user/startup/ServiceUserStartUp.java (93%) diff --git a/basic-interface/src/main/java/ink/wgink/interfaces/dictionary/IDictionaryCheckService.java b/basic-interface/src/main/java/ink/wgink/interfaces/dictionary/IDictionaryCheckService.java new file mode 100644 index 00000000..fd3de403 --- /dev/null +++ b/basic-interface/src/main/java/ink/wgink/interfaces/dictionary/IDictionaryCheckService.java @@ -0,0 +1,14 @@ +package ink.wgink.interfaces.dictionary; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: IDictionaryCheckService + * @Description: 字典检查 + * @Author: wanggeng + * @Date: 2021/2/11 9:02 下午 + * @Version: 1.0 + */ +public interface IDictionaryCheckService { +} diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/api/AreaController.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/AreaController.java similarity index 97% rename from module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/api/AreaController.java rename to module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/AreaController.java index 0b0247de..5e7a5314 100644 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/api/AreaController.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/AreaController.java @@ -1,11 +1,11 @@ -package ink.wgink.service.dictionary.controller.api; +package ink.wgink.module.dictionary.controller.api; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.service.dictionary.pojo.dtos.AreaDTO; -import ink.wgink.service.dictionary.pojo.vos.AreaVO; -import ink.wgink.service.dictionary.service.IAreaService; +import ink.wgink.module.dictionary.pojo.dtos.AreaDTO; +import ink.wgink.module.dictionary.pojo.vos.AreaVO; +import ink.wgink.module.dictionary.service.IAreaService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.ErrorResult; diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/api/DataController.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/DataController.java similarity index 96% rename from module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/api/DataController.java rename to module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/DataController.java index 36f85a69..79d4d5d1 100644 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/api/DataController.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/DataController.java @@ -1,11 +1,11 @@ -package ink.wgink.service.dictionary.controller.api; +package ink.wgink.module.dictionary.controller.api; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.service.dictionary.pojo.dtos.DataDTO; -import ink.wgink.service.dictionary.pojo.vos.DataVO; -import ink.wgink.service.dictionary.service.IDataService; +import ink.wgink.module.dictionary.pojo.dtos.DataDTO; +import ink.wgink.module.dictionary.pojo.vos.DataVO; +import ink.wgink.module.dictionary.service.IDataService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.ErrorResult; diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/app/api/AreaAppController.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/app/api/AreaAppController.java similarity index 98% rename from module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/app/api/AreaAppController.java rename to module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/app/api/AreaAppController.java index 01f7df6b..70b7af26 100644 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/app/api/AreaAppController.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/app/api/AreaAppController.java @@ -1,9 +1,9 @@ -package ink.wgink.service.dictionary.controller.app.api; +package ink.wgink.module.dictionary.controller.app.api; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.service.dictionary.pojo.dtos.AreaDTO; -import ink.wgink.service.dictionary.service.IAreaService; +import ink.wgink.module.dictionary.pojo.dtos.AreaDTO; +import ink.wgink.module.dictionary.service.IAreaService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.ErrorResult; diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/app/api/DataAppController.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/app/api/DataAppController.java similarity index 98% rename from module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/app/api/DataAppController.java rename to module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/app/api/DataAppController.java index 8197e74a..cba9f416 100644 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/app/api/DataAppController.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/app/api/DataAppController.java @@ -1,9 +1,9 @@ -package ink.wgink.service.dictionary.controller.app.api; +package ink.wgink.module.dictionary.controller.app.api; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.service.dictionary.pojo.dtos.DataDTO; -import ink.wgink.service.dictionary.service.IDataService; +import ink.wgink.module.dictionary.pojo.dtos.DataDTO; +import ink.wgink.module.dictionary.service.IDataService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.ErrorResult; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/route/AreaRouteController.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/route/AreaRouteController.java new file mode 100644 index 00000000..3488e21a --- /dev/null +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/route/AreaRouteController.java @@ -0,0 +1,45 @@ +package ink.wgink.module.dictionary.controller.route; + +import ink.wgink.interfaces.consts.ISystemConstant; +import io.swagger.annotations.Api; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: IDataDictionaryRouteController + * @Description: 数据字典 + * @Author: WangGeng + * @Date: 2019/12/6 16:52 + * @Version: 1.0 + **/ +@Api(tags = ISystemConstant.ROUTE_TAGS_PREFIX + "地区字典页面接口") +@Controller +@RequestMapping(ISystemConstant.ROUTE_PREFIX + "/area") +public class AreaRouteController { + + @GetMapping("save") + public ModelAndView save() { + return new ModelAndView("area/save"); + } + + @GetMapping("update") + public ModelAndView updateDataDictionary() { + return new ModelAndView("area/update"); + } + + @GetMapping("list-tree") + public ModelAndView listTree() { + return new ModelAndView("area/list-tree"); + } + + @GetMapping("list") + public ModelAndView list() { + return new ModelAndView("area/list"); + } + +} diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/route/DataRouteController.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/route/DataRouteController.java new file mode 100644 index 00000000..6ac0eb75 --- /dev/null +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/route/DataRouteController.java @@ -0,0 +1,45 @@ +package ink.wgink.module.dictionary.controller.route; + +import ink.wgink.interfaces.consts.ISystemConstant; +import io.swagger.annotations.Api; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.ModelAndView; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: IDataDictionaryRouteController + * @Description: 数据字典 + * @Author: WangGeng + * @Date: 2019/12/6 16:52 + * @Version: 1.0 + **/ +@Api(tags = ISystemConstant.ROUTE_TAGS_PREFIX + "数据字典页面接口") +@Controller +@RequestMapping(ISystemConstant.ROUTE_PREFIX + "/data") +public class DataRouteController { + + @GetMapping("save") + public ModelAndView save() { + return new ModelAndView("data/save"); + } + + @GetMapping("update") + public ModelAndView update() { + return new ModelAndView("data/update"); + } + + @GetMapping("list-tree") + public ModelAndView listTree() { + return new ModelAndView("data/list-tree"); + } + + @GetMapping("list") + public ModelAndView list() { + return new ModelAndView("data/list"); + } + +} diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/wechat/AreaWechatController.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/wechat/AreaWechatController.java similarity index 96% rename from module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/wechat/AreaWechatController.java rename to module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/wechat/AreaWechatController.java index 65569dba..5ad19437 100644 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/wechat/AreaWechatController.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/wechat/AreaWechatController.java @@ -1,9 +1,9 @@ -package ink.wgink.service.dictionary.controller.wechat; +package ink.wgink.module.dictionary.controller.wechat; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.service.dictionary.pojo.dtos.AreaDTO; -import ink.wgink.service.dictionary.service.IAreaService; +import ink.wgink.module.dictionary.pojo.dtos.AreaDTO; +import ink.wgink.module.dictionary.service.IAreaService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.ErrorResult; diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/wechat/DataWechatController.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/wechat/DataWechatController.java similarity index 96% rename from module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/wechat/DataWechatController.java rename to module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/wechat/DataWechatController.java index d1a5a963..b4dd17fc 100644 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/wechat/DataWechatController.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/wechat/DataWechatController.java @@ -1,9 +1,9 @@ -package ink.wgink.service.dictionary.controller.wechat; +package ink.wgink.module.dictionary.controller.wechat; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.service.dictionary.pojo.dtos.DataDTO; -import ink.wgink.service.dictionary.service.IDataService; +import ink.wgink.module.dictionary.pojo.dtos.DataDTO; +import ink.wgink.module.dictionary.service.IDataService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.ErrorResult; diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/dao/IAreaDao.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/dao/IAreaDao.java similarity index 90% rename from module-dictionary/src/main/java/ink/wgink/service/dictionary/dao/IAreaDao.java rename to module-dictionary/src/main/java/ink/wgink/module/dictionary/dao/IAreaDao.java index d16d441a..ec670e5c 100644 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/dao/IAreaDao.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/dao/IAreaDao.java @@ -1,10 +1,10 @@ -package ink.wgink.service.dictionary.dao; +package ink.wgink.module.dictionary.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; -import ink.wgink.service.dictionary.pojo.dtos.AreaDTO; +import ink.wgink.module.dictionary.pojo.dtos.AreaDTO; import ink.wgink.pojo.dtos.ZTreeDTO; import org.springframework.stereotype.Repository; @@ -21,6 +21,13 @@ import java.util.Map; @Repository public interface IAreaDao { + /** + * 建表 + * + * @throws UpdateException + */ + void createTable() throws UpdateException; + /** * 新增地区字典 * diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/dao/IDataDao.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/dao/IDataDao.java similarity index 90% rename from module-dictionary/src/main/java/ink/wgink/service/dictionary/dao/IDataDao.java rename to module-dictionary/src/main/java/ink/wgink/module/dictionary/dao/IDataDao.java index 2acdc753..f2f8c5d7 100644 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/dao/IDataDao.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/dao/IDataDao.java @@ -1,10 +1,10 @@ -package ink.wgink.service.dictionary.dao; +package ink.wgink.module.dictionary.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; -import ink.wgink.service.dictionary.pojo.dtos.DataDTO; +import ink.wgink.module.dictionary.pojo.dtos.DataDTO; import ink.wgink.pojo.dtos.ZTreeDTO; import org.springframework.stereotype.Repository; @@ -21,6 +21,13 @@ import java.util.Map; @Repository public interface IDataDao { + /** + * 建表 + * + * @throws UpdateException + */ + void createTable() throws UpdateException; + /** * 新增字典 * diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/dtos/AreaDTO.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/dtos/AreaDTO.java similarity index 99% rename from module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/dtos/AreaDTO.java rename to module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/dtos/AreaDTO.java index 090e0520..3a00f73c 100644 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/dtos/AreaDTO.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/dtos/AreaDTO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.dictionary.pojo.dtos; +package ink.wgink.module.dictionary.pojo.dtos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/dtos/DataDTO.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/dtos/DataDTO.java similarity index 98% rename from module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/dtos/DataDTO.java rename to module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/dtos/DataDTO.java index 2506ca86..6c023eb5 100644 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/dtos/DataDTO.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/dtos/DataDTO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.dictionary.pojo.dtos; +package ink.wgink.module.dictionary.pojo.dtos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/vos/AreaVO.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/vos/AreaVO.java similarity index 87% rename from module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/vos/AreaVO.java rename to module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/vos/AreaVO.java index 2aa13eb9..c33a2f63 100644 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/vos/AreaVO.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/vos/AreaVO.java @@ -1,5 +1,7 @@ -package ink.wgink.service.dictionary.pojo.vos; +package ink.wgink.module.dictionary.pojo.vos; +import ink.wgink.annotation.CheckEmptyAnnotation; +import ink.wgink.annotation.CheckNumberAnnotation; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -14,28 +16,37 @@ import io.swagger.annotations.ApiModelProperty; public class AreaVO { @ApiModelProperty(name = "areaParentId", value = "字典上级ID") + @CheckEmptyAnnotation(name = "字典上级ID") private String areaParentId; @ApiModelProperty(name = "areaName", value = "地区名称") + @CheckEmptyAnnotation(name = "地区名称") private String areaName; @ApiModelProperty(name = "areaCode", value = "地区编码") - private Boolean areaCode; + @CheckEmptyAnnotation(name = "地区编码") + private String areaCode; @ApiModelProperty(name = "areaCityCode", value = "地区城市编码") private String areaCityCode; @ApiModelProperty(name = "areaMergerName", value = "地区合并名称") + @CheckEmptyAnnotation(name = "地区合并名称") private String areaMergerName; @ApiModelProperty(name = "areaShortName", value = "地区简称") + @CheckEmptyAnnotation(name = "地区简称") private String areaShortName; @ApiModelProperty(name = "areaZipCode", value = "地区邮政编码") + @CheckEmptyAnnotation(name = "地区邮政编码") private String areaZipCode; @ApiModelProperty(name = "areaLevel", value = "地区级别（0: 省级 1:市级 2:县级 3:镇级 4:乡村级）") + @CheckEmptyAnnotation(name = "地区级别") private String areaLevel; @ApiModelProperty(name = "areaLng", value = "地区经度") private String areaLng; @ApiModelProperty(name = "areaLat", value = "地区纬度") private String areaLat; @ApiModelProperty(name = "areaPinyin", value = "地区拼音") + @CheckEmptyAnnotation(name = "地区拼音") private String areaPinyin; @ApiModelProperty(name = "areaFirst", value = "地区首字母") + @CheckEmptyAnnotation(name = "地区首字母") private String areaFirst; public String getAreaParentId() { @@ -54,11 +65,11 @@ public class AreaVO { this.areaName = areaName; } - public Boolean getAreaCode() { + public String getAreaCode() { return areaCode; } - public void setAreaCode(Boolean areaCode) { + public void setAreaCode(String areaCode) { this.areaCode = areaCode; } diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/vos/DataVO.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/vos/DataVO.java similarity index 97% rename from module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/vos/DataVO.java rename to module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/vos/DataVO.java index ccdd3fc8..dcfc5539 100644 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/pojo/vos/DataVO.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/pojo/vos/DataVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.dictionary.pojo.vos; +package ink.wgink.module.dictionary.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/service/IAreaService.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/IAreaService.java similarity index 92% rename from module-dictionary/src/main/java/ink/wgink/service/dictionary/service/IAreaService.java rename to module-dictionary/src/main/java/ink/wgink/module/dictionary/service/IAreaService.java index a369583a..0c036bc5 100644 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/service/IAreaService.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/IAreaService.java @@ -1,7 +1,7 @@ -package ink.wgink.service.dictionary.service; +package ink.wgink.module.dictionary.service; -import ink.wgink.service.dictionary.pojo.dtos.AreaDTO; -import ink.wgink.service.dictionary.pojo.vos.AreaVO; +import ink.wgink.module.dictionary.pojo.dtos.AreaDTO; +import ink.wgink.module.dictionary.pojo.vos.AreaVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.SuccessResultList; diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/service/IDataService.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/IDataService.java similarity index 86% rename from module-dictionary/src/main/java/ink/wgink/service/dictionary/service/IDataService.java rename to module-dictionary/src/main/java/ink/wgink/module/dictionary/service/IDataService.java index 93417505..bfa809af 100644 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/service/IDataService.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/IDataService.java @@ -1,7 +1,8 @@ -package ink.wgink.service.dictionary.service; +package ink.wgink.module.dictionary.service; -import ink.wgink.service.dictionary.pojo.dtos.DataDTO; -import ink.wgink.service.dictionary.pojo.vos.DataVO; +import ink.wgink.interfaces.dictionary.IDictionaryCheckService; +import ink.wgink.module.dictionary.pojo.dtos.DataDTO; +import ink.wgink.module.dictionary.pojo.vos.DataVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.SuccessResultList; @@ -19,7 +20,7 @@ import java.util.Map; * @Date: 2019/11/18 14:09 * @Version: 1.0 **/ -public interface IDataService { +public interface IDataService extends IDictionaryCheckService { /** * 字典新增 * diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/service/impl/AreaServiceImpl.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/AreaServiceImpl.java similarity index 93% rename from module-dictionary/src/main/java/ink/wgink/service/dictionary/service/impl/AreaServiceImpl.java rename to module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/AreaServiceImpl.java index f50e56ed..ae6b1fcd 100644 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/service/impl/AreaServiceImpl.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/AreaServiceImpl.java @@ -1,12 +1,12 @@ -package ink.wgink.service.dictionary.service.impl; +package ink.wgink.module.dictionary.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; -import ink.wgink.service.dictionary.dao.IAreaDao; -import ink.wgink.service.dictionary.pojo.dtos.AreaDTO; -import ink.wgink.service.dictionary.pojo.vos.AreaVO; -import ink.wgink.service.dictionary.service.IAreaService; +import ink.wgink.module.dictionary.dao.IAreaDao; +import ink.wgink.module.dictionary.pojo.dtos.AreaDTO; +import ink.wgink.module.dictionary.pojo.vos.AreaVO; +import ink.wgink.module.dictionary.service.IAreaService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.SuccessResultList; diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/service/impl/DataServiceImpl.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/DataServiceImpl.java similarity index 94% rename from module-dictionary/src/main/java/ink/wgink/service/dictionary/service/impl/DataServiceImpl.java rename to module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/DataServiceImpl.java index 9bced3ed..489a0778 100644 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/service/impl/DataServiceImpl.java +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/service/impl/DataServiceImpl.java @@ -1,13 +1,13 @@ -package ink.wgink.service.dictionary.service.impl; +package ink.wgink.module.dictionary.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.service.dictionary.dao.IDataDao; -import ink.wgink.service.dictionary.pojo.dtos.DataDTO; -import ink.wgink.service.dictionary.pojo.vos.DataVO; -import ink.wgink.service.dictionary.service.IDataService; +import ink.wgink.module.dictionary.dao.IDataDao; +import ink.wgink.module.dictionary.pojo.dtos.DataDTO; +import ink.wgink.module.dictionary.pojo.vos.DataVO; +import ink.wgink.module.dictionary.service.IDataService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.result.SuccessResultList; diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/startup/ModuleDictionaryStartUp.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/startup/ModuleDictionaryStartUp.java new file mode 100644 index 00000000..712c11dc --- /dev/null +++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/startup/ModuleDictionaryStartUp.java @@ -0,0 +1,45 @@ +package ink.wgink.module.dictionary.startup; + +import ink.wgink.module.dictionary.dao.IAreaDao; +import ink.wgink.module.dictionary.dao.IDataDao; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.stereotype.Component; + +/** + * When you feel like quitting. Think about why you started + * 当你想要放弃的时候，想想当初你为何开始 + * + * @ClassName: ModuleDictionaryStartUp + * @Description: 字典模块启动 + * @Author: wanggeng + * @Date: 2021/2/11 9:41 下午 + * @Version: 1.0 + */ +@Component +public class ModuleDictionaryStartUp implements ApplicationRunner { + + private static final Logger LOG = LoggerFactory.getLogger(ModuleDictionaryStartUp.class); + @Autowired + private IDataDao dataDao; + @Autowired + private IAreaDao areaDao; + + @Override + public void run(ApplicationArguments args) throws Exception { + initTable(); + } + + /** + * 建表 + */ + private void initTable() { + LOG.debug("创建 data_data 表"); + dataDao.createTable(); + LOG.debug("创建 data_area 表"); + areaDao.createTable(); + } +} diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/route/AreaRouteController.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/route/AreaRouteController.java deleted file mode 100644 index d795ab86..00000000 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/route/AreaRouteController.java +++ /dev/null @@ -1,53 +0,0 @@ -package ink.wgink.service.dictionary.controller.route; - -import ink.wgink.interfaces.consts.ISystemConstant; -import io.swagger.annotations.Api; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.ModelAndView; - -/** - * When you feel like quitting. Think about why you started - * 当你想要放弃的时候，想想当初你为何开始 - * - * @ClassName: IDataDictionaryRouteController - * @Description: 数据字典 - * @Author: WangGeng - * @Date: 2019/12/6 16:52 - * @Version: 1.0 - **/ -@Api(tags = ISystemConstant.ROUTE_TAGS_PREFIX + "地区字典页面接口") -@Controller -@RequestMapping(ISystemConstant.ROUTE_PREFIX + "/area") -public class AreaRouteController { - - @GetMapping("save/{areaParentId}") - public ModelAndView save(@PathVariable("areaParentId") String areaParentId) { - ModelAndView mv = new ModelAndView("area/save"); - mv.addObject("areaParentId", areaParentId); - return mv; - } - - @GetMapping("update/{areaId}") - public ModelAndView updateDataDictionary(@PathVariable("areaId") String areaId) { - ModelAndView mv = new ModelAndView("area/update"); - mv.addObject("areaId", areaId); - return mv; - } - - @GetMapping("listtree") - public ModelAndView listTree() { - ModelAndView mv = new ModelAndView("area/list-tree"); - return mv; - } - - @GetMapping("list/{areaParentId}") - public ModelAndView list(@PathVariable("areaParentId") String areaParentId) { - ModelAndView mv = new ModelAndView("area/list"); - mv.addObject("areaParentId", areaParentId); - return mv; - } - -} diff --git a/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/route/DataRouteController.java b/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/route/DataRouteController.java deleted file mode 100644 index 8311bea7..00000000 --- a/module-dictionary/src/main/java/ink/wgink/service/dictionary/controller/route/DataRouteController.java +++ /dev/null @@ -1,53 +0,0 @@ -package ink.wgink.service.dictionary.controller.route; - -import ink.wgink.interfaces.consts.ISystemConstant; -import io.swagger.annotations.Api; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.ModelAndView; - -/** - * When you feel like quitting. Think about why you started - * 当你想要放弃的时候，想想当初你为何开始 - * - * @ClassName: IDataDictionaryRouteController - * @Description: 数据字典 - * @Author: WangGeng - * @Date: 2019/12/6 16:52 - * @Version: 1.0 - **/ -@Api(tags = ISystemConstant.ROUTE_TAGS_PREFIX + "数据字典页面接口") -@Controller -@RequestMapping(ISystemConstant.ROUTE_PREFIX + "/data") -public class DataRouteController { - - @GetMapping("save/{parentId}") - public ModelAndView save(@PathVariable("parentId") String parentId) { - ModelAndView mv = new ModelAndView("data/save"); - mv.addObject("parentId", parentId); - return mv; - } - - @GetMapping("update/{dataId}") - public ModelAndView update(@PathVariable("dataId") String dataId) { - ModelAndView mv = new ModelAndView("data/update"); - mv.addObject("dataId", dataId); - return mv; - } - - @GetMapping("listtree") - public ModelAndView listTree() { - ModelAndView mv = new ModelAndView("data/list-tree"); - return mv; - } - - @GetMapping("list/{parentId}") - public ModelAndView list(@PathVariable("parentId") String parentId) { - ModelAndView mv = new ModelAndView("data/list"); - mv.addObject("parentId", parentId); - return mv; - } - -} diff --git a/module-dictionary/src/main/resources/mybatis/mapper/area-mapper.xml b/module-dictionary/src/main/resources/mybatis/mapper/area-mapper.xml index 6d3dbe5d..bb674293 100644 --- a/module-dictionary/src/main/resources/mybatis/mapper/area-mapper.xml +++ b/module-dictionary/src/main/resources/mybatis/mapper/area-mapper.xml @@ -1,10 +1,10 @@ - + - + @@ -27,8 +27,35 @@ + + + CREATE TABLE IF NOT EXISTS `data_area` ( + `area_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `area_parent_id` bigint(20) DEFAULT '0', + `area_name` varchar(255) DEFAULT NULL COMMENT '地区名称', + `area_code` varchar(255) DEFAULT NULL COMMENT '地区编码', + `area_city_code` varchar(255) DEFAULT NULL COMMENT '地区城市编码', + `area_merger_name` varchar(255) DEFAULT NULL COMMENT '地区合并名称', + `area_short_name` varchar(255) DEFAULT NULL COMMENT '地区简称', + `area_zip_code` varchar(255) DEFAULT NULL COMMENT '地区邮政编码', + `area_level` int(1) DEFAULT '0' COMMENT '地区级别（0: 省级 1:市级 2:县级 3:镇级 4:乡村级）', + `area_lng` varchar(255) DEFAULT NULL COMMENT '地区经度', + `area_lat` varchar(255) DEFAULT NULL COMMENT '地区纬度', + `area_pinyin` varchar(255) DEFAULT NULL COMMENT '地区拼音', + `area_first` varchar(255) DEFAULT NULL COMMENT '地区首字母', + `gmt_create` datetime DEFAULT NULL, + `creator` char(36) DEFAULT NULL, + `gmt_modified` datetime DEFAULT NULL, + `modifier` char(36) DEFAULT NULL, + `is_delete` int(2) DEFAULT '0', + PRIMARY KEY (`area_id`), + KEY `area_parent_id` (`area_parent_id`) USING BTREE, + KEY `is_delete` (`is_delete`) USING BTREE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + - + INSERT INTO data_area( area_parent_id, area_name, diff --git a/module-dictionary/src/main/resources/mybatis/mapper/data-mapper.xml b/module-dictionary/src/main/resources/mybatis/mapper/data-mapper.xml index 94c3776c..24549cbd 100644 --- a/module-dictionary/src/main/resources/mybatis/mapper/data-mapper.xml +++ b/module-dictionary/src/main/resources/mybatis/mapper/data-mapper.xml @@ -1,10 +1,10 @@ - + - + @@ -20,6 +20,27 @@ + + + CREATE TABLE IF NOT EXISTS `data_data` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `data_id` char(36) NOT NULL, + `data_parent_id` char(36) DEFAULT '0' COMMENT '字典上级ID', + `data_name` varchar(255) DEFAULT NULL COMMENT '字典名称', + `data_summary` varchar(255) DEFAULT NULL COMMENT '字典说明', + `data_code` varchar(255) DEFAULT NULL COMMENT '字典编码', + `data_sort` int(11) DEFAULT '0' COMMENT '字典排序', + `creator` char(36) DEFAULT NULL, + `gmt_create` datetime DEFAULT NULL, + `modifier` char(36) DEFAULT NULL, + `gmt_modified` datetime DEFAULT NULL, + `is_delete` int(2) DEFAULT '0', + PRIMARY KEY (`id`,`data_id`), + KEY `is_delete_index` (`is_delete`) USING BTREE, + KEY `data_id` (`data_id`) USING BTREE + ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + INSERT INTO data_data( diff --git a/module-dictionary/src/main/resources/templates/area/list-tree.html b/module-dictionary/src/main/resources/templates/area/list-tree.html index 45dce2ad..3b6fcca8 100644 --- a/module-dictionary/src/main/resources/templates/area/list-tree.html +++ b/module-dictionary/src/main/resources/templates/area/list-tree.html @@ -49,7 +49,7 @@ // 初始化IFrame function initIFrame() { - $('#listContent').attr('src', top.restAjax.path('route/area/list/{parentId}', [parentId])); + $('#listContent').attr('src', top.restAjax.path('route/area/list?parentId={parentId}', [parentId])); } // 初始化大小 function initSize() { @@ -88,14 +88,6 @@ }, }; var zTree = $.fn.zTree.init($("#leftTree"), setting); - // zTree.addNodes(null, { - // id: '0', - // pId: '-1', - // name: top.dataMessage.tree.rootName, - // url: 'javascript:;', - // isParent: 'true' - // }); - // common.refreshTree('leftTree'); } initSize(); initIFrame(); diff --git a/module-dictionary/src/main/resources/templates/area/list.html b/module-dictionary/src/main/resources/templates/area/list.html index 480f51c2..15a90057 100644 --- a/module-dictionary/src/main/resources/templates/area/list.html +++ b/module-dictionary/src/main/resources/templates/area/list.html @@ -57,7 +57,7 @@ var table = layui.table; var admin = layui.admin; var laydate = layui.laydate; - var parentId = $('#areaParentId').val(); + var parentId = top.restAjax.params(window.location.href).parentId; var tableUrl = top.restAjax.path('api/area/listpage?parentId={parentId}', [parentId]); // 初始化表格 @@ -164,7 +164,7 @@ area: ['100%', '100%'], shadeClose: true, anim: 2, - content: top.restAjax.path('route/area/save/{parentId}', [parentId]), + content: top.restAjax.path('route/area/save?areaParentId={parentId}', [parentId]), end: function() { reloadTable(); } @@ -182,7 +182,7 @@ area: ['100%', '100%'], shadeClose: true, anim: 2, - content: top.restAjax.path('route/area/update/{areaId}', [checkDatas[0].areaId]), + content: top.restAjax.path('route/area/update?areaId={areaId}', [checkDatas[0].areaId]), end: function() { reloadTable(); } diff --git a/module-dictionary/src/main/resources/templates/area/save.html b/module-dictionary/src/main/resources/templates/area/save.html index 5b9dbbf6..729ded30 100644 --- a/module-dictionary/src/main/resources/templates/area/save.html +++ b/module-dictionary/src/main/resources/templates/area/save.html @@ -123,7 +123,7 @@ }).use(['index', 'form', 'laydate'], function(){ var $ = layui.$; var form = layui.form; - var areaParentId = $('#areaParentId').val(); + var areaParentId = top.restAjax.params(window.location.href).areaParentId; function closeBox() { parent.layer.close(parent.layer.getFrameIndex(window.name)); } @@ -146,7 +146,7 @@ }); form.render(null, 'dataForm'); }, function(code, data) { - top.DialogBox.msg(data.msg); + top.dialog.msg(data.msg); }, function() { loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3}); }, function() { @@ -161,18 +161,17 @@ top.dialog.close(index); var loadLayerIndex; top.restAjax.post(top.restAjax.path('api/area/save', []), formData.field, null, function(code, data) { + parent.parent.common.refreshTree('leftTree'); var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, { time: 0, btn: [top.dataMessage.button.yes, top.dataMessage.button.no], shade: 0.3, yes: function(index) { top.dialog.close(index); - parent.parent.common.refreshTree('leftTree'); window.location.reload(); }, btn2: function() { closeBox(); - parent.parent.common.refreshTree('leftTree'); } }); }, function(code, data) { diff --git a/module-dictionary/src/main/resources/templates/area/update.html b/module-dictionary/src/main/resources/templates/area/update.html index d06a2ac8..bdbff75f 100644 --- a/module-dictionary/src/main/resources/templates/area/update.html +++ b/module-dictionary/src/main/resources/templates/area/update.html @@ -123,7 +123,7 @@ }).use(['index', 'form', 'laydate'], function(){ var $ = layui.$; var form = layui.form; - var areaId = $('#areaId').val(); + var areaId = top.restAjax.params(window.location.href).areaId; function closeBox() { parent.layer.close(parent.layer.getFrameIndex(window.name)); } @@ -148,7 +148,7 @@ }); form.render(null, 'dataForm'); }, function(code, data) { - top.DialogBox.msg(data.msg); + top.dialog.msg(data.msg); }, function() { loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3}); }, function() { @@ -163,18 +163,17 @@ top.dialog.close(index); var loadLayerIndex; top.restAjax.put(top.restAjax.path('api/area/update/{areaId}', [areaId]), formData.field, null, function(code, data) { + parent.parent.common.refreshTree('leftTree'); var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, { time: 0, btn: [top.dataMessage.button.yes, top.dataMessage.button.no], shade: 0.3, yes: function(index) { top.dialog.close(index); - parent.parent.common.refreshTree('leftTree'); window.location.reload(); }, btn2: function() { closeBox(); - parent.parent.common.refreshTree('leftTree'); } }); }, function(code, data) { diff --git a/module-dictionary/src/main/resources/templates/datadictionary/list-tree.html b/module-dictionary/src/main/resources/templates/data/list-tree.html similarity index 98% rename from module-dictionary/src/main/resources/templates/datadictionary/list-tree.html rename to module-dictionary/src/main/resources/templates/data/list-tree.html index 77615d02..32217a35 100644 --- a/module-dictionary/src/main/resources/templates/datadictionary/list-tree.html +++ b/module-dictionary/src/main/resources/templates/data/list-tree.html @@ -49,7 +49,7 @@ // 初始化IFrame function initIFrame() { - $('#listContent').attr('src', top.restAjax.path('route/data/list/{parentId}', [parentId])); + $('#listContent').attr('src', top.restAjax.path('route/data/list?parentId={parentId}', [parentId])); } // 初始化大小 function initSize() { diff --git a/module-dictionary/src/main/resources/templates/datadictionary/list.html b/module-dictionary/src/main/resources/templates/data/list.html similarity index 97% rename from module-dictionary/src/main/resources/templates/datadictionary/list.html rename to module-dictionary/src/main/resources/templates/data/list.html index 7f3f5daa..1a53ad4f 100644 --- a/module-dictionary/src/main/resources/templates/datadictionary/list.html +++ b/module-dictionary/src/main/resources/templates/data/list.html @@ -57,7 +57,7 @@ var table = layui.table; var admin = layui.admin; var laydate = layui.laydate; - var parentId = $('#parentId').val(); + var parentId = top.restAjax.params(window.location.href).parentId; // 初始化表格 function initTable() { @@ -156,7 +156,7 @@ area: ['100%', '100%'], shadeClose: true, anim: 2, - content: top.restAjax.path('route/data/save/{parentId}', [parentId]), + content: top.restAjax.path('route/data/save?dataParentId={parentId}', [parentId]), end: function() { reloadTable(); } @@ -174,7 +174,7 @@ area: ['100%', '100%'], shadeClose: true, anim: 2, - content: top.restAjax.path('route/data/update/{dictionaryId}', [checkDatas[0].dictionaryId]), + content: top.restAjax.path('route/data/update?dataId={dataId}', [checkDatas[0].dataId]), end: function() { reloadTable(); } diff --git a/module-dictionary/src/main/resources/templates/datadictionary/save.html b/module-dictionary/src/main/resources/templates/data/save.html similarity index 96% rename from module-dictionary/src/main/resources/templates/datadictionary/save.html rename to module-dictionary/src/main/resources/templates/data/save.html index 7c6dad2a..5325c9bf 100644 --- a/module-dictionary/src/main/resources/templates/datadictionary/save.html +++ b/module-dictionary/src/main/resources/templates/data/save.html @@ -69,7 +69,7 @@ }).use(['index', 'form', 'laydate'], function(){ var $ = layui.$; var form = layui.form; - var dataParentId = $('#parentId').val(); + var dataParentId = top.restAjax.params(window.location.href).dataParentId; function closeBox() { parent.layer.close(parent.layer.getFrameIndex(window.name)); } @@ -92,7 +92,7 @@ }); form.render(null, 'dataForm'); }, function(code, data) { - top.DialogBox.msg(data.msg); + top.dialog.msg(data.msg); }, function() { loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3}); }, function() { @@ -107,18 +107,17 @@ top.dialog.close(index); var loadLayerIndex; top.restAjax.post(top.restAjax.path('api/data/save', []), formData.field, null, function(code, data) { + parent.parent.common.refreshTree('leftTree'); var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, { time: 0, btn: [top.dataMessage.button.yes, top.dataMessage.button.no], shade: 0.3, yes: function(index) { top.dialog.close(index); - parent.parent.common.refreshTree('leftTree'); window.location.reload(); }, btn2: function() { closeBox(); - parent.parent.common.refreshTree('leftTree'); } }); }, function(code, data) { diff --git a/module-dictionary/src/main/resources/templates/datadictionary/update.html b/module-dictionary/src/main/resources/templates/data/update.html similarity index 96% rename from module-dictionary/src/main/resources/templates/datadictionary/update.html rename to module-dictionary/src/main/resources/templates/data/update.html index 85eb92af..4d4c69aa 100644 --- a/module-dictionary/src/main/resources/templates/datadictionary/update.html +++ b/module-dictionary/src/main/resources/templates/data/update.html @@ -69,7 +69,7 @@ }).use(['index', 'form', 'laydate'], function(){ var $ = layui.$; var form = layui.form; - var dataId = $('#dataId').val(); + var dataId = top.restAjax.params(window.location.href).dataId; function closeBox() { parent.layer.close(parent.layer.getFrameIndex(window.name)); } @@ -86,7 +86,7 @@ }); form.render(null, 'dataForm'); }, function(code, data) { - top.DialogBox.msg(data.msg); + top.dialog.msg(data.msg); }, function() { loadLayerIndex = top.dialog.msg(top.dataMessage.loading, {icon: 16, time: 0, shade: 0.3}); }, function() { @@ -101,18 +101,17 @@ top.dialog.close(index); var loadLayerIndex; top.restAjax.put(top.restAjax.path('api/data/update/{dataId}', [dataId]), formData.field, null, function(code, data) { + parent.parent.common.refreshTree('leftTree'); var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, { time: 0, btn: [top.dataMessage.button.yes, top.dataMessage.button.no], shade: 0.3, yes: function(index) { top.dialog.close(index); - parent.parent.common.refreshTree('leftTree'); window.location.reload(); }, btn2: function() { closeBox(); - parent.parent.common.refreshTree('leftTree'); } }); }, function(code, data) { diff --git a/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaAppMaxDurationProperties.java b/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaAppMaxDurationProperties.java similarity index 88% rename from module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaAppMaxDurationProperties.java rename to module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaAppMaxDurationProperties.java index aa3c6227..63151533 100644 --- a/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaAppMaxDurationProperties.java +++ b/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaAppMaxDurationProperties.java @@ -1,4 +1,4 @@ -package ink.wgink.service.file.config.properties; +package ink.wgink.module.file.config.properties; /** * When you feel like quitting. Think about why you started diff --git a/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaBackendMaxDurationProperties.java b/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaBackendMaxDurationProperties.java similarity index 88% rename from module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaBackendMaxDurationProperties.java rename to module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaBackendMaxDurationProperties.java index 165f8c60..6b9d1112 100644 --- a/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaBackendMaxDurationProperties.java +++ b/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaBackendMaxDurationProperties.java @@ -1,4 +1,4 @@ -package ink.wgink.service.file.config.properties; +package ink.wgink.module.file.config.properties; /** * When you feel like quitting. Think about why you started diff --git a/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaBaseMaxDurationProperties.java b/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaBaseMaxDurationProperties.java similarity index 95% rename from module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaBaseMaxDurationProperties.java rename to module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaBaseMaxDurationProperties.java index 9d4807dd..85b57409 100644 --- a/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaBaseMaxDurationProperties.java +++ b/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaBaseMaxDurationProperties.java @@ -1,4 +1,4 @@ -package ink.wgink.service.file.config.properties; +package ink.wgink.module.file.config.properties; /** * When you feel like quitting. Think about why you started diff --git a/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaMaxDurationProperties.java b/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaMaxDurationProperties.java similarity index 96% rename from module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaMaxDurationProperties.java rename to module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaMaxDurationProperties.java index 8529f21e..c3066bfe 100644 --- a/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaMaxDurationProperties.java +++ b/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaMaxDurationProperties.java @@ -1,4 +1,4 @@ -package ink.wgink.service.file.config.properties; +package ink.wgink.module.file.config.properties; /** * When you feel like quitting. Think about why you started diff --git a/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaWechatMaxDurationProperties.java b/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaWechatMaxDurationProperties.java similarity index 88% rename from module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaWechatMaxDurationProperties.java rename to module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaWechatMaxDurationProperties.java index a64e4dd2..be1f0f7c 100644 --- a/module-file/src/main/java/ink/wgink/service/file/config/properties/FileMediaWechatMaxDurationProperties.java +++ b/module-file/src/main/java/ink/wgink/module/file/config/properties/FileMediaWechatMaxDurationProperties.java @@ -1,4 +1,4 @@ -package ink.wgink.service.file.config.properties; +package ink.wgink.module.file.config.properties; /** * When you feel like quitting. Think about why you started diff --git a/module-file/src/main/java/ink/wgink/service/file/config/properties/FileProperties.java b/module-file/src/main/java/ink/wgink/module/file/config/properties/FileProperties.java similarity index 98% rename from module-file/src/main/java/ink/wgink/service/file/config/properties/FileProperties.java rename to module-file/src/main/java/ink/wgink/module/file/config/properties/FileProperties.java index e65b8b06..7fc46d09 100644 --- a/module-file/src/main/java/ink/wgink/service/file/config/properties/FileProperties.java +++ b/module-file/src/main/java/ink/wgink/module/file/config/properties/FileProperties.java @@ -1,4 +1,4 @@ -package ink.wgink.service.file.config.properties; +package ink.wgink.module.file.config.properties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/module-file/src/main/java/ink/wgink/service/file/controller/api/FileController.java b/module-file/src/main/java/ink/wgink/module/file/controller/api/FileController.java similarity index 95% rename from module-file/src/main/java/ink/wgink/service/file/controller/api/FileController.java rename to module-file/src/main/java/ink/wgink/module/file/controller/api/FileController.java index 8bc98bee..56aa26a5 100644 --- a/module-file/src/main/java/ink/wgink/service/file/controller/api/FileController.java +++ b/module-file/src/main/java/ink/wgink/module/file/controller/api/FileController.java @@ -1,13 +1,13 @@ -package ink.wgink.service.file.controller.api; +package ink.wgink.module.file.controller.api; import com.alibaba.fastjson.JSONObject; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.service.file.config.properties.FileProperties; -import ink.wgink.service.file.enums.UploadTypeEnum; -import ink.wgink.service.file.pojo.dtos.FileDTO; -import ink.wgink.service.file.pojo.dtos.FileInfoDTO; -import ink.wgink.service.file.service.IFileService; +import ink.wgink.module.file.config.properties.FileProperties; +import ink.wgink.module.file.enums.UploadTypeEnum; +import ink.wgink.module.file.pojo.dtos.FileDTO; +import ink.wgink.module.file.pojo.dtos.FileInfoDTO; +import ink.wgink.module.file.service.IFileService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; diff --git a/module-file/src/main/java/ink/wgink/service/file/controller/app/api/FileAppController.java b/module-file/src/main/java/ink/wgink/module/file/controller/app/api/FileAppController.java similarity index 95% rename from module-file/src/main/java/ink/wgink/service/file/controller/app/api/FileAppController.java rename to module-file/src/main/java/ink/wgink/module/file/controller/app/api/FileAppController.java index 7fbae5a5..826b16cd 100644 --- a/module-file/src/main/java/ink/wgink/service/file/controller/app/api/FileAppController.java +++ b/module-file/src/main/java/ink/wgink/module/file/controller/app/api/FileAppController.java @@ -1,12 +1,12 @@ -package ink.wgink.service.file.controller.app.api; +package ink.wgink.module.file.controller.app.api; import com.alibaba.fastjson.JSONObject; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.service.file.config.properties.FileProperties; -import ink.wgink.service.file.enums.UploadTypeEnum; -import ink.wgink.service.file.pojo.dtos.FileDTO; -import ink.wgink.service.file.service.IFileService; +import ink.wgink.module.file.config.properties.FileProperties; +import ink.wgink.module.file.enums.UploadTypeEnum; +import ink.wgink.module.file.pojo.dtos.FileDTO; +import ink.wgink.module.file.service.IFileService; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResultData; import io.swagger.annotations.*; diff --git a/module-file/src/main/java/ink/wgink/service/file/controller/route/FileRouteController.java b/module-file/src/main/java/ink/wgink/module/file/controller/route/FileRouteController.java similarity index 97% rename from module-file/src/main/java/ink/wgink/service/file/controller/route/FileRouteController.java rename to module-file/src/main/java/ink/wgink/module/file/controller/route/FileRouteController.java index f3347aa3..f3ad6226 100644 --- a/module-file/src/main/java/ink/wgink/service/file/controller/route/FileRouteController.java +++ b/module-file/src/main/java/ink/wgink/module/file/controller/route/FileRouteController.java @@ -1,10 +1,10 @@ -package ink.wgink.service.file.controller.route; +package ink.wgink.module.file.controller.route; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.exceptions.ParamsException; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.service.file.config.properties.FileProperties; -import ink.wgink.service.file.service.IFileService; +import ink.wgink.module.file.config.properties.FileProperties; +import ink.wgink.module.file.service.IFileService; import ink.wgink.pojo.result.ErrorResult; import io.swagger.annotations.*; import org.apache.commons.lang3.StringUtils; diff --git a/module-file/src/main/java/ink/wgink/service/file/controller/wechat/FileWechatController.java b/module-file/src/main/java/ink/wgink/module/file/controller/wechat/FileWechatController.java similarity index 95% rename from module-file/src/main/java/ink/wgink/service/file/controller/wechat/FileWechatController.java rename to module-file/src/main/java/ink/wgink/module/file/controller/wechat/FileWechatController.java index cd921154..a05b805d 100644 --- a/module-file/src/main/java/ink/wgink/service/file/controller/wechat/FileWechatController.java +++ b/module-file/src/main/java/ink/wgink/module/file/controller/wechat/FileWechatController.java @@ -1,11 +1,11 @@ -package ink.wgink.service.file.controller.wechat; +package ink.wgink.module.file.controller.wechat; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.service.file.config.properties.FileProperties; -import ink.wgink.service.file.enums.UploadTypeEnum; -import ink.wgink.service.file.pojo.dtos.FileDTO; -import ink.wgink.service.file.service.IFileService; +import ink.wgink.module.file.config.properties.FileProperties; +import ink.wgink.module.file.enums.UploadTypeEnum; +import ink.wgink.module.file.pojo.dtos.FileDTO; +import ink.wgink.module.file.service.IFileService; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResultData; import io.swagger.annotations.*; diff --git a/module-file/src/main/java/ink/wgink/service/file/dao/IFileDao.java b/module-file/src/main/java/ink/wgink/module/file/dao/IFileDao.java similarity index 93% rename from module-file/src/main/java/ink/wgink/service/file/dao/IFileDao.java rename to module-file/src/main/java/ink/wgink/module/file/dao/IFileDao.java index b522b06c..780dad48 100644 --- a/module-file/src/main/java/ink/wgink/service/file/dao/IFileDao.java +++ b/module-file/src/main/java/ink/wgink/module/file/dao/IFileDao.java @@ -1,11 +1,11 @@ -package ink.wgink.service.file.dao; +package ink.wgink.module.file.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; -import ink.wgink.service.file.pojo.dtos.FileDTO; -import ink.wgink.service.file.pojo.dtos.FileInfoDTO; +import ink.wgink.module.file.pojo.dtos.FileDTO; +import ink.wgink.module.file.pojo.dtos.FileInfoDTO; import ink.wgink.pojo.pos.FilePO; import org.springframework.stereotype.Repository; diff --git a/module-file/src/main/java/ink/wgink/service/file/enums/UploadTypeEnum.java b/module-file/src/main/java/ink/wgink/module/file/enums/UploadTypeEnum.java similarity index 90% rename from module-file/src/main/java/ink/wgink/service/file/enums/UploadTypeEnum.java rename to module-file/src/main/java/ink/wgink/module/file/enums/UploadTypeEnum.java index 8dd93625..561e476d 100644 --- a/module-file/src/main/java/ink/wgink/service/file/enums/UploadTypeEnum.java +++ b/module-file/src/main/java/ink/wgink/module/file/enums/UploadTypeEnum.java @@ -1,4 +1,4 @@ -package ink.wgink.service.file.enums; +package ink.wgink.module.file.enums; /** * @ClassName: UploadTypeEnum diff --git a/module-file/src/main/java/ink/wgink/service/file/excel/error/AbstractErrorExcelHandler.java b/module-file/src/main/java/ink/wgink/module/file/excel/error/AbstractErrorExcelHandler.java similarity index 94% rename from module-file/src/main/java/ink/wgink/service/file/excel/error/AbstractErrorExcelHandler.java rename to module-file/src/main/java/ink/wgink/module/file/excel/error/AbstractErrorExcelHandler.java index ac6c2817..e0908b22 100644 --- a/module-file/src/main/java/ink/wgink/service/file/excel/error/AbstractErrorExcelHandler.java +++ b/module-file/src/main/java/ink/wgink/module/file/excel/error/AbstractErrorExcelHandler.java @@ -1,7 +1,7 @@ -package ink.wgink.service.file.excel.error; +package ink.wgink.module.file.excel.error; import com.alibaba.excel.EasyExcel; -import ink.wgink.service.file.service.IFileService; +import ink.wgink.module.file.service.IFileService; import ink.wgink.util.UUIDUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/module-file/src/main/java/ink/wgink/service/file/pojo/dtos/FileDTO.java b/module-file/src/main/java/ink/wgink/module/file/pojo/dtos/FileDTO.java similarity index 98% rename from module-file/src/main/java/ink/wgink/service/file/pojo/dtos/FileDTO.java rename to module-file/src/main/java/ink/wgink/module/file/pojo/dtos/FileDTO.java index e2630a19..266c2526 100644 --- a/module-file/src/main/java/ink/wgink/service/file/pojo/dtos/FileDTO.java +++ b/module-file/src/main/java/ink/wgink/module/file/pojo/dtos/FileDTO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.file.pojo.dtos; +package ink.wgink.module.file.pojo.dtos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/module-file/src/main/java/ink/wgink/service/file/pojo/dtos/FileInfoDTO.java b/module-file/src/main/java/ink/wgink/module/file/pojo/dtos/FileInfoDTO.java similarity index 97% rename from module-file/src/main/java/ink/wgink/service/file/pojo/dtos/FileInfoDTO.java rename to module-file/src/main/java/ink/wgink/module/file/pojo/dtos/FileInfoDTO.java index 23e45472..92d930d8 100644 --- a/module-file/src/main/java/ink/wgink/service/file/pojo/dtos/FileInfoDTO.java +++ b/module-file/src/main/java/ink/wgink/module/file/pojo/dtos/FileInfoDTO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.file.pojo.dtos; +package ink.wgink.module.file.pojo.dtos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/module-file/src/main/java/ink/wgink/service/file/service/IFileService.java b/module-file/src/main/java/ink/wgink/module/file/service/IFileService.java similarity index 96% rename from module-file/src/main/java/ink/wgink/service/file/service/IFileService.java rename to module-file/src/main/java/ink/wgink/module/file/service/IFileService.java index de6c936e..fd82c030 100644 --- a/module-file/src/main/java/ink/wgink/service/file/service/IFileService.java +++ b/module-file/src/main/java/ink/wgink/module/file/service/IFileService.java @@ -1,9 +1,9 @@ -package ink.wgink.service.file.service; +package ink.wgink.module.file.service; import com.alibaba.fastjson.JSONObject; -import ink.wgink.service.file.enums.UploadTypeEnum; -import ink.wgink.service.file.pojo.dtos.FileDTO; -import ink.wgink.service.file.pojo.dtos.FileInfoDTO; +import ink.wgink.module.file.enums.UploadTypeEnum; +import ink.wgink.module.file.pojo.dtos.FileDTO; +import ink.wgink.module.file.pojo.dtos.FileInfoDTO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.pos.FilePO; import ink.wgink.pojo.result.SuccessResultData; diff --git a/module-file/src/main/java/ink/wgink/service/file/service/impl/FileServiceImpl.java b/module-file/src/main/java/ink/wgink/module/file/service/impl/FileServiceImpl.java similarity index 98% rename from module-file/src/main/java/ink/wgink/service/file/service/impl/FileServiceImpl.java rename to module-file/src/main/java/ink/wgink/module/file/service/impl/FileServiceImpl.java index 1a35c86d..cdd7b8aa 100644 --- a/module-file/src/main/java/ink/wgink/service/file/service/impl/FileServiceImpl.java +++ b/module-file/src/main/java/ink/wgink/module/file/service/impl/FileServiceImpl.java @@ -1,4 +1,4 @@ -package ink.wgink.service.file.service.impl; +package ink.wgink.module.file.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -12,12 +12,12 @@ import ink.wgink.exceptions.ParamsException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.base.SystemException; -import ink.wgink.service.file.config.properties.FileProperties; -import ink.wgink.service.file.dao.IFileDao; -import ink.wgink.service.file.enums.UploadTypeEnum; -import ink.wgink.service.file.pojo.dtos.FileDTO; -import ink.wgink.service.file.pojo.dtos.FileInfoDTO; -import ink.wgink.service.file.service.IFileService; +import ink.wgink.module.file.config.properties.FileProperties; +import ink.wgink.module.file.dao.IFileDao; +import ink.wgink.module.file.enums.UploadTypeEnum; +import ink.wgink.module.file.pojo.dtos.FileDTO; +import ink.wgink.module.file.pojo.dtos.FileInfoDTO; +import ink.wgink.module.file.service.IFileService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.pos.FilePO; import ink.wgink.pojo.result.SuccessResultData; diff --git a/module-file/src/main/java/ink/wgink/service/file/startup/ModuleFileStartUp.java b/module-file/src/main/java/ink/wgink/module/file/startup/ModuleFileStartUp.java similarity index 92% rename from module-file/src/main/java/ink/wgink/service/file/startup/ModuleFileStartUp.java rename to module-file/src/main/java/ink/wgink/module/file/startup/ModuleFileStartUp.java index daa71a4e..a71b6fc4 100644 --- a/module-file/src/main/java/ink/wgink/service/file/startup/ModuleFileStartUp.java +++ b/module-file/src/main/java/ink/wgink/module/file/startup/ModuleFileStartUp.java @@ -1,6 +1,6 @@ -package ink.wgink.service.file.startup; +package ink.wgink.module.file.startup; -import ink.wgink.service.file.dao.IFileDao; +import ink.wgink.module.file.dao.IFileDao; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/module-file/src/main/resources/mybatis/mapper/file-mapper.xml b/module-file/src/main/resources/mybatis/mapper/file-mapper.xml index a23c5fa4..ec919816 100644 --- a/module-file/src/main/resources/mybatis/mapper/file-mapper.xml +++ b/module-file/src/main/resources/mybatis/mapper/file-mapper.xml @@ -1,6 +1,6 @@ - + @@ -20,7 +20,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/module-permission/src/main/java/ink/wgink/service/permission/controller/api/PermissionController.java b/module-permission/src/main/java/ink/wgink/module/permission/controller/api/PermissionController.java similarity index 96% rename from module-permission/src/main/java/ink/wgink/service/permission/controller/api/PermissionController.java rename to module-permission/src/main/java/ink/wgink/module/permission/controller/api/PermissionController.java index 9e71f565..91c67d09 100644 --- a/module-permission/src/main/java/ink/wgink/service/permission/controller/api/PermissionController.java +++ b/module-permission/src/main/java/ink/wgink/module/permission/controller/api/PermissionController.java @@ -1,4 +1,4 @@ -package ink.wgink.service.permission.controller.api; +package ink.wgink.module.permission.controller.api; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; @@ -10,8 +10,8 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.permission.pojo.vos.PermissionVO; -import ink.wgink.service.permission.service.IPermissionService; +import ink.wgink.module.permission.pojo.vos.PermissionVO; +import ink.wgink.module.permission.service.IPermissionService; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.AntPathMatcher; diff --git a/module-permission/src/main/java/ink/wgink/service/permission/dao/IPermissionDao.java b/module-permission/src/main/java/ink/wgink/module/permission/dao/IPermissionDao.java similarity index 97% rename from module-permission/src/main/java/ink/wgink/service/permission/dao/IPermissionDao.java rename to module-permission/src/main/java/ink/wgink/module/permission/dao/IPermissionDao.java index 4956d095..0886a909 100644 --- a/module-permission/src/main/java/ink/wgink/service/permission/dao/IPermissionDao.java +++ b/module-permission/src/main/java/ink/wgink/module/permission/dao/IPermissionDao.java @@ -1,4 +1,4 @@ -package ink.wgink.service.permission.dao; +package ink.wgink.module.permission.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; diff --git a/module-permission/src/main/java/ink/wgink/service/permission/enums/PermissionTypeEnum.java b/module-permission/src/main/java/ink/wgink/module/permission/enums/PermissionTypeEnum.java similarity index 93% rename from module-permission/src/main/java/ink/wgink/service/permission/enums/PermissionTypeEnum.java rename to module-permission/src/main/java/ink/wgink/module/permission/enums/PermissionTypeEnum.java index 5e186762..58b248b3 100644 --- a/module-permission/src/main/java/ink/wgink/service/permission/enums/PermissionTypeEnum.java +++ b/module-permission/src/main/java/ink/wgink/module/permission/enums/PermissionTypeEnum.java @@ -1,4 +1,4 @@ -package ink.wgink.service.permission.enums; +package ink.wgink.module.permission.enums; /** * When you feel like quitting. Think about why you started diff --git a/module-permission/src/main/java/ink/wgink/service/permission/pojo/vos/PermissionVO.java b/module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/PermissionVO.java similarity index 98% rename from module-permission/src/main/java/ink/wgink/service/permission/pojo/vos/PermissionVO.java rename to module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/PermissionVO.java index b46e1d9b..623ea776 100644 --- a/module-permission/src/main/java/ink/wgink/service/permission/pojo/vos/PermissionVO.java +++ b/module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/PermissionVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.permission.pojo.vos; +package ink.wgink.module.permission.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/module-permission/src/main/java/ink/wgink/service/permission/service/IPermissionService.java b/module-permission/src/main/java/ink/wgink/module/permission/service/IPermissionService.java similarity index 94% rename from module-permission/src/main/java/ink/wgink/service/permission/service/IPermissionService.java rename to module-permission/src/main/java/ink/wgink/module/permission/service/IPermissionService.java index c95029dc..9e11bcd3 100644 --- a/module-permission/src/main/java/ink/wgink/service/permission/service/IPermissionService.java +++ b/module-permission/src/main/java/ink/wgink/module/permission/service/IPermissionService.java @@ -1,10 +1,10 @@ -package ink.wgink.service.permission.service; +package ink.wgink.module.permission.service; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.permission.PermissionDTO; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.permission.pojo.vos.PermissionVO; +import ink.wgink.module.permission.pojo.vos.PermissionVO; import java.util.List; import java.util.Map; diff --git a/module-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java b/module-permission/src/main/java/ink/wgink/module/permission/service/impl/PermissionServiceImpl.java similarity index 93% rename from module-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java rename to module-permission/src/main/java/ink/wgink/module/permission/service/impl/PermissionServiceImpl.java index 3b58660d..47b7fe00 100644 --- a/module-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java +++ b/module-permission/src/main/java/ink/wgink/module/permission/service/impl/PermissionServiceImpl.java @@ -1,4 +1,4 @@ -package ink.wgink.service.permission.service.impl; +package ink.wgink.module.permission.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -7,9 +7,9 @@ import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.permission.PermissionDTO; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.permission.dao.IPermissionDao; -import ink.wgink.service.permission.pojo.vos.PermissionVO; -import ink.wgink.service.permission.service.IPermissionService; +import ink.wgink.module.permission.dao.IPermissionDao; +import ink.wgink.module.permission.pojo.vos.PermissionVO; +import ink.wgink.module.permission.service.IPermissionService; import ink.wgink.util.UUIDUtil; import ink.wgink.util.map.HashMapUtil; import org.springframework.beans.factory.annotation.Autowired; diff --git a/module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml b/module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml index d36fdcd3..294ccbf0 100644 --- a/module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml +++ b/module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentController.java b/service-department/src/main/java/ink/wgink/module/department/controller/api/DepartmentController.java similarity index 96% rename from service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentController.java rename to service-department/src/main/java/ink/wgink/module/department/controller/api/DepartmentController.java index c2dac7d6..992674f1 100644 --- a/service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentController.java +++ b/service-department/src/main/java/ink/wgink/module/department/controller/api/DepartmentController.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.controller.api; +package ink.wgink.module.department.controller.api; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; @@ -8,11 +8,11 @@ import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.dtos.department.DepartmentDTO; import ink.wgink.pojo.result.*; -import ink.wgink.service.department.pojo.vos.DepartmentVO; -import ink.wgink.service.department.pojo.vos.MergeDepartmentInfoVO; -import ink.wgink.service.department.pojo.vos.MergeNewDepartmentInfoVO; -import ink.wgink.service.department.pojo.vos.SplitDepartmentVO; -import ink.wgink.service.department.service.IDepartmentService; +import ink.wgink.module.department.pojo.vos.DepartmentVO; +import ink.wgink.module.department.pojo.vos.MergeDepartmentInfoVO; +import ink.wgink.module.department.pojo.vos.MergeNewDepartmentInfoVO; +import ink.wgink.module.department.pojo.vos.SplitDepartmentVO; +import ink.wgink.module.department.service.IDepartmentService; import io.swagger.annotations.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentUserController.java b/service-department/src/main/java/ink/wgink/module/department/controller/api/DepartmentUserController.java similarity index 92% rename from service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentUserController.java rename to service-department/src/main/java/ink/wgink/module/department/controller/api/DepartmentUserController.java index 1fff5e5e..4d4547a4 100644 --- a/service-department/src/main/java/ink/wgink/service/department/controller/api/DepartmentUserController.java +++ b/service-department/src/main/java/ink/wgink/module/department/controller/api/DepartmentUserController.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.controller.api; +package ink.wgink.module.department.controller.api; import ink.wgink.interfaces.consts.ISystemConstant; import io.swagger.annotations.Api; diff --git a/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentRouteController.java b/service-department/src/main/java/ink/wgink/module/department/controller/route/DepartmentRouteController.java similarity index 97% rename from service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentRouteController.java rename to service-department/src/main/java/ink/wgink/module/department/controller/route/DepartmentRouteController.java index eb267e93..e0237f69 100644 --- a/service-department/src/main/java/ink/wgink/service/department/controller/route/DepartmentRouteController.java +++ b/service-department/src/main/java/ink/wgink/module/department/controller/route/DepartmentRouteController.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.controller.route; +package ink.wgink.module.department.controller.route; import ink.wgink.interfaces.consts.ISystemConstant; import io.swagger.annotations.Api; diff --git a/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentAdjustmentDao.java b/service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentAdjustmentDao.java similarity index 93% rename from service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentAdjustmentDao.java rename to service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentAdjustmentDao.java index 2b538a59..9b92a162 100644 --- a/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentAdjustmentDao.java +++ b/service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentAdjustmentDao.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.dao; +package ink.wgink.module.department.dao; import ink.wgink.exceptions.SaveException; import org.springframework.stereotype.Repository; diff --git a/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentDao.java b/service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentDao.java similarity index 98% rename from service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentDao.java rename to service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentDao.java index d3ce88fe..217cdede 100644 --- a/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentDao.java +++ b/service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentDao.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.dao; +package ink.wgink.module.department.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; diff --git a/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserAdjustmentDao.java b/service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentUserAdjustmentDao.java similarity index 93% rename from service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserAdjustmentDao.java rename to service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentUserAdjustmentDao.java index aa031235..78c04986 100644 --- a/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserAdjustmentDao.java +++ b/service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentUserAdjustmentDao.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.dao; +package ink.wgink.module.department.dao; import ink.wgink.exceptions.SaveException; import org.springframework.stereotype.Repository; diff --git a/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserDao.java b/service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentUserDao.java similarity index 96% rename from service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserDao.java rename to service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentUserDao.java index 86470835..d569df9d 100644 --- a/service-department/src/main/java/ink/wgink/service/department/dao/IDepartmentUserDao.java +++ b/service-department/src/main/java/ink/wgink/module/department/dao/IDepartmentUserDao.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.dao; +package ink.wgink.module.department.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; diff --git a/service-department/src/main/java/ink/wgink/service/department/enmus/DepartmentAdjustmentTypeEnum.java b/service-department/src/main/java/ink/wgink/module/department/enmus/DepartmentAdjustmentTypeEnum.java similarity index 93% rename from service-department/src/main/java/ink/wgink/service/department/enmus/DepartmentAdjustmentTypeEnum.java rename to service-department/src/main/java/ink/wgink/module/department/enmus/DepartmentAdjustmentTypeEnum.java index fa4b5e16..1c515dc5 100644 --- a/service-department/src/main/java/ink/wgink/service/department/enmus/DepartmentAdjustmentTypeEnum.java +++ b/service-department/src/main/java/ink/wgink/module/department/enmus/DepartmentAdjustmentTypeEnum.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.enmus; +package ink.wgink.module.department.enmus; /** * When you feel like quitting. Think about why you started diff --git a/service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcel.java b/service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcel.java similarity index 98% rename from service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcel.java rename to service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcel.java index f010ea38..c418b9e2 100644 --- a/service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcel.java +++ b/service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcel.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.listener.excel; +package ink.wgink.module.department.listener.excel; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcelError.java b/service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcelError.java similarity index 98% rename from service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcelError.java rename to service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcelError.java index ddd8082d..a8409a08 100644 --- a/service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcelError.java +++ b/service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcelError.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.listener.excel; +package ink.wgink.module.department.listener.excel; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcelListener.java b/service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcelListener.java similarity index 96% rename from service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcelListener.java rename to service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcelListener.java index b3779fa0..589cb50e 100644 --- a/service-department/src/main/java/ink/wgink/service/department/listener/excel/DepartmentExcelListener.java +++ b/service-department/src/main/java/ink/wgink/module/department/listener/excel/DepartmentExcelListener.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.listener.excel; +package ink.wgink.module.department.listener.excel; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; diff --git a/service-department/src/main/java/ink/wgink/service/department/pojo/vos/DepartmentVO.java b/service-department/src/main/java/ink/wgink/module/department/pojo/vos/DepartmentVO.java similarity index 99% rename from service-department/src/main/java/ink/wgink/service/department/pojo/vos/DepartmentVO.java rename to service-department/src/main/java/ink/wgink/module/department/pojo/vos/DepartmentVO.java index 6436ee99..53cb8321 100644 --- a/service-department/src/main/java/ink/wgink/service/department/pojo/vos/DepartmentVO.java +++ b/service-department/src/main/java/ink/wgink/module/department/pojo/vos/DepartmentVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.pojo.vos; +package ink.wgink.module.department.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/service-department/src/main/java/ink/wgink/service/department/pojo/vos/MergeDepartmentInfoVO.java b/service-department/src/main/java/ink/wgink/module/department/pojo/vos/MergeDepartmentInfoVO.java similarity index 96% rename from service-department/src/main/java/ink/wgink/service/department/pojo/vos/MergeDepartmentInfoVO.java rename to service-department/src/main/java/ink/wgink/module/department/pojo/vos/MergeDepartmentInfoVO.java index 2073252e..e795d505 100644 --- a/service-department/src/main/java/ink/wgink/service/department/pojo/vos/MergeDepartmentInfoVO.java +++ b/service-department/src/main/java/ink/wgink/module/department/pojo/vos/MergeDepartmentInfoVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.pojo.vos; +package ink.wgink.module.department.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import io.swagger.annotations.ApiModel; diff --git a/service-department/src/main/java/ink/wgink/service/department/pojo/vos/MergeNewDepartmentInfoVO.java b/service-department/src/main/java/ink/wgink/module/department/pojo/vos/MergeNewDepartmentInfoVO.java similarity index 96% rename from service-department/src/main/java/ink/wgink/service/department/pojo/vos/MergeNewDepartmentInfoVO.java rename to service-department/src/main/java/ink/wgink/module/department/pojo/vos/MergeNewDepartmentInfoVO.java index 10d7de67..8749c002 100644 --- a/service-department/src/main/java/ink/wgink/service/department/pojo/vos/MergeNewDepartmentInfoVO.java +++ b/service-department/src/main/java/ink/wgink/module/department/pojo/vos/MergeNewDepartmentInfoVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.pojo.vos; +package ink.wgink.module.department.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import io.swagger.annotations.ApiModel; diff --git a/service-department/src/main/java/ink/wgink/service/department/pojo/vos/SplitDepartmentInfoVO.java b/service-department/src/main/java/ink/wgink/module/department/pojo/vos/SplitDepartmentInfoVO.java similarity index 95% rename from service-department/src/main/java/ink/wgink/service/department/pojo/vos/SplitDepartmentInfoVO.java rename to service-department/src/main/java/ink/wgink/module/department/pojo/vos/SplitDepartmentInfoVO.java index 24ace62f..961b95e7 100644 --- a/service-department/src/main/java/ink/wgink/service/department/pojo/vos/SplitDepartmentInfoVO.java +++ b/service-department/src/main/java/ink/wgink/module/department/pojo/vos/SplitDepartmentInfoVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.pojo.vos; +package ink.wgink.module.department.pojo.vos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/service-department/src/main/java/ink/wgink/service/department/pojo/vos/SplitDepartmentVO.java b/service-department/src/main/java/ink/wgink/module/department/pojo/vos/SplitDepartmentVO.java similarity index 96% rename from service-department/src/main/java/ink/wgink/service/department/pojo/vos/SplitDepartmentVO.java rename to service-department/src/main/java/ink/wgink/module/department/pojo/vos/SplitDepartmentVO.java index 07508aa9..f9a818ad 100644 --- a/service-department/src/main/java/ink/wgink/service/department/pojo/vos/SplitDepartmentVO.java +++ b/service-department/src/main/java/ink/wgink/module/department/pojo/vos/SplitDepartmentVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.pojo.vos; +package ink.wgink.module.department.pojo.vos; import ink.wgink.annotation.CheckListAnnotation; import io.swagger.annotations.ApiModel; diff --git a/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentAdjustmentService.java b/service-department/src/main/java/ink/wgink/module/department/service/IDepartmentAdjustmentService.java similarity index 91% rename from service-department/src/main/java/ink/wgink/service/department/service/IDepartmentAdjustmentService.java rename to service-department/src/main/java/ink/wgink/module/department/service/IDepartmentAdjustmentService.java index f7cf03a1..36714368 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentAdjustmentService.java +++ b/service-department/src/main/java/ink/wgink/module/department/service/IDepartmentAdjustmentService.java @@ -1,6 +1,6 @@ -package ink.wgink.service.department.service; +package ink.wgink.module.department.service; -import ink.wgink.service.department.enmus.DepartmentAdjustmentTypeEnum; +import ink.wgink.module.department.enmus.DepartmentAdjustmentTypeEnum; import java.util.List; diff --git a/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentService.java b/service-department/src/main/java/ink/wgink/module/department/service/IDepartmentService.java similarity index 94% rename from service-department/src/main/java/ink/wgink/service/department/service/IDepartmentService.java rename to service-department/src/main/java/ink/wgink/module/department/service/IDepartmentService.java index 301ab112..fb0691de 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentService.java +++ b/service-department/src/main/java/ink/wgink/module/department/service/IDepartmentService.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.service; +package ink.wgink.module.department.service; import ink.wgink.interfaces.department.IDepartmentBaseService; import ink.wgink.pojo.ListPage; @@ -8,10 +8,10 @@ import ink.wgink.pojo.dtos.department.DepartmentDTO; import ink.wgink.pojo.dtos.department.DepartmentSimpleDTO; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.pojo.result.UploadExcelResultDTO; -import ink.wgink.service.department.pojo.vos.DepartmentVO; -import ink.wgink.service.department.pojo.vos.MergeDepartmentInfoVO; -import ink.wgink.service.department.pojo.vos.MergeNewDepartmentInfoVO; -import ink.wgink.service.department.pojo.vos.SplitDepartmentVO; +import ink.wgink.module.department.pojo.vos.DepartmentVO; +import ink.wgink.module.department.pojo.vos.MergeDepartmentInfoVO; +import ink.wgink.module.department.pojo.vos.MergeNewDepartmentInfoVO; +import ink.wgink.module.department.pojo.vos.SplitDepartmentVO; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; diff --git a/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserAdjustmentService.java b/service-department/src/main/java/ink/wgink/module/department/service/IDepartmentUserAdjustmentService.java similarity index 91% rename from service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserAdjustmentService.java rename to service-department/src/main/java/ink/wgink/module/department/service/IDepartmentUserAdjustmentService.java index a0ceb9b1..2fe29cea 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserAdjustmentService.java +++ b/service-department/src/main/java/ink/wgink/module/department/service/IDepartmentUserAdjustmentService.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.service; +package ink.wgink.module.department.service; import java.util.Map; diff --git a/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java b/service-department/src/main/java/ink/wgink/module/department/service/IDepartmentUserService.java similarity index 97% rename from service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java rename to service-department/src/main/java/ink/wgink/module/department/service/IDepartmentUserService.java index 381bd0d1..d9e0e7cc 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/IDepartmentUserService.java +++ b/service-department/src/main/java/ink/wgink/module/department/service/IDepartmentUserService.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.service; +package ink.wgink.module.department.service; import ink.wgink.interfaces.department.IDepartmentUserBaseService; diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentAdjustmentServiceImpl.java b/service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentAdjustmentServiceImpl.java similarity index 86% rename from service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentAdjustmentServiceImpl.java rename to service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentAdjustmentServiceImpl.java index b56626ae..edd8378e 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentAdjustmentServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentAdjustmentServiceImpl.java @@ -1,12 +1,12 @@ -package ink.wgink.service.department.service.impl; +package ink.wgink.module.department.service.impl; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.dtos.user.UserDTO; -import ink.wgink.service.department.dao.IDepartmentAdjustmentDao; -import ink.wgink.service.department.enmus.DepartmentAdjustmentTypeEnum; -import ink.wgink.service.department.service.IDepartmentAdjustmentService; -import ink.wgink.service.department.service.IDepartmentUserAdjustmentService; -import ink.wgink.service.user.service.IUserService; +import ink.wgink.module.department.dao.IDepartmentAdjustmentDao; +import ink.wgink.module.department.enmus.DepartmentAdjustmentTypeEnum; +import ink.wgink.module.department.service.IDepartmentAdjustmentService; +import ink.wgink.module.department.service.IDepartmentUserAdjustmentService; +import ink.wgink.module.user.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java b/service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentServiceImpl.java similarity index 97% rename from service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java rename to service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentServiceImpl.java index 010f37a6..f81aabd7 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentServiceImpl.java @@ -1,4 +1,4 @@ -package ink.wgink.service.department.service.impl; +package ink.wgink.module.department.service.impl; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSONArray; @@ -9,10 +9,10 @@ import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.service.dictionary.pojo.dtos.AreaDTO; -import ink.wgink.service.dictionary.service.IAreaService; -import ink.wgink.service.file.excel.error.AbstractErrorExcelHandler; -import ink.wgink.service.file.service.IFileService; +import ink.wgink.module.dictionary.pojo.dtos.AreaDTO; +import ink.wgink.module.dictionary.service.IAreaService; +import ink.wgink.module.file.excel.error.AbstractErrorExcelHandler; +import ink.wgink.module.file.service.IFileService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.bos.DepartmentBO; import ink.wgink.pojo.dtos.ZTreeDTO; @@ -20,15 +20,15 @@ import ink.wgink.pojo.dtos.department.DepartmentDTO; import ink.wgink.pojo.dtos.department.DepartmentSimpleDTO; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.pojo.result.UploadExcelResultDTO; -import ink.wgink.service.department.dao.IDepartmentDao; -import ink.wgink.service.department.enmus.DepartmentAdjustmentTypeEnum; -import ink.wgink.service.department.listener.excel.DepartmentExcel; -import ink.wgink.service.department.listener.excel.DepartmentExcelError; -import ink.wgink.service.department.listener.excel.DepartmentExcelListener; -import ink.wgink.service.department.pojo.vos.*; -import ink.wgink.service.department.service.IDepartmentAdjustmentService; -import ink.wgink.service.department.service.IDepartmentService; -import ink.wgink.service.department.service.IDepartmentUserService; +import ink.wgink.module.department.dao.IDepartmentDao; +import ink.wgink.module.department.enmus.DepartmentAdjustmentTypeEnum; +import ink.wgink.module.department.listener.excel.DepartmentExcel; +import ink.wgink.module.department.listener.excel.DepartmentExcelError; +import ink.wgink.module.department.listener.excel.DepartmentExcelListener; +import ink.wgink.module.department.pojo.vos.*; +import ink.wgink.module.department.service.IDepartmentAdjustmentService; +import ink.wgink.module.department.service.IDepartmentService; +import ink.wgink.module.department.service.IDepartmentUserService; import ink.wgink.util.UUIDUtil; import ink.wgink.util.map.HashMapUtil; import org.apache.commons.lang3.StringUtils; diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserAdjustmentServiceImpl.java b/service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentUserAdjustmentServiceImpl.java similarity index 80% rename from service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserAdjustmentServiceImpl.java rename to service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentUserAdjustmentServiceImpl.java index 0d912631..b0491305 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserAdjustmentServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentUserAdjustmentServiceImpl.java @@ -1,8 +1,8 @@ -package ink.wgink.service.department.service.impl; +package ink.wgink.module.department.service.impl; import ink.wgink.common.base.DefaultBaseService; -import ink.wgink.service.department.dao.IDepartmentUserAdjustmentDao; -import ink.wgink.service.department.service.IDepartmentUserAdjustmentService; +import ink.wgink.module.department.dao.IDepartmentUserAdjustmentDao; +import ink.wgink.module.department.service.IDepartmentUserAdjustmentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java b/service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentUserServiceImpl.java similarity index 93% rename from service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java rename to service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentUserServiceImpl.java index 5d56a12a..62786e51 100644 --- a/service-department/src/main/java/ink/wgink/service/department/service/impl/DepartmentUserServiceImpl.java +++ b/service-department/src/main/java/ink/wgink/module/department/service/impl/DepartmentUserServiceImpl.java @@ -1,12 +1,12 @@ -package ink.wgink.service.department.service.impl; +package ink.wgink.module.department.service.impl; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SearchException; import ink.wgink.pojo.dtos.department.DepartmentSimpleDTO; -import ink.wgink.service.department.dao.IDepartmentUserDao; -import ink.wgink.service.department.service.IDepartmentAdjustmentService; -import ink.wgink.service.department.service.IDepartmentService; -import ink.wgink.service.department.service.IDepartmentUserService; +import ink.wgink.module.department.dao.IDepartmentUserDao; +import ink.wgink.module.department.service.IDepartmentAdjustmentService; +import ink.wgink.module.department.service.IDepartmentService; +import ink.wgink.module.department.service.IDepartmentUserService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/service-department/src/main/resources/mybatis/mapper/department-adjustment-mapper.xml b/service-department/src/main/resources/mybatis/mapper/department-adjustment-mapper.xml index b75d40ff..400c465b 100644 --- a/service-department/src/main/resources/mybatis/mapper/department-adjustment-mapper.xml +++ b/service-department/src/main/resources/mybatis/mapper/department-adjustment-mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml index b9bdbb96..7ae78321 100644 --- a/service-department/src/main/resources/mybatis/mapper/department-mapper.xml +++ b/service-department/src/main/resources/mybatis/mapper/department-mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service-department/src/main/resources/mybatis/mapper/department-user-adjustment-mapper.xml b/service-department/src/main/resources/mybatis/mapper/department-user-adjustment-mapper.xml index 42e6f17a..ae733f79 100644 --- a/service-department/src/main/resources/mybatis/mapper/department-user-adjustment-mapper.xml +++ b/service-department/src/main/resources/mybatis/mapper/department-user-adjustment-mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml b/service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml index cfe29043..e89d5c8e 100644 --- a/service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml +++ b/service-department/src/main/resources/mybatis/mapper/department-user-mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service-group/src/main/java/ink/wgink/service/group/controller/api/GroupController.java b/service-group/src/main/java/ink/wgink/module/group/controller/api/GroupController.java similarity index 98% rename from service-group/src/main/java/ink/wgink/service/group/controller/api/GroupController.java rename to service-group/src/main/java/ink/wgink/module/group/controller/api/GroupController.java index b9b98171..1b8ed6ab 100644 --- a/service-group/src/main/java/ink/wgink/service/group/controller/api/GroupController.java +++ b/service-group/src/main/java/ink/wgink/module/group/controller/api/GroupController.java @@ -1,4 +1,4 @@ -package ink.wgink.service.group.controller.api; +package ink.wgink.module.group.controller.api; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.exceptions.ParamsException; @@ -9,8 +9,8 @@ import ink.wgink.pojo.dtos.group.GroupDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.group.pojo.vos.GroupVO; -import ink.wgink.service.group.service.IGroupService; +import ink.wgink.module.group.pojo.vos.GroupVO; +import ink.wgink.module.group.service.IGroupService; import io.swagger.annotations.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service-group/src/main/java/ink/wgink/service/group/dao/IGroupDao.java b/service-group/src/main/java/ink/wgink/module/group/dao/IGroupDao.java similarity index 96% rename from service-group/src/main/java/ink/wgink/service/group/dao/IGroupDao.java rename to service-group/src/main/java/ink/wgink/module/group/dao/IGroupDao.java index c39feb9b..a69040ae 100644 --- a/service-group/src/main/java/ink/wgink/service/group/dao/IGroupDao.java +++ b/service-group/src/main/java/ink/wgink/module/group/dao/IGroupDao.java @@ -1,4 +1,4 @@ -package ink.wgink.service.group.dao; +package ink.wgink.module.group.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; @@ -7,7 +7,7 @@ import ink.wgink.exceptions.UpdateException; import ink.wgink.pojo.bos.GroupBO; import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.dtos.group.GroupDTO; -import ink.wgink.service.group.pojo.pos.GroupPO; +import ink.wgink.module.group.pojo.pos.GroupPO; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/service-group/src/main/java/ink/wgink/service/group/pojo/pos/GroupPO.java b/service-group/src/main/java/ink/wgink/module/group/pojo/pos/GroupPO.java similarity index 96% rename from service-group/src/main/java/ink/wgink/service/group/pojo/pos/GroupPO.java rename to service-group/src/main/java/ink/wgink/module/group/pojo/pos/GroupPO.java index c69249c8..8475b877 100644 --- a/service-group/src/main/java/ink/wgink/service/group/pojo/pos/GroupPO.java +++ b/service-group/src/main/java/ink/wgink/module/group/pojo/pos/GroupPO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.group.pojo.pos; +package ink.wgink.module.group.pojo.pos; /** * @ClassName: GroupDTO diff --git a/service-group/src/main/java/ink/wgink/service/group/pojo/vos/GroupVO.java b/service-group/src/main/java/ink/wgink/module/group/pojo/vos/GroupVO.java similarity index 97% rename from service-group/src/main/java/ink/wgink/service/group/pojo/vos/GroupVO.java rename to service-group/src/main/java/ink/wgink/module/group/pojo/vos/GroupVO.java index 56d0f753..fa9e897b 100644 --- a/service-group/src/main/java/ink/wgink/service/group/pojo/vos/GroupVO.java +++ b/service-group/src/main/java/ink/wgink/module/group/pojo/vos/GroupVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.group.pojo.vos; +package ink.wgink.module.group.pojo.vos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/service-group/src/main/java/ink/wgink/service/group/service/IGroupService.java b/service-group/src/main/java/ink/wgink/module/group/service/IGroupService.java similarity index 98% rename from service-group/src/main/java/ink/wgink/service/group/service/IGroupService.java rename to service-group/src/main/java/ink/wgink/module/group/service/IGroupService.java index 7bcd866e..0f5817df 100644 --- a/service-group/src/main/java/ink/wgink/service/group/service/IGroupService.java +++ b/service-group/src/main/java/ink/wgink/module/group/service/IGroupService.java @@ -1,4 +1,4 @@ -package ink.wgink.service.group.service; +package ink.wgink.module.group.service; import ink.wgink.interfaces.group.IGroupBaseService; import ink.wgink.pojo.ListPage; diff --git a/service-group/src/main/java/ink/wgink/service/group/service/impl/GroupServiceImpl.java b/service-group/src/main/java/ink/wgink/module/group/service/impl/GroupServiceImpl.java similarity index 97% rename from service-group/src/main/java/ink/wgink/service/group/service/impl/GroupServiceImpl.java rename to service-group/src/main/java/ink/wgink/module/group/service/impl/GroupServiceImpl.java index c7a50227..e39dcdde 100644 --- a/service-group/src/main/java/ink/wgink/service/group/service/impl/GroupServiceImpl.java +++ b/service-group/src/main/java/ink/wgink/module/group/service/impl/GroupServiceImpl.java @@ -1,4 +1,4 @@ -package ink.wgink.service.group.service.impl; +package ink.wgink.module.group.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -9,8 +9,8 @@ import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.dtos.group.GroupDTO; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.group.dao.IGroupDao; -import ink.wgink.service.group.service.IGroupService; +import ink.wgink.module.group.dao.IGroupDao; +import ink.wgink.module.group.service.IGroupService; import ink.wgink.util.UUIDUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service-group/src/main/resources/mybatis/mapper/group-mapper.xml b/service-group/src/main/resources/mybatis/mapper/group-mapper.xml index 026e1969..09432d19 100644 --- a/service-group/src/main/resources/mybatis/mapper/group-mapper.xml +++ b/service-group/src/main/resources/mybatis/mapper/group-mapper.xml @@ -11,7 +11,7 @@ - + diff --git a/service-menu/src/main/java/ink/wgink/service/menu/controller/api/MenuController.java b/service-menu/src/main/java/ink/wgink/module/menu/controller/api/MenuController.java similarity index 67% rename from service-menu/src/main/java/ink/wgink/service/menu/controller/api/MenuController.java rename to service-menu/src/main/java/ink/wgink/module/menu/controller/api/MenuController.java index 5407d025..35b21f8b 100644 --- a/service-menu/src/main/java/ink/wgink/service/menu/controller/api/MenuController.java +++ b/service-menu/src/main/java/ink/wgink/module/menu/controller/api/MenuController.java @@ -1,7 +1,6 @@ -package ink.wgink.service.menu.controller.api; +package ink.wgink.module.menu.controller.api; import ink.wgink.common.base.DefaultBaseController; -import ink.wgink.exceptions.ParamsException; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.ZTreeDTO; @@ -9,14 +8,14 @@ import ink.wgink.pojo.dtos.menu.MenuDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.menu.pojo.vos.MenuVO; -import ink.wgink.service.menu.service.IMenuService; +import ink.wgink.module.menu.pojo.vos.MenuVO; +import ink.wgink.module.menu.service.IMenuService; import io.swagger.annotations.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.HashMap; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -39,11 +38,11 @@ public class MenuController extends DefaultBaseController { @ApiOperation(value = "保存菜单", notes = "保存菜单接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PostMapping("savemenu") + @PostMapping("save") public SuccessResult saveMenu(@RequestBody MenuVO menuVO) { - Map params = new HashMap<>(16); - checkParams(menuVO, params); - return menuService.saveMenu(params); + checkParams(menuVO); + menuService.save(menuVO); + return new SuccessResult(); } @ApiOperation(value = "菜单删除", notes = "通过id列表批量删除菜单接口") @@ -51,11 +50,10 @@ public class MenuController extends DefaultBaseController { @ApiImplicitParam(name = "ids", value = "菜单ID列表，用下划线分隔", paramType = "path") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @DeleteMapping("removemenu/{ids}") + @DeleteMapping("remove/{ids}") public SuccessResult removeMenu(@PathVariable("ids") String ids) { - Map params = new HashMap<>(0); - params.put("menuIds", ids); - return menuService.removeMenu(params); + menuService.remove(Arrays.asList(ids.split("\\_"))); + return new SuccessResult(); } @ApiOperation(value = "修改菜单", notes = "修改菜单接口") @@ -63,68 +61,21 @@ public class MenuController extends DefaultBaseController { @ApiImplicitParam(name = "menuId", value = "菜单ID", paramType = "path") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @PutMapping("updatemenu/{menuId}") + @PutMapping("update/{menuId}") public SuccessResult updateMenu(@PathVariable("menuId") String menuId, @RequestBody MenuVO menuVO) { - Map params = new HashMap<>(16); - params.put("menuId", menuId); - checkParams(menuVO, params); - return menuService.updateMenu(params); + checkParams(menuVO); + menuService.update(menuId, menuVO); + return new SuccessResult(); } /** * 参数校验 * * @param menuVO - * @param params - * @throws ParamsException */ - private void checkParams(MenuVO menuVO, Map params) { - if (StringUtils.isBlank(menuVO.getMenuParentId())) { - throw new ParamsException("父ID不能为空"); - } - params.put("menuParentId", menuVO.getMenuParentId()); - - if (StringUtils.isBlank(menuVO.getMenuName())) { - throw new ParamsException("菜单名称不能为空"); - } - params.put("menuName", menuVO.getMenuName()); - - if (StringUtils.isBlank(menuVO.getMenuOrder())) { - throw new ParamsException("菜单排序不能为空"); - } - params.put("menuOrder", menuVO.getMenuOrder()); - - if (menuVO.getMenuType() == null) { - throw new ParamsException("菜单类别不能为空或格式错误，格式为数字"); - } - params.put("menuType", menuVO.getMenuType()); - - if (menuVO.getMenuStatus() == null) { - throw new ParamsException("菜单状态不能为空或格式错误，格式为数字"); - } - params.put("menuStatus", menuVO.getMenuStatus()); - - if (StringUtils.isBlank(menuVO.getMenuUrl())) { - params.put("menuUrl", "javascript:void(0);"); - } else if (StringUtils.equals(menuVO.getMenuUrl(), "javascript:void(0);")) { - params.put("menuUrl", menuVO.getMenuUrl()); - } else { - params.put("menuUrl", addSlash(menuVO.getMenuUrl())); - } - - if (menuVO.getOpenType() == null) { - throw new ParamsException("打开方式不能为空或格式错误，格式为数字"); - } - params.put("openType", menuVO.getOpenType()); - - params.put("apiPrefix", addSlash(menuVO.getApiPrefix())); - params.put("resourcePrefix", addSlash(menuVO.getResourcePrefix())); - params.put("routePrefix", addSlash(menuVO.getRoutePrefix())); - - if (StringUtils.isBlank(menuVO.getMenuIcon())) { - params.put("menuIcon", "fa-icon-color-white fa fa-list"); - } else { - params.put("menuIcon", menuVO.getMenuIcon()); + private void checkParams(MenuVO menuVO) { + if (!StringUtils.equals(menuVO.getMenuUrl(), "javascript:void(0);")) { + menuVO.setMenuUrl(addSlash(menuVO.getMenuUrl())); } } diff --git a/service-menu/src/main/java/ink/wgink/service/menu/controller/route/MenuRouteController.java b/service-menu/src/main/java/ink/wgink/module/menu/controller/route/MenuRouteController.java similarity index 96% rename from service-menu/src/main/java/ink/wgink/service/menu/controller/route/MenuRouteController.java rename to service-menu/src/main/java/ink/wgink/module/menu/controller/route/MenuRouteController.java index b634a9fe..4e0dd6fb 100644 --- a/service-menu/src/main/java/ink/wgink/service/menu/controller/route/MenuRouteController.java +++ b/service-menu/src/main/java/ink/wgink/module/menu/controller/route/MenuRouteController.java @@ -1,4 +1,4 @@ -package ink.wgink.service.menu.controller.route; +package ink.wgink.module.menu.controller.route; import ink.wgink.interfaces.consts.ISystemConstant; import io.swagger.annotations.Api; diff --git a/service-menu/src/main/java/ink/wgink/service/menu/dao/IMenuDao.java b/service-menu/src/main/java/ink/wgink/module/menu/dao/IMenuDao.java similarity index 98% rename from service-menu/src/main/java/ink/wgink/service/menu/dao/IMenuDao.java rename to service-menu/src/main/java/ink/wgink/module/menu/dao/IMenuDao.java index a6ee6f8b..0c267bfb 100644 --- a/service-menu/src/main/java/ink/wgink/service/menu/dao/IMenuDao.java +++ b/service-menu/src/main/java/ink/wgink/module/menu/dao/IMenuDao.java @@ -1,4 +1,4 @@ -package ink.wgink.service.menu.dao; +package ink.wgink.module.menu.dao; import ink.wgink.exceptions.UpdateException; import ink.wgink.pojo.dtos.ZTreeDTO; diff --git a/service-menu/src/main/java/ink/wgink/module/menu/pojo/vos/MenuVO.java b/service-menu/src/main/java/ink/wgink/module/menu/pojo/vos/MenuVO.java new file mode 100644 index 00000000..f70af84c --- /dev/null +++ b/service-menu/src/main/java/ink/wgink/module/menu/pojo/vos/MenuVO.java @@ -0,0 +1,115 @@ +package ink.wgink.module.menu.pojo.vos; + +import ink.wgink.annotation.CheckEmptyAnnotation; +import ink.wgink.annotation.CheckNumberAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @ClassName: MenuVO + * @Description: 菜单视图 + * @Author: WangGeng + * @Date: 2019/3/1 10:24 PM + * @Version: 1.0 + **/ +@ApiModel +public class MenuVO { + + @ApiModelProperty(name = "menuParentId", value = "上级ID", required = true, example = "0") + @CheckEmptyAnnotation(name = "上级ID") + private String menuParentId; + @ApiModelProperty(name = "menuName", value = "菜单名称", required = true) + @CheckEmptyAnnotation(name = "菜单名称") + private String menuName; + @ApiModelProperty(name = "menuSummary", value = "菜单说明", required = true) + @CheckEmptyAnnotation(name = "菜单说明") + private String menuSummary; + @ApiModelProperty(name = "menuUrl", value = "菜单链接") + private String menuUrl; + @ApiModelProperty(name = "menuIcon", value = "菜单图标") + private String menuIcon; + @ApiModelProperty(name = "menuType", value = "菜单类型，1：系统菜单，2：业务菜单", example = "1") + @CheckNumberAnnotation(name = "菜单类型", types = {"1", "2"}) + private Integer menuType; + @ApiModelProperty(name = "menuOrder", value = "菜单排序", required = true, example = "99") + @CheckNumberAnnotation(name = "菜单排序") + private String menuOrder; + @ApiModelProperty(name = "menuStatus", value = "菜单状态，0：显示，1：不显示", example = "1") + @CheckNumberAnnotation(name = "菜单状态", types = {"0", "1"}) + private Integer menuStatus; + @ApiModelProperty(name = "openType", value = "打开方式，1: 默认，2: 弹窗，3: 页面") + @CheckNumberAnnotation(name = "打开方式", types = {"1", "2", "3"}) + private Integer openType; + + public String getMenuParentId() { + return menuParentId == null ? "" : menuParentId; + } + + public void setMenuParentId(String menuParentId) { + this.menuParentId = menuParentId; + } + + public String getMenuName() { + return menuName == null ? "" : menuName; + } + + public void setMenuName(String menuName) { + this.menuName = menuName; + } + + public String getMenuSummary() { + return menuSummary == null ? "" : menuSummary; + } + + public void setMenuSummary(String menuSummary) { + this.menuSummary = menuSummary; + } + + public String getMenuUrl() { + return menuUrl == null ? "javascript:void(0);" : menuUrl; + } + + public void setMenuUrl(String menuUrl) { + this.menuUrl = menuUrl; + } + + public String getMenuIcon() { + return menuIcon == null ? "fa-icon-color-white fa fa-list" : menuIcon; + } + + public void setMenuIcon(String menuIcon) { + this.menuIcon = menuIcon; + } + + public Integer getMenuType() { + return menuType == null ? 0 : menuType; + } + + public void setMenuType(Integer menuType) { + this.menuType = menuType; + } + + public String getMenuOrder() { + return menuOrder == null ? "" : menuOrder; + } + + public void setMenuOrder(String menuOrder) { + this.menuOrder = menuOrder; + } + + public Integer getMenuStatus() { + return menuStatus == null ? 0 : menuStatus; + } + + public void setMenuStatus(Integer menuStatus) { + this.menuStatus = menuStatus; + } + + public Integer getOpenType() { + return openType == null ? 0 : openType; + } + + public void setOpenType(Integer openType) { + this.openType = openType; + } +} diff --git a/service-menu/src/main/java/ink/wgink/service/menu/service/IMenuService.java b/service-menu/src/main/java/ink/wgink/module/menu/service/IMenuService.java similarity index 66% rename from service-menu/src/main/java/ink/wgink/service/menu/service/IMenuService.java rename to service-menu/src/main/java/ink/wgink/module/menu/service/IMenuService.java index 85422359..bc04d0e0 100644 --- a/service-menu/src/main/java/ink/wgink/service/menu/service/IMenuService.java +++ b/service-menu/src/main/java/ink/wgink/module/menu/service/IMenuService.java @@ -1,15 +1,10 @@ -package ink.wgink.service.menu.service; +package ink.wgink.module.menu.service; import ink.wgink.interfaces.menu.IMenuBaseService; -import ink.wgink.pojo.ListPage; -import ink.wgink.pojo.dtos.ZTreeDTO; -import ink.wgink.pojo.dtos.menu.MenuDTO; import ink.wgink.pojo.result.SuccessResult; -import ink.wgink.pojo.result.SuccessResultData; -import ink.wgink.pojo.result.SuccessResultList; +import ink.wgink.module.menu.pojo.vos.MenuVO; import java.util.List; -import java.util.Map; /** * @ClassName: IMenuService @@ -23,26 +18,27 @@ public interface IMenuService extends IMenuBaseService { /** * 保存菜单 * - * @param params + * @param menuVO * @return */ - SuccessResult saveMenu(Map params); + SuccessResult save(MenuVO menuVO); /** * 修改菜单 * - * @param params + * @param menuId 菜单ID + * @param menuVO * @return */ - SuccessResult updateMenu(Map params); + SuccessResult update(String menuId, MenuVO menuVO); /** * 菜单删除 * - * @param params + * @param ids * @return */ - SuccessResult removeMenu(Map params); + SuccessResult remove(List ids); /** * 通过clientId获取菜单 diff --git a/service-menu/src/main/java/ink/wgink/service/menu/service/impl/MenuServiceImpl.java b/service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java similarity index 94% rename from service-menu/src/main/java/ink/wgink/service/menu/service/impl/MenuServiceImpl.java rename to service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java index 064a21c6..967d1f22 100644 --- a/service-menu/src/main/java/ink/wgink/service/menu/service/impl/MenuServiceImpl.java +++ b/service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java @@ -1,4 +1,4 @@ -package ink.wgink.service.menu.service.impl; +package ink.wgink.module.menu.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -9,9 +9,11 @@ import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.dtos.menu.MenuDTO; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.menu.dao.IMenuDao; -import ink.wgink.service.menu.service.IMenuService; +import ink.wgink.module.menu.dao.IMenuDao; +import ink.wgink.module.menu.pojo.vos.MenuVO; +import ink.wgink.module.menu.service.IMenuService; import ink.wgink.util.UUIDUtil; +import ink.wgink.util.map.HashMapUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -113,7 +115,8 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService } @Override - public synchronized SuccessResult saveMenu(Map params) { + public synchronized SuccessResult save(MenuVO menuVO) { + Map params = HashMapUtil.beanToMap(menuVO); String parentCode = null; String menuParentId = params.get("menuParentId").toString(); if (!"0".equals(menuParentId)) { @@ -130,13 +133,22 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService } @Override - public SuccessResult removeMenu(Map params) { - params.put("menuIds", Arrays.asList(params.get("menuIds").toString().split("_"))); + public SuccessResult remove(List ids) { + Map params = getHashMap(2); + params.put("menuIds", ids); setUpdateInfo(params); menuDao.remove(params); return new SuccessResult(); } + @Override + public SuccessResult update(String menuId, MenuVO menuVO) { + Map params = HashMapUtil.beanToMap(menuVO); + params.put("menuId", menuId); + setUpdateInfo(params); + menuDao.update(params); + return new SuccessResult(); + } // @Override // public SuccessResultData> listMenuByClientId(Map params) { // OauthClientDTO oauthClientDTO = oauthClientService.getOauthClient(params); @@ -204,13 +216,6 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService return menuDao.listIdByUser(params); } - @Override - public SuccessResult updateMenu(Map params) { - setUpdateInfo(params); - menuDao.update(params); - return new SuccessResult(); - } - /** * 获取角色菜单列表 * diff --git a/service-menu/src/main/java/ink/wgink/service/menu/startup/ServiceMenuStartUp.java b/service-menu/src/main/java/ink/wgink/module/menu/startup/ServiceMenuStartUp.java similarity index 72% rename from service-menu/src/main/java/ink/wgink/service/menu/startup/ServiceMenuStartUp.java rename to service-menu/src/main/java/ink/wgink/module/menu/startup/ServiceMenuStartUp.java index 0c7cffaa..f1ed63d6 100644 --- a/service-menu/src/main/java/ink/wgink/service/menu/startup/ServiceMenuStartUp.java +++ b/service-menu/src/main/java/ink/wgink/module/menu/startup/ServiceMenuStartUp.java @@ -1,9 +1,10 @@ -package ink.wgink.service.menu.startup; +package ink.wgink.module.menu.startup; +import ink.wgink.interfaces.dictionary.IDictionaryCheckService; import ink.wgink.interfaces.menu.IMenuBaseService; import ink.wgink.interfaces.user.IUserCheckService; import ink.wgink.pojo.dtos.menu.MenuDTO; -import ink.wgink.service.menu.dao.IMenuDao; +import ink.wgink.module.menu.dao.IMenuDao; import ink.wgink.util.UUIDUtil; import ink.wgink.util.date.DateUtil; import org.slf4j.Logger; @@ -33,6 +34,8 @@ public class ServiceMenuStartUp implements ApplicationRunner { private IMenuDao menuDao; @Autowired(required = false) private IUserCheckService userCheckService; + @Autowired(required = false) + private IDictionaryCheckService dictionaryCheckService; @Override public void run(ApplicationArguments args) throws Exception { @@ -82,8 +85,9 @@ public class ServiceMenuStartUp implements ApplicationRunner { params.remove("menuId"); params.put("menuCode", "00010001"); MenuDTO menuDTO = menuDao.getSimple(params); - String menuId = UUIDUtil.getUUID(); + String menuId; if (menuDTO == null) { + menuId = UUIDUtil.getUUID(); params.put("menuId", menuId); params.put("menuParentId", menuParentId); params.put("menuName", "系统管理"); @@ -95,8 +99,12 @@ public class ServiceMenuStartUp implements ApplicationRunner { params.put("menuStatus", "0"); params.put("openType", "1"); menuDao.save(params); + } else { + menuId = menuDTO.getMenuId(); } initMenuManage(params, menuId); + initDataManager(params, menuId); + initAreaManager(params, menuId); } /** @@ -125,6 +133,64 @@ public class ServiceMenuStartUp implements ApplicationRunner { } } + /** + * 初始化数据字典 + * + * @param params + * @param menuParentId + */ + public void initDataManager(Map params, String menuParentId) { + if (dictionaryCheckService == null) { + return; + } + LOG.debug("初始化菜单：数据字典"); + params.remove("menuId"); + params.put("menuCode", "000100010002"); + MenuDTO menuDTO = menuDao.getSimple(params); + if (menuDTO == null) { + params.put("menuId", UUIDUtil.getUUID()); + params.put("menuParentId", menuParentId); + params.put("menuName", "数据字典"); + params.put("menuSummary", "数据字典"); + params.put("menuUrl", "/route/data/list-tree"); + params.put("menuType", "1"); + params.put("menuIcon", "fa-icon-color-white fa fa-address-book"); + params.put("menuOrder", "2"); + params.put("menuStatus", "0"); + params.put("openType", "1"); + menuDao.save(params); + } + } + + /** + * 初始化地区字典 + * + * @param params + * @param menuParentId + */ + public void initAreaManager(Map params, String menuParentId) { + if (dictionaryCheckService == null) { + return; + } + LOG.debug("初始化菜单：地区字典"); + params.remove("menuId"); + params.put("menuCode", "000100010003"); + MenuDTO menuDTO = menuDao.getSimple(params); + if (menuDTO == null) { + params.put("menuId", UUIDUtil.getUUID()); + params.put("menuParentId", menuParentId); + params.put("menuName", "区域字典"); + params.put("menuSummary", "区域字典"); + params.put("menuUrl", "/route/area/list-tree"); + params.put("menuType", "1"); + params.put("menuIcon", "fa-icon-color-white fa fa-map-o"); + params.put("menuOrder", "3"); + params.put("menuStatus", "0"); + params.put("openType", "1"); + menuDao.save(params); + } + } + /** * 用户权限管理 * @@ -136,8 +202,9 @@ public class ServiceMenuStartUp implements ApplicationRunner { params.remove("menuId"); params.put("menuCode", "00010002"); MenuDTO menuDTO = menuDao.getSimple(params); - String menuId = UUIDUtil.getUUID(); + String menuId; if (menuDTO == null) { + menuId = UUIDUtil.getUUID(); params.put("menuId", menuId); params.put("menuParentId", menuParentId); params.put("menuName", "用户与权限"); @@ -149,6 +216,8 @@ public class ServiceMenuStartUp implements ApplicationRunner { params.put("menuStatus", "0"); params.put("openType", "1"); menuDao.save(params); + } else { + menuId = menuDTO.getMenuId(); } initUserManage(params, menuId); } diff --git a/service-menu/src/main/java/ink/wgink/service/menu/pojo/vos/MenuVO.java b/service-menu/src/main/java/ink/wgink/service/menu/pojo/vos/MenuVO.java deleted file mode 100644 index c1ed2d87..00000000 --- a/service-menu/src/main/java/ink/wgink/service/menu/pojo/vos/MenuVO.java +++ /dev/null @@ -1,155 +0,0 @@ -package ink.wgink.service.menu.pojo.vos; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * @ClassName: MenuVO - * @Description: 菜单视图 - * @Author: WangGeng - * @Date: 2019/3/1 10:24 PM - * @Version: 1.0 - **/ -@ApiModel -public class MenuVO { - - @ApiModelProperty(name = "menuParentId", value = "上级ID", required = true, example = "0") - private String menuParentId; - @ApiModelProperty(name = "menuName", value = "菜单名称", required = true, example = "菜单名称") - private String menuName; - @ApiModelProperty(name = "apiPrefix", value = "接口前缀", required = true, example = "/api/menu") - private String apiPrefix; - @ApiModelProperty(name = "resourcePrefix", value = "资源前缀", required = true, example = "/resource/menu") - private String resourcePrefix; - @ApiModelProperty(name = "routePrefix", value = "路由前缀", required = true, example = "/route/menu") - private String routePrefix; - @ApiModelProperty(name = "menuUrl", value = "菜单链接") - private String menuUrl; - @ApiModelProperty(name = "menuIcon", value = "菜单图标") - private String menuIcon; - @ApiModelProperty(name = "menuType", value = "菜单类型，1：系统菜单，2：业务菜单", example = "1") - private Integer menuType; - @ApiModelProperty(name = "menuOrder", value = "菜单排序", required = true, example = "99") - private String menuOrder; - @ApiModelProperty(name = "menuStatus", value = "菜单状态，0：显示，1：不显示", example = "1") - private Integer menuStatus; - @ApiModelProperty(name = "openType", value = "打开方式，1: 默认，2: 弹窗，3: 页面") - private Integer openType; - - public String getMenuParentId() { - return menuParentId == null ? "" : menuParentId.trim(); - } - - public void setMenuParentId(String menuParentId) { - this.menuParentId = menuParentId; - } - - public String getMenuName() { - return menuName == null ? "" : menuName.trim(); - } - - public void setMenuName(String menuName) { - this.menuName = menuName; - } - - public String getApiPrefix() { - return apiPrefix == null ? "" : apiPrefix.trim(); - } - - public void setApiPrefix(String apiPrefix) { - this.apiPrefix = apiPrefix; - } - - public String getResourcePrefix() { - return resourcePrefix == null ? "" : resourcePrefix.trim(); - } - - public void setResourcePrefix(String resourcePrefix) { - this.resourcePrefix = resourcePrefix; - } - - public String getRoutePrefix() { - return routePrefix == null ? "" : routePrefix.trim(); - } - - public void setRoutePrefix(String routePrefix) { - this.routePrefix = routePrefix; - } - - public String getMenuUrl() { - return menuUrl == null ? "" : menuUrl.trim(); - } - - public void setMenuUrl(String menuUrl) { - this.menuUrl = menuUrl; - } - - public String getMenuIcon() { - return menuIcon == null ? "" : menuIcon.trim(); - } - - public void setMenuIcon(String menuIcon) { - this.menuIcon = menuIcon; - } - - public Integer getMenuType() { - return menuType; - } - - public void setMenuType(Integer menuType) { - this.menuType = menuType; - } - - public String getMenuOrder() { - return menuOrder == null ? "" : menuOrder.trim(); - } - - public void setMenuOrder(String menuOrder) { - this.menuOrder = menuOrder; - } - - public Integer getMenuStatus() { - return menuStatus; - } - - public void setMenuStatus(Integer menuStatus) { - this.menuStatus = menuStatus; - } - - public Integer getOpenType() { - return openType; - } - - public void setOpenType(Integer openType) { - this.openType = openType; - } - - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("{"); - sb.append("\"menuParentId\":") - .append("\"").append(menuParentId).append("\""); - sb.append(",\"menuName\":") - .append("\"").append(menuName).append("\""); - sb.append(",\"apiPrefix\":") - .append("\"").append(apiPrefix).append("\""); - sb.append(",\"resourcePrefix\":") - .append("\"").append(resourcePrefix).append("\""); - sb.append(",\"routePrefix\":") - .append("\"").append(routePrefix).append("\""); - sb.append(",\"menuUrl\":") - .append("\"").append(menuUrl).append("\""); - sb.append(",\"menuIcon\":") - .append("\"").append(menuIcon).append("\""); - sb.append(",\"menuType\":") - .append("\"").append(menuType).append("\""); - sb.append(",\"menuOrder\":") - .append("\"").append(menuOrder).append("\""); - sb.append(",\"menuStatus\":") - .append("\"").append(menuStatus).append("\""); - sb.append(",\"openType\":") - .append("\"").append(openType).append("\""); - sb.append('}'); - return sb.toString(); - } -} diff --git a/service-menu/src/main/resources/mybatis/mapper/menu-mapper.xml b/service-menu/src/main/resources/mybatis/mapper/menu-mapper.xml index da15b3e7..807709f9 100644 --- a/service-menu/src/main/resources/mybatis/mapper/menu-mapper.xml +++ b/service-menu/src/main/resources/mybatis/mapper/menu-mapper.xml @@ -1,6 +1,6 @@ - + @@ -233,7 +233,7 @@ - SELECT t1.*, t2.menu_name menu_parent_name @@ -254,7 +254,7 @@ - SELECT t1.menu_id, t1.menu_parent_id, diff --git a/service-menu/src/main/resources/templates/menu/list.html b/service-menu/src/main/resources/templates/menu/list.html index eac3fc96..eedf0156 100644 --- a/service-menu/src/main/resources/templates/menu/list.html +++ b/service-menu/src/main/resources/templates/menu/list.html @@ -167,10 +167,6 @@ height: $win.height() - 60, }); } - function refreshTable() { - parent.common.refreshTree('leftTree'); - reloadTable(); - } // 初始化日期 function initDate() {} // 删除 @@ -184,7 +180,8 @@ var layIndex; top.restAjax.delete(top.restAjax.path('api/menu/remove/{ids}', [ids]), {}, null, function (code, data) { top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000}, function () { - refreshTable(); + parent.common.refreshTree('leftTree'); + reloadTable(); }); }, function (code, data) { top.dialog.msg(data.msg); @@ -222,7 +219,7 @@ anim: 2, content: top.restAjax.path('route/menu/save?menuParentId={parentId}', [parentId]), end: function() { - refreshTable(); + reloadTable(); } }); } else if(layEvent === 'update') { @@ -240,7 +237,7 @@ anim: 2, content: top.restAjax.path('route/menu/update?menuId={menuId}', [checkDatas[0].menuId]), end: function() { - refreshTable(); + reloadTable(); } }); } diff --git a/service-menu/src/main/resources/templates/menu/save.html b/service-menu/src/main/resources/templates/menu/save.html index beee18dc..5b0705c6 100644 --- a/service-menu/src/main/resources/templates/menu/save.html +++ b/service-menu/src/main/resources/templates/menu/save.html @@ -147,7 +147,8 @@ top.dialog.confirm(top.dataMessage.commit, function(index) { top.dialog.close(index); var loadLayerIndex; - top.restAjax.post(top.restAjax.path('api/menu/savemenu', []), formData.field, null, function(code, data) { + top.restAjax.post(top.restAjax.path('api/menu/save', []), formData.field, null, function(code, data) { + parent.parent.common.refreshTree('leftTree'); var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, { time: 0, btn: [top.dataMessage.button.yes, top.dataMessage.button.no], diff --git a/service-menu/src/main/resources/templates/menu/update.html b/service-menu/src/main/resources/templates/menu/update.html index d1f3f7d0..a1529e8d 100644 --- a/service-menu/src/main/resources/templates/menu/update.html +++ b/service-menu/src/main/resources/templates/menu/update.html @@ -147,7 +147,8 @@ top.dialog.confirm(top.dataMessage.commit, function(index) { top.dialog.close(index); var loadLayerIndex; - top.restAjax.put(top.restAjax.path('api/menu/updatemenu/{menuId}', [menuId]), formData.field, null, function(code, data) { + top.restAjax.put(top.restAjax.path('api/menu/update/{menuId}', [menuId]), formData.field, null, function(code, data) { + parent.parent.common.refreshTree('leftTree'); var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, { time: 0, btn: [top.dataMessage.button.yes, top.dataMessage.button.no], diff --git a/service-oauth-client/src/main/java/ink/wgink/service/oauth/client/controller/api/OauthClientController.java b/service-oauth-client/src/main/java/ink/wgink/module/oauth/client/controller/api/OauthClientController.java similarity index 98% rename from service-oauth-client/src/main/java/ink/wgink/service/oauth/client/controller/api/OauthClientController.java rename to service-oauth-client/src/main/java/ink/wgink/module/oauth/client/controller/api/OauthClientController.java index b1b5d798..d8fea0a4 100644 --- a/service-oauth-client/src/main/java/ink/wgink/service/oauth/client/controller/api/OauthClientController.java +++ b/service-oauth-client/src/main/java/ink/wgink/module/oauth/client/controller/api/OauthClientController.java @@ -1,4 +1,4 @@ -package ink.wgink.service.oauth.client.controller.api; +package ink.wgink.module.oauth.client.controller.api; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.exceptions.ParamsException; @@ -8,8 +8,8 @@ import ink.wgink.pojo.dtos.oauth.client.OauthClientDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.oauth.client.pojo.vos.OauthClientVO; -import ink.wgink.service.oauth.client.service.IOauthClientService; +import ink.wgink.module.oauth.client.pojo.vos.OauthClientVO; +import ink.wgink.module.oauth.client.service.IOauthClientService; import ink.wgink.util.AesUtil; import io.swagger.annotations.*; import org.apache.commons.codec.binary.Base64; diff --git a/service-oauth-client/src/main/java/ink/wgink/service/oauth/client/dao/IOauthClientDao.java b/service-oauth-client/src/main/java/ink/wgink/module/oauth/client/dao/IOauthClientDao.java similarity index 98% rename from service-oauth-client/src/main/java/ink/wgink/service/oauth/client/dao/IOauthClientDao.java rename to service-oauth-client/src/main/java/ink/wgink/module/oauth/client/dao/IOauthClientDao.java index c6e5f217..656555a1 100644 --- a/service-oauth-client/src/main/java/ink/wgink/service/oauth/client/dao/IOauthClientDao.java +++ b/service-oauth-client/src/main/java/ink/wgink/module/oauth/client/dao/IOauthClientDao.java @@ -1,4 +1,4 @@ -package ink.wgink.service.oauth.client.dao; +package ink.wgink.module.oauth.client.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; diff --git a/service-oauth-client/src/main/java/ink/wgink/service/oauth/client/pojo/vos/OauthClientVO.java b/service-oauth-client/src/main/java/ink/wgink/module/oauth/client/pojo/vos/OauthClientVO.java similarity index 99% rename from service-oauth-client/src/main/java/ink/wgink/service/oauth/client/pojo/vos/OauthClientVO.java rename to service-oauth-client/src/main/java/ink/wgink/module/oauth/client/pojo/vos/OauthClientVO.java index a96d8ee7..4cd680a3 100644 --- a/service-oauth-client/src/main/java/ink/wgink/service/oauth/client/pojo/vos/OauthClientVO.java +++ b/service-oauth-client/src/main/java/ink/wgink/module/oauth/client/pojo/vos/OauthClientVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.oauth.client.pojo.vos; +package ink.wgink.module.oauth.client.pojo.vos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/service-oauth-client/src/main/java/ink/wgink/service/oauth/client/service/IOauthClientService.java b/service-oauth-client/src/main/java/ink/wgink/module/oauth/client/service/IOauthClientService.java similarity index 98% rename from service-oauth-client/src/main/java/ink/wgink/service/oauth/client/service/IOauthClientService.java rename to service-oauth-client/src/main/java/ink/wgink/module/oauth/client/service/IOauthClientService.java index a23489b9..2d7b4c3f 100644 --- a/service-oauth-client/src/main/java/ink/wgink/service/oauth/client/service/IOauthClientService.java +++ b/service-oauth-client/src/main/java/ink/wgink/module/oauth/client/service/IOauthClientService.java @@ -1,4 +1,4 @@ -package ink.wgink.service.oauth.client.service; +package ink.wgink.module.oauth.client.service; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.oauth.client.OauthClientDTO; diff --git a/service-oauth-client/src/main/java/ink/wgink/service/oauth/client/service/impl/OauthClientServiceImpl.java b/service-oauth-client/src/main/java/ink/wgink/module/oauth/client/service/impl/OauthClientServiceImpl.java similarity index 96% rename from service-oauth-client/src/main/java/ink/wgink/service/oauth/client/service/impl/OauthClientServiceImpl.java rename to service-oauth-client/src/main/java/ink/wgink/module/oauth/client/service/impl/OauthClientServiceImpl.java index 5872070d..4f08a169 100644 --- a/service-oauth-client/src/main/java/ink/wgink/service/oauth/client/service/impl/OauthClientServiceImpl.java +++ b/service-oauth-client/src/main/java/ink/wgink/module/oauth/client/service/impl/OauthClientServiceImpl.java @@ -1,4 +1,4 @@ -package ink.wgink.service.oauth.client.service.impl; +package ink.wgink.module.oauth.client.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -10,8 +10,8 @@ import ink.wgink.pojo.dtos.oauth.client.OauthClientSimpleDTO; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.oauth.client.dao.IOauthClientDao; -import ink.wgink.service.oauth.client.service.IOauthClientService; +import ink.wgink.module.oauth.client.dao.IOauthClientDao; +import ink.wgink.module.oauth.client.service.IOauthClientService; import ink.wgink.util.AesUtil; import ink.wgink.util.UUIDUtil; import org.apache.commons.codec.binary.Base64; diff --git a/service-oauth-client/src/main/resources/mybatis/mapper/oauthclient-mapper.xml b/service-oauth-client/src/main/resources/mybatis/mapper/oauthclient-mapper.xml index c35f6dd3..25f3c552 100644 --- a/service-oauth-client/src/main/resources/mybatis/mapper/oauthclient-mapper.xml +++ b/service-oauth-client/src/main/resources/mybatis/mapper/oauthclient-mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service-position/src/main/java/ink/wgink/service/position/controller/api/PositionController.java b/service-position/src/main/java/ink/wgink/module/position/controller/api/PositionController.java similarity index 97% rename from service-position/src/main/java/ink/wgink/service/position/controller/api/PositionController.java rename to service-position/src/main/java/ink/wgink/module/position/controller/api/PositionController.java index b381b18e..4867568c 100644 --- a/service-position/src/main/java/ink/wgink/service/position/controller/api/PositionController.java +++ b/service-position/src/main/java/ink/wgink/module/position/controller/api/PositionController.java @@ -1,4 +1,4 @@ -package ink.wgink.service.position.controller.api; +package ink.wgink.module.position.controller.api; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.exceptions.ParamsException; @@ -9,8 +9,8 @@ import ink.wgink.pojo.dtos.position.PositionDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.position.pojo.vos.PositionVO; -import ink.wgink.service.position.service.IPositionService; +import ink.wgink.module.position.pojo.vos.PositionVO; +import ink.wgink.module.position.service.IPositionService; import io.swagger.annotations.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service-position/src/main/java/ink/wgink/service/position/dao/IPositionDao.java b/service-position/src/main/java/ink/wgink/module/position/dao/IPositionDao.java similarity index 98% rename from service-position/src/main/java/ink/wgink/service/position/dao/IPositionDao.java rename to service-position/src/main/java/ink/wgink/module/position/dao/IPositionDao.java index 926623c6..e50bb4fe 100644 --- a/service-position/src/main/java/ink/wgink/service/position/dao/IPositionDao.java +++ b/service-position/src/main/java/ink/wgink/module/position/dao/IPositionDao.java @@ -1,4 +1,4 @@ -package ink.wgink.service.position.dao; +package ink.wgink.module.position.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; diff --git a/service-position/src/main/java/ink/wgink/service/position/pojo/vos/PositionVO.java b/service-position/src/main/java/ink/wgink/module/position/pojo/vos/PositionVO.java similarity index 97% rename from service-position/src/main/java/ink/wgink/service/position/pojo/vos/PositionVO.java rename to service-position/src/main/java/ink/wgink/module/position/pojo/vos/PositionVO.java index 398c6cc3..99c68c3a 100644 --- a/service-position/src/main/java/ink/wgink/service/position/pojo/vos/PositionVO.java +++ b/service-position/src/main/java/ink/wgink/module/position/pojo/vos/PositionVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.position.pojo.vos; +package ink.wgink.module.position.pojo.vos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/service-position/src/main/java/ink/wgink/service/position/service/IPositionService.java b/service-position/src/main/java/ink/wgink/module/position/service/IPositionService.java similarity index 98% rename from service-position/src/main/java/ink/wgink/service/position/service/IPositionService.java rename to service-position/src/main/java/ink/wgink/module/position/service/IPositionService.java index fa343ba4..b569a6e6 100644 --- a/service-position/src/main/java/ink/wgink/service/position/service/IPositionService.java +++ b/service-position/src/main/java/ink/wgink/module/position/service/IPositionService.java @@ -1,4 +1,4 @@ -package ink.wgink.service.position.service; +package ink.wgink.module.position.service; import ink.wgink.interfaces.position.IPositionBaseService; import ink.wgink.pojo.ListPage; diff --git a/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionServiceImpl.java b/service-position/src/main/java/ink/wgink/module/position/service/impl/PositionServiceImpl.java similarity index 96% rename from service-position/src/main/java/ink/wgink/service/position/service/impl/PositionServiceImpl.java rename to service-position/src/main/java/ink/wgink/module/position/service/impl/PositionServiceImpl.java index c65ff191..347e5e45 100644 --- a/service-position/src/main/java/ink/wgink/service/position/service/impl/PositionServiceImpl.java +++ b/service-position/src/main/java/ink/wgink/module/position/service/impl/PositionServiceImpl.java @@ -1,4 +1,4 @@ -package ink.wgink.service.position.service.impl; +package ink.wgink.module.position.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -9,8 +9,8 @@ import ink.wgink.pojo.dtos.ZTreeDTO; import ink.wgink.pojo.dtos.position.PositionDTO; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.position.dao.IPositionDao; -import ink.wgink.service.position.service.IPositionService; +import ink.wgink.module.position.dao.IPositionDao; +import ink.wgink.module.position.service.IPositionService; import ink.wgink.util.UUIDUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/service-position/src/main/resources/mybatis/mapper/position-mapper.xml b/service-position/src/main/resources/mybatis/mapper/position-mapper.xml index 6b696cca..d6fd9c2e 100644 --- a/service-position/src/main/resources/mybatis/mapper/position-mapper.xml +++ b/service-position/src/main/resources/mybatis/mapper/position-mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service-role/src/main/java/ink/wgink/service/role/controller/api/RoleController.java b/service-role/src/main/java/ink/wgink/module/role/controller/api/RoleController.java similarity index 97% rename from service-role/src/main/java/ink/wgink/service/role/controller/api/RoleController.java rename to service-role/src/main/java/ink/wgink/module/role/controller/api/RoleController.java index e2aa9402..6a29b280 100644 --- a/service-role/src/main/java/ink/wgink/service/role/controller/api/RoleController.java +++ b/service-role/src/main/java/ink/wgink/module/role/controller/api/RoleController.java @@ -1,4 +1,4 @@ -package ink.wgink.service.role.controller.api; +package ink.wgink.module.role.controller.api; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; @@ -11,10 +11,10 @@ import ink.wgink.pojo.dtos.role.RoleDataAuthorityTypeDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.role.pojo.vos.RoleDataAuthorityVO; -import ink.wgink.service.role.pojo.vos.RoleUserAuthorizationVO; -import ink.wgink.service.role.pojo.vos.RoleVO; -import ink.wgink.service.role.service.IRoleService; +import ink.wgink.module.role.pojo.vos.RoleDataAuthorityVO; +import ink.wgink.module.role.pojo.vos.RoleUserAuthorizationVO; +import ink.wgink.module.role.pojo.vos.RoleVO; +import ink.wgink.module.role.service.IRoleService; import io.swagger.annotations.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service-role/src/main/java/ink/wgink/service/role/controller/api/RoleGroupController.java b/service-role/src/main/java/ink/wgink/module/role/controller/api/RoleGroupController.java similarity index 98% rename from service-role/src/main/java/ink/wgink/service/role/controller/api/RoleGroupController.java rename to service-role/src/main/java/ink/wgink/module/role/controller/api/RoleGroupController.java index 32168ced..f98431fe 100644 --- a/service-role/src/main/java/ink/wgink/service/role/controller/api/RoleGroupController.java +++ b/service-role/src/main/java/ink/wgink/module/role/controller/api/RoleGroupController.java @@ -1,4 +1,4 @@ -package ink.wgink.service.role.controller.api; +package ink.wgink.module.role.controller.api; /** * When you feel like quitting. Think about why you started diff --git a/service-role/src/main/java/ink/wgink/service/role/dao/IRoleDao.java b/service-role/src/main/java/ink/wgink/module/role/dao/IRoleDao.java similarity index 98% rename from service-role/src/main/java/ink/wgink/service/role/dao/IRoleDao.java rename to service-role/src/main/java/ink/wgink/module/role/dao/IRoleDao.java index 12d78baa..883ab6e1 100644 --- a/service-role/src/main/java/ink/wgink/service/role/dao/IRoleDao.java +++ b/service-role/src/main/java/ink/wgink/module/role/dao/IRoleDao.java @@ -1,10 +1,10 @@ -package ink.wgink.service.role.dao; +package ink.wgink.module.role.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; -import ink.wgink.service.role.pojo.pos.RolePO; +import ink.wgink.module.role.pojo.pos.RolePO; import ink.wgink.pojo.bos.RoleBO; import ink.wgink.pojo.bos.RoleMenuBO; import ink.wgink.pojo.dtos.ZTreeDTO; diff --git a/service-role/src/main/java/ink/wgink/service/role/dao/IRoleGroupDao.java b/service-role/src/main/java/ink/wgink/module/role/dao/IRoleGroupDao.java similarity index 94% rename from service-role/src/main/java/ink/wgink/service/role/dao/IRoleGroupDao.java rename to service-role/src/main/java/ink/wgink/module/role/dao/IRoleGroupDao.java index 0a181a4b..1dafd0aa 100644 --- a/service-role/src/main/java/ink/wgink/service/role/dao/IRoleGroupDao.java +++ b/service-role/src/main/java/ink/wgink/module/role/dao/IRoleGroupDao.java @@ -1,4 +1,4 @@ -package ink.wgink.service.role.dao; +package ink.wgink.module.role.dao; import ink.wgink.exceptions.SearchException; import org.springframework.stereotype.Repository; diff --git a/service-role/src/main/java/ink/wgink/service/role/dao/IRoleMenuDao.java b/service-role/src/main/java/ink/wgink/module/role/dao/IRoleMenuDao.java similarity index 89% rename from service-role/src/main/java/ink/wgink/service/role/dao/IRoleMenuDao.java rename to service-role/src/main/java/ink/wgink/module/role/dao/IRoleMenuDao.java index befa2884..82c7875b 100644 --- a/service-role/src/main/java/ink/wgink/service/role/dao/IRoleMenuDao.java +++ b/service-role/src/main/java/ink/wgink/module/role/dao/IRoleMenuDao.java @@ -1,4 +1,4 @@ -package ink.wgink.service.role.dao; +package ink.wgink.module.role.dao; /** * When you feel like quitting. Think about why you started diff --git a/service-role/src/main/java/ink/wgink/service/role/dao/IRolePermissionDao.java b/service-role/src/main/java/ink/wgink/module/role/dao/IRolePermissionDao.java similarity index 97% rename from service-role/src/main/java/ink/wgink/service/role/dao/IRolePermissionDao.java rename to service-role/src/main/java/ink/wgink/module/role/dao/IRolePermissionDao.java index bec055f3..1308d95c 100644 --- a/service-role/src/main/java/ink/wgink/service/role/dao/IRolePermissionDao.java +++ b/service-role/src/main/java/ink/wgink/module/role/dao/IRolePermissionDao.java @@ -1,4 +1,4 @@ -package ink.wgink.service.role.dao; +package ink.wgink.module.role.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; diff --git a/service-role/src/main/java/ink/wgink/service/role/pojo/pos/RolePO.java b/service-role/src/main/java/ink/wgink/module/role/pojo/pos/RolePO.java similarity index 98% rename from service-role/src/main/java/ink/wgink/service/role/pojo/pos/RolePO.java rename to service-role/src/main/java/ink/wgink/module/role/pojo/pos/RolePO.java index ed9e6196..e6253d4e 100644 --- a/service-role/src/main/java/ink/wgink/service/role/pojo/pos/RolePO.java +++ b/service-role/src/main/java/ink/wgink/module/role/pojo/pos/RolePO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.role.pojo.pos; +package ink.wgink.module.role.pojo.pos; import java.io.Serializable; diff --git a/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleDataAuthorityVO.java b/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleDataAuthorityVO.java similarity index 97% rename from service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleDataAuthorityVO.java rename to service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleDataAuthorityVO.java index 66d9a981..7d29dbb0 100644 --- a/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleDataAuthorityVO.java +++ b/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleDataAuthorityVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.role.pojo.vos; +package ink.wgink.module.role.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import io.swagger.annotations.ApiModel; diff --git a/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RolePermissionVO.java b/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RolePermissionVO.java similarity index 97% rename from service-role/src/main/java/ink/wgink/service/role/pojo/vos/RolePermissionVO.java rename to service-role/src/main/java/ink/wgink/module/role/pojo/vos/RolePermissionVO.java index 134fdfdd..f110e9e4 100644 --- a/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RolePermissionVO.java +++ b/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RolePermissionVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.role.pojo.vos; +package ink.wgink.module.role.pojo.vos; import ink.wgink.annotation.CheckBooleanAnnotation; import ink.wgink.annotation.CheckListAnnotation; diff --git a/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleUserAuthorityVO.java b/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleUserAuthorityVO.java similarity index 97% rename from service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleUserAuthorityVO.java rename to service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleUserAuthorityVO.java index dd837baa..80b80a6e 100644 --- a/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleUserAuthorityVO.java +++ b/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleUserAuthorityVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.role.pojo.vos; +package ink.wgink.module.role.pojo.vos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleUserAuthorizationVO.java b/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleUserAuthorizationVO.java similarity index 95% rename from service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleUserAuthorizationVO.java rename to service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleUserAuthorizationVO.java index d3b56f94..36381e88 100644 --- a/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleUserAuthorizationVO.java +++ b/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleUserAuthorizationVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.role.pojo.vos; +package ink.wgink.module.role.pojo.vos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleVO.java b/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleVO.java similarity index 97% rename from service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleVO.java rename to service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleVO.java index 05ce2d0f..98bf7ee9 100644 --- a/service-role/src/main/java/ink/wgink/service/role/pojo/vos/RoleVO.java +++ b/service-role/src/main/java/ink/wgink/module/role/pojo/vos/RoleVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.role.pojo.vos; +package ink.wgink.module.role.pojo.vos; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/service-role/src/main/java/ink/wgink/service/role/service/IRoleGroupService.java b/service-role/src/main/java/ink/wgink/module/role/service/IRoleGroupService.java similarity index 93% rename from service-role/src/main/java/ink/wgink/service/role/service/IRoleGroupService.java rename to service-role/src/main/java/ink/wgink/module/role/service/IRoleGroupService.java index 7b51b44d..dda051cd 100644 --- a/service-role/src/main/java/ink/wgink/service/role/service/IRoleGroupService.java +++ b/service-role/src/main/java/ink/wgink/module/role/service/IRoleGroupService.java @@ -1,4 +1,4 @@ -package ink.wgink.service.role.service; +package ink.wgink.module.role.service; /** * When you feel like quitting. Think about why you started diff --git a/service-role/src/main/java/ink/wgink/service/role/service/IRoleMenuService.java b/service-role/src/main/java/ink/wgink/module/role/service/IRoleMenuService.java similarity index 88% rename from service-role/src/main/java/ink/wgink/service/role/service/IRoleMenuService.java rename to service-role/src/main/java/ink/wgink/module/role/service/IRoleMenuService.java index d7f91f8b..4d513d92 100644 --- a/service-role/src/main/java/ink/wgink/service/role/service/IRoleMenuService.java +++ b/service-role/src/main/java/ink/wgink/module/role/service/IRoleMenuService.java @@ -1,4 +1,4 @@ -package ink.wgink.service.role.service; +package ink.wgink.module.role.service; /** * When you feel like quitting. Think about why you started diff --git a/service-role/src/main/java/ink/wgink/service/role/service/IRolePermissionService.java b/service-role/src/main/java/ink/wgink/module/role/service/IRolePermissionService.java similarity index 91% rename from service-role/src/main/java/ink/wgink/service/role/service/IRolePermissionService.java rename to service-role/src/main/java/ink/wgink/module/role/service/IRolePermissionService.java index 0f8266bc..faa36694 100644 --- a/service-role/src/main/java/ink/wgink/service/role/service/IRolePermissionService.java +++ b/service-role/src/main/java/ink/wgink/module/role/service/IRolePermissionService.java @@ -1,9 +1,9 @@ -package ink.wgink.service.role.service; +package ink.wgink.module.role.service; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; import ink.wgink.pojo.dtos.role.RolePermissionDTO; -import ink.wgink.service.role.pojo.vos.RolePermissionVO; +import ink.wgink.module.role.pojo.vos.RolePermissionVO; import java.util.List; diff --git a/service-role/src/main/java/ink/wgink/service/role/service/IRoleService.java b/service-role/src/main/java/ink/wgink/module/role/service/IRoleService.java similarity index 98% rename from service-role/src/main/java/ink/wgink/service/role/service/IRoleService.java rename to service-role/src/main/java/ink/wgink/module/role/service/IRoleService.java index 12a841ad..72f199fb 100644 --- a/service-role/src/main/java/ink/wgink/service/role/service/IRoleService.java +++ b/service-role/src/main/java/ink/wgink/module/role/service/IRoleService.java @@ -1,4 +1,4 @@ -package ink.wgink.service.role.service; +package ink.wgink.module.role.service; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; @@ -16,7 +16,7 @@ import ink.wgink.pojo.dtos.role.RoleDataAuthorityDTO; import ink.wgink.pojo.dtos.role.RoleDataAuthorityTypeDTO; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.role.pojo.vos.RoleDataAuthorityVO; +import ink.wgink.module.role.pojo.vos.RoleDataAuthorityVO; import java.util.List; import java.util.Map; diff --git a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleGroupServiceImpl.java b/service-role/src/main/java/ink/wgink/module/role/service/impl/RoleGroupServiceImpl.java similarity index 95% rename from service-role/src/main/java/ink/wgink/service/role/service/impl/RoleGroupServiceImpl.java rename to service-role/src/main/java/ink/wgink/module/role/service/impl/RoleGroupServiceImpl.java index 88f51fe2..b9695bab 100644 --- a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleGroupServiceImpl.java +++ b/service-role/src/main/java/ink/wgink/module/role/service/impl/RoleGroupServiceImpl.java @@ -1,4 +1,4 @@ -package ink.wgink.service.role.service.impl; +package ink.wgink.module.role.service.impl; import org.springframework.stereotype.Service; diff --git a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleMenuServiceImpl.java b/service-role/src/main/java/ink/wgink/module/role/service/impl/RoleMenuServiceImpl.java similarity index 82% rename from service-role/src/main/java/ink/wgink/service/role/service/impl/RoleMenuServiceImpl.java rename to service-role/src/main/java/ink/wgink/module/role/service/impl/RoleMenuServiceImpl.java index bfb62c01..c94688aa 100644 --- a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleMenuServiceImpl.java +++ b/service-role/src/main/java/ink/wgink/module/role/service/impl/RoleMenuServiceImpl.java @@ -1,7 +1,7 @@ -package ink.wgink.service.role.service.impl; +package ink.wgink.module.role.service.impl; import ink.wgink.common.base.DefaultBaseService; -import ink.wgink.service.role.service.IRoleMenuService; +import ink.wgink.module.role.service.IRoleMenuService; import org.springframework.stereotype.Service; /** diff --git a/service-role/src/main/java/ink/wgink/service/role/service/impl/RolePermissionServiceImpl.java b/service-role/src/main/java/ink/wgink/module/role/service/impl/RolePermissionServiceImpl.java similarity index 94% rename from service-role/src/main/java/ink/wgink/service/role/service/impl/RolePermissionServiceImpl.java rename to service-role/src/main/java/ink/wgink/module/role/service/impl/RolePermissionServiceImpl.java index 8bbc0dbf..a4a9b3f5 100644 --- a/service-role/src/main/java/ink/wgink/service/role/service/impl/RolePermissionServiceImpl.java +++ b/service-role/src/main/java/ink/wgink/module/role/service/impl/RolePermissionServiceImpl.java @@ -1,12 +1,12 @@ -package ink.wgink.service.role.service.impl; +package ink.wgink.module.role.service.impl; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.dtos.permission.PermissionDTO; import ink.wgink.pojo.dtos.role.RolePermissionDTO; -import ink.wgink.service.permission.service.IPermissionService; -import ink.wgink.service.role.dao.IRolePermissionDao; -import ink.wgink.service.role.pojo.vos.RolePermissionVO; -import ink.wgink.service.role.service.IRolePermissionService; +import ink.wgink.module.permission.service.IPermissionService; +import ink.wgink.module.role.dao.IRolePermissionDao; +import ink.wgink.module.role.pojo.vos.RolePermissionVO; +import ink.wgink.module.role.service.IRolePermissionService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleServiceImpl.java b/service-role/src/main/java/ink/wgink/module/role/service/impl/RoleServiceImpl.java similarity index 97% rename from service-role/src/main/java/ink/wgink/service/role/service/impl/RoleServiceImpl.java rename to service-role/src/main/java/ink/wgink/module/role/service/impl/RoleServiceImpl.java index 8fac611e..dcd21f1b 100644 --- a/service-role/src/main/java/ink/wgink/service/role/service/impl/RoleServiceImpl.java +++ b/service-role/src/main/java/ink/wgink/module/role/service/impl/RoleServiceImpl.java @@ -1,4 +1,4 @@ -package ink.wgink.service.role.service.impl; +package ink.wgink.module.role.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -17,15 +17,15 @@ import ink.wgink.pojo.dtos.role.RoleDataAuthorityTypeDTO; import ink.wgink.pojo.dtos.role.RolePermissionDTO; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.department.service.IDepartmentUserService; -import ink.wgink.service.permission.enums.PermissionTypeEnum; -import ink.wgink.service.permission.service.IPermissionService; -import ink.wgink.service.role.dao.IRoleDao; -import ink.wgink.service.role.pojo.vos.RoleDataAuthorityVO; -import ink.wgink.service.role.pojo.vos.RoleUserAuthorityVO; -import ink.wgink.service.role.service.IRolePermissionService; -import ink.wgink.service.role.service.IRoleService; -import ink.wgink.service.user.service.IUserService; +import ink.wgink.module.department.service.IDepartmentUserService; +import ink.wgink.module.permission.enums.PermissionTypeEnum; +import ink.wgink.module.permission.service.IPermissionService; +import ink.wgink.module.role.dao.IRoleDao; +import ink.wgink.module.role.pojo.vos.RoleDataAuthorityVO; +import ink.wgink.module.role.pojo.vos.RoleUserAuthorityVO; +import ink.wgink.module.role.service.IRolePermissionService; +import ink.wgink.module.role.service.IRoleService; +import ink.wgink.module.user.service.IUserService; import ink.wgink.util.UUIDUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service-role/src/main/resources/mybatis/mapper/role-permission-mapper.xml b/service-role/src/main/resources/mybatis/mapper/role-permission-mapper.xml index 84a1fded..eda0bced 100644 --- a/service-role/src/main/resources/mybatis/mapper/role-permission-mapper.xml +++ b/service-role/src/main/resources/mybatis/mapper/role-permission-mapper.xml @@ -1,6 +1,6 @@ - + diff --git a/service-user/src/main/java/ink/wgink/service/user/controller/api/UserController.java b/service-user/src/main/java/ink/wgink/module/user/controller/api/UserController.java similarity index 96% rename from service-user/src/main/java/ink/wgink/service/user/controller/api/UserController.java rename to service-user/src/main/java/ink/wgink/module/user/controller/api/UserController.java index f6f1745d..a8027ff5 100644 --- a/service-user/src/main/java/ink/wgink/service/user/controller/api/UserController.java +++ b/service-user/src/main/java/ink/wgink/module/user/controller/api/UserController.java @@ -1,19 +1,19 @@ -package ink.wgink.service.user.controller.api; +package ink.wgink.module.user.controller.api; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.exceptions.ParamsException; import ink.wgink.interfaces.consts.IFileConstant; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.service.user.pojo.vos.RestPasswordVO; -import ink.wgink.service.user.pojo.vos.UpdateUsernameVO; +import ink.wgink.module.user.pojo.vos.RestPasswordVO; +import ink.wgink.module.user.pojo.vos.UpdateUsernameVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; -import ink.wgink.service.user.pojo.vos.UserVO; -import ink.wgink.service.user.service.IUserService; +import ink.wgink.module.user.pojo.vos.UserVO; +import ink.wgink.module.user.service.IUserService; import ink.wgink.pojo.result.UploadExcelResultDTO; import ink.wgink.util.RegexUtil; import io.swagger.annotations.*; diff --git a/service-user/src/main/java/ink/wgink/service/user/controller/route/UserRouteController.java b/service-user/src/main/java/ink/wgink/module/user/controller/route/UserRouteController.java similarity index 97% rename from service-user/src/main/java/ink/wgink/service/user/controller/route/UserRouteController.java rename to service-user/src/main/java/ink/wgink/module/user/controller/route/UserRouteController.java index 922105bf..4eac1351 100644 --- a/service-user/src/main/java/ink/wgink/service/user/controller/route/UserRouteController.java +++ b/service-user/src/main/java/ink/wgink/module/user/controller/route/UserRouteController.java @@ -1,4 +1,4 @@ -package ink.wgink.service.user.controller.route; +package ink.wgink.module.user.controller.route; import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.util.ResourceUtil; diff --git a/service-user/src/main/java/ink/wgink/service/user/dao/IUserDao.java b/service-user/src/main/java/ink/wgink/module/user/dao/IUserDao.java similarity index 96% rename from service-user/src/main/java/ink/wgink/service/user/dao/IUserDao.java rename to service-user/src/main/java/ink/wgink/module/user/dao/IUserDao.java index c851d780..a255011f 100644 --- a/service-user/src/main/java/ink/wgink/service/user/dao/IUserDao.java +++ b/service-user/src/main/java/ink/wgink/module/user/dao/IUserDao.java @@ -1,11 +1,11 @@ -package ink.wgink.service.user.dao; +package ink.wgink.module.user.dao; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; import ink.wgink.pojo.dtos.user.UserDTO; -import ink.wgink.service.user.pojo.pos.UserPO; +import ink.wgink.module.user.pojo.pos.UserPO; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/service-user/src/main/java/ink/wgink/service/user/excel/UserExcel.java b/service-user/src/main/java/ink/wgink/module/user/excel/UserExcel.java similarity index 98% rename from service-user/src/main/java/ink/wgink/service/user/excel/UserExcel.java rename to service-user/src/main/java/ink/wgink/module/user/excel/UserExcel.java index b2619b19..6b805ce1 100644 --- a/service-user/src/main/java/ink/wgink/service/user/excel/UserExcel.java +++ b/service-user/src/main/java/ink/wgink/module/user/excel/UserExcel.java @@ -1,4 +1,4 @@ -package ink.wgink.service.user.excel; +package ink.wgink.module.user.excel; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/service-user/src/main/java/ink/wgink/service/user/excel/UserExcelError.java b/service-user/src/main/java/ink/wgink/module/user/excel/UserExcelError.java similarity index 98% rename from service-user/src/main/java/ink/wgink/service/user/excel/UserExcelError.java rename to service-user/src/main/java/ink/wgink/module/user/excel/UserExcelError.java index a8c9c42b..33848bd4 100644 --- a/service-user/src/main/java/ink/wgink/service/user/excel/UserExcelError.java +++ b/service-user/src/main/java/ink/wgink/module/user/excel/UserExcelError.java @@ -1,4 +1,4 @@ -package ink.wgink.service.user.excel; +package ink.wgink.module.user.excel; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/service-user/src/main/java/ink/wgink/service/user/excel/UserExcelListener.java b/service-user/src/main/java/ink/wgink/module/user/excel/UserExcelListener.java similarity index 97% rename from service-user/src/main/java/ink/wgink/service/user/excel/UserExcelListener.java rename to service-user/src/main/java/ink/wgink/module/user/excel/UserExcelListener.java index 63529f81..baeaaaa2 100644 --- a/service-user/src/main/java/ink/wgink/service/user/excel/UserExcelListener.java +++ b/service-user/src/main/java/ink/wgink/module/user/excel/UserExcelListener.java @@ -1,4 +1,4 @@ -package ink.wgink.service.user.excel; +package ink.wgink.module.user.excel; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; diff --git a/service-user/src/main/java/ink/wgink/service/user/pojo/pos/UserPO.java b/service-user/src/main/java/ink/wgink/module/user/pojo/pos/UserPO.java similarity index 99% rename from service-user/src/main/java/ink/wgink/service/user/pojo/pos/UserPO.java rename to service-user/src/main/java/ink/wgink/module/user/pojo/pos/UserPO.java index c1d90a11..e020df9f 100644 --- a/service-user/src/main/java/ink/wgink/service/user/pojo/pos/UserPO.java +++ b/service-user/src/main/java/ink/wgink/module/user/pojo/pos/UserPO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.user.pojo.pos; +package ink.wgink.module.user.pojo.pos; import io.swagger.annotations.ApiModel; diff --git a/service-user/src/main/java/ink/wgink/service/user/pojo/vos/RestPasswordVO.java b/service-user/src/main/java/ink/wgink/module/user/pojo/vos/RestPasswordVO.java similarity index 96% rename from service-user/src/main/java/ink/wgink/service/user/pojo/vos/RestPasswordVO.java rename to service-user/src/main/java/ink/wgink/module/user/pojo/vos/RestPasswordVO.java index da25fa93..de47a922 100644 --- a/service-user/src/main/java/ink/wgink/service/user/pojo/vos/RestPasswordVO.java +++ b/service-user/src/main/java/ink/wgink/module/user/pojo/vos/RestPasswordVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.user.pojo.vos; +package ink.wgink.module.user.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import io.swagger.annotations.ApiModel; diff --git a/service-user/src/main/java/ink/wgink/service/user/pojo/vos/UpdateUsernameVO.java b/service-user/src/main/java/ink/wgink/module/user/pojo/vos/UpdateUsernameVO.java similarity index 97% rename from service-user/src/main/java/ink/wgink/service/user/pojo/vos/UpdateUsernameVO.java rename to service-user/src/main/java/ink/wgink/module/user/pojo/vos/UpdateUsernameVO.java index 838a3786..c57371fb 100644 --- a/service-user/src/main/java/ink/wgink/service/user/pojo/vos/UpdateUsernameVO.java +++ b/service-user/src/main/java/ink/wgink/module/user/pojo/vos/UpdateUsernameVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.user.pojo.vos; +package ink.wgink.module.user.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import io.swagger.annotations.ApiModel; diff --git a/service-user/src/main/java/ink/wgink/service/user/pojo/vos/UserVO.java b/service-user/src/main/java/ink/wgink/module/user/pojo/vos/UserVO.java similarity index 98% rename from service-user/src/main/java/ink/wgink/service/user/pojo/vos/UserVO.java rename to service-user/src/main/java/ink/wgink/module/user/pojo/vos/UserVO.java index 90b0703d..8785e9a2 100644 --- a/service-user/src/main/java/ink/wgink/service/user/pojo/vos/UserVO.java +++ b/service-user/src/main/java/ink/wgink/module/user/pojo/vos/UserVO.java @@ -1,4 +1,4 @@ -package ink.wgink.service.user.pojo.vos; +package ink.wgink.module.user.pojo.vos; import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; diff --git a/service-user/src/main/java/ink/wgink/service/user/service/IUserService.java b/service-user/src/main/java/ink/wgink/module/user/service/IUserService.java similarity index 89% rename from service-user/src/main/java/ink/wgink/service/user/service/IUserService.java rename to service-user/src/main/java/ink/wgink/module/user/service/IUserService.java index dd66b17f..0ea54956 100644 --- a/service-user/src/main/java/ink/wgink/service/user/service/IUserService.java +++ b/service-user/src/main/java/ink/wgink/module/user/service/IUserService.java @@ -1,10 +1,10 @@ -package ink.wgink.service.user.service; +package ink.wgink.module.user.service; import ink.wgink.interfaces.user.IUserBaseService; import ink.wgink.interfaces.user.IUserCheckService; -import ink.wgink.service.user.pojo.vos.RestPasswordVO; -import ink.wgink.service.user.pojo.vos.UpdateUsernameVO; -import ink.wgink.service.user.pojo.vos.UserVO; +import ink.wgink.module.user.pojo.vos.RestPasswordVO; +import ink.wgink.module.user.pojo.vos.UpdateUsernameVO; +import ink.wgink.module.user.pojo.vos.UserVO; import ink.wgink.pojo.result.UploadExcelResultDTO; import org.springframework.web.multipart.MultipartFile; diff --git a/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java b/service-user/src/main/java/ink/wgink/module/user/service/impl/UserServiceImpl.java similarity index 93% rename from service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java rename to service-user/src/main/java/ink/wgink/module/user/service/impl/UserServiceImpl.java index 9c571dfc..fbe4e08f 100644 --- a/service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java +++ b/service-user/src/main/java/ink/wgink/module/user/service/impl/UserServiceImpl.java @@ -1,20 +1,20 @@ -package ink.wgink.service.user.service.impl; +package ink.wgink.module.user.service.impl; import com.alibaba.excel.EasyExcel; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SearchException; -import ink.wgink.service.file.excel.error.AbstractErrorExcelHandler; -import ink.wgink.service.file.service.IFileService; -import ink.wgink.service.user.dao.IUserDao; -import ink.wgink.service.user.excel.UserExcel; -import ink.wgink.service.user.excel.UserExcelError; -import ink.wgink.service.user.excel.UserExcelListener; -import ink.wgink.service.user.pojo.vos.RestPasswordVO; -import ink.wgink.service.user.pojo.vos.UpdateUsernameVO; -import ink.wgink.service.user.pojo.vos.UserVO; -import ink.wgink.service.user.service.IUserService; +import ink.wgink.module.file.excel.error.AbstractErrorExcelHandler; +import ink.wgink.module.file.service.IFileService; +import ink.wgink.module.user.dao.IUserDao; +import ink.wgink.module.user.excel.UserExcel; +import ink.wgink.module.user.excel.UserExcelError; +import ink.wgink.module.user.excel.UserExcelListener; +import ink.wgink.module.user.pojo.vos.RestPasswordVO; +import ink.wgink.module.user.pojo.vos.UpdateUsernameVO; +import ink.wgink.module.user.pojo.vos.UserVO; +import ink.wgink.module.user.service.IUserService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.result.SuccessResultList; diff --git a/service-user/src/main/java/ink/wgink/service/user/startup/ServiceUserStartUp.java b/service-user/src/main/java/ink/wgink/module/user/startup/ServiceUserStartUp.java similarity index 93% rename from service-user/src/main/java/ink/wgink/service/user/startup/ServiceUserStartUp.java rename to service-user/src/main/java/ink/wgink/module/user/startup/ServiceUserStartUp.java index 10fd4497..b7a5da2a 100644 --- a/service-user/src/main/java/ink/wgink/service/user/startup/ServiceUserStartUp.java +++ b/service-user/src/main/java/ink/wgink/module/user/startup/ServiceUserStartUp.java @@ -1,7 +1,6 @@ -package ink.wgink.service.user.startup; +package ink.wgink.module.user.startup; -import ink.wgink.interfaces.user.IUserCheckService; -import ink.wgink.service.user.dao.IUserDao; +import ink.wgink.module.user.dao.IUserDao; import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.util.date.DateUtil; import org.slf4j.Logger; diff --git a/service-user/src/main/resources/mybatis/mapper/user-mapper.xml b/service-user/src/main/resources/mybatis/mapper/user-mapper.xml index 3a3eb8cc..f6fb6f54 100644 --- a/service-user/src/main/resources/mybatis/mapper/user-mapper.xml +++ b/service-user/src/main/resources/mybatis/mapper/user-mapper.xml @@ -1,9 +1,9 @@ - + - +