From 58ab02ea01edb3e85ea6861cefaf7ca13fb56a4d Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Tue, 19 Apr 2022 10:54:38 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=9F=20=E6=9E=84=E5=BB=BA=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E4=B8=9A=E5=8A=A1=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...kiccAuthenticationFailureEventHandler.java | 2 +- ...kiccAuthenticationSuccessEventHandler.java | 2 +- .../kiccLogoutSuccessEventHandler.java | 2 +- kicc-common/kicc-common-bom/pom.xml | 5 + .../common/core/constant/RegexConstants.java | 18 ++ .../common/core/util/tree/ForestNode.java | 27 --- .../core/util/tree/ForestNodeManager.java | 66 ------- .../core/util/tree/ForestNodeMerger.java | 34 ---- .../kicc/common/core/util/tree/INode.java | 17 -- .../common/core/util/tree/MapperNode.java | 22 --- .../kicc/common/core/util/tree/TreeNode.java | 57 ------ .../kicc/common/log/LogAutoConfiguration.java | 2 +- .../kicc/common/log/aspect/SysLogAspect.java | 2 +- .../kicc/common/log/event/SysLogEvent.java | 2 +- .../kicc/common/log/event/SysLogListener.java | 5 +- .../kicc/common/log/util/SysLogUtils.java | 2 +- .../service/KiccUserDetailsService.java | 2 +- .../impl/KiccAppUserDetailsServiceImpl.java | 4 +- .../impl/KiccUserDetailsServiceImpl.java | 4 +- .../kicc-platform-api/kicc-common-api/pom.xml | 28 +++ .../main/resources/META-INF/spring.factories | 1 + .../com/cloud/kicc/admin/api/dto/MenuDTO.java | 55 ------ .../com/cloud/kicc/admin/api/vo/MenuVo.java | 132 ------------- .../com/cloud/kicc/admin/api/vo/MetaVo.java | 35 ---- .../{admin => system}/api/dto/LoginDto.java | 5 +- .../{admin => system}/api/entity/Address.java | 3 +- .../{admin => system}/api/entity/Config.java | 2 +- .../{admin => system}/api/entity/Dept.java | 2 +- .../{admin => system}/api/entity/Dict.java | 2 +- .../api/entity/DictData.java | 2 +- .../{admin => system}/api/entity/File.java | 4 +- .../api/entity/Hospital.java | 2 +- .../{admin => system}/api/entity/Menu.java | 21 +- .../api/entity/OauthClientDetails.java | 2 +- .../{admin => system}/api/entity/OperLog.java | 3 +- .../api/entity/ProjectManager.java | 2 +- .../{admin => system}/api/entity/Role.java | 2 +- .../api/entity/RoleDept.java | 2 +- .../api/entity/RoleMenu.java | 2 +- .../api/entity/Shortcut.java | 2 +- .../{admin => system}/api/entity/User.java | 2 +- .../api/entity/UserRole.java | 2 +- .../cloud/kicc/system/api/enums/MenuEnum.java | 43 +++++ .../api/feign/RemoteDictService.java | 4 +- .../api/feign/RemoteLogService.java | 4 +- .../api/feign/RemoteTokenService.java | 2 +- .../api/feign/RemoteUserService.java | 4 +- .../com/cloud/kicc/system/api/vo/MenuVo.java | 45 +++++ .../com/cloud/kicc/system/api/vo/MetaVo.java | 41 ++++ .../{admin => system}/api/vo/ResultVo.java | 2 +- .../main/resources/META-INF/spring.factories | 8 +- kicc-platform/kicc-platform-api/pom.xml | 1 + .../kicc-common-biz/Dockerfile | 15 ++ .../kicc-platform-biz/kicc-common-biz/pom.xml | 72 +++++++ .../kicc/commonbiz/KiccCommonApplication.java | 29 +++ .../src/main/resources/bootstrap.yml | 17 ++ .../src/main/resources/logback-spring.xml | 57 ++++++ .../kicc/admin/controller/MenuController.java | 153 --------------- .../admin/service/impl/MenuServiceImpl.java | 182 ------------------ .../KiccSystemApplication.java | 3 +- .../controller/AddressController.java | 6 +- .../controller/AppController.java | 8 +- .../controller/ConfigController.java | 6 +- .../controller/DeptController.java | 16 +- .../controller/DictController.java | 7 +- .../controller/DictDataController.java | 8 +- .../controller/FileController.java | 6 +- .../controller/HospitalController.java | 6 +- .../system/controller/MenuController.java | 103 ++++++++++ .../OauthClientDetailsController.java | 6 +- .../controller/OperLogController.java | 6 +- .../controller/ProjectManagerController.java | 6 +- .../controller/RoleController.java | 6 +- .../controller/ShortcutController.java | 6 +- .../controller/TokenController.java | 4 +- .../controller/UserController.java | 18 +- .../mapper/AddressMapper.java | 4 +- .../mapper/ConfigMapper.java | 4 +- .../{admin => system}/mapper/DeptMapper.java | 4 +- .../mapper/DictDataMapper.java | 4 +- .../{admin => system}/mapper/DictMapper.java | 4 +- .../{admin => system}/mapper/FileMapper.java | 4 +- .../mapper/HospitalMapper.java | 4 +- .../{admin => system}/mapper/MenuMapper.java | 4 +- .../mapper/OauthClientDetailsMapper.java | 4 +- .../mapper/OperLogMapper.java | 4 +- .../mapper/ProjectManagerMapper.java | 8 +- .../mapper/RoleDeptMapper.java | 4 +- .../{admin => system}/mapper/RoleMapper.java | 4 +- .../mapper/RoleMenuMapper.java | 4 +- .../mapper/ShortcutMapper.java | 4 +- .../{admin => system}/mapper/UserMapper.java | 6 +- .../mapper/UserRoleMapper.java | 4 +- .../service/AddressService.java | 4 +- .../{admin => system}/service/AppService.java | 2 +- .../service/ConfigService.java | 4 +- .../service/DeptService.java | 4 +- .../service/DictDataService.java | 4 +- .../service/DictService.java | 4 +- .../service/FileService.java | 4 +- .../service/HospitalService.java | 4 +- .../service/MenuService.java | 23 +-- .../service/OauthClientDetailsService.java | 4 +- .../service/OperLogService.java | 4 +- .../service/ProjectManagerService.java | 4 +- .../service/RoleDeptService.java | 4 +- .../service/RoleMenuService.java | 4 +- .../service/RoleService.java | 4 +- .../service/ShortcutService.java | 4 +- .../service/UserRoleService.java | 4 +- .../service/UserService.java | 4 +- .../service/impl/AddressServiceImpl.java | 11 +- .../service/impl/AppServiceImpl.java | 8 +- .../service/impl/ConfigServiceImpl.java | 8 +- .../service/impl/DeptServiceImpl.java | 8 +- .../service/impl/DictDataServiceImpl.java | 8 +- .../service/impl/DictServiceImpl.java | 8 +- .../service/impl/FileServiceImpl.java | 8 +- .../service/impl/HospitalServiceImpl.java | 8 +- .../system/service/impl/MenuServiceImpl.java | 110 +++++++++++ .../impl/OauthClientDetailsServiceImpl.java | 8 +- .../service/impl/OperLogServiceImpl.java | 8 +- .../impl/ProjectManagerServiceImpl.java | 8 +- .../service/impl/RoleDeptServiceImpl.java | 8 +- .../service/impl/RoleMenuServiceImpl.java | 8 +- .../service/impl/RoleServiceImpl.java | 20 +- .../service/impl/ShortcutServiceImpl.java | 8 +- .../service/impl/UserRoleServiceImpl.java | 8 +- .../service/impl/UserServiceImpl.java | 14 +- .../src/main/resources/mapper/MenuMapper.xml | 5 +- kicc-platform/kicc-platform-biz/pom.xml | 1 + kicc-ui/src/api/sys/menu.ts | 2 +- kicc-ui/src/api/sys/model/menuModel.ts | 6 +- kicc-ui/src/api/sys/user.ts | 17 +- kicc-ui/src/api/system/menu.ts | 8 +- kicc-ui/src/api/system/model/departModel.ts | 1 - kicc-ui/src/api/system/model/roleModel.ts | 1 - .../src/router/routes/modules/dashboard.ts | 1 - kicc-ui/src/router/types.ts | 2 - kicc-ui/src/store/modules/multipleTab.ts | 2 +- kicc-ui/src/store/modules/permission.ts | 1 + kicc-ui/types/vue-router.d.ts | 5 +- 142 files changed, 859 insertions(+), 1111 deletions(-) create mode 100644 kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/RegexConstants.java delete mode 100644 kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/ForestNode.java delete mode 100644 kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/ForestNodeManager.java delete mode 100644 kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/ForestNodeMerger.java delete mode 100644 kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/INode.java delete mode 100644 kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/MapperNode.java delete mode 100644 kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/TreeNode.java create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/pom.xml create mode 100644 kicc-platform/kicc-platform-api/kicc-common-api/src/main/resources/META-INF/spring.factories delete mode 100644 kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/dto/MenuDTO.java delete mode 100644 kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/vo/MenuVo.java delete mode 100644 kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/vo/MetaVo.java rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/dto/LoginDto.java (80%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/Address.java (86%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/Config.java (95%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/Dept.java (97%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/Dict.java (95%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/DictData.java (95%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/File.java (85%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/Hospital.java (95%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/Menu.java (82%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/OauthClientDetails.java (98%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/OperLog.java (96%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/ProjectManager.java (93%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/Role.java (97%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/RoleDept.java (93%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/RoleMenu.java (93%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/Shortcut.java (95%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/User.java (98%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/entity/UserRole.java (93%) create mode 100644 kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/enums/MenuEnum.java rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/feign/RemoteDictService.java (91%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/feign/RemoteLogService.java (91%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/feign/RemoteTokenService.java (96%) rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/feign/RemoteUserService.java (93%) create mode 100644 kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/vo/MenuVo.java create mode 100644 kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/vo/MetaVo.java rename kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/{admin => system}/api/vo/ResultVo.java (91%) create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml create mode 100644 kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/logback-spring.xml delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/MenuController.java delete mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/MenuServiceImpl.java rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/KiccSystemApplication.java (88%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/controller/AddressController.java (94%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/controller/AppController.java (88%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/controller/ConfigController.java (95%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/controller/DeptController.java (92%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/controller/DictController.java (94%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/controller/DictDataController.java (94%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/controller/FileController.java (95%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/controller/HospitalController.java (95%) create mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/MenuController.java rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/controller/OauthClientDetailsController.java (94%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/controller/OperLogController.java (94%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/controller/ProjectManagerController.java (94%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/controller/RoleController.java (96%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/controller/ShortcutController.java (94%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/controller/TokenController.java (92%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/controller/UserController.java (94%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/AddressMapper.java (71%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/ConfigMapper.java (73%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/DeptMapper.java (88%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/DictDataMapper.java (73%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/DictMapper.java (73%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/FileMapper.java (72%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/HospitalMapper.java (72%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/MenuMapper.java (90%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/OauthClientDetailsMapper.java (72%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/OperLogMapper.java (73%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/ProjectManagerMapper.java (53%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/RoleDeptMapper.java (73%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/RoleMapper.java (83%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/RoleMenuMapper.java (73%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/ShortcutMapper.java (72%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/UserMapper.java (75%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/mapper/UserRoleMapper.java (73%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/AddressService.java (71%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/AppService.java (88%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/ConfigService.java (75%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/DeptService.java (84%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/DictDataService.java (72%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/DictService.java (73%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/FileService.java (89%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/HospitalService.java (72%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/MenuService.java (63%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/OauthClientDetailsService.java (85%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/OperLogService.java (73%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/ProjectManagerService.java (72%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/RoleDeptService.java (73%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/RoleMenuService.java (73%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/RoleService.java (92%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/ShortcutService.java (72%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/UserRoleService.java (73%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/UserService.java (90%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/AddressServiceImpl.java (62%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/AppServiceImpl.java (91%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/ConfigServiceImpl.java (85%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/DeptServiceImpl.java (92%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/DictDataServiceImpl.java (67%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/DictServiceImpl.java (64%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/FileServiceImpl.java (94%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/HospitalServiceImpl.java (63%) create mode 100644 kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/MenuServiceImpl.java rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/OauthClientDetailsServiceImpl.java (83%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/OperLogServiceImpl.java (64%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/ProjectManagerServiceImpl.java (62%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/RoleDeptServiceImpl.java (64%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/RoleMenuServiceImpl.java (64%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/RoleServiceImpl.java (89%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/ShortcutServiceImpl.java (63%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/UserRoleServiceImpl.java (64%) rename kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/{admin => system}/service/impl/UserServiceImpl.java (95%) diff --git a/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/kiccAuthenticationFailureEventHandler.java b/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/kiccAuthenticationFailureEventHandler.java index b9d2ce3d..e84c3f25 100644 --- a/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/kiccAuthenticationFailureEventHandler.java +++ b/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/kiccAuthenticationFailureEventHandler.java @@ -1,6 +1,6 @@ package com.cloud.kicc.auth.handler; -import com.cloud.kicc.admin.api.entity.OperLog; +import com.cloud.kicc.system.api.entity.OperLog; import com.cloud.kicc.common.core.util.SpringContextHolder; import com.cloud.kicc.common.data.entity.KiccUser; import com.cloud.kicc.common.log.event.SysLogEvent; diff --git a/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/kiccAuthenticationSuccessEventHandler.java b/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/kiccAuthenticationSuccessEventHandler.java index 57187515..2199ea85 100644 --- a/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/kiccAuthenticationSuccessEventHandler.java +++ b/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/kiccAuthenticationSuccessEventHandler.java @@ -1,6 +1,6 @@ package com.cloud.kicc.auth.handler; -import com.cloud.kicc.admin.api.entity.OperLog; +import com.cloud.kicc.system.api.entity.OperLog; import com.cloud.kicc.common.core.util.SpringContextHolder; import com.cloud.kicc.common.data.entity.KiccUser; import com.cloud.kicc.common.log.event.SysLogEvent; diff --git a/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/kiccLogoutSuccessEventHandler.java b/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/kiccLogoutSuccessEventHandler.java index 765848a7..1664e30e 100644 --- a/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/kiccLogoutSuccessEventHandler.java +++ b/kicc-auth/src/main/java/com/cloud/kicc/auth/handler/kiccLogoutSuccessEventHandler.java @@ -1,6 +1,6 @@ package com.cloud.kicc.auth.handler; -import com.cloud.kicc.admin.api.entity.OperLog; +import com.cloud.kicc.system.api.entity.OperLog; import com.cloud.kicc.common.core.util.SpringContextHolder; import com.cloud.kicc.common.core.util.WebUtils; import com.cloud.kicc.common.data.entity.KiccUser; diff --git a/kicc-common/kicc-common-bom/pom.xml b/kicc-common/kicc-common-bom/pom.xml index b4bc2563..40df0f23 100644 --- a/kicc-common/kicc-common-bom/pom.xml +++ b/kicc-common/kicc-common-bom/pom.xml @@ -91,6 +91,11 @@ kicc-common-swagger ${kicc.common.version} + + com.cloud + kicc-common-api + ${kicc.common.version} + com.cloud kicc-system-api diff --git a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/RegexConstants.java b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/RegexConstants.java new file mode 100644 index 00000000..d1ec8acc --- /dev/null +++ b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/RegexConstants.java @@ -0,0 +1,18 @@ +package com.cloud.kicc.common.core.constant; + +/** + *

+ * 正则表达式常量 + *

+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/4/18 + */ +public interface RegexConstants { + + /** + * 匹配网址正则表达式 + */ + String MATCHER_URL = "(((^https?:(?:\\/\\/)?)(?:[-;:&=\\+\\$,\\w]+@)?[A-Za-z0-9.-]+(?::\\d+)?|(?:www.|[-;:&=\\+\\$,\\w]+@)[A-Za-z0-9.-]+)((?:\\/[\\+~%\\/.\\w-_]*)?\\??(?:[-\\+=&;%@.\\w_]*)#?(?:[\\w]*))?)$"; + +} diff --git a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/ForestNode.java b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/ForestNode.java deleted file mode 100644 index ac6c90f8..00000000 --- a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/ForestNode.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cloud.kicc.common.core.util.tree; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 森林节点 - * @author pangu - */ -@Data -@EqualsAndHashCode(callSuper = false) -public class ForestNode extends TreeNode { - - private static final long serialVersionUID = -5188222097134746118L; - - /** - * 节点内容 - */ - private Object content; - - public ForestNode(String id, String parentId, Object content) { - this.id = id; - this.parentId = parentId; - this.content = content; - } - -} diff --git a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/ForestNodeManager.java b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/ForestNodeManager.java deleted file mode 100644 index 3abaa20d..00000000 --- a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/ForestNodeManager.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.cloud.kicc.common.core.util.tree; - -import java.util.ArrayList; -import java.util.List; - -/** - * 森林管理类 - * @param - * @author pangu - * @link https://blog.csdn.net/u014424628/article/details/51765394?utm_source=blogxgwz2 - */ -public class ForestNodeManager { - - /** - * 森林的所有节点 - */ - private List list; - - /** - * 森林的父节点ID - */ - private List parentIds = new ArrayList<>(); - - public ForestNodeManager(List items) { - list = items; - } - - /** - * 根据节点ID获取一个节点 - * - * @param id 节点ID - * @return 对应的节点对象 - */ - public INode getTreeNodeAT(String id) { - for (INode forestNode : list) { - if (id.equals(forestNode.getId())) { - return forestNode; - } - } - return null; - } - - /** - * 增加父节点ID - * - * @param parentId - */ - public void addParentId(String parentId) { - parentIds.add(parentId); - } - - /** - * 获取树的根节点(一个森林对应多颗树) - * - * @return 树的根节点集合 - */ - public List getRoot() { - List roots = new ArrayList<>(); - for (T forestNode : list) { - if (forestNode.getParentId() == "0" || parentIds.contains(forestNode.getId())) { - roots.add(forestNode); - } - } - return roots; - } -} diff --git a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/ForestNodeMerger.java b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/ForestNodeMerger.java deleted file mode 100644 index 2543a4e3..00000000 --- a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/ForestNodeMerger.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.cloud.kicc.common.core.util.tree; - -import java.util.List; - -/** - * 节点归并类 - * - * @author pangu - * @link https://blog.csdn.net/u014424628/article/details/51765394?utm_source=blogxgwz2 - */ -public class ForestNodeMerger { - - /** - * 将节点数组归并为一个森林（多棵树）（填充节点的children域） - * 时间复杂度为O(n^2) - * - * @param items 节点域 - * @return 多棵树的根节点集合 - */ - public static List merge(List items) { - ForestNodeManager forestNodeManager = new ForestNodeManager<>(items); - items.forEach(forestNode -> { - if (forestNode.getParentId() != "0") { - INode node = forestNodeManager.getTreeNodeAT(forestNode.getParentId()); - if (node != null) { - node.getChildren().add(forestNode); - } else { - forestNodeManager.addParentId(forestNode.getId()); - } - } - }); - return forestNodeManager.getRoot(); - } -} diff --git a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/INode.java b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/INode.java deleted file mode 100644 index 3d595775..00000000 --- a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/INode.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cloud.kicc.common.core.util.tree; - -import java.io.Serializable; -import java.util.List; - -public interface INode extends Serializable { - - String getId(); - - String getParentId(); - - List getChildren(); - - default Boolean getHasChildren() { - return false; - } -} diff --git a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/MapperNode.java b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/MapperNode.java deleted file mode 100644 index 8eaa1fbc..00000000 --- a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/MapperNode.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.cloud.kicc.common.core.util.tree; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * Mapper数据模型节点 - */ -@Data -@EqualsAndHashCode(callSuper = false) -public class MapperNode extends TreeNode { - - private String title; - - @JsonSerialize(using = ToStringSerializer.class) - private String key; - - @JsonSerialize(using = ToStringSerializer.class) - private String value; -} diff --git a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/TreeNode.java b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/TreeNode.java deleted file mode 100644 index 51577cd2..00000000 --- a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/util/tree/TreeNode.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.cloud.kicc.common.core.util.tree; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -/** - * 树根节点 - * @author pangu - */ -@Data -public class TreeNode implements INode { - - /** - * 主键ID - */ - @JsonSerialize(using = ToStringSerializer.class) - protected String id; - - /** - * 父节点ID - */ - @JsonSerialize(using = ToStringSerializer.class) - protected String parentId; - - /** - * 子孙节点 - */ - @JsonInclude(JsonInclude.Include.NON_EMPTY) - protected List children = new ArrayList<>(); - - /** - * 是否有子孙节点 - */ - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Boolean hasChildren; - - /** - * 是否有子孙节点 - * - * @return Boolean - */ - @Override - public Boolean getHasChildren() { - if (children.size() > 0) { - return true; - } else { - return this.hasChildren; - } - } - - -} diff --git a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/LogAutoConfiguration.java b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/LogAutoConfiguration.java index 0a8b159e..308e78a2 100644 --- a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/LogAutoConfiguration.java +++ b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/LogAutoConfiguration.java @@ -1,6 +1,6 @@ package com.cloud.kicc.common.log; -import com.cloud.kicc.admin.api.feign.RemoteLogService; +import com.cloud.kicc.system.api.feign.RemoteLogService; import com.cloud.kicc.common.log.aspect.SysLogAspect; import com.cloud.kicc.common.log.event.SysLogListener; import lombok.RequiredArgsConstructor; diff --git a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/aspect/SysLogAspect.java b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/aspect/SysLogAspect.java index e069092f..d789a0b0 100644 --- a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/aspect/SysLogAspect.java +++ b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/aspect/SysLogAspect.java @@ -1,6 +1,6 @@ package com.cloud.kicc.common.log.aspect; -import com.cloud.kicc.admin.api.entity.OperLog; +import com.cloud.kicc.system.api.entity.OperLog; import com.cloud.kicc.common.core.util.SpringContextHolder; import com.cloud.kicc.common.log.annotation.SysLog; import com.cloud.kicc.common.log.event.SysLogEvent; diff --git a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/event/SysLogEvent.java b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/event/SysLogEvent.java index 82009fcd..30343176 100644 --- a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/event/SysLogEvent.java +++ b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/event/SysLogEvent.java @@ -1,6 +1,6 @@ package com.cloud.kicc.common.log.event; -import com.cloud.kicc.admin.api.entity.OperLog; +import com.cloud.kicc.system.api.entity.OperLog; import org.springframework.context.ApplicationEvent; /** diff --git a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/event/SysLogListener.java b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/event/SysLogListener.java index 63d0ae59..95192fb2 100644 --- a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/event/SysLogListener.java +++ b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/event/SysLogListener.java @@ -1,9 +1,8 @@ package com.cloud.kicc.common.log.event; -import com.cloud.kicc.admin.api.entity.OperLog; -import com.cloud.kicc.admin.api.feign.RemoteLogService; +import com.cloud.kicc.system.api.entity.OperLog; +import com.cloud.kicc.system.api.feign.RemoteLogService; import com.cloud.kicc.common.core.constant.SecurityConstants; -import com.cloud.kicc.common.log.annotation.SysLog; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; diff --git a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/util/SysLogUtils.java b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/util/SysLogUtils.java index fb7d501b..9dc7e8a6 100644 --- a/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/util/SysLogUtils.java +++ b/kicc-common/kicc-common-log/src/main/java/com/cloud/kicc/common/log/util/SysLogUtils.java @@ -3,7 +3,7 @@ package com.cloud.kicc.common.log.util; import cn.hutool.core.util.URLUtil; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.http.HttpUtil; -import com.cloud.kicc.admin.api.entity.OperLog; +import com.cloud.kicc.system.api.entity.OperLog; import com.cloud.kicc.common.data.entity.KiccUser; import lombok.experimental.UtilityClass; import org.springframework.http.HttpHeaders; diff --git a/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/KiccUserDetailsService.java b/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/KiccUserDetailsService.java index 61aa99de..201b3d3d 100644 --- a/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/KiccUserDetailsService.java +++ b/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/KiccUserDetailsService.java @@ -2,7 +2,7 @@ package com.cloud.kicc.common.security.service; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; -import com.cloud.kicc.admin.api.entity.User; +import com.cloud.kicc.system.api.entity.User; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.CommonConstants; import com.cloud.kicc.common.core.constant.SecurityConstants; diff --git a/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccAppUserDetailsServiceImpl.java b/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccAppUserDetailsServiceImpl.java index 794be052..300a8321 100644 --- a/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccAppUserDetailsServiceImpl.java +++ b/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccAppUserDetailsServiceImpl.java @@ -1,7 +1,7 @@ package com.cloud.kicc.common.security.service.impl; -import com.cloud.kicc.admin.api.feign.RemoteUserService; -import com.cloud.kicc.admin.api.entity.User; +import com.cloud.kicc.system.api.feign.RemoteUserService; +import com.cloud.kicc.system.api.entity.User; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.CacheConstants; import com.cloud.kicc.common.core.constant.SecurityConstants; diff --git a/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccUserDetailsServiceImpl.java b/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccUserDetailsServiceImpl.java index 121029fe..5c04ff99 100644 --- a/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccUserDetailsServiceImpl.java +++ b/kicc-common/kicc-common-security/src/main/java/com/cloud/kicc/common/security/service/impl/KiccUserDetailsServiceImpl.java @@ -1,7 +1,7 @@ package com.cloud.kicc.common.security.service.impl; -import com.cloud.kicc.admin.api.feign.RemoteUserService; -import com.cloud.kicc.admin.api.entity.User; +import com.cloud.kicc.system.api.feign.RemoteUserService; +import com.cloud.kicc.system.api.entity.User; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.CacheConstants; import com.cloud.kicc.common.core.constant.SecurityConstants; diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/pom.xml b/kicc-platform/kicc-platform-api/kicc-common-api/pom.xml new file mode 100644 index 00000000..a34f8304 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + com.cloud + kicc-platform-api + 1.0.0 + + + kicc-common-api + jar + + kicc 通用业务模块公共api模块 + + + + + com.cloud + kicc-common-feign + + + + com.cloud + kicc-common-data + + + diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/resources/META-INF/spring.factories b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..9d486397 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/resources/META-INF/spring.factories @@ -0,0 +1 @@ +com.cloud.kicc.common.feign.KiccFeignAutoConfiguration=\ diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/dto/MenuDTO.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/dto/MenuDTO.java deleted file mode 100644 index d8daa196..00000000 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/dto/MenuDTO.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.cloud.kicc.admin.api.dto; - -import com.cloud.kicc.common.core.util.tree.INode; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Builder; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -/** - * 菜单数据传输对象 - * - * @author xuzhanfu - */ -@Data -@Builder -@JsonInclude(JsonInclude.Include.NON_NULL) -public class MenuDTO implements INode { - - private static final long serialVersionUID = -7053157666510171528L; - - /** - * 主键ID - */ - private String id; - /** - * 父ID - */ - private String parentId; - /** - * 标签 - */ - private String label; - - /** - * 子孙节点 - */ - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List children; - - /** - * 是否有子孙节点 - */ - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Boolean hasChildren; - - @Override - public List getChildren() { - if (this.children == null) { - this.children = new ArrayList<>(); - } - return this.children; - } -} diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/vo/MenuVo.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/vo/MenuVo.java deleted file mode 100644 index a079d076..00000000 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/vo/MenuVo.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.cloud.kicc.admin.api.vo; - -import com.cloud.kicc.common.core.util.tree.INode; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - -/** - *

- * 菜单路由信息 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/2/24 - */ -@Data -public class MenuVo implements Serializable , INode { - - /** - * id - */ - private String id; - - /** - * 父节点id - */ - private String parentId; - - /** - * 路由名字 - */ - private String name; - - /** - * 路由地址 - */ - private String path; - - /** - * 类型 - */ - private String type; - - /** - * 类型名称 - */ - private String typeName; - - /** - * 权限标识 - */ - private String permission; - - /** - * 菜单图标 - */ - private String icon; - - /** - * 是否缓存该页面: 1:是 0:不是 - */ - private String keepAlive; - - /** - * 是否外链 - */ - private String target; - - /** - * 显示顺序 - */ - private Integer sort; - - /** - * 菜单状态（0启用 1禁用） - */ - private String status; - - /** - * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现 - */ - private Boolean hidden; - - /** - * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击 - */ - private String redirect; - - /** - * 组件地址 - */ - private String component; - - /** - * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面 - */ - private Boolean alwaysShow; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - protected LocalDateTime createTime; - - /** - * 其他元素 - */ - private MetaVo meta; - /** - * 子路由 - */ - private List children; - - @Override - public List getChildren(){ - if (children == null) { - return null; - } - - return children.stream() - .map(item -> (INode) item) - .collect(Collectors.toList()); - } - - @Override - public Boolean getHasChildren() { - return INode.super.getHasChildren(); - } -} - diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/vo/MetaVo.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/vo/MetaVo.java deleted file mode 100644 index e9a15f77..00000000 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/vo/MetaVo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.cloud.kicc.admin.api.vo; - -import lombok.Builder; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 路由信息 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/2/24 - */ -@Data -@Builder -public class MetaVo implements Serializable { - - /** - * 设置该路由在侧边栏和面包屑中展示的名字 - */ - private String title; - - /** - * 设置该路由的图标，对应路径src/icons/svg - */ - private String icon; - - /** - * 路由缓存，keep-alive - */ - private boolean keepAlive; - -} diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/dto/LoginDto.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/dto/LoginDto.java similarity index 80% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/dto/LoginDto.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/dto/LoginDto.java index 29e27e85..5cbf6a2a 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/dto/LoginDto.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/dto/LoginDto.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.dto; +package com.cloud.kicc.system.api.dto; import lombok.Data; @@ -27,5 +27,8 @@ public class LoginDto { */ private String code; + /** + * redis验证码存储密钥 + */ private String realKey; } diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Address.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Address.java similarity index 86% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Address.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Address.java index 855cb62e..991c985b 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Address.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Address.java @@ -1,6 +1,5 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.cloud.kicc.common.data.entity.TreeEntity; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Config.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Config.java similarity index 95% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Config.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Config.java index 9da48360..99865cfd 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Config.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Config.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Dept.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Dept.java similarity index 97% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Dept.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Dept.java index 15719b57..120a902d 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Dept.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Dept.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Dict.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Dict.java similarity index 95% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Dict.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Dict.java index c3eba0e8..f7f574f8 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Dict.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Dict.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/DictData.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/DictData.java similarity index 95% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/DictData.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/DictData.java index 4b15b31b..88731303 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/DictData.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/DictData.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/File.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/File.java similarity index 85% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/File.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/File.java index 2bb4ddcf..cb6dcbe9 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/File.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/File.java @@ -1,8 +1,6 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.cloud.kicc.common.data.entity.CommonEntity; import lombok.Data; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Hospital.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Hospital.java similarity index 95% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Hospital.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Hospital.java index 28b6e013..5a0bd6af 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Hospital.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Hospital.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Menu.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Menu.java similarity index 82% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Menu.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Menu.java index 0ec6d542..3b63ddfa 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Menu.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Menu.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -43,12 +43,6 @@ public class Menu extends CommonEntity { */ private String parentId; - /** - * 父菜单名称 - */ - @TableField(exist = false) - private String parentName; - /** * 菜单类型（M模块 C菜单 F资源） */ @@ -79,27 +73,16 @@ public class Menu extends CommonEntity { */ private String keepAlive; - /** * 是否隐藏(0显示 1隐藏) */ - private String hidden; - - /** - * 是否外链 - */ - private String target; + private String hideMenu; /** * 显示顺序 */ private Integer sort; - /** - * 菜单状态（0启用 1禁用） - */ - private String status; - /** * 子菜单 */ diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/OauthClientDetails.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/OauthClientDetails.java similarity index 98% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/OauthClientDetails.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/OauthClientDetails.java index 2e18fe15..2052d2e1 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/OauthClientDetails.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/OauthClientDetails.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/OperLog.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/OperLog.java similarity index 96% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/OperLog.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/OperLog.java index 9a6d8b77..ad314540 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/OperLog.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/OperLog.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.time.LocalDateTime; -import java.util.Date; /** *

diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/ProjectManager.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/ProjectManager.java similarity index 93% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/ProjectManager.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/ProjectManager.java index 45b21c33..62677ac8 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/ProjectManager.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/ProjectManager.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Role.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Role.java similarity index 97% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Role.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Role.java index e32bda57..271ae71d 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Role.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Role.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/RoleDept.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/RoleDept.java similarity index 93% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/RoleDept.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/RoleDept.java index 97aab2b9..31abdc3a 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/RoleDept.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/RoleDept.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/RoleMenu.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/RoleMenu.java similarity index 93% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/RoleMenu.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/RoleMenu.java index a85d7aff..be293638 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/RoleMenu.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/RoleMenu.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Shortcut.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Shortcut.java similarity index 95% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Shortcut.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Shortcut.java index e266b9d7..8ab34099 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/Shortcut.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Shortcut.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/User.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java similarity index 98% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/User.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java index c3ed659c..06918feb 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/User.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/UserRole.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/UserRole.java similarity index 93% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/UserRole.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/UserRole.java index d8345b5d..66920f19 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/entity/UserRole.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/UserRole.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.entity; +package com.cloud.kicc.system.api.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/enums/MenuEnum.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/enums/MenuEnum.java new file mode 100644 index 00000000..83029de5 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/enums/MenuEnum.java @@ -0,0 +1,43 @@ +package com.cloud.kicc.system.api.enums; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +/** + *

+ * 菜单枚举 + *

+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/2/18 + */ +@Getter +@RequiredArgsConstructor +public enum MenuEnum { + + /** + * 菜单模块类(菜单目录) + */ + MENU_M("M", "菜单模块类(菜单目录)"), + + /** + * 菜单0,启动,根菜单标识 + */ + MENU_0("0", "启动,根菜单标识"), + + /** + * 菜单0,禁用 + */ + MENU_1("1", "禁用"); + + /** + * 值 + */ + private final String value; + + /** + * 描述 + */ + private final String description; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/feign/RemoteDictService.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteDictService.java similarity index 91% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/feign/RemoteDictService.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteDictService.java index 059b3eeb..c07f85d8 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/feign/RemoteDictService.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteDictService.java @@ -1,6 +1,6 @@ -package com.cloud.kicc.admin.api.feign; +package com.cloud.kicc.system.api.feign; -import com.cloud.kicc.admin.api.entity.DictData; +import com.cloud.kicc.system.api.entity.DictData; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.core.constant.SecurityConstants; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/feign/RemoteLogService.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteLogService.java similarity index 91% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/feign/RemoteLogService.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteLogService.java index 7ceed1e0..66812f55 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/feign/RemoteLogService.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteLogService.java @@ -1,6 +1,6 @@ -package com.cloud.kicc.admin.api.feign; +package com.cloud.kicc.system.api.feign; -import com.cloud.kicc.admin.api.entity.OperLog; +import com.cloud.kicc.system.api.entity.OperLog; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.core.constant.SecurityConstants; import com.cloud.kicc.common.core.constant.ServiceNameConstants; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/feign/RemoteTokenService.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteTokenService.java similarity index 96% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/feign/RemoteTokenService.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteTokenService.java index 59e17861..1123bc50 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/feign/RemoteTokenService.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteTokenService.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.feign; +package com.cloud.kicc.system.api.feign; import com.cloud.kicc.common.core.constant.SecurityConstants; import com.cloud.kicc.common.core.constant.ServiceNameConstants; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/feign/RemoteUserService.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteUserService.java similarity index 93% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/feign/RemoteUserService.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteUserService.java index 899ee7ac..56d22ef8 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/feign/RemoteUserService.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/feign/RemoteUserService.java @@ -1,6 +1,6 @@ -package com.cloud.kicc.admin.api.feign; +package com.cloud.kicc.system.api.feign; -import com.cloud.kicc.admin.api.entity.User; +import com.cloud.kicc.system.api.entity.User; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.core.constant.SecurityConstants; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/vo/MenuVo.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/vo/MenuVo.java new file mode 100644 index 00000000..66f18ea4 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/vo/MenuVo.java @@ -0,0 +1,45 @@ +package com.cloud.kicc.system.api.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 菜单路由信息 + *

+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/2/24 + */ +@Data +public class MenuVo implements Serializable { + + /** + * 路由名字 + */ + private String name; + + /** + * 路由地址 + */ + private String path; + + /** + * 组件地址 + */ + private String component; + + /** + * 设置属性 + */ + private MetaVo meta; + + /** + * 子路由 + */ + private List children; + +} + diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/vo/MetaVo.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/vo/MetaVo.java new file mode 100644 index 00000000..74383151 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/vo/MetaVo.java @@ -0,0 +1,41 @@ +package com.cloud.kicc.system.api.vo; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + *

+ * 路由元信息 + * 路由设置属性 + *

+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/2/24 + */ +@Data +@Accessors(chain = true) +public class MetaVo implements Serializable { + + /** + * 菜单名字 + */ + private String title; + + /** + * 菜单图标 + */ + private String icon; + + /** + * 是否缓存该页面(true:是,false:不是) + */ + private Boolean keepAlive; + + /** + * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现 + */ + private Boolean hideMenu; + +} diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/vo/ResultVo.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/vo/ResultVo.java similarity index 91% rename from kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/vo/ResultVo.java rename to kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/vo/ResultVo.java index 7a146e1b..c4e630a3 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/admin/api/vo/ResultVo.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/vo/ResultVo.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.api.vo; +package com.cloud.kicc.system.api.vo; import lombok.Data; import lombok.experimental.Accessors; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/resources/META-INF/spring.factories b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/resources/META-INF/spring.factories index 16bb4147..5cb38710 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/resources/META-INF/spring.factories +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/resources/META-INF/spring.factories @@ -1,5 +1,5 @@ com.cloud.kicc.common.feign.KiccFeignAutoConfiguration=\ - com.cloud.kicc.admin.api.feign.RemoteDictService,\ - com.cloud.kicc.admin.api.feign.RemoteLogService,\ - com.cloud.kicc.admin.api.feign.RemoteTokenService,\ - com.cloud.kicc.admin.api.feign.RemoteUserService + com.cloud.kicc.system.api.feign.RemoteDictService,\ + com.cloud.kicc.system.api.feign.RemoteLogService,\ + com.cloud.kicc.system.api.feign.RemoteTokenService,\ + com.cloud.kicc.system.api.feign.RemoteUserService diff --git a/kicc-platform/kicc-platform-api/pom.xml b/kicc-platform/kicc-platform-api/pom.xml index bb1a23b9..1c375ddc 100644 --- a/kicc-platform/kicc-platform-api/pom.xml +++ b/kicc-platform/kicc-platform-api/pom.xml @@ -16,6 +16,7 @@ kicc-system-api + kicc-common-api diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile b/kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile new file mode 100644 index 00000000..aaa5d528 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile @@ -0,0 +1,15 @@ +FROM moxm/java:1.8-full + +RUN mkdir -p /kicc-common-biz + +WORKDIR /kicc-common-biz + +ARG JAR_FILE=target/kicc-common-biz.jar + +COPY ${JAR_FILE} app.jar + +EXPOSE 4000 + +ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" + +CMD sleep 60; java -jar app.jar $JAVA_OPTS diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml new file mode 100644 index 00000000..1879c5a3 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/pom.xml @@ -0,0 +1,72 @@ + + + 4.0.0 + + com.cloud + kicc-platform-biz + 1.0.0 + + + kicc-common-biz + jar + + kicc 通用业务模块 + + + + + com.cloud + kicc-common-api + + + + com.cloud + kicc-common-security + + + + com.cloud + kicc-common-log + + + + com.cloud + kicc-common-swagger + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + org.springframework.boot + spring-boot-starter-undertow + + + + com.cloud + kicc-common-mock + + + + + + + io.fabric8 + docker-maven-plugin + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java new file mode 100644 index 00000000..eb1fd76d --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java @@ -0,0 +1,29 @@ +package com.cloud.kicc.commonbiz; + +import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert; +import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients; +import com.cloud.kicc.common.security.annotation.EnableKiccResourceServer; +import com.cloud.kicc.common.swagger.annotation.EnableKiccSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + *

+ * 通用业务模块 + *

+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/2/17 + */ +@EnableKiccSwagger2 +@EnableKiccResourceServer +@EnableKiccFeignClients +@SpringBootApplication +@EnableKiccJacksonAutoConvert +public class KiccCommonApplication { + + public static void main(String[] args) { + SpringApplication.run(KiccCommonApplication.class, args); + } + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml new file mode 100644 index 00000000..3116bd1b --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml @@ -0,0 +1,17 @@ +server: + port: 5000 + +spring: + application: + name: @artifactId@ + cloud: + nacos: + discovery: + server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} + namespace: @profiles.namespace@ + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + file-extension: yml + namespace: @profiles.namespace@ + shared-configs: + - application.${spring.cloud.nacos.config.file-extension} diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/logback-spring.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..9cd338b2 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/logback-spring.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/MenuController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/MenuController.java deleted file mode 100644 index 53b2d092..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/MenuController.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.cloud.kicc.admin.controller; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.cloud.kicc.admin.api.dto.MenuDTO; -import com.cloud.kicc.admin.api.entity.Menu; -import com.cloud.kicc.admin.api.entity.RoleMenu; -import com.cloud.kicc.admin.api.vo.MenuVo; -import com.cloud.kicc.admin.api.vo.ResultVo; -import com.cloud.kicc.admin.service.MenuService; -import com.cloud.kicc.admin.service.RoleMenuService; -import com.cloud.kicc.common.core.api.R; -import com.cloud.kicc.common.core.constant.AppConstants; -import com.cloud.kicc.common.core.util.tree.ForestNodeMerger; -import com.cloud.kicc.common.log.annotation.SysLog; -import com.cloud.kicc.common.security.util.SecurityUtils; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -/** - *

- * 菜单信息 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/2/24 - */ -@RestController -@AllArgsConstructor -@RequestMapping(AppConstants.APP_SYSTEM + "/menu") -public class MenuController { - - private final MenuService menuService; - private final RoleMenuService roleMenuService; - - private QueryWrapper getQueryWrapper(Menu menu) { - return new QueryWrapper() - .like(StrUtil.isNotBlank(menu.getName()), "name", menu.getName()) - .eq(StrUtil.isNotBlank(menu.getStatus()), "status", menu.getStatus()) - .orderByAsc("sort"); - } - - @GetMapping("/list") - @PreAuthorize("@pms.hasPermission('menu_view')") - public R list(Menu menu) { - List menuList = menuService.list(getQueryWrapper(menu)); - List treeList = menuService.buildMenus(menuService.buildTree(menuList, "0")); - return R.ok(treeList, treeList.size()); - } - - @GetMapping("/{id:\\w+}") - public R getById(@PathVariable String id) { - return R.ok(menuService.getById(id)); - } - - @SysLog("菜单新增") - @PostMapping("/save") - @PreAuthorize("@pms.hasPermission('menu_add')") - public R save(@RequestBody Menu menu) { - menuService.save(menu); - return R.ok(); - } - - @SysLog("菜单修改") - @PutMapping("/update") - @PreAuthorize("@pms.hasPermission('menu_edit')") - public R update(@RequestBody Menu menu) { - menuService.updateById(menu); - return R.ok(); - } - - @SysLog("菜单删除") - @DeleteMapping("/remove/{id:\\w+}") - @PreAuthorize("@pms.hasPermission('menu_del')") - public R remove(@PathVariable String id) { - if (menuService.count(new QueryWrapper().eq("parent_id", id)) > 0) { - return R.error("存在子菜单,不允许删除"); - } - if (roleMenuService.count(new QueryWrapper().eq("menu_id", id)) > 0) { - return R.error("菜单已分配,不允许删除"); - } - menuService.removeById(id); - return R.ok(); - } - - @SysLog("菜单状态更改") - @GetMapping("/changeStatus") - @PreAuthorize("@pms.hasPermission('menu_edit')") - public R changeStatus(Menu menu) { - menuService.updateById(menu); - return R.ok(); - } - - /** - * 获取当前用户菜单信息 - * - * @return 菜单信息 - */ - @GetMapping("/menus") - public R menus() { - Set menuSet = new HashSet<>(); - SecurityUtils.getRoles().forEach(roleId -> menuSet.addAll(menuService.selectMenuListByRoleId(roleId))); - List menuList = menuSet.stream().sorted(Comparator.comparingInt(Menu::getSort)).collect(Collectors.toList()); - return R.ok(menuService.buildMenus(menuService.buildTree(menuList, "0"))); - } - - /** - * 加载所有菜单列表树 - */ - @GetMapping("/menuTree") - @ResponseBody - public R menuTree() { - List menuList = menuService.list(new QueryWrapper().eq("status", "0").orderByAsc("sort")); - return R.ok(menuList); - } - - /** - * todo: menus ? 重复的方法? 后面需要删除一个 - * 加载角色菜单列表树 - */ - @GetMapping("/tree/{roleId:\\w+}") - public R roleMenuTree(@PathVariable String roleId) { - return R.ok().setData(menuService.selectTreeMenusByRoleId(roleId)); - } - - /** - * 菜单分级列表，用于前端下拉框使用 - * - * @return Result - */ - @GetMapping("/grade") - public R grade() { - LambdaQueryWrapper lsm = Wrappers.query().lambda().orderByAsc(Menu::getSort); - List menus = menuService.list(lsm); - return R.ok().setData(ForestNodeMerger.merge( - menus.stream().map(menu -> MenuDTO.builder() - .id(menu.getId()) - .label(menu.getName()) - .parentId(menu.getParentId()).build()).collect(Collectors.toList()))); - } - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/MenuServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/MenuServiceImpl.java deleted file mode 100644 index 558cdb26..00000000 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/MenuServiceImpl.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.cloud.kicc.admin.service.impl; - -import cn.hutool.core.lang.tree.TreeUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.Menu; -import com.cloud.kicc.admin.api.vo.MenuVo; -import com.cloud.kicc.admin.api.vo.MetaVo; -import com.cloud.kicc.admin.mapper.MenuMapper; -import com.cloud.kicc.admin.service.MenuService; -import com.cloud.kicc.common.core.util.tree.ForestNodeManager; -import com.cloud.kicc.common.core.util.tree.ForestNodeMerger; -import com.cloud.kicc.common.core.util.tree.INode; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.stream.Collectors; - -/** - *

- * 菜单权限表 服务实现类 - *

- * - * @Author: entfrm开发团队-王翔 - * @Date: 2022/2/24 - */ -@Service -public class MenuServiceImpl extends ServiceImpl implements MenuService { - - - - - /** - * 通过角色编号查询权限 - * - * @param roleId 角色ID - * @return 菜单列表 - */ - @Override - public List selectMenuListByRoleId(String roleId) { - return baseMapper.selectMenuListByRoleId(roleId); - } - - /** - * 通过角色编号查询权限小时 - * - * @param roleId 角色ID - * @return 菜单列表 - */ - @Override - public List selectPermsByRoleId(String roleId) { - return baseMapper.selectPermsByRoleId(roleId); - } - - /** - * 根据菜单ID查询信息 - * - * @param roleId 角色ID - * @return 菜单信息 - */ - @Override - public List selectTreeMenusByRoleId(String roleId) { - //1. 获取用户的菜单列表，待扩展 - List menus = this.baseMapper.selectMenuListByRoleId(roleId); - //2. 生成菜单树 - return buildMenus(buildTree(menus, "0")); - } - - /** - * 构建前端路由所需要的菜单 - * - * @param menus 菜单列表 - * @return 路由列表 - */ - @Override - public List buildMenus(List menus) { - List menuVoList = menus.stream().map(menu -> { - MenuVo menuVo = new MenuVo(); - - menuVo.setId(menu.getId()); - menuVo.setParentId(menu.getParentId()); - menuVo.setKeepAlive(menu.getKeepAlive()); - menuVo.setPermission(menu.getPermission()); - menuVo.setIcon(menu.getIcon()); - menuVo.setTarget(menu.getTarget()); - menuVo.setSort(menu.getSort()); - menuVo.setName(menu.getName()); - menuVo.setType(menu.getType()); - menuVo.setCreateTime(menu.getCreateTime()); - menuVo.setStatus(menu.getStatus()); - if ("M".equals(menu.getType())) { - menuVo.setTypeName("目录"); - }else if ("C".equals(menu.getType())) { - menuVo.setTypeName("菜单"); - } else if ("F".equals(menu.getType())) { - menuVo.setTypeName("按钮"); - } - menuVo.setPath(menu.getPath()); - menuVo.setHidden("1".equals(menu.getStatus())); - menuVo.setComponent(menu.getComponent()); - menuVo.setMeta(MetaVo.builder().title(menu.getName()).icon(menu.getIcon()).keepAlive("0".equals(menu.getKeepAlive()) ? true : false).build()); - List cMenus = menu.getChildren(); - if (cMenus != null && cMenus.size() > 0 && "M".equals(menu.getType())) { - menuVo.setAlwaysShow(true); - menuVo.setRedirect("noRedirect"); - menuVo.setChildren(buildMenus(cMenus)); - } else { - menuVo.setAlwaysShow(false); - } - return menuVo; - }).collect(Collectors.toList()); - return menuVoList; - } - - /** - * 构建树 - * - * @param list 分类表 - * @param parentId 传入的父节点ID - * @return String - */ - @Override - public List buildTree(List list, String parentId) { - List menuList = new ArrayList(); - for (Iterator iterator = list.iterator(); iterator.hasNext(); ) { - Menu t = iterator.next(); - if (StrUtil.equals(t.getParentId(), parentId)) { - recursion(list, t); - menuList.add(t); - } - } - return menuList; - } - - /** - * 递归列表 - * - * @param list - * @param t - */ - private void recursion(List list, Menu t) { - // 得到子节点列表 - List childList = getChildList(list, t); - t.setChildren(childList); - for (Menu tChild : childList) { - if (hasChild(list, tChild)) { - // 判断是否有子节点 - Iterator it = childList.iterator(); - while (it.hasNext()) { - Menu n = it.next(); - recursion(list, n); - } - } - } - } - - /** - * 判断是否有子节点 - */ - private boolean hasChild(List list, Menu t) { - return getChildList(list, t).size() > 0 ? true : false; - } - - /** - * 得到子节点列表 - */ - private List getChildList(List list, Menu t) { - List tlist = new ArrayList(); - Iterator it = list.iterator(); - while (it.hasNext()) { - Menu n = it.next(); - if (StrUtil.equals(n.getParentId(), t.getId())) { - tlist.add(n); - } - } - return tlist; - } - - -} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/KiccSystemApplication.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/KiccSystemApplication.java similarity index 88% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/KiccSystemApplication.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/KiccSystemApplication.java index eb1dcea9..ff59baba 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/KiccSystemApplication.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/KiccSystemApplication.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin; +package com.cloud.kicc.system; import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert; import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients; @@ -6,7 +6,6 @@ import com.cloud.kicc.common.security.annotation.EnableKiccResourceServer; import com.cloud.kicc.common.swagger.annotation.EnableKiccSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/AddressController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AddressController.java similarity index 94% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/AddressController.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AddressController.java index 7a88957d..85efdfb5 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/AddressController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AddressController.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.admin.controller; +package com.cloud.kicc.system.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cloud.kicc.admin.api.entity.Address; -import com.cloud.kicc.admin.service.AddressService; +import com.cloud.kicc.system.api.entity.Address; +import com.cloud.kicc.system.service.AddressService; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import io.swagger.annotations.Api; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/AppController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AppController.java similarity index 88% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/AppController.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AppController.java index c7a5ba49..659f7f79 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/AppController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/AppController.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.admin.controller; +package com.cloud.kicc.system.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.cloud.kicc.admin.api.entity.User; -import com.cloud.kicc.admin.service.AppService; -import com.cloud.kicc.admin.service.UserService; +import com.cloud.kicc.system.api.entity.User; +import com.cloud.kicc.system.service.AppService; +import com.cloud.kicc.system.service.UserService; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.security.annotation.Inner; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/ConfigController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ConfigController.java similarity index 95% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/ConfigController.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ConfigController.java index 41d0e62b..5bc23910 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/ConfigController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ConfigController.java @@ -1,12 +1,12 @@ -package com.cloud.kicc.admin.controller; +package com.cloud.kicc.system.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.admin.api.entity.Config; -import com.cloud.kicc.admin.service.ConfigService; +import com.cloud.kicc.system.api.entity.Config; +import com.cloud.kicc.system.service.ConfigService; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.core.constant.CacheConstants; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/DeptController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DeptController.java similarity index 92% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/DeptController.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DeptController.java index f3990fc5..fdd99d87 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/DeptController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DeptController.java @@ -1,14 +1,14 @@ -package com.cloud.kicc.admin.controller; +package com.cloud.kicc.system.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cloud.kicc.admin.api.entity.Dept; -import com.cloud.kicc.admin.api.entity.RoleDept; -import com.cloud.kicc.admin.api.entity.User; -import com.cloud.kicc.admin.api.vo.ResultVo; -import com.cloud.kicc.admin.service.DeptService; -import com.cloud.kicc.admin.service.RoleDeptService; -import com.cloud.kicc.admin.service.UserService; +import com.cloud.kicc.system.api.entity.Dept; +import com.cloud.kicc.system.api.entity.RoleDept; +import com.cloud.kicc.system.api.entity.User; +import com.cloud.kicc.system.api.vo.ResultVo; +import com.cloud.kicc.system.service.DeptService; +import com.cloud.kicc.system.service.RoleDeptService; +import com.cloud.kicc.system.service.UserService; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.log.annotation.SysLog; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/DictController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictController.java similarity index 94% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/DictController.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictController.java index b23a5760..7e2939f5 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/DictController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictController.java @@ -1,11 +1,11 @@ -package com.cloud.kicc.admin.controller; +package com.cloud.kicc.system.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.admin.api.entity.Dict; -import com.cloud.kicc.admin.service.DictService; +import com.cloud.kicc.system.api.entity.Dict; +import com.cloud.kicc.system.service.DictService; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.log.annotation.SysLog; @@ -14,7 +14,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.Arrays; -import java.util.List; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/DictDataController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictDataController.java similarity index 94% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/DictDataController.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictDataController.java index 2ecedd34..e63eef9f 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/DictDataController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DictDataController.java @@ -1,13 +1,13 @@ -package com.cloud.kicc.admin.controller; +package com.cloud.kicc.system.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.admin.api.entity.DictData; -import com.cloud.kicc.admin.api.feign.RemoteDictService; -import com.cloud.kicc.admin.service.DictDataService; +import com.cloud.kicc.system.api.entity.DictData; +import com.cloud.kicc.system.api.feign.RemoteDictService; +import com.cloud.kicc.system.service.DictDataService; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.core.constant.CacheConstants; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/FileController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/FileController.java similarity index 95% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/FileController.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/FileController.java index 7b1519de..70fa93ca 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/FileController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/FileController.java @@ -1,11 +1,11 @@ -package com.cloud.kicc.admin.controller; +package com.cloud.kicc.system.controller; import cn.hutool.core.io.IoUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.admin.api.entity.File; -import com.cloud.kicc.admin.service.FileService; +import com.cloud.kicc.system.api.entity.File; +import com.cloud.kicc.system.service.FileService; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.log.annotation.SysLog; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/HospitalController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/HospitalController.java similarity index 95% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/HospitalController.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/HospitalController.java index ea5af0ce..aa50edc4 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/HospitalController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/HospitalController.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.admin.controller; +package com.cloud.kicc.system.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cloud.kicc.admin.api.entity.Hospital; -import com.cloud.kicc.admin.service.HospitalService; +import com.cloud.kicc.system.api.entity.Hospital; +import com.cloud.kicc.system.service.HospitalService; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import io.swagger.annotations.Api; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/MenuController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/MenuController.java new file mode 100644 index 00000000..1b05e734 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/MenuController.java @@ -0,0 +1,103 @@ +package com.cloud.kicc.system.controller; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.cloud.kicc.system.api.entity.Menu; +import com.cloud.kicc.system.api.entity.RoleMenu; +import com.cloud.kicc.system.service.MenuService; +import com.cloud.kicc.system.service.RoleMenuService; +import com.cloud.kicc.common.core.api.R; +import com.cloud.kicc.common.core.constant.AppConstants; +import com.cloud.kicc.common.log.annotation.SysLog; +import com.cloud.kicc.common.security.util.SecurityUtils; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +/** + *

+ * 菜单信息 + *

+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/2/24 + */ +@RestController +@AllArgsConstructor +@RequestMapping(AppConstants.APP_SYSTEM + "/menu") +public class MenuController { + + private final MenuService menuService; + private final RoleMenuService roleMenuService; + + private LambdaQueryWrapper getQueryWrapper(Menu menu) { + return new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(menu.getName()), Menu::getName, menu.getName()) + .eq(StrUtil.isNotBlank(menu.getHideMenu()), Menu::getHideMenu, menu.getHideMenu()) + .orderByAsc(Menu::getSort); + } + + /** + * 获取当前用户菜单路由信息 + * 前端需要根据路由的数据生成菜单 + * @return 前端路由数据 + */ + @GetMapping("/menuRoute") + @ApiOperation(value = "路由菜单树", notes = "前端需要根据路由的数据生成菜单") + public R menuRoute() { + Set menuSet = new HashSet(); + SecurityUtils.getRoles().forEach(roleId -> menuSet.addAll(menuService.selectMenuListByRoleId(roleId))); + List menuList = menuSet.stream().sorted(Comparator.comparingInt(Menu::getSort)).collect(Collectors.toList()); + return R.ok(menuService.buildMenuRoute(menuService.buildMenuTree(menuList, "0"))); + } + + @GetMapping("/list") + @PreAuthorize("@pms.hasPermission('menu_view')") + public R list(Menu menu) { + List menuList = menuService.list(getQueryWrapper(menu)); + return R.ok(menuList, menuList.size()); + } + + @GetMapping("/{id:\\w+}") + public R getById(@PathVariable String id) { + return R.ok(menuService.getById(id)); + } + + @SysLog("菜单新增") + @PostMapping("/save") + @PreAuthorize("@pms.hasPermission('menu_add')") + public R save(@RequestBody Menu menu) { + menuService.save(menu); + return R.ok(); + } + + @SysLog("菜单修改") + @PutMapping("/update") + @PreAuthorize("@pms.hasPermission('menu_edit')") + public R update(@RequestBody Menu menu) { + menuService.updateById(menu); + return R.ok(); + } + + @SysLog("菜单删除") + @DeleteMapping("/remove/{id:\\w+}") + @PreAuthorize("@pms.hasPermission('menu_del')") + public R remove(@PathVariable String id) { + if (menuService.count(new LambdaQueryWrapper().eq(Menu::getParentId, id)) > 0) { + return R.error("存在子菜单,不允许删除"); + } + if (roleMenuService.count(new LambdaQueryWrapper().eq(RoleMenu::getMenuId, id)) > 0) { + return R.error("菜单已分配,不允许删除"); + } + menuService.removeById(id); + return R.ok(); + } + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/OauthClientDetailsController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OauthClientDetailsController.java similarity index 94% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/OauthClientDetailsController.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OauthClientDetailsController.java index da91aa6f..f8365270 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/OauthClientDetailsController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OauthClientDetailsController.java @@ -1,10 +1,10 @@ -package com.cloud.kicc.admin.controller; +package com.cloud.kicc.system.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.admin.api.entity.OauthClientDetails; -import com.cloud.kicc.admin.service.OauthClientDetailsService; +import com.cloud.kicc.system.api.entity.OauthClientDetails; +import com.cloud.kicc.system.service.OauthClientDetailsService; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.log.annotation.SysLog; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/OperLogController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OperLogController.java similarity index 94% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/OperLogController.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OperLogController.java index 16ee721c..a035cd03 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/OperLogController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/OperLogController.java @@ -1,11 +1,11 @@ -package com.cloud.kicc.admin.controller; +package com.cloud.kicc.system.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.admin.api.entity.OperLog; -import com.cloud.kicc.admin.service.OperLogService; +import com.cloud.kicc.system.api.entity.OperLog; +import com.cloud.kicc.system.service.OperLogService; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.log.annotation.SysLog; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/ProjectManagerController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ProjectManagerController.java similarity index 94% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/ProjectManagerController.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ProjectManagerController.java index 06cdc3bc..7a49b8c2 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/ProjectManagerController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ProjectManagerController.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.admin.controller; +package com.cloud.kicc.system.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cloud.kicc.admin.api.entity.ProjectManager; -import com.cloud.kicc.admin.service.ProjectManagerService; +import com.cloud.kicc.system.api.entity.ProjectManager; +import com.cloud.kicc.system.service.ProjectManagerService; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import io.swagger.annotations.Api; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/RoleController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java similarity index 96% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/RoleController.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java index e60c4b1f..4712add5 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/RoleController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RoleController.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.controller; +package com.cloud.kicc.system.controller; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.admin.api.entity.Role; -import com.cloud.kicc.admin.service.RoleService; +import com.cloud.kicc.system.api.entity.Role; +import com.cloud.kicc.system.service.RoleService; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.core.util.PinyinUtil; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/ShortcutController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ShortcutController.java similarity index 94% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/ShortcutController.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ShortcutController.java index 90c5a2ff..2bdd2412 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/ShortcutController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ShortcutController.java @@ -1,11 +1,11 @@ -package com.cloud.kicc.admin.controller; +package com.cloud.kicc.system.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.admin.api.entity.Shortcut; -import com.cloud.kicc.admin.service.ShortcutService; +import com.cloud.kicc.system.api.entity.Shortcut; +import com.cloud.kicc.system.service.ShortcutService; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.log.annotation.SysLog; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/TokenController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TokenController.java similarity index 92% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/TokenController.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TokenController.java index 4c6316a0..e3df0d2c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/TokenController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TokenController.java @@ -1,6 +1,6 @@ -package com.cloud.kicc.admin.controller; +package com.cloud.kicc.system.controller; -import com.cloud.kicc.admin.api.feign.RemoteTokenService; +import com.cloud.kicc.system.api.feign.RemoteTokenService; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.core.constant.SecurityConstants; import com.cloud.kicc.common.core.api.R; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/UserController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java similarity index 94% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/UserController.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java index 9308e03e..626794ee 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/controller/UserController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/UserController.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.controller; +package com.cloud.kicc.system.controller; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; @@ -8,14 +8,14 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cloud.kicc.admin.api.entity.Role; -import com.cloud.kicc.admin.api.entity.User; -import com.cloud.kicc.admin.api.entity.UserRole; -import com.cloud.kicc.admin.api.vo.ResultVo; -import com.cloud.kicc.admin.service.RoleService; -import com.cloud.kicc.admin.service.FileService; -import com.cloud.kicc.admin.service.UserRoleService; -import com.cloud.kicc.admin.service.UserService; +import com.cloud.kicc.system.api.entity.Role; +import com.cloud.kicc.system.api.entity.User; +import com.cloud.kicc.system.api.entity.UserRole; +import com.cloud.kicc.system.api.vo.ResultVo; +import com.cloud.kicc.system.service.RoleService; +import com.cloud.kicc.system.service.FileService; +import com.cloud.kicc.system.service.UserRoleService; +import com.cloud.kicc.system.service.UserService; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.data.entity.KiccUser; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/AddressMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/AddressMapper.java similarity index 71% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/AddressMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/AddressMapper.java index dacfb841..5855e44f 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/AddressMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/AddressMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.Address; +import com.cloud.kicc.system.api.entity.Address; /** * @Author: TangSheng * @Description: diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/ConfigMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ConfigMapper.java similarity index 73% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/ConfigMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ConfigMapper.java index dd18cbc5..fc243115 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/ConfigMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ConfigMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.Config; +import com.cloud.kicc.system.api.entity.Config; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/DeptMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/DeptMapper.java similarity index 88% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/DeptMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/DeptMapper.java index f824b043..1322fd8b 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/DeptMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/DeptMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.Dept; +import com.cloud.kicc.system.api.entity.Dept; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/DictDataMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/DictDataMapper.java similarity index 73% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/DictDataMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/DictDataMapper.java index 850f99b9..a33c3b4b 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/DictDataMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/DictDataMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.DictData; +import com.cloud.kicc.system.api.entity.DictData; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/DictMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/DictMapper.java similarity index 73% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/DictMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/DictMapper.java index 7f65baeb..df4d783f 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/DictMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/DictMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.Dict; +import com.cloud.kicc.system.api.entity.Dict; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/FileMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/FileMapper.java similarity index 72% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/FileMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/FileMapper.java index fd114199..a1e848c9 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/FileMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/FileMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.File; +import com.cloud.kicc.system.api.entity.File; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/HospitalMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/HospitalMapper.java similarity index 72% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/HospitalMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/HospitalMapper.java index d9b9e88f..289b40ec 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/HospitalMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/HospitalMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.Hospital; +import com.cloud.kicc.system.api.entity.Hospital; /** * @Author: TangSheng diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/MenuMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/MenuMapper.java similarity index 90% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/MenuMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/MenuMapper.java index a20540a4..fe11cdba 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/MenuMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/MenuMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.Menu; +import com.cloud.kicc.system.api.entity.Menu; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/OauthClientDetailsMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/OauthClientDetailsMapper.java similarity index 72% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/OauthClientDetailsMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/OauthClientDetailsMapper.java index 613e39fd..ebc62e65 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/OauthClientDetailsMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/OauthClientDetailsMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.OauthClientDetails; +import com.cloud.kicc.system.api.entity.OauthClientDetails; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/OperLogMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/OperLogMapper.java similarity index 73% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/OperLogMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/OperLogMapper.java index e9778e21..6de4a44c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/OperLogMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/OperLogMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.OperLog; +import com.cloud.kicc.system.api.entity.OperLog; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/ProjectManagerMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ProjectManagerMapper.java similarity index 53% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/ProjectManagerMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ProjectManagerMapper.java index 99f6fd0d..1f8bbbd3 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/ProjectManagerMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ProjectManagerMapper.java @@ -1,11 +1,7 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.ProjectManager; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; +import com.cloud.kicc.system.api.entity.ProjectManager; /** * @Author: TangSheng diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/RoleDeptMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RoleDeptMapper.java similarity index 73% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/RoleDeptMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RoleDeptMapper.java index 289dc479..a808a0c5 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/RoleDeptMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RoleDeptMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.RoleDept; +import com.cloud.kicc.system.api.entity.RoleDept; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/RoleMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RoleMapper.java similarity index 83% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/RoleMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RoleMapper.java index 45003e31..d54441a5 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/RoleMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RoleMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.Role; +import com.cloud.kicc.system.api.entity.Role; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/RoleMenuMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RoleMenuMapper.java similarity index 73% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/RoleMenuMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RoleMenuMapper.java index 3d890b41..41737b38 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/RoleMenuMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RoleMenuMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.RoleMenu; +import com.cloud.kicc.system.api.entity.RoleMenu; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/ShortcutMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ShortcutMapper.java similarity index 72% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/ShortcutMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ShortcutMapper.java index 52712eb4..470a62e1 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/ShortcutMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/ShortcutMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.Shortcut; +import com.cloud.kicc.system.api.entity.Shortcut; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/UserMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/UserMapper.java similarity index 75% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/UserMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/UserMapper.java index 06811db2..e4c9bc78 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/UserMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/UserMapper.java @@ -1,8 +1,8 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.Dept; -import com.cloud.kicc.admin.api.entity.User; +import com.cloud.kicc.system.api.entity.Dept; +import com.cloud.kicc.system.api.entity.User; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/UserRoleMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/UserRoleMapper.java similarity index 73% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/UserRoleMapper.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/UserRoleMapper.java index 83e0b734..61e1d6d5 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/mapper/UserRoleMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/UserRoleMapper.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.mapper; +package com.cloud.kicc.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cloud.kicc.admin.api.entity.UserRole; +import com.cloud.kicc.system.api.entity.UserRole; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/AddressService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AddressService.java similarity index 71% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/AddressService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AddressService.java index f8ed5f2a..5580410c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/AddressService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AddressService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.Address; +import com.cloud.kicc.system.api.entity.Address; /** * @Author: TangSheng diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/AppService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AppService.java similarity index 88% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/AppService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AppService.java index f673e43b..08fe2270 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/AppService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/AppService.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.cloud.kicc.common.core.api.R; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/ConfigService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ConfigService.java similarity index 75% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/ConfigService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ConfigService.java index ac9bd97b..e4a068b1 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/ConfigService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ConfigService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.Config; +import com.cloud.kicc.system.api.entity.Config; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/DeptService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DeptService.java similarity index 84% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/DeptService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DeptService.java index 44b0f434..e6d51bf7 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/DeptService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DeptService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.Dept; +import com.cloud.kicc.system.api.entity.Dept; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/DictDataService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DictDataService.java similarity index 72% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/DictDataService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DictDataService.java index e51bd567..e7cfbf52 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/DictDataService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DictDataService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.DictData; +import com.cloud.kicc.system.api.entity.DictData; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/DictService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DictService.java similarity index 73% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/DictService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DictService.java index 989e2e07..a457c5f8 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/DictService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/DictService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.Dict; +import com.cloud.kicc.system.api.entity.Dict; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/FileService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/FileService.java similarity index 89% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/FileService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/FileService.java index b20db812..7c041442 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/FileService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/FileService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.File; +import com.cloud.kicc.system.api.entity.File; import com.cloud.kicc.common.core.api.R; import org.springframework.web.multipart.MultipartFile; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/HospitalService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/HospitalService.java similarity index 72% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/HospitalService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/HospitalService.java index a0a3d51d..c53957bc 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/HospitalService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/HospitalService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.Hospital; +import com.cloud.kicc.system.api.entity.Hospital; /** * @Author: TangSheng diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/MenuService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/MenuService.java similarity index 63% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/MenuService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/MenuService.java index f830e725..8dc0b928 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/MenuService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/MenuService.java @@ -1,8 +1,8 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.Menu; -import com.cloud.kicc.admin.api.vo.MenuVo; +import com.cloud.kicc.system.api.entity.Menu; +import com.cloud.kicc.system.api.vo.MenuVo; import java.util.List; @@ -18,7 +18,6 @@ public interface MenuService extends IService

{ /** * 通过角色编号查询菜单 - * * @param roleId 角色ID * @return 菜单列表 */ @@ -26,35 +25,25 @@ public interface MenuService extends IService { /** * 通过角色编号查询权限 - * * @param roleId 角色ID * @return 菜单权限列表 */ List selectPermsByRoleId(String roleId); - /** - * 通过角色编号查询菜单 - * - * @param roleId 角色ID - * @return 菜单编号 - */ - List selectTreeMenusByRoleId(String roleId); /** * 构建树 - * * @param list 分类表 * @param parentId 传入的父节点ID * @return String */ - List buildTree(List list, String parentId); + List buildMenuTree(List list, String parentId); /** - * 菜单转换为路由 - * + * 构建前端路由所需要的字段信息 * @param menus 菜单列表 * @return 路由列表 */ - List buildMenus(List menus); + List buildMenuRoute(List menus); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/OauthClientDetailsService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/OauthClientDetailsService.java similarity index 85% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/OauthClientDetailsService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/OauthClientDetailsService.java index 3abf2040..6da6a979 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/OauthClientDetailsService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/OauthClientDetailsService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.OauthClientDetails; +import com.cloud.kicc.system.api.entity.OauthClientDetails; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/OperLogService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/OperLogService.java similarity index 73% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/OperLogService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/OperLogService.java index 130aac0e..31721fdb 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/OperLogService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/OperLogService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.OperLog; +import com.cloud.kicc.system.api.entity.OperLog; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/ProjectManagerService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ProjectManagerService.java similarity index 72% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/ProjectManagerService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ProjectManagerService.java index 7b5b9fd6..421571f4 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/ProjectManagerService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ProjectManagerService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.ProjectManager; +import com.cloud.kicc.system.api.entity.ProjectManager; /** * @Author: TangSheng diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/RoleDeptService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RoleDeptService.java similarity index 73% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/RoleDeptService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RoleDeptService.java index c1ea1932..556e0c14 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/RoleDeptService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RoleDeptService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.RoleDept; +import com.cloud.kicc.system.api.entity.RoleDept; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/RoleMenuService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RoleMenuService.java similarity index 73% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/RoleMenuService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RoleMenuService.java index c83520f3..24f5456c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/RoleMenuService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RoleMenuService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.RoleMenu; +import com.cloud.kicc.system.api.entity.RoleMenu; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/RoleService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RoleService.java similarity index 92% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/RoleService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RoleService.java index 24f052cd..cee1dc85 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/RoleService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RoleService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.Role; +import com.cloud.kicc.system.api.entity.Role; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/ShortcutService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ShortcutService.java similarity index 72% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/ShortcutService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ShortcutService.java index 50e2c3e2..f9d2b6a9 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/ShortcutService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/ShortcutService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.Shortcut; +import com.cloud.kicc.system.api.entity.Shortcut; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/UserRoleService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/UserRoleService.java similarity index 73% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/UserRoleService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/UserRoleService.java index 04212c58..38df7d4c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/UserRoleService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/UserRoleService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.UserRole; +import com.cloud.kicc.system.api.entity.UserRole; /** *

diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/UserService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/UserService.java similarity index 90% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/UserService.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/UserService.java index 4a39ae2e..b91c710e 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/UserService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/UserService.java @@ -1,7 +1,7 @@ -package com.cloud.kicc.admin.service; +package com.cloud.kicc.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.cloud.kicc.admin.api.entity.User; +import com.cloud.kicc.system.api.entity.User; import java.util.List; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/AddressServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AddressServiceImpl.java similarity index 62% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/AddressServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AddressServiceImpl.java index a3edd0ea..ed3da3f3 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/AddressServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AddressServiceImpl.java @@ -1,16 +1,13 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.Address; -import com.cloud.kicc.admin.mapper.AddressMapper; -import com.cloud.kicc.admin.service.AddressService; +import com.cloud.kicc.system.api.entity.Address; +import com.cloud.kicc.system.mapper.AddressMapper; +import com.cloud.kicc.system.service.AddressService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; /** * @Author: TangSheng diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/AppServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AppServiceImpl.java similarity index 91% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/AppServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AppServiceImpl.java index 7516dcac..33053036 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/AppServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/AppServiceImpl.java @@ -1,12 +1,12 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.RandomUtil; import cn.javaer.aliyun.sms.SmsClient; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.cloud.kicc.admin.api.entity.User; -import com.cloud.kicc.admin.service.AppService; -import com.cloud.kicc.admin.service.UserService; +import com.cloud.kicc.system.api.entity.User; +import com.cloud.kicc.system.service.AppService; +import com.cloud.kicc.system.service.UserService; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.CacheConstants; import com.cloud.kicc.common.core.constant.SecurityConstants; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/ConfigServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ConfigServiceImpl.java similarity index 85% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/ConfigServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ConfigServiceImpl.java index 3caf8955..141e569f 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/ConfigServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ConfigServiceImpl.java @@ -1,10 +1,10 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.Config; -import com.cloud.kicc.admin.mapper.ConfigMapper; -import com.cloud.kicc.admin.service.ConfigService; +import com.cloud.kicc.system.api.entity.Config; +import com.cloud.kicc.system.mapper.ConfigMapper; +import com.cloud.kicc.system.service.ConfigService; import com.cloud.kicc.common.core.constant.CacheConstants; import lombok.AllArgsConstructor; import org.springframework.cache.Cache; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/DeptServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DeptServiceImpl.java similarity index 92% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/DeptServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DeptServiceImpl.java index a859f6e7..bee73c2a 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/DeptServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DeptServiceImpl.java @@ -1,10 +1,10 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.Dept; -import com.cloud.kicc.admin.mapper.DeptMapper; -import com.cloud.kicc.admin.service.DeptService; +import com.cloud.kicc.system.api.entity.Dept; +import com.cloud.kicc.system.mapper.DeptMapper; +import com.cloud.kicc.system.service.DeptService; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/DictDataServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DictDataServiceImpl.java similarity index 67% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/DictDataServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DictDataServiceImpl.java index 75092835..9205198d 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/DictDataServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DictDataServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.DictData; -import com.cloud.kicc.admin.mapper.DictDataMapper; -import com.cloud.kicc.admin.service.DictDataService; +import com.cloud.kicc.system.api.entity.DictData; +import com.cloud.kicc.system.mapper.DictDataMapper; +import com.cloud.kicc.system.service.DictDataService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/DictServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DictServiceImpl.java similarity index 64% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/DictServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DictServiceImpl.java index 0f3eb8f0..f23f7671 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/DictServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/DictServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.Dict; -import com.cloud.kicc.admin.mapper.DictMapper; -import com.cloud.kicc.admin.service.DictService; +import com.cloud.kicc.system.api.entity.Dict; +import com.cloud.kicc.system.mapper.DictMapper; +import com.cloud.kicc.system.service.DictService; import org.springframework.stereotype.Service; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/FileServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/FileServiceImpl.java similarity index 94% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/FileServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/FileServiceImpl.java index aece709e..b2667974 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/FileServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/FileServiceImpl.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; @@ -6,9 +6,9 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.amazonaws.services.s3.model.S3Object; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.File; -import com.cloud.kicc.admin.mapper.FileMapper; -import com.cloud.kicc.admin.service.FileService; +import com.cloud.kicc.system.api.entity.File; +import com.cloud.kicc.system.mapper.FileMapper; +import com.cloud.kicc.system.service.FileService; import com.cloud.kicc.common.core.api.R; import com.pig4cloud.plugin.oss.OssProperties; import com.pig4cloud.plugin.oss.service.OssTemplate; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/HospitalServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/HospitalServiceImpl.java similarity index 63% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/HospitalServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/HospitalServiceImpl.java index 1113843a..53fed1fc 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/HospitalServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/HospitalServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.Hospital; -import com.cloud.kicc.admin.mapper.HospitalMapper; -import com.cloud.kicc.admin.service.HospitalService; +import com.cloud.kicc.system.api.entity.Hospital; +import com.cloud.kicc.system.mapper.HospitalMapper; +import com.cloud.kicc.system.service.HospitalService; import org.springframework.stereotype.Service; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/MenuServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/MenuServiceImpl.java new file mode 100644 index 00000000..ef62eaed --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/MenuServiceImpl.java @@ -0,0 +1,110 @@ +package com.cloud.kicc.system.service.impl; + +import cn.hutool.core.util.ReUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cloud.kicc.system.api.entity.Menu; +import com.cloud.kicc.system.api.enums.MenuEnum; +import com.cloud.kicc.system.api.vo.MenuVo; +import com.cloud.kicc.system.api.vo.MetaVo; +import com.cloud.kicc.system.mapper.MenuMapper; +import com.cloud.kicc.system.service.MenuService; +import com.cloud.kicc.common.core.constant.RegexConstants; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.stream.Collectors; + +/** + *

+ * 菜单权限表 服务实现类 + *

+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/2/24 + */ +@Service +public class MenuServiceImpl extends ServiceImpl implements MenuService { + + @Override + public List selectMenuListByRoleId(String roleId) { + return baseMapper.selectMenuListByRoleId(roleId); + } + + @Override + public List selectPermsByRoleId(String roleId) { + return baseMapper.selectPermsByRoleId(roleId); + } + + @Override + public List buildMenuRoute(List menus) { + List menuVoList = menus.stream().map(menu -> { + MenuVo menuVo = new MenuVo(); + menuVo.setName(menu.getName()); + // 检测是否是根节点,0:代表根节点 + if (MenuEnum.MENU_0.getValue().equals(menu.getParentId()) && !ReUtil.isMatch(RegexConstants.MATCHER_URL, menu.getPath())) { + menuVo.setPath("/" + menu.getPath()); + } else { + menuVo.setPath(menu.getPath()); + } + // 配置路由设置属性 + menuVo.setMeta(new MetaVo() + .setTitle(menu.getName()) + .setIcon(menu.getIcon()) + .setHideMenu(MenuEnum.MENU_1.getValue().equals(menu.getHideMenu())) + .setKeepAlive(menu.getKeepAlive().equals(MenuEnum.MENU_1.getValue()))); + + List childrenMenus = menu.getChildren(); + if (childrenMenus != null && childrenMenus.size() > 0 && MenuEnum.MENU_M.getValue().equals(menu.getType())) { + menuVo.setChildren(buildMenuRoute(childrenMenus)); + } + return menuVo; + }).collect(Collectors.toList()); + return menuVoList; + } + + @Override + public List buildMenuTree(List list, String parentId) { + List menuList = new ArrayList(); + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + Menu menu = iterator.next(); + if (StrUtil.equals(menu.getParentId(), parentId)) { + menuRecursion(list, menu); + menuList.add(menu); + } + } + return menuList; + } + + /** 子菜单递归加入父菜单列表 */ + private void menuRecursion(List list, Menu menu) { + List childList = getChildList(list, menu); + menu.setChildren(childList); + for (Menu menuChild : childList) { + if (getChildList(list, menuChild).size() > 0) { + Iterator it = childList.iterator(); + while (it.hasNext()) { + Menu next = it.next(); + menuRecursion(list, next); + } + } + } + } + + /** 查询list菜单集合得到子节点列表 */ + private List getChildList(List list, Menu menu) { + List menuList = new ArrayList(); + Iterator it = list.iterator(); + while (it.hasNext()) { + Menu next = it.next(); + if (StrUtil.equals(next.getParentId(), menu.getId())) { + menuList.add(next); + } + } + return menuList; + } + + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/OauthClientDetailsServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/OauthClientDetailsServiceImpl.java similarity index 83% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/OauthClientDetailsServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/OauthClientDetailsServiceImpl.java index a9d17889..e7e4a457 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/OauthClientDetailsServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/OauthClientDetailsServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.OauthClientDetails; -import com.cloud.kicc.admin.mapper.OauthClientDetailsMapper; -import com.cloud.kicc.admin.service.OauthClientDetailsService; +import com.cloud.kicc.system.api.entity.OauthClientDetails; +import com.cloud.kicc.system.mapper.OauthClientDetailsMapper; +import com.cloud.kicc.system.service.OauthClientDetailsService; import com.cloud.kicc.common.core.constant.CacheConstants; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/OperLogServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/OperLogServiceImpl.java similarity index 64% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/OperLogServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/OperLogServiceImpl.java index 3d093821..0742e054 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/OperLogServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/OperLogServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.OperLog; -import com.cloud.kicc.admin.mapper.OperLogMapper; -import com.cloud.kicc.admin.service.OperLogService; +import com.cloud.kicc.system.api.entity.OperLog; +import com.cloud.kicc.system.mapper.OperLogMapper; +import com.cloud.kicc.system.service.OperLogService; import org.springframework.stereotype.Service; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/ProjectManagerServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ProjectManagerServiceImpl.java similarity index 62% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/ProjectManagerServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ProjectManagerServiceImpl.java index 1e79abce..0e25b006 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/ProjectManagerServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ProjectManagerServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.ProjectManager; -import com.cloud.kicc.admin.mapper.ProjectManagerMapper; -import com.cloud.kicc.admin.service.ProjectManagerService; +import com.cloud.kicc.system.api.entity.ProjectManager; +import com.cloud.kicc.system.mapper.ProjectManagerMapper; +import com.cloud.kicc.system.service.ProjectManagerService; import org.springframework.stereotype.Service; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/RoleDeptServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleDeptServiceImpl.java similarity index 64% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/RoleDeptServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleDeptServiceImpl.java index 0de958ed..cc9b9250 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/RoleDeptServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleDeptServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.RoleDept; -import com.cloud.kicc.admin.mapper.RoleDeptMapper; -import com.cloud.kicc.admin.service.RoleDeptService; +import com.cloud.kicc.system.api.entity.RoleDept; +import com.cloud.kicc.system.mapper.RoleDeptMapper; +import com.cloud.kicc.system.service.RoleDeptService; import org.springframework.stereotype.Service; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/RoleMenuServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleMenuServiceImpl.java similarity index 64% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/RoleMenuServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleMenuServiceImpl.java index 8e9e5b69..5c9603ac 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/RoleMenuServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleMenuServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.RoleMenu; -import com.cloud.kicc.admin.mapper.RoleMenuMapper; -import com.cloud.kicc.admin.service.RoleMenuService; +import com.cloud.kicc.system.api.entity.RoleMenu; +import com.cloud.kicc.system.mapper.RoleMenuMapper; +import com.cloud.kicc.system.service.RoleMenuService; import org.springframework.stereotype.Service; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/RoleServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleServiceImpl.java similarity index 89% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/RoleServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleServiceImpl.java index 8a0776e3..90486ada 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/RoleServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RoleServiceImpl.java @@ -1,17 +1,17 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.Dept; -import com.cloud.kicc.admin.api.entity.Role; -import com.cloud.kicc.admin.api.entity.RoleDept; -import com.cloud.kicc.admin.api.entity.RoleMenu; -import com.cloud.kicc.admin.mapper.RoleMapper; -import com.cloud.kicc.admin.service.DeptService; -import com.cloud.kicc.admin.service.RoleDeptService; -import com.cloud.kicc.admin.service.RoleMenuService; -import com.cloud.kicc.admin.service.RoleService; +import com.cloud.kicc.system.api.entity.Dept; +import com.cloud.kicc.system.api.entity.Role; +import com.cloud.kicc.system.api.entity.RoleDept; +import com.cloud.kicc.system.api.entity.RoleMenu; +import com.cloud.kicc.system.mapper.RoleMapper; +import com.cloud.kicc.system.service.DeptService; +import com.cloud.kicc.system.service.RoleDeptService; +import com.cloud.kicc.system.service.RoleMenuService; +import com.cloud.kicc.system.service.RoleService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/ShortcutServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ShortcutServiceImpl.java similarity index 63% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/ShortcutServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ShortcutServiceImpl.java index 611efb0c..04a797cf 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/ShortcutServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ShortcutServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.Shortcut; -import com.cloud.kicc.admin.mapper.ShortcutMapper; -import com.cloud.kicc.admin.service.ShortcutService; +import com.cloud.kicc.system.api.entity.Shortcut; +import com.cloud.kicc.system.mapper.ShortcutMapper; +import com.cloud.kicc.system.service.ShortcutService; import org.springframework.stereotype.Service; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/UserRoleServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/UserRoleServiceImpl.java similarity index 64% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/UserRoleServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/UserRoleServiceImpl.java index 926ce593..a5e423b5 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/UserRoleServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/UserRoleServiceImpl.java @@ -1,9 +1,9 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.UserRole; -import com.cloud.kicc.admin.mapper.UserRoleMapper; -import com.cloud.kicc.admin.service.UserRoleService; +import com.cloud.kicc.system.api.entity.UserRole; +import com.cloud.kicc.system.mapper.UserRoleMapper; +import com.cloud.kicc.system.service.UserRoleService; import org.springframework.stereotype.Service; /** diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/UserServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/UserServiceImpl.java similarity index 95% rename from kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/UserServiceImpl.java rename to kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/UserServiceImpl.java index 43efb6b5..44bb376f 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/admin/service/impl/UserServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/UserServiceImpl.java @@ -1,15 +1,15 @@ -package com.cloud.kicc.admin.service.impl; +package com.cloud.kicc.system.service.impl; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.cloud.kicc.admin.api.entity.Dept; -import com.cloud.kicc.admin.api.entity.Role; -import com.cloud.kicc.admin.api.entity.User; -import com.cloud.kicc.admin.api.entity.UserRole; -import com.cloud.kicc.admin.mapper.UserMapper; -import com.cloud.kicc.admin.service.*; +import com.cloud.kicc.system.api.entity.Dept; +import com.cloud.kicc.system.api.entity.Role; +import com.cloud.kicc.system.api.entity.User; +import com.cloud.kicc.system.api.entity.UserRole; +import com.cloud.kicc.system.mapper.UserMapper; +import com.cloud.kicc.system.service.*; import com.cloud.kicc.common.core.constant.SecurityConstants; import com.cloud.kicc.common.core.exception.CheckedException; import lombok.AllArgsConstructor; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/MenuMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/MenuMapper.xml index 9f99e663..38b6ffe6 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/MenuMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/MenuMapper.xml @@ -6,17 +6,14 @@ - - - - + diff --git a/kicc-platform/kicc-platform-biz/pom.xml b/kicc-platform/kicc-platform-biz/pom.xml index b1c83cdc..2966cf43 100644 --- a/kicc-platform/kicc-platform-biz/pom.xml +++ b/kicc-platform/kicc-platform-biz/pom.xml @@ -16,6 +16,7 @@ kicc-system-biz + kicc-common-biz diff --git a/kicc-ui/src/api/sys/menu.ts b/kicc-ui/src/api/sys/menu.ts index c106cbee..71f02010 100644 --- a/kicc-ui/src/api/sys/menu.ts +++ b/kicc-ui/src/api/sys/menu.ts @@ -2,7 +2,7 @@ import { defHttp } from '/@/utils/http/axios'; import { getMenuListResultModel } from './model/menuModel'; enum Api { - GetMenuList = '/admin/system/menu/menus', + GetMenuList = '/system_proxy/system/menu/menuRoute', } /** 获取用户菜单 */ diff --git a/kicc-ui/src/api/sys/model/menuModel.ts b/kicc-ui/src/api/sys/model/menuModel.ts index 8d19eeab..5ef2094c 100644 --- a/kicc-ui/src/api/sys/model/menuModel.ts +++ b/kicc-ui/src/api/sys/model/menuModel.ts @@ -4,13 +4,9 @@ export interface RouteItem { component: any; meta: RouteMeta; name?: string; - alias?: string | string[]; redirect?: string; - caseSensitive?: boolean; children?: RouteItem[]; } -/** - * @description: Get menu return value - */ +/** 获取菜单路由 */ export type getMenuListResultModel = RouteItem[]; diff --git a/kicc-ui/src/api/sys/user.ts b/kicc-ui/src/api/sys/user.ts index 26b7236d..f862c3eb 100644 --- a/kicc-ui/src/api/sys/user.ts +++ b/kicc-ui/src/api/sys/user.ts @@ -1,19 +1,12 @@ -import { defHttp } from '/@/utils/http/axios'; -import { - LoginParams, - LoginResultModel, - GetUserInfoModel, - GetCaptchaModel, -} from './model/userModel'; - -import { ErrorMessageMode } from '/#/axios'; -import { encryptionLogin } from '/@/utils/cipher'; +import {defHttp} from '/@/utils/http/axios'; +import {GetCaptchaModel, GetUserInfoModel, LoginParams, LoginResultModel,} from './model/userModel'; +import {encryptionLogin} from '/@/utils/cipher'; import qs from 'qs'; enum Api { - Login = '/auth/oauth/token', + Login = '/auth_proxy/oauth/token', Logout = '/mate-uaa/auth/logout', - GetUserInfo = '/admin/system/user/info', + GetUserInfo = '/system_proxy/system/user/info', GetPermCode = '/getPermCode', GetCaptcha = '/code', } diff --git a/kicc-ui/src/api/system/menu.ts b/kicc-ui/src/api/system/menu.ts index 5a7f8154..fdec7b5c 100644 --- a/kicc-ui/src/api/system/menu.ts +++ b/kicc-ui/src/api/system/menu.ts @@ -2,10 +2,10 @@ import { MenuVO, Menu } from './model/menuModel'; import { defHttp } from '/@/utils/http/axios'; enum Api { - List = '/system/menu/list', - add = '/system/menu/save', - update = '/system/menu/update', - del = '/system/menu/remove' + List = 'system_proxy/system/menu/list', + add = 'system_proxy/system/menu/save', + update = 'system_proxy/system/menu/update', + del = 'system_proxy/system/menu/remove' } // 菜单树 diff --git a/kicc-ui/src/api/system/model/departModel.ts b/kicc-ui/src/api/system/model/departModel.ts index 6664ff84..fa680891 100644 --- a/kicc-ui/src/api/system/model/departModel.ts +++ b/kicc-ui/src/api/system/model/departModel.ts @@ -20,7 +20,6 @@ export type DepartDTO = BasicFetchResult; export interface DeptListItem { id: string; - orderNo: string; createTime: string; remark: string; status: number; diff --git a/kicc-ui/src/api/system/model/roleModel.ts b/kicc-ui/src/api/system/model/roleModel.ts index 8a679923..d060b5d3 100644 --- a/kicc-ui/src/api/system/model/roleModel.ts +++ b/kicc-ui/src/api/system/model/roleModel.ts @@ -27,7 +27,6 @@ export type MenuParams = { export interface MenuListItem { id: string; - orderNo: string; createTime: string; status: number; icon: string; diff --git a/kicc-ui/src/router/routes/modules/dashboard.ts b/kicc-ui/src/router/routes/modules/dashboard.ts index be99c034..61c461ed 100644 --- a/kicc-ui/src/router/routes/modules/dashboard.ts +++ b/kicc-ui/src/router/routes/modules/dashboard.ts @@ -16,7 +16,6 @@ const dashboard: AppRouteModule = { component: LAYOUT, redirect: '/dashboard/analysis', meta: { - orderNo: 10, icon: 'ion:grid-outline', title: t('routes.dashboard.dashboard'), }, diff --git a/kicc-ui/src/router/types.ts b/kicc-ui/src/router/types.ts index d03502ca..85538cdb 100644 --- a/kicc-ui/src/router/types.ts +++ b/kicc-ui/src/router/types.ts @@ -34,8 +34,6 @@ export interface Menu { children?: Menu[]; - orderNo?: number; - meta?: Partial; tag?: MenuTag; diff --git a/kicc-ui/src/store/modules/multipleTab.ts b/kicc-ui/src/store/modules/multipleTab.ts index 7ad33dfa..d5c050e0 100644 --- a/kicc-ui/src/store/modules/multipleTab.ts +++ b/kicc-ui/src/store/modules/multipleTab.ts @@ -59,7 +59,7 @@ export const useMultipleTabStore = defineStore({ for (const tab of this.tabList) { const item = getRawRoute(tab); // 忽略缓存 - const needCache = !item.meta?.ignoreKeepAlive; + const needCache = item.meta?.keepAlive; if (!needCache) continue; const name = item.name as string; cacheMap.add(name); diff --git a/kicc-ui/src/store/modules/permission.ts b/kicc-ui/src/store/modules/permission.ts index 63e47f27..b8ce7aef 100644 --- a/kicc-ui/src/store/modules/permission.ts +++ b/kicc-ui/src/store/modules/permission.ts @@ -75,6 +75,7 @@ export const usePermissionStore = defineStore({ /** 根据设置的首页path，修正routes中的affix标记（固定首页） */ const patchHomeAffix = (routes: AppRouteRecordRaw[]) => { + debugger if (!routes || routes.length === 0) return; let homePath: string = userStore.getUserInfo.homePath || PageEnum.BASE_HOME; function patcher(routes: AppRouteRecordRaw[], parentPath = '') { diff --git a/kicc-ui/types/vue-router.d.ts b/kicc-ui/types/vue-router.d.ts index f3e9def6..53b48de1 100644 --- a/kicc-ui/types/vue-router.d.ts +++ b/kicc-ui/types/vue-router.d.ts @@ -9,13 +9,12 @@ export {}; declare module 'vue-router' { interface RouteMeta extends Record { - orderNo?: number; // 标题 title: string; // 是否忽略权限 ignoreAuth?: boolean; - // 是否不缓存 - ignoreKeepAlive?: boolean; + // 是否缓存 + keepAlive?: boolean; // 是否固定在选项卡上 affix?: boolean; // 选项卡上的图标