From 10d70ed347d67d0a582fe634d47ecc349973871d Mon Sep 17 00:00:00 2001 From: maliang Date: Mon, 20 Mar 2017 18:00:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base.common/pom.xml | 8 +- .../lyms/base/common/dao/SysDepartmentsMapper.java | 20 -- .../lyms/base/common/dao/SysDepartmentsMapper.xml | 24 -- .../lyms/base/common/dao/SysOrganGroupMapper.java | 20 -- .../lyms/base/common/dao/SysOrganGroupMapper.xml | 19 -- .../base/common/dao/SysOrganizationsMapper.java | 20 -- .../base/common/dao/SysOrganizationsMapper.xml | 37 --- .../lyms/base/common/dao/SysPermissionsMapper.java | 28 -- .../lyms/base/common/dao/SysPermissionsMapper.xml | 38 --- .../com/lyms/base/common/dao/SysRegionsMapper.java | 36 --- .../com/lyms/base/common/dao/SysRegionsMapper.xml | 34 --- .../common/dao/SysRolePermissionMapsMapper.java | 20 -- .../common/dao/SysRolePermissionMapsMapper.xml | 17 -- .../com/lyms/base/common/dao/SysRolesMapper.java | 20 -- .../com/lyms/base/common/dao/SysRolesMapper.xml | 25 -- .../base/common/dao/SysUserRoleMapsMapper.java | 21 -- .../lyms/base/common/dao/SysUserRoleMapsMapper.xml | 17 -- .../com/lyms/base/common/dao/SysUsersMapper.java | 20 -- .../com/lyms/base/common/dao/SysUsersMapper.xml | 36 --- .../base/common/dao/organ/DepartmentsMapper.java | 23 ++ .../base/common/dao/organ/DepartmentsMapper.xml | 24 ++ .../base/common/dao/organ/OrganGroupMapper.java | 23 ++ .../base/common/dao/organ/OrganGroupMapper.xml | 19 ++ .../base/common/dao/organ/OrganizationsMapper.java | 23 ++ .../base/common/dao/organ/OrganizationsMapper.xml | 37 +++ .../lyms/base/common/dao/organ/package-info.java | 15 + .../lyms/base/common/dao/region/RegionsMapper.java | 36 +++ .../lyms/base/common/dao/region/RegionsMapper.xml | 34 +++ .../lyms/base/common/dao/region/package-info.java | 15 + .../base/common/dao/role/PermissionsMapper.java | 28 ++ .../base/common/dao/role/PermissionsMapper.xml | 38 +++ .../common/dao/role/RolePermissionMapsMapper.java | 23 ++ .../common/dao/role/RolePermissionMapsMapper.xml | 17 ++ .../com/lyms/base/common/dao/role/RolesMapper.java | 23 ++ .../com/lyms/base/common/dao/role/RolesMapper.xml | 25 ++ .../com/lyms/base/common/dao/role/TreeNode.java | 111 +++++++ .../base/common/dao/role/UserRoleMapsMapper.java | 23 ++ .../base/common/dao/role/UserRoleMapsMapper.xml | 17 ++ .../lyms/base/common/dao/role/package-info.java | 8 + .../com/lyms/base/common/dao/user/UsersMapper.java | 23 ++ .../com/lyms/base/common/dao/user/UsersMapper.xml | 36 +++ .../lyms/base/common/dao/user/package-info.java | 8 + .../lyms/base/common/entity/SysDepartments.java | 166 ---------- .../com/lyms/base/common/entity/SysOrganGroup.java | 102 ------- .../lyms/base/common/entity/SysOrganizations.java | 336 -------------------- .../lyms/base/common/entity/SysPermissions.java | 166 ---------- .../com/lyms/base/common/entity/SysRegions.java | 140 --------- .../base/common/entity/SysRolePermissionMaps.java | 75 ----- .../java/com/lyms/base/common/entity/SysRoles.java | 180 ----------- .../lyms/base/common/entity/SysUserRoleMaps.java | 75 ----- .../java/com/lyms/base/common/entity/SysUsers.java | 338 --------------------- .../java/com/lyms/base/common/entity/TreeNode.java | 88 ------ .../lyms/base/common/entity/organ/Departments.java | 166 ++++++++++ .../lyms/base/common/entity/organ/OrganGroup.java | 102 +++++++ .../base/common/entity/organ/Organizations.java | 336 ++++++++++++++++++++ .../base/common/entity/organ/package-info.java | 8 + .../lyms/base/common/entity/region/Regions.java | 140 +++++++++ .../base/common/entity/region/package-info.java | 8 + .../lyms/base/common/entity/role/Permissions.java | 168 ++++++++++ .../common/entity/role/RolePermissionMaps.java | 75 +++++ .../com/lyms/base/common/entity/role/Roles.java | 180 +++++++++++ .../lyms/base/common/entity/role/UserRoleMaps.java | 75 +++++ .../lyms/base/common/entity/role/package-info.java | 15 + .../com/lyms/base/common/entity/user/Users.java | 338 +++++++++++++++++++++ .../lyms/base/common/entity/user/package-info.java | 15 + .../com/lyms/base/common/enums/PermissionEnum.java | 23 ++ .../java/com/lyms/base/common/enums/RoleType.java | 22 ++ .../com/lyms/base/common/enums/StatusEnum.java | 34 +++ .../java/com/lyms/base/common/enums/TypeEnum.java | 31 ++ .../com/lyms/base/common/enums/ValidityEnum.java | 26 ++ .../com/lyms/base/common/enums/package-info.java | 8 + .../common/service/organ/DepartmentsService.java | 59 ++++ .../common/service/organ/OrganGroupService.java | 62 ++++ .../common/service/organ/OrganizationsService.java | 63 ++++ .../service/organ/impl/DepartmentsServiceImpl.java | 56 ++++ .../service/organ/impl/OrganGroupServiceImpl.java | 62 ++++ .../organ/impl/OrganizationsServiceImpl.java | 57 ++++ .../common/service/organ/impl/package-info.java | 15 + .../base/common/service/organ/package-info.java | 15 + .../base/common/service/region/RegionsService.java | 39 +++ .../service/region/impl/RegionsServiceImpl.java | 40 +++ .../common/service/region/impl/package-info.java | 8 + .../base/common/service/region/package-info.java | 15 + .../common/service/role/PermissionsService.java | 52 ++++ .../service/role/RolePermissionMapsService.java | 25 ++ .../base/common/service/role/RolesService.java | 51 ++++ .../common/service/role/UserRoleMapsService.java | 25 ++ .../service/role/impl/PermissionsServiceImpl.java | 178 +++++++++++ .../role/impl/RolePermissionMapsServiceImpl.java | 27 ++ .../common/service/role/impl/RolesServiceImpl.java | 57 ++++ .../service/role/impl/UserRoleMapsServiceImpl.java | 27 ++ .../common/service/role/impl/package-info.java | 8 + .../base/common/service/role/package-info.java | 15 + .../base/common/service/user/UsersService.java | 98 ++++++ .../common/service/user/impl/UsersServiceImpl.java | 195 ++++++++++++ .../common/service/user/impl/package-info.java | 8 + .../base/common/service/user/package-info.java | 8 + center.manager/pom.xml | 14 +- .../com/lyms/cm/controller/LoginController.java | 46 +-- .../controller/sys/SysDepartmentsController.java | 18 +- .../cm/controller/sys/SysOrganGroupController.java | 45 ++- .../controller/sys/SysOrganizationsController.java | 18 +- .../cm/controller/sys/SysRegionsController.java | 12 +- .../lyms/cm/controller/sys/SysRolesController.java | 276 ++++++++--------- .../lyms/cm/controller/sys/SysUsersController.java | 165 +++++----- .../com/lyms/cm/dao/sys/SysDepartmentsMapper.java | 20 -- .../com/lyms/cm/dao/sys/SysDepartmentsMapper.xml | 24 -- .../com/lyms/cm/dao/sys/SysOrganGroupMapper.java | 20 -- .../com/lyms/cm/dao/sys/SysOrganGroupMapper.xml | 19 -- .../lyms/cm/dao/sys/SysOrganizationsMapper.java | 20 -- .../com/lyms/cm/dao/sys/SysOrganizationsMapper.xml | 37 --- .../com/lyms/cm/dao/sys/SysPermissionsMapper.java | 28 -- .../com/lyms/cm/dao/sys/SysPermissionsMapper.xml | 38 --- .../java/com/lyms/cm/dao/sys/SysRegionsMapper.java | 36 --- .../java/com/lyms/cm/dao/sys/SysRegionsMapper.xml | 34 --- .../cm/dao/sys/SysRolePermissionMapsMapper.java | 20 -- .../cm/dao/sys/SysRolePermissionMapsMapper.xml | 17 -- .../java/com/lyms/cm/dao/sys/SysRolesMapper.java | 20 -- .../java/com/lyms/cm/dao/sys/SysRolesMapper.xml | 25 -- .../com/lyms/cm/dao/sys/SysUserRoleMapsMapper.java | 21 -- .../com/lyms/cm/dao/sys/SysUserRoleMapsMapper.xml | 17 -- .../java/com/lyms/cm/dao/sys/SysUsersMapper.java | 20 -- .../java/com/lyms/cm/dao/sys/SysUsersMapper.xml | 36 --- .../com/lyms/cm/entity/sys/SysDepartments.java | 166 ---------- .../java/com/lyms/cm/entity/sys/SysOrganGroup.java | 102 ------- .../com/lyms/cm/entity/sys/SysOrganizations.java | 336 -------------------- .../com/lyms/cm/entity/sys/SysPermissions.java | 166 ---------- .../java/com/lyms/cm/entity/sys/SysRegions.java | 140 --------- .../lyms/cm/entity/sys/SysRolePermissionMaps.java | 75 ----- .../main/java/com/lyms/cm/entity/sys/SysRoles.java | 180 ----------- .../com/lyms/cm/entity/sys/SysUserRoleMaps.java | 75 ----- .../main/java/com/lyms/cm/entity/sys/SysUsers.java | 338 --------------------- .../main/java/com/lyms/cm/entity/sys/TreeNode.java | 88 ------ .../java/com/lyms/cm/enums/PermissionEnum.java | 23 -- .../src/main/java/com/lyms/cm/enums/RoleType.java | 22 -- .../main/java/com/lyms/cm/enums/StatusEnum.java | 34 --- .../src/main/java/com/lyms/cm/enums/TypeEnum.java | 31 -- .../main/java/com/lyms/cm/enums/ValidityEnum.java | 26 -- .../main/java/com/lyms/cm/enums/package-info.java | 6 - .../lyms/cm/service/sys/SysDepartmentsService.java | 59 ---- .../lyms/cm/service/sys/SysOrganGroupService.java | 62 ---- .../cm/service/sys/SysOrganizationsService.java | 63 ---- .../lyms/cm/service/sys/SysPermissionsService.java | 51 ---- .../com/lyms/cm/service/sys/SysRegionsService.java | 39 --- .../service/sys/SysRolePermissionMapsService.java | 24 -- .../com/lyms/cm/service/sys/SysRolesService.java | 56 ---- .../cm/service/sys/SysUserRoleMapsService.java | 24 -- .../com/lyms/cm/service/sys/SysUsersService.java | 102 ------- .../sys/impl/SysDepartmentsServiceImpl.java | 57 ---- .../service/sys/impl/SysOrganGroupServiceImpl.java | 63 ---- .../sys/impl/SysOrganizationsServiceImpl.java | 57 ---- .../sys/impl/SysPermissionsServiceImpl.java | 176 ----------- .../cm/service/sys/impl/SysRegionsServiceImpl.java | 40 --- .../sys/impl/SysRolePermissionMapsServiceImpl.java | 24 -- .../cm/service/sys/impl/SysRolesServiceImpl.java | 58 ---- .../sys/impl/SysUserRoleMapsServiceImpl.java | 24 -- .../cm/service/sys/impl/SysUsersServiceImpl.java | 196 ------------ .../main/java/com/lyms/cm/shiro/ShiroRealm.java | 134 ++++---- center.manager/src/main/resources/app-context.xml | 13 +- .../src/main/resources/xml/app-datasource.xml | 9 +- .../src/main/resources/xml/app-timer.xml | 3 +- .../center/manager/test/user/DepartmentsTest.java | 8 +- .../java/center/manager/test/user/ReginsTest.java | 10 +- .../java/center/manager/test/user/UserTest.java | 22 +- core.sdk/pom.xml | 3 + .../java/com/lyms/aop/ParamRequiredAspect.java | 216 ++++++------- hospital.mac/pom.xml | 4 +- hospital.web/pom.xml | 4 +- 168 files changed, 4183 insertions(+), 6062 deletions(-) delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysDepartmentsMapper.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysDepartmentsMapper.xml delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysOrganGroupMapper.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysOrganGroupMapper.xml delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysOrganizationsMapper.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysOrganizationsMapper.xml delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysPermissionsMapper.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysPermissionsMapper.xml delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysRegionsMapper.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysRegionsMapper.xml delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysRolePermissionMapsMapper.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysRolePermissionMapsMapper.xml delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysRolesMapper.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysRolesMapper.xml delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysUserRoleMapsMapper.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysUserRoleMapsMapper.xml delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysUsersMapper.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/dao/SysUsersMapper.xml create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/organ/DepartmentsMapper.java create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/organ/DepartmentsMapper.xml create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapper.java create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapper.xml create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/organ/OrganizationsMapper.java create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/organ/OrganizationsMapper.xml create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/organ/package-info.java create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/region/RegionsMapper.java create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/region/RegionsMapper.xml create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/region/package-info.java create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/role/PermissionsMapper.java create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/role/PermissionsMapper.xml create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/role/RolePermissionMapsMapper.java create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/role/RolePermissionMapsMapper.xml create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/role/RolesMapper.java create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/role/RolesMapper.xml create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/role/TreeNode.java create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/role/UserRoleMapsMapper.java create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/role/UserRoleMapsMapper.xml create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/role/package-info.java create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.java create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.xml create mode 100644 base.common/src/main/java/com/lyms/base/common/dao/user/package-info.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/entity/SysDepartments.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/entity/SysOrganGroup.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/entity/SysOrganizations.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/entity/SysPermissions.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/entity/SysRegions.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/entity/SysRolePermissionMaps.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/entity/SysRoles.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/entity/SysUserRoleMaps.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/entity/SysUsers.java delete mode 100644 base.common/src/main/java/com/lyms/base/common/entity/TreeNode.java create mode 100644 base.common/src/main/java/com/lyms/base/common/entity/organ/Departments.java create mode 100644 base.common/src/main/java/com/lyms/base/common/entity/organ/OrganGroup.java create mode 100644 base.common/src/main/java/com/lyms/base/common/entity/organ/Organizations.java create mode 100644 base.common/src/main/java/com/lyms/base/common/entity/organ/package-info.java create mode 100644 base.common/src/main/java/com/lyms/base/common/entity/region/Regions.java create mode 100644 base.common/src/main/java/com/lyms/base/common/entity/region/package-info.java create mode 100644 base.common/src/main/java/com/lyms/base/common/entity/role/Permissions.java create mode 100644 base.common/src/main/java/com/lyms/base/common/entity/role/RolePermissionMaps.java create mode 100644 base.common/src/main/java/com/lyms/base/common/entity/role/Roles.java create mode 100644 base.common/src/main/java/com/lyms/base/common/entity/role/UserRoleMaps.java create mode 100644 base.common/src/main/java/com/lyms/base/common/entity/role/package-info.java create mode 100644 base.common/src/main/java/com/lyms/base/common/entity/user/Users.java create mode 100644 base.common/src/main/java/com/lyms/base/common/entity/user/package-info.java create mode 100644 base.common/src/main/java/com/lyms/base/common/enums/PermissionEnum.java create mode 100644 base.common/src/main/java/com/lyms/base/common/enums/RoleType.java create mode 100644 base.common/src/main/java/com/lyms/base/common/enums/StatusEnum.java create mode 100644 base.common/src/main/java/com/lyms/base/common/enums/TypeEnum.java create mode 100644 base.common/src/main/java/com/lyms/base/common/enums/ValidityEnum.java create mode 100644 base.common/src/main/java/com/lyms/base/common/enums/package-info.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/organ/DepartmentsService.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupService.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/organ/OrganizationsService.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/organ/impl/DepartmentsServiceImpl.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/organ/impl/package-info.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/organ/package-info.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/region/RegionsService.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/region/impl/RegionsServiceImpl.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/region/impl/package-info.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/region/package-info.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/role/PermissionsService.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/role/RolePermissionMapsService.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/role/RolesService.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/role/UserRoleMapsService.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/role/impl/PermissionsServiceImpl.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/role/impl/RolePermissionMapsServiceImpl.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/role/impl/RolesServiceImpl.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/role/impl/UserRoleMapsServiceImpl.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/role/impl/package-info.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/role/package-info.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/user/UsersService.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/user/impl/package-info.java create mode 100644 base.common/src/main/java/com/lyms/base/common/service/user/package-info.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysDepartmentsMapper.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysDepartmentsMapper.xml delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysOrganGroupMapper.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysOrganGroupMapper.xml delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysOrganizationsMapper.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysOrganizationsMapper.xml delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysPermissionsMapper.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysPermissionsMapper.xml delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysRegionsMapper.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysRegionsMapper.xml delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolePermissionMapsMapper.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolePermissionMapsMapper.xml delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.xml delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.xml delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.xml delete mode 100644 center.manager/src/main/java/com/lyms/cm/entity/sys/SysDepartments.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/entity/sys/SysOrganGroup.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/entity/sys/SysOrganizations.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/entity/sys/SysPermissions.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/entity/sys/SysRegions.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/entity/sys/SysRolePermissionMaps.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/entity/sys/SysRoles.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/entity/sys/SysUserRoleMaps.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/entity/sys/TreeNode.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/enums/PermissionEnum.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/enums/RoleType.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/enums/StatusEnum.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/enums/TypeEnum.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/enums/ValidityEnum.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/enums/package-info.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/SysDepartmentsService.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/SysOrganGroupService.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/SysOrganizationsService.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/SysPermissionsService.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/SysRegionsService.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/SysRolePermissionMapsService.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/SysRolesService.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/SysUserRoleMapsService.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/SysUsersService.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysDepartmentsServiceImpl.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysOrganGroupServiceImpl.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysOrganizationsServiceImpl.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysPermissionsServiceImpl.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRegionsServiceImpl.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolePermissionMapsServiceImpl.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolesServiceImpl.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUserRoleMapsServiceImpl.java delete mode 100644 center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUsersServiceImpl.java diff --git a/base.common/pom.xml b/base.common/pom.xml index 96c46d4..7e742e3 100644 --- a/base.common/pom.xml +++ b/base.common/pom.xml @@ -16,9 +16,9 @@ - com.lyms + com.lyms.core.sdk core.sdk - ${project.parent.version} + core.sdk-1.0 @@ -35,7 +35,7 @@ - - + + base.common-1.0 \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysDepartmentsMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/SysDepartmentsMapper.java deleted file mode 100644 index b61f4b9..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysDepartmentsMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.base.common.dao; - -import com.lyms.cm.entity.sys.SysDepartments; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import org.springframework.stereotype.Repository; -import java.io.Serializable; -/** - *

- * Mapper接口 - *

- * - * @author maliang - * @since 2017-03-08 - */ -@Repository -public interface SysDepartmentsMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - -} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysDepartmentsMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/SysDepartmentsMapper.xml deleted file mode 100644 index 7715969..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysDepartmentsMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - ID AS id, PARENT_ID AS parentId, NAME AS name, ORG_ID AS orgId, DESCRIPTION AS description, PUBLISH_ID AS publishId, IFDEL AS ifdel, MODIFIED AS modified, CREATED AS created, SHORT_CODE AS shortCode, FOREIGN_ID AS foreignId - - diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysOrganGroupMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/SysOrganGroupMapper.java deleted file mode 100644 index 0b6024d..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysOrganGroupMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.base.common.dao; - -import com.lyms.cm.entity.sys.SysOrganGroup; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import org.springframework.stereotype.Repository; -import java.io.Serializable; -/** - *

- * Mapper接口 - *

- * - * @author maliang - * @since 2017-03-09 - */ -@Repository -public interface SysOrganGroupMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - -} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysOrganGroupMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/SysOrganGroupMapper.xml deleted file mode 100644 index c9642dc..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysOrganGroupMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - ID AS id, NAME AS name, TYPE AS type, ORGNUMBER AS orgnumber, CLIENTADDRESS AS clientaddress ,IFDEL AS ifdel - - diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysOrganizationsMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/SysOrganizationsMapper.java deleted file mode 100644 index b5fae05..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysOrganizationsMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.base.common.dao; - -import com.lyms.cm.entity.sys.SysOrganizations; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import org.springframework.stereotype.Repository; -import java.io.Serializable; -/** - *

- * Mapper接口 - *

- * - * @author maliang - * @since 2017-03-08 - */ -@Repository -public interface SysOrganizationsMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - -} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysOrganizationsMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/SysOrganizationsMapper.xml deleted file mode 100644 index b70eddf..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysOrganizationsMapper.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, NAME AS name, TYPE AS type, LEVEL AS level, PROVINCE_ID AS provinceId, CITY_ID AS cityId, AREA_ID AS areaId, ADDRESS AS address, DESCRIPTION AS description, PUBLISH_ID AS publishId, IFDEL AS ifdel, MODIFIED AS modified, CREATED AS created, FOREIGN_ID AS foreignId, STREET_ID AS streetId, STATUS AS status, SHORT_CODE AS shortCode, LAT AS lat, LNG AS lng, LOGO AS logo, IMAGE AS image, GRADE_LEVEL AS gradeLevel, STAR_LEVEL AS starLevel, MOBILE AS mobile - - diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysPermissionsMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/SysPermissionsMapper.java deleted file mode 100644 index 3a7ca11..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysPermissionsMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.lyms.base.common.dao; - -import java.io.Serializable; -import java.util.List; - -import org.springframework.stereotype.Repository; - -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.lyms.cm.entity.sys.SysPermissions; -import com.lyms.cm.entity.sys.TreeNode; -/** - *

- * Mapper接口 - *

- * - * @author fangcheng - * @since 2017-03-08 - */ -@Repository -public interface SysPermissionsMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - - List getMenuTreeByPuri(String puri); - - List getUserPermission(String uid); - -} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysPermissionsMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/SysPermissionsMapper.xml deleted file mode 100644 index 8284fec..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysPermissionsMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - ID AS id, NAME AS name, URI AS uri, TYPE AS type, PURI AS puri, ICON AS icon, IFDEL AS ifdel, ENABLE AS enable, EXTRA_DATA AS extraData, WEIGHT AS weight, FOREIGN_ID AS foreignId - - - - - - - - diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysRegionsMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/SysRegionsMapper.java deleted file mode 100644 index 82bbe81..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysRegionsMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.lyms.base.common.dao; - -import java.io.Serializable; -/** - *

- * Mapper接口 - *

- * - * @author maliang - * @since 2017-03-08 - */ -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.lyms.cm.entity.sys.SysRegions; - -@Repository -public interface SysRegionsMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - - /** - *
  • @Description:获取父/子级Region - *
  • @param id - *
  • @return - *
  • 创建人：maliang - *
  • 创建时间：2017年3月8日 - *
  • 修改人： - *
  • 修改时间： - */ - public List selectRegionsById(@Param("id") Serializable id); - -} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysRegionsMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/SysRegionsMapper.xml deleted file mode 100644 index bf1fa0a..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysRegionsMapper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - SYS_REGIONS - - - - ID AS id, PARENT_ID AS parentId, NAME AS name, ENABLE AS enable, IFDEL AS ifdel, CODE AS code, MODIFIE AS modifie, CREATED AS created, FOREIGN_ID AS foreignId - - - - - - diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysRolePermissionMapsMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/SysRolePermissionMapsMapper.java deleted file mode 100644 index 959973b..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysRolePermissionMapsMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.base.common.dao; - -import com.lyms.cm.entity.sys.SysRolePermissionMaps; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import org.springframework.stereotype.Repository; -import java.io.Serializable; -/** - *

    - * Mapper接口 - *

    - * - * @author fangcheng - * @since 2017-03-08 - */ -@Repository -public interface SysRolePermissionMapsMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - -} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysRolePermissionMapsMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/SysRolePermissionMapsMapper.xml deleted file mode 100644 index 1def22e..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysRolePermissionMapsMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - ID AS id, ROLE_ID AS roleId, PERMISSION_ID AS permissionId, IFDEL AS ifdel - - diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysRolesMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/SysRolesMapper.java deleted file mode 100644 index bfc39f2..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysRolesMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.base.common.dao; - -import com.lyms.cm.entity.sys.SysRoles; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import org.springframework.stereotype.Repository; -import java.io.Serializable; -/** - *

    - * Mapper接口 - *

    - * - * @author fangcheng - * @since 2017-03-07 - */ -@Repository -public interface SysRolesMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - -} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysRolesMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/SysRolesMapper.xml deleted file mode 100644 index c343f7c..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysRolesMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - ID AS id, TYPE AS type, NAME AS name, REMARKS AS remarks, SHORT_CODE AS shortCode, ORG_ID AS orgId, CREATE_ID AS createId, CREATE_TIME AS createTime, MODIFY_ID AS modifyId, MODIFY_TIME AS modifyTime, IFDEL AS ifdel, ENABLE AS enable - - diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysUserRoleMapsMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/SysUserRoleMapsMapper.java deleted file mode 100644 index 0ce13c1..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysUserRoleMapsMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lyms.base.common.dao; - -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.lyms.cm.entity.sys.SysUserRoleMaps; - -import org.springframework.stereotype.Repository; -import java.io.Serializable; -/** - *

    - * Mapper接口 - *

    - * - * @author fangcheng - * @since 2017-03-07 - */ -@Repository -public interface SysUserRoleMapsMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - -} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysUserRoleMapsMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/SysUserRoleMapsMapper.xml deleted file mode 100644 index 82c0510..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysUserRoleMapsMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - ID AS id, USER_ID AS userId, ROLE_ID AS roleId, IFDEL AS ifdel - - diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysUsersMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/SysUsersMapper.java deleted file mode 100644 index 4f48653..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysUsersMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.base.common.dao; - -import com.lyms.cm.entity.sys.SysUsers; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import org.springframework.stereotype.Repository; -import java.io.Serializable; -/** - *

    - * Mapper接口 - *

    - * - * @author fangcheng - * @since 2017-03-07 - */ -@Repository -public interface SysUsersMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - -} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/SysUsersMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/SysUsersMapper.xml deleted file mode 100644 index b6bcbae..0000000 --- a/base.common/src/main/java/com/lyms/base/common/dao/SysUsersMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, TYPE AS type, ORG_ID AS orgId, DEPT_ID AS deptId, NAME AS name, ACCOUNT AS account, PWD AS pwd, PHONE AS phone, PUBLISH_ID AS publishId, IFDEL AS ifdel, ENABLE AS enable, MODIFIED AS modified, CREATED AS created, REMARKS AS remarks, LAST_LOGIN_TIME AS lastLoginTime, FOREIGN_ID AS foreignId, OTHER_ACCOUNT AS otherAccount, EMPLOYEE_ID AS employeeId, EXPIR_TIME AS expirTime, LEVEL AS level, AVATAR AS avatar, WORK_TIME AS workTime, GOOD_AT AS goodAt - - diff --git a/base.common/src/main/java/com/lyms/base/common/dao/organ/DepartmentsMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/organ/DepartmentsMapper.java new file mode 100644 index 0000000..0160332 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/organ/DepartmentsMapper.java @@ -0,0 +1,23 @@ +package com.lyms.base.common.dao.organ; + +import java.io.Serializable; + +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.lyms.base.common.entity.organ.Departments; + +/** + *

    + * Mapper接口 + *

    + * + * @author maliang + * @since 2017-03-08 + */ +@Repository +public interface DepartmentsMapper extends BaseMapper { + + public Integer deleteLogicById(Serializable id); + +} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/organ/DepartmentsMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/organ/DepartmentsMapper.xml new file mode 100644 index 0000000..5dc4302 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/organ/DepartmentsMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + ID AS id, PARENT_ID AS parentId, NAME AS name, ORG_ID AS orgId, DESCRIPTION AS description, PUBLISH_ID AS publishId, IFDEL AS ifdel, MODIFIED AS modified, CREATED AS created, SHORT_CODE AS shortCode, FOREIGN_ID AS foreignId + + diff --git a/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapper.java new file mode 100644 index 0000000..6626135 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapper.java @@ -0,0 +1,23 @@ +package com.lyms.base.common.dao.organ; + +import java.io.Serializable; + +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.lyms.base.common.entity.organ.OrganGroup; + +/** + *

    + * Mapper接口 + *

    + * + * @author maliang + * @since 2017-03-09 + */ +@Repository +public interface OrganGroupMapper extends BaseMapper { + + public Integer deleteLogicById(Serializable id); + +} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapper.xml new file mode 100644 index 0000000..a3115cc --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganGroupMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + ID AS id, NAME AS name, TYPE AS type, ORGNUMBER AS orgnumber, CLIENTADDRESS AS clientaddress ,IFDEL AS ifdel + + diff --git a/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganizationsMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganizationsMapper.java new file mode 100644 index 0000000..9a9fc66 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganizationsMapper.java @@ -0,0 +1,23 @@ +package com.lyms.base.common.dao.organ; + +import java.io.Serializable; + +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.lyms.base.common.entity.organ.Organizations; + +/** + *

    + * Mapper接口 + *

    + * + * @author maliang + * @since 2017-03-08 + */ +@Repository +public interface OrganizationsMapper extends BaseMapper { + + public Integer deleteLogicById(Serializable id); + +} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganizationsMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganizationsMapper.xml new file mode 100644 index 0000000..117692c --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/organ/OrganizationsMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, NAME AS name, TYPE AS type, LEVEL AS level, PROVINCE_ID AS provinceId, CITY_ID AS cityId, AREA_ID AS areaId, ADDRESS AS address, DESCRIPTION AS description, PUBLISH_ID AS publishId, IFDEL AS ifdel, MODIFIED AS modified, CREATED AS created, FOREIGN_ID AS foreignId, STREET_ID AS streetId, STATUS AS status, SHORT_CODE AS shortCode, LAT AS lat, LNG AS lng, LOGO AS logo, IMAGE AS image, GRADE_LEVEL AS gradeLevel, STAR_LEVEL AS starLevel, MOBILE AS mobile + + diff --git a/base.common/src/main/java/com/lyms/base/common/dao/organ/package-info.java b/base.common/src/main/java/com/lyms/base/common/dao/organ/package-info.java new file mode 100644 index 0000000..ebb4b73 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/organ/package-info.java @@ -0,0 +1,15 @@ +/** + *
  • @Title: package-info.java + *
  • @Package com.lyms.base.common.dao.organ + *
  • @Description: TODO(文件描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + */ +/** + *
  • @ClassName: package-info + *
  • @Description: TODO(类描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.dao.organ; \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/region/RegionsMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/region/RegionsMapper.java new file mode 100644 index 0000000..6d2d2c9 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/region/RegionsMapper.java @@ -0,0 +1,36 @@ +package com.lyms.base.common.dao.region; + +import java.io.Serializable; +/** + *

    + * Mapper接口 + *

    + * + * @author maliang + * @since 2017-03-08 + */ +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.lyms.base.common.entity.region.Regions; + +@Repository +public interface RegionsMapper extends BaseMapper { + + public Integer deleteLogicById(Serializable id); + + /** + *
  • @Description:获取父/子级Region + *
  • @param id + *
  • @return + *
  • 创建人：maliang + *
  • 创建时间：2017年3月8日 + *
  • 修改人： + *
  • 修改时间： + */ + public List selectRegionsById(@Param("id") Serializable id); + +} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/region/RegionsMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/region/RegionsMapper.xml new file mode 100644 index 0000000..f4339e1 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/region/RegionsMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + SYS_REGIONS + + + + ID AS id, PARENT_ID AS parentId, NAME AS name, ENABLE AS enable, IFDEL AS ifdel, CODE AS code, MODIFIE AS modifie, CREATED AS created, FOREIGN_ID AS foreignId + + + + + + diff --git a/base.common/src/main/java/com/lyms/base/common/dao/region/package-info.java b/base.common/src/main/java/com/lyms/base/common/dao/region/package-info.java new file mode 100644 index 0000000..91251bc --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/region/package-info.java @@ -0,0 +1,15 @@ +/** + *
  • @Title: package-info.java + *
  • @Package com.lyms.base.common.dao.region + *
  • @Description: TODO(文件描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + */ +/** + *
  • @ClassName: package-info + *
  • @Description: TODO(类描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.dao.region; \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/role/PermissionsMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/role/PermissionsMapper.java new file mode 100644 index 0000000..29405e9 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/role/PermissionsMapper.java @@ -0,0 +1,28 @@ +package com.lyms.base.common.dao.role; + +import java.io.Serializable; +import java.util.List; + +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.lyms.base.common.entity.role.Permissions; + +/** + *

    + * Mapper接口 + *

    + * + * @author fangcheng + * @since 2017-03-08 + */ +@Repository +public interface PermissionsMapper extends BaseMapper { + + public Integer deleteLogicById(Serializable id); + + List getMenuTreeByPuri(String puri); + + List getUserPermission(String uid); + +} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/role/PermissionsMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/role/PermissionsMapper.xml new file mode 100644 index 0000000..c111bea --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/role/PermissionsMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + ID AS id, NAME AS name, URI AS uri, TYPE AS type, PURI AS puri, ICON AS icon, IFDEL AS ifdel, ENABLE AS enable, EXTRA_DATA AS extraData, WEIGHT AS weight, FOREIGN_ID AS foreignId + + + + + + + + diff --git a/base.common/src/main/java/com/lyms/base/common/dao/role/RolePermissionMapsMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/role/RolePermissionMapsMapper.java new file mode 100644 index 0000000..ec5eb3d --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/role/RolePermissionMapsMapper.java @@ -0,0 +1,23 @@ +package com.lyms.base.common.dao.role; + +import java.io.Serializable; + +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.lyms.base.common.entity.role.RolePermissionMaps; + +/** + *

    + * Mapper接口 + *

    + * + * @author fangcheng + * @since 2017-03-08 + */ +@Repository +public interface RolePermissionMapsMapper extends BaseMapper { + + public Integer deleteLogicById(Serializable id); + +} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/role/RolePermissionMapsMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/role/RolePermissionMapsMapper.xml new file mode 100644 index 0000000..d377818 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/role/RolePermissionMapsMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + ID AS id, ROLE_ID AS roleId, PERMISSION_ID AS permissionId, IFDEL AS ifdel + + diff --git a/base.common/src/main/java/com/lyms/base/common/dao/role/RolesMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/role/RolesMapper.java new file mode 100644 index 0000000..541ca4a --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/role/RolesMapper.java @@ -0,0 +1,23 @@ +package com.lyms.base.common.dao.role; + +import java.io.Serializable; + +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.lyms.base.common.entity.role.Roles; + +/** + *

    + * Mapper接口 + *

    + * + * @author fangcheng + * @since 2017-03-07 + */ +@Repository +public interface RolesMapper extends BaseMapper { + + public Integer deleteLogicById(Serializable id); + +} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/role/RolesMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/role/RolesMapper.xml new file mode 100644 index 0000000..ec34323 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/role/RolesMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + ID AS id, TYPE AS type, NAME AS name, REMARKS AS remarks, SHORT_CODE AS shortCode, ORG_ID AS orgId, CREATE_ID AS createId, CREATE_TIME AS createTime, MODIFY_ID AS modifyId, MODIFY_TIME AS modifyTime, IFDEL AS ifdel, ENABLE AS enable + + diff --git a/base.common/src/main/java/com/lyms/base/common/dao/role/TreeNode.java b/base.common/src/main/java/com/lyms/base/common/dao/role/TreeNode.java new file mode 100644 index 0000000..3e9706e --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/role/TreeNode.java @@ -0,0 +1,111 @@ +package com.lyms.base.common.dao.role; + +import java.util.List; + +import org.apache.ibatis.type.Alias; + +@Alias(value = "TreeNode") +public class TreeNode implements java.io.Serializable { + + private static final long serialVersionUID = 980682543891282923L; + private String id; + private String text; + private String description; + private String url; + private String state = "closed";// open,closed + private boolean checked = false; + private Object attributes; + private List children; + private String permissions; + private String icon; + private String pid; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public boolean isChecked() { + return checked; + } + + public void setChecked(boolean checked) { + this.checked = checked; + } + + public Object getAttributes() { + return attributes; + } + + public void setAttributes(Object attributes) { + this.attributes = attributes; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + + public String getPermissions() { + return permissions; + } + + public void setPermissions(String permissions) { + this.permissions = permissions; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + +} diff --git a/base.common/src/main/java/com/lyms/base/common/dao/role/UserRoleMapsMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/role/UserRoleMapsMapper.java new file mode 100644 index 0000000..59c6506 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/role/UserRoleMapsMapper.java @@ -0,0 +1,23 @@ +package com.lyms.base.common.dao.role; + +import java.io.Serializable; + +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.lyms.base.common.entity.role.UserRoleMaps; + +/** + *

    + * Mapper接口 + *

    + * + * @author fangcheng + * @since 2017-03-07 + */ +@Repository +public interface UserRoleMapsMapper extends BaseMapper { + + public Integer deleteLogicById(Serializable id); + +} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/role/UserRoleMapsMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/role/UserRoleMapsMapper.xml new file mode 100644 index 0000000..29e322d --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/role/UserRoleMapsMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + ID AS id, USER_ID AS userId, ROLE_ID AS roleId, IFDEL AS ifdel + + diff --git a/base.common/src/main/java/com/lyms/base/common/dao/role/package-info.java b/base.common/src/main/java/com/lyms/base/common/dao/role/package-info.java new file mode 100644 index 0000000..f23a71d --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/role/package-info.java @@ -0,0 +1,8 @@ +/** + *
  • @ClassName: package-info + *
  • @Description:角色信息 + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.dao.role; \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.java b/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.java new file mode 100644 index 0000000..de5041b --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.java @@ -0,0 +1,23 @@ +package com.lyms.base.common.dao.user; + +import java.io.Serializable; + +import org.springframework.stereotype.Repository; + +import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.lyms.base.common.entity.user.Users; + +/** + *

    + * Mapper接口 + *

    + * + * @author fangcheng + * @since 2017-03-07 + */ +@Repository +public interface UsersMapper extends BaseMapper { + + public Integer deleteLogicById(Serializable id); + +} \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.xml b/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.xml new file mode 100644 index 0000000..aa995cd --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/user/UsersMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ID AS id, TYPE AS type, ORG_ID AS orgId, DEPT_ID AS deptId, NAME AS name, ACCOUNT AS account, PWD AS pwd, PHONE AS phone, PUBLISH_ID AS publishId, IFDEL AS ifdel, ENABLE AS enable, MODIFIED AS modified, CREATED AS created, REMARKS AS remarks, LAST_LOGIN_TIME AS lastLoginTime, FOREIGN_ID AS foreignId, OTHER_ACCOUNT AS otherAccount, EMPLOYEE_ID AS employeeId, EXPIR_TIME AS expirTime, LEVEL AS level, AVATAR AS avatar, WORK_TIME AS workTime, GOOD_AT AS goodAt + + diff --git a/base.common/src/main/java/com/lyms/base/common/dao/user/package-info.java b/base.common/src/main/java/com/lyms/base/common/dao/user/package-info.java new file mode 100644 index 0000000..8914261 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/dao/user/package-info.java @@ -0,0 +1,8 @@ +/** + *
  • @ClassName: package-info + *
  • @Description: 用户信息 + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.dao.user; \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/entity/SysDepartments.java b/base.common/src/main/java/com/lyms/base/common/entity/SysDepartments.java deleted file mode 100644 index 42176e9..0000000 --- a/base.common/src/main/java/com/lyms/base/common/entity/SysDepartments.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.lyms.base.common.entity; - -import java.io.Serializable; -import java.util.Date; - -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; - -/** - *

    - * 部门 科室表 - *

    - * - * @author maliang - * @since 2017-03-08 - */ -@TableName("SYS_DEPARTMENTS") -public class SysDepartments implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableField(value = "ID") - private String id; - /** - * 上级部门,0为root - */ - @TableField(value = "PARENT_ID") - private String parentId; - /** - * - */ - @TableField(value = "NAME") - private String name; - /** - * 机构id - */ - @TableField(value = "ORG_ID") - private String orgId; - /** - * - */ - @TableField(value = "DESCRIPTION") - private String description; - /** - * - */ - @TableField(value = "PUBLISH_ID") - private String publishId; - /** - * - */ - @TableField(value = "IFDEL") - private Integer ifdel; - /** - * - */ - @TableField(value = "MODIFIED") - private Date modified; - /** - * - */ - @TableField(value = "CREATED") - private Date created; - /** - * 简码 - */ - @TableField(value = "SHORT_CODE") - private String shortCode; - /** - * - */ - @TableField(value = "FOREIGN_ID") - private String foreignId; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getOrgId() { - return orgId; - } - - public void setOrgId(String orgId) { - this.orgId = orgId; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getPublishId() { - return publishId; - } - - public void setPublishId(String publishId) { - this.publishId = publishId; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - - public Date getModified() { - return modified; - } - - public void setModified(Date modified) { - this.modified = modified; - } - - public Date getCreated() { - return created; - } - - public void setCreated(Date created) { - this.created = created; - } - - public String getShortCode() { - return shortCode; - } - - public void setShortCode(String shortCode) { - this.shortCode = shortCode; - } - - public String getForeignId() { - return foreignId; - } - - public void setForeignId(String foreignId) { - this.foreignId = foreignId; - } - -} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/SysOrganGroup.java b/base.common/src/main/java/com/lyms/base/common/entity/SysOrganGroup.java deleted file mode 100644 index 6df8100..0000000 --- a/base.common/src/main/java/com/lyms/base/common/entity/SysOrganGroup.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.lyms.base.common.entity; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableName; - -/** - *

    - * - *

    - * - * @author maliang - * @since 2017-03-09 - */ -@TableName("SYS_ORGAN_GROUP") -public class SysOrganGroup implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableId(value = "ID") - private String id; - /** - * - */ - @TableField(value = "NAME") - private String name; - /** - * 建档方式 - */ - @TableField(value = "TYPE") - private String type; - /** - * - */ - @TableField(value = "ORGNUMBER") - private Integer orgnumber; - /** - * 数据推送地址 - */ - @TableField(value = "CLIENTADDRESS") - private String clientaddress; - - /** - * 0:可用 1:不可用 - */ - @TableField(value = "IFDEL") - private Integer ifdel; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public Integer getOrgnumber() { - return orgnumber; - } - - public void setOrgnumber(Integer orgnumber) { - this.orgnumber = orgnumber; - } - - public String getClientaddress() { - return clientaddress; - } - - public void setClientaddress(String clientaddress) { - this.clientaddress = clientaddress; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - -} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/SysOrganizations.java b/base.common/src/main/java/com/lyms/base/common/entity/SysOrganizations.java deleted file mode 100644 index 3605eef..0000000 --- a/base.common/src/main/java/com/lyms/base/common/entity/SysOrganizations.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.lyms.base.common.entity; - -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; -import java.io.Serializable; -import java.util.Date; - -/** - *

    - * 机构表 - *

    - * - * @author maliang - * @since 2017-03-08 - */ -@TableName("SYS_ORGANIZATIONS") -public class SysOrganizations implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableId(value="ID") - private String id; - /** - * 机构名 - */ - @TableField(value="NAME") - private String name; - /** - * 1:卫生与计划生育委员会,2:妇幼保健院/站,3:妇产(科)医院,4:综合医院,5:计生站,6:卫生院,7:卫生所,8:其他 - */ - @TableField(value="TYPE") - private Integer type; - /** - * 1省,2市,3区县,4乡镇,5村,6其他 - */ - @TableField(value="LEVEL") - private Integer level; - /** - * 省ID - */ - @TableField(value="PROVINCE_ID") - private String provinceId; - /** - * 城市ID - */ - @TableField(value="CITY_ID") - private String cityId; - /** - * 区县ID - */ - @TableField(value="AREA_ID") - private String areaId; - /** - * 街道地址 - */ - @TableField(value="ADDRESS") - private String address; - /** - * 简介 - */ - @TableField(value="DESCRIPTION") - private String description; - /** - * 发布人ID - */ - @TableField(value="PUBLISH_ID") - private String publishId; - /** - * 1：有效，2：无效 - */ - @TableField(value="IFDEL") - private Integer ifdel; - /** - * 最后修改时间 - */ - @TableField(value="MODIFIED") - private Date modified; - /** - * 创建时间 - */ - @TableField(value="CREATED") - private Date created; - /** - * - */ - @TableField(value="FOREIGN_ID") - private String foreignId; - /** - * - */ - @TableField(value="STREET_ID") - private String streetId; - /** - * 0,"正式运行" 1,"试运行" 2,"停止运行" - */ - @TableField(value="STATUS") - private Integer status; - /** - * 简码 - */ - @TableField(value="SHORT_CODE") - private String shortCode; - /** - * 经度 - */ - @TableField(value="LAT") - private Double lat; - /** - * '纬度 - */ - @TableField(value="LNG") - private Double lng; - /** - * - */ - @TableField(value="LOGO") - private String logo; - /** - * - */ - @TableField(value="IMAGE") - private String image; - /** - * 医院等级 - */ - @TableField(value="GRADE_LEVEL") - private Integer gradeLevel; - /** - * 星级 - */ - @TableField(value="STAR_LEVEL") - private Integer starLevel; - /** - * 服务热线 - */ - @TableField(value="MOBILE") - private String mobile; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public Integer getLevel() { - return level; - } - - public void setLevel(Integer level) { - this.level = level; - } - - public String getProvinceId() { - return provinceId; - } - - public void setProvinceId(String provinceId) { - this.provinceId = provinceId; - } - - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getPublishId() { - return publishId; - } - - public void setPublishId(String publishId) { - this.publishId = publishId; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - - public Date getModified() { - return modified; - } - - public void setModified(Date modified) { - this.modified = modified; - } - - public Date getCreated() { - return created; - } - - public void setCreated(Date created) { - this.created = created; - } - - public String getForeignId() { - return foreignId; - } - - public void setForeignId(String foreignId) { - this.foreignId = foreignId; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public String getShortCode() { - return shortCode; - } - - public void setShortCode(String shortCode) { - this.shortCode = shortCode; - } - - public Double getLat() { - return lat; - } - - public void setLat(Double lat) { - this.lat = lat; - } - - public Double getLng() { - return lng; - } - - public void setLng(Double lng) { - this.lng = lng; - } - - public String getLogo() { - return logo; - } - - public void setLogo(String logo) { - this.logo = logo; - } - - public String getImage() { - return image; - } - - public void setImage(String image) { - this.image = image; - } - - public Integer getGradeLevel() { - return gradeLevel; - } - - public void setGradeLevel(Integer gradeLevel) { - this.gradeLevel = gradeLevel; - } - - public Integer getStarLevel() { - return starLevel; - } - - public void setStarLevel(Integer starLevel) { - this.starLevel = starLevel; - } - - public String getMobile() { - return mobile; - } - - public void setMobile(String mobile) { - this.mobile = mobile; - } - -} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/SysPermissions.java b/base.common/src/main/java/com/lyms/base/common/entity/SysPermissions.java deleted file mode 100644 index 113dcfd..0000000 --- a/base.common/src/main/java/com/lyms/base/common/entity/SysPermissions.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.lyms.base.common.entity; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; - -/** - *

    - * 权限表 - *

    - * - * @author fangcheng - * @since 2017-03-08 - */ -@TableName("SYS_PERMISSIONS") -public class SysPermissions implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableField(value="ID") - private String id; - /** - * - */ - @TableField(value="NAME") - private String name; - /** - * - */ - @TableField(value="URI") - private String uri; - /** - * - */ - @TableField(value="TYPE") - private Integer type; - /** - * - */ - @TableField(value="PURI") - private String puri; - /** - * - */ - @TableField(value="ICON") - private String icon; - /** - * - */ - @TableField(value="IFDEL") - private Integer ifdel; - /** - * - */ - @TableField(value="ENABLE") - private Integer enable; - /** - * - */ - @TableField(value="EXTRA_DATA") - private String extraData; - /** - * - */ - @TableField(value="WEIGHT") - private Integer weight; - /** - * - */ - @TableField(value="FOREIGN_ID") - private String foreignId; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getUri() { - return uri; - } - - public void setUri(String uri) { - this.uri = uri; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public String getPuri() { - return puri; - } - - public void setPuri(String puri) { - this.puri = puri; - } - - public String getIcon() { - return icon; - } - - public void setIcon(String icon) { - this.icon = icon; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - - public Integer getEnable() { - return enable; - } - - public void setEnable(Integer enable) { - this.enable = enable; - } - - public String getExtraData() { - return extraData; - } - - public void setExtraData(String extraData) { - this.extraData = extraData; - } - - public Integer getWeight() { - return weight; - } - - public void setWeight(Integer weight) { - this.weight = weight; - } - - public String getForeignId() { - return foreignId; - } - - public void setForeignId(String foreignId) { - this.foreignId = foreignId; - } - -} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/SysRegions.java b/base.common/src/main/java/com/lyms/base/common/entity/SysRegions.java deleted file mode 100644 index 671f6fd..0000000 --- a/base.common/src/main/java/com/lyms/base/common/entity/SysRegions.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.lyms.base.common.entity; - -import java.io.Serializable; -import java.util.Date; - -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; - -/** - *

    - * 省市区地址表 - *

    - * - * @author maliang - * @since 2017-03-08 - */ -@TableName("SYS_REGIONS") -public class SysRegions implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableField(value = "ID") - private String id; - /** - * - */ - @TableField(value = "PARENT_ID") - private String parentId; - /** - * - */ - @TableField(value = "NAME") - private String name; - /** - * - */ - @TableField(value = "ENABLE") - private Integer enable; - /** - * - */ - @TableField(value = "IFDEL") - private Integer ifdel; - /** - * - */ - @TableField(value = "CODE") - private String code; - /** - * - */ - @TableField(value = "MODIFIE") - private Date modifie; - /** - * - */ - @TableField(value = "CREATED") - private Date created; - /** - * - */ - @TableField(value = "FOREIGN_ID") - private String foreignId; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Integer getEnable() { - return enable; - } - - public void setEnable(Integer enable) { - this.enable = enable; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public Date getModifie() { - return modifie; - } - - public void setModifie(Date modifie) { - this.modifie = modifie; - } - - public Date getCreated() { - return created; - } - - public void setCreated(Date created) { - this.created = created; - } - - public String getForeignId() { - return foreignId; - } - - public void setForeignId(String foreignId) { - this.foreignId = foreignId; - } - -} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/SysRolePermissionMaps.java b/base.common/src/main/java/com/lyms/base/common/entity/SysRolePermissionMaps.java deleted file mode 100644 index a1b0bd1..0000000 --- a/base.common/src/main/java/com/lyms/base/common/entity/SysRolePermissionMaps.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.lyms.base.common.entity; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; - -/** - *

    - * 角色权限映射表 - *

    - * - * @author fangcheng - * @since 2017-03-08 - */ -@TableName("SYS_ROLE_PERMISSION_MAPS") -public class SysRolePermissionMaps implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableField(value="ID") - private String id; - /** - * - */ - @TableField(value="ROLE_ID") - private String roleId; - /** - * - */ - @TableField(value="PERMISSION_ID") - private String permissionId; - /** - * - */ - @TableField(value="IFDEL") - private Integer ifdel; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getRoleId() { - return roleId; - } - - public void setRoleId(String roleId) { - this.roleId = roleId; - } - - public String getPermissionId() { - return permissionId; - } - - public void setPermissionId(String permissionId) { - this.permissionId = permissionId; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - -} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/SysRoles.java b/base.common/src/main/java/com/lyms/base/common/entity/SysRoles.java deleted file mode 100644 index 032d430..0000000 --- a/base.common/src/main/java/com/lyms/base/common/entity/SysRoles.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.lyms.base.common.entity; - -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; -import java.io.Serializable; -import java.util.Date; - -/** - *

    - * 角色表 - *

    - * - * @author fangcheng - * @since 2017-03-10 - */ -@TableName("SYS_ROLES") -public class SysRoles implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableId(value="ID") - private String id; - /** - * 0:管理员角色,1:用户角色 - */ - @TableField(value="TYPE") - private Integer type; - /** - * 角色名称 - */ - @TableField(value="NAME") - private String name; - /** - * 备注 - */ - @TableField(value="REMARKS") - private String remarks; - /** - * 简码 - */ - @TableField(value="SHORT_CODE") - private String shortCode; - /** - * 机构id - */ - @TableField(value="ORG_ID") - private String orgId; - /** - * - */ - @TableField(value="CREATE_ID") - private String createId; - /** - * - */ - @TableField(value="CREATE_TIME") - private Date createTime; - /** - * - */ - @TableField(value="MODIFY_ID") - private String modifyId; - /** - * - */ - @TableField(value="MODIFY_TIME") - private Date modifyTime; - /** - * - */ - @TableField(value="IFDEL") - private Integer ifdel; - /** - * - */ - @TableField(value="ENABLE") - private Integer enable; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getRemarks() { - return remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - public String getShortCode() { - return shortCode; - } - - public void setShortCode(String shortCode) { - this.shortCode = shortCode; - } - - public String getOrgId() { - return orgId; - } - - public void setOrgId(String orgId) { - this.orgId = orgId; - } - - public String getCreateId() { - return createId; - } - - public void setCreateId(String createId) { - this.createId = createId; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public String getModifyId() { - return modifyId; - } - - public void setModifyId(String modifyId) { - this.modifyId = modifyId; - } - - public Date getModifyTime() { - return modifyTime; - } - - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - - public Integer getEnable() { - return enable; - } - - public void setEnable(Integer enable) { - this.enable = enable; - } - -} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/SysUserRoleMaps.java b/base.common/src/main/java/com/lyms/base/common/entity/SysUserRoleMaps.java deleted file mode 100644 index 9277ddf..0000000 --- a/base.common/src/main/java/com/lyms/base/common/entity/SysUserRoleMaps.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.lyms.base.common.entity; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; - -/** - *

    - * 用户角色关系表 - *

    - * - * @author fangcheng - * @since 2017-03-07 - */ -@TableName("SYS_USER_ROLE_MAPS") -public class SysUserRoleMaps implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableField(value="ID") - private String id; - /** - * - */ - @TableField(value="USER_ID") - private String userId; - /** - * - */ - @TableField(value="ROLE_ID") - private String roleId; - /** - * - */ - @TableField(value="IFDEL") - private Integer ifdel; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - public String getRoleId() { - return roleId; - } - - public void setRoleId(String roleId) { - this.roleId = roleId; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - -} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/SysUsers.java b/base.common/src/main/java/com/lyms/base/common/entity/SysUsers.java deleted file mode 100644 index f20d99f..0000000 --- a/base.common/src/main/java/com/lyms/base/common/entity/SysUsers.java +++ /dev/null @@ -1,338 +0,0 @@ -package com.lyms.base.common.entity; - -import java.io.Serializable; -import java.util.Date; - -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableName; - -/** - *

    - * 用户表 - *

    - * - * @author fangcheng - * @since 2017-03-08 - */ -@TableName("SYS_USERS") -public class SysUsers implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableId(value = "ID") - private String id; - /** - * 0:管理员,1:用户 - */ - @TableField(value = "TYPE") - private Integer type; - /** - * 名称 - */ - @TableField(value = "NAME") - private String name; - /** - * 帐号 - */ - @TableField(value = "ACCOUNT") - private String account; - /** - * 机构id - */ - @TableField(value = "ORG_ID") - private String orgId; - /** - * 部门id - */ - @TableField(value = "DEPT_ID") - private String deptId; - /** - * 名字 - */ - @TableField(value = "PWD") - private String pwd; - /** - * 手机号 - */ - @TableField(value = "PHONE") - private String phone; - /** - * 备注 - */ - @TableField(value = "REMARKS") - private String remarks; - /** - * 最后登录时间 - */ - @TableField(value = "LAST_LOGIN_TIME") - private Date lastLoginTime; - /** - * 导入数据的源id - */ - @TableField(value = "FOREIGN_ID") - private String foreignId; - /** - * 医院的帐号 - */ - @TableField(value = "OTHER_ACCOUNT") - private String otherAccount; - /** - * - */ - @TableField(value = "EMPLOYEE_ID") - private String employeeId; - /** - * - */ - @TableField(value = "EXPIR_TIME") - private Date expirTime; - /** - * - */ - @TableField(value = "LEVEL") - private Integer level; - /** - * - */ - @TableField(value = "AVATAR") - private String avatar; - /** - * - */ - @TableField(value = "WORK_TIME") - private String workTime; - /** - * - */ - @TableField(value = "GOOD_AT") - private String goodAt; - /** - * - */ - @TableField(value = "CREATE_ID") - private String createId; - /** - * - */ - @TableField(value = "CREATE_TIME") - private Date createTime; - /** - * - */ - @TableField(value = "MODIFY_ID") - private String modifyId; - /** - * - */ - @TableField(value = "MODIFY_TIME") - private Date modifyTime; - /** - * - */ - @TableField(value = "IFDEL") - private Integer ifdel; - /** - * - */ - @TableField(value = "ENABLE") - private Integer enable; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getAccount() { - return account; - } - - public void setAccount(String account) { - this.account = account; - } - - public String getOrgId() { - return orgId; - } - - public void setOrgId(String orgId) { - this.orgId = orgId; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getPwd() { - return pwd; - } - - public void setPwd(String pwd) { - this.pwd = pwd; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getRemarks() { - return remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - public Date getLastLoginTime() { - return lastLoginTime; - } - - public void setLastLoginTime(Date lastLoginTime) { - this.lastLoginTime = lastLoginTime; - } - - public String getForeignId() { - return foreignId; - } - - public void setForeignId(String foreignId) { - this.foreignId = foreignId; - } - - public String getOtherAccount() { - return otherAccount; - } - - public void setOtherAccount(String otherAccount) { - this.otherAccount = otherAccount; - } - - public String getEmployeeId() { - return employeeId; - } - - public void setEmployeeId(String employeeId) { - this.employeeId = employeeId; - } - - public Date getExpirTime() { - return expirTime; - } - - public void setExpirTime(Date expirTime) { - this.expirTime = expirTime; - } - - public Integer getLevel() { - return level; - } - - public void setLevel(Integer level) { - this.level = level; - } - - public String getAvatar() { - return avatar; - } - - public void setAvatar(String avatar) { - this.avatar = avatar; - } - - public String getWorkTime() { - return workTime; - } - - public void setWorkTime(String workTime) { - this.workTime = workTime; - } - - public String getGoodAt() { - return goodAt; - } - - public void setGoodAt(String goodAt) { - this.goodAt = goodAt; - } - - public String getCreateId() { - return createId; - } - - public void setCreateId(String createId) { - this.createId = createId; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public String getModifyId() { - return modifyId; - } - - public void setModifyId(String modifyId) { - this.modifyId = modifyId; - } - - public Date getModifyTime() { - return modifyTime; - } - - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - - public Integer getEnable() { - return enable; - } - - public void setEnable(Integer enable) { - this.enable = enable; - } - - -} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/TreeNode.java b/base.common/src/main/java/com/lyms/base/common/entity/TreeNode.java deleted file mode 100644 index 65fbd10..0000000 --- a/base.common/src/main/java/com/lyms/base/common/entity/TreeNode.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.lyms.base.common.entity; - -import java.util.List; -public class TreeNode implements java.io.Serializable { - - private static final long serialVersionUID = 980682543891282923L; - private String id; - private String text; - private String description; - private String url; - private String state = "closed";// open,closed - private boolean checked = false; - private Object attributes; - private List children; - private String permissions; - private String icon; - private String pid; - - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - public String getText() { - return text; - } - public void setText(String text) { - this.text = text; - } - public String getDescription() { - return description; - } - public void setDescription(String description) { - this.description = description; - } - public String getUrl() { - return url; - } - public void setUrl(String url) { - this.url = url; - } - public String getState() { - return state; - } - public void setState(String state) { - this.state = state; - } - public boolean isChecked() { - return checked; - } - public void setChecked(boolean checked) { - this.checked = checked; - } - public Object getAttributes() { - return attributes; - } - public void setAttributes(Object attributes) { - this.attributes = attributes; - } - public List getChildren() { - return children; - } - public void setChildren(List children) { - this.children = children; - } - public String getPermissions() { - return permissions; - } - public void setPermissions(String permissions) { - this.permissions = permissions; - } - public String getIcon() { - return icon; - } - public void setIcon(String icon) { - this.icon = icon; - } - public String getPid() { - return pid; - } - public void setPid(String pid) { - this.pid = pid; - } - - - -} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/organ/Departments.java b/base.common/src/main/java/com/lyms/base/common/entity/organ/Departments.java new file mode 100644 index 0000000..c3d048c --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/entity/organ/Departments.java @@ -0,0 +1,166 @@ +package com.lyms.base.common.entity.organ; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; + +/** + *

    + * 部门 科室表 + *

    + * + * @author maliang + * @since 2017-03-08 + */ +@TableName("SYS_DEPARTMENTS") +public class Departments implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableField(value = "ID") + private String id; + /** + * 上级部门,0为root + */ + @TableField(value = "PARENT_ID") + private String parentId; + /** + * + */ + @TableField(value = "NAME") + private String name; + /** + * 机构id + */ + @TableField(value = "ORG_ID") + private String orgId; + /** + * + */ + @TableField(value = "DESCRIPTION") + private String description; + /** + * + */ + @TableField(value = "PUBLISH_ID") + private String publishId; + /** + * + */ + @TableField(value = "IFDEL") + private Integer ifdel; + /** + * + */ + @TableField(value = "MODIFIED") + private Date modified; + /** + * + */ + @TableField(value = "CREATED") + private Date created; + /** + * 简码 + */ + @TableField(value = "SHORT_CODE") + private String shortCode; + /** + * + */ + @TableField(value = "FOREIGN_ID") + private String foreignId; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getOrgId() { + return orgId; + } + + public void setOrgId(String orgId) { + this.orgId = orgId; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getPublishId() { + return publishId; + } + + public void setPublishId(String publishId) { + this.publishId = publishId; + } + + public Integer getIfdel() { + return ifdel; + } + + public void setIfdel(Integer ifdel) { + this.ifdel = ifdel; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public String getShortCode() { + return shortCode; + } + + public void setShortCode(String shortCode) { + this.shortCode = shortCode; + } + + public String getForeignId() { + return foreignId; + } + + public void setForeignId(String foreignId) { + this.foreignId = foreignId; + } + +} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/organ/OrganGroup.java b/base.common/src/main/java/com/lyms/base/common/entity/organ/OrganGroup.java new file mode 100644 index 0000000..1b277e7 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/entity/organ/OrganGroup.java @@ -0,0 +1,102 @@ +package com.lyms.base.common.entity.organ; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; + +/** + *

    + * + *

    + * + * @author maliang + * @since 2017-03-09 + */ +@TableName("SYS_ORGAN_GROUP") +public class OrganGroup implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "ID") + private String id; + /** + * + */ + @TableField(value = "NAME") + private String name; + /** + * 建档方式 + */ + @TableField(value = "TYPE") + private String type; + /** + * + */ + @TableField(value = "ORGNUMBER") + private Integer orgnumber; + /** + * 数据推送地址 + */ + @TableField(value = "CLIENTADDRESS") + private String clientaddress; + + /** + * 0:可用 1:不可用 + */ + @TableField(value = "IFDEL") + private Integer ifdel; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Integer getOrgnumber() { + return orgnumber; + } + + public void setOrgnumber(Integer orgnumber) { + this.orgnumber = orgnumber; + } + + public String getClientaddress() { + return clientaddress; + } + + public void setClientaddress(String clientaddress) { + this.clientaddress = clientaddress; + } + + public Integer getIfdel() { + return ifdel; + } + + public void setIfdel(Integer ifdel) { + this.ifdel = ifdel; + } + +} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/organ/Organizations.java b/base.common/src/main/java/com/lyms/base/common/entity/organ/Organizations.java new file mode 100644 index 0000000..5920999 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/entity/organ/Organizations.java @@ -0,0 +1,336 @@ +package com.lyms.base.common.entity.organ; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; +import java.util.Date; + +/** + *

    + * 机构表 + *

    + * + * @author maliang + * @since 2017-03-08 + */ +@TableName("SYS_ORGANIZATIONS") +public class Organizations implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value="ID") + private String id; + /** + * 机构名 + */ + @TableField(value="NAME") + private String name; + /** + * 1:卫生与计划生育委员会,2:妇幼保健院/站,3:妇产(科)医院,4:综合医院,5:计生站,6:卫生院,7:卫生所,8:其他 + */ + @TableField(value="TYPE") + private Integer type; + /** + * 1省,2市,3区县,4乡镇,5村,6其他 + */ + @TableField(value="LEVEL") + private Integer level; + /** + * 省ID + */ + @TableField(value="PROVINCE_ID") + private String provinceId; + /** + * 城市ID + */ + @TableField(value="CITY_ID") + private String cityId; + /** + * 区县ID + */ + @TableField(value="AREA_ID") + private String areaId; + /** + * 街道地址 + */ + @TableField(value="ADDRESS") + private String address; + /** + * 简介 + */ + @TableField(value="DESCRIPTION") + private String description; + /** + * 发布人ID + */ + @TableField(value="PUBLISH_ID") + private String publishId; + /** + * 1：有效，2：无效 + */ + @TableField(value="IFDEL") + private Integer ifdel; + /** + * 最后修改时间 + */ + @TableField(value="MODIFIED") + private Date modified; + /** + * 创建时间 + */ + @TableField(value="CREATED") + private Date created; + /** + * + */ + @TableField(value="FOREIGN_ID") + private String foreignId; + /** + * + */ + @TableField(value="STREET_ID") + private String streetId; + /** + * 0,"正式运行" 1,"试运行" 2,"停止运行" + */ + @TableField(value="STATUS") + private Integer status; + /** + * 简码 + */ + @TableField(value="SHORT_CODE") + private String shortCode; + /** + * 经度 + */ + @TableField(value="LAT") + private Double lat; + /** + * '纬度 + */ + @TableField(value="LNG") + private Double lng; + /** + * + */ + @TableField(value="LOGO") + private String logo; + /** + * + */ + @TableField(value="IMAGE") + private String image; + /** + * 医院等级 + */ + @TableField(value="GRADE_LEVEL") + private Integer gradeLevel; + /** + * 星级 + */ + @TableField(value="STAR_LEVEL") + private Integer starLevel; + /** + * 服务热线 + */ + @TableField(value="MOBILE") + private String mobile; + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getLevel() { + return level; + } + + public void setLevel(Integer level) { + this.level = level; + } + + public String getProvinceId() { + return provinceId; + } + + public void setProvinceId(String provinceId) { + this.provinceId = provinceId; + } + + public String getCityId() { + return cityId; + } + + public void setCityId(String cityId) { + this.cityId = cityId; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getPublishId() { + return publishId; + } + + public void setPublishId(String publishId) { + this.publishId = publishId; + } + + public Integer getIfdel() { + return ifdel; + } + + public void setIfdel(Integer ifdel) { + this.ifdel = ifdel; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public String getForeignId() { + return foreignId; + } + + public void setForeignId(String foreignId) { + this.foreignId = foreignId; + } + + public String getStreetId() { + return streetId; + } + + public void setStreetId(String streetId) { + this.streetId = streetId; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getShortCode() { + return shortCode; + } + + public void setShortCode(String shortCode) { + this.shortCode = shortCode; + } + + public Double getLat() { + return lat; + } + + public void setLat(Double lat) { + this.lat = lat; + } + + public Double getLng() { + return lng; + } + + public void setLng(Double lng) { + this.lng = lng; + } + + public String getLogo() { + return logo; + } + + public void setLogo(String logo) { + this.logo = logo; + } + + public String getImage() { + return image; + } + + public void setImage(String image) { + this.image = image; + } + + public Integer getGradeLevel() { + return gradeLevel; + } + + public void setGradeLevel(Integer gradeLevel) { + this.gradeLevel = gradeLevel; + } + + public Integer getStarLevel() { + return starLevel; + } + + public void setStarLevel(Integer starLevel) { + this.starLevel = starLevel; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + +} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/organ/package-info.java b/base.common/src/main/java/com/lyms/base/common/entity/organ/package-info.java new file mode 100644 index 0000000..0c8fb7c --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/entity/organ/package-info.java @@ -0,0 +1,8 @@ +/** + *
  • @ClassName: package-info + *
  • @Description: TODO(类描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.entity.organ; \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/entity/region/Regions.java b/base.common/src/main/java/com/lyms/base/common/entity/region/Regions.java new file mode 100644 index 0000000..47c64ff --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/entity/region/Regions.java @@ -0,0 +1,140 @@ +package com.lyms.base.common.entity.region; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; + +/** + *

    + * 省市区地址表 + *

    + * + * @author maliang + * @since 2017-03-08 + */ +@TableName("SYS_REGIONS") +public class Regions implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableField(value = "ID") + private String id; + /** + * + */ + @TableField(value = "PARENT_ID") + private String parentId; + /** + * + */ + @TableField(value = "NAME") + private String name; + /** + * + */ + @TableField(value = "ENABLE") + private Integer enable; + /** + * + */ + @TableField(value = "IFDEL") + private Integer ifdel; + /** + * + */ + @TableField(value = "CODE") + private String code; + /** + * + */ + @TableField(value = "MODIFIE") + private Date modifie; + /** + * + */ + @TableField(value = "CREATED") + private Date created; + /** + * + */ + @TableField(value = "FOREIGN_ID") + private String foreignId; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getEnable() { + return enable; + } + + public void setEnable(Integer enable) { + this.enable = enable; + } + + public Integer getIfdel() { + return ifdel; + } + + public void setIfdel(Integer ifdel) { + this.ifdel = ifdel; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public Date getModifie() { + return modifie; + } + + public void setModifie(Date modifie) { + this.modifie = modifie; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public String getForeignId() { + return foreignId; + } + + public void setForeignId(String foreignId) { + this.foreignId = foreignId; + } + +} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/region/package-info.java b/base.common/src/main/java/com/lyms/base/common/entity/region/package-info.java new file mode 100644 index 0000000..ac47789 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/entity/region/package-info.java @@ -0,0 +1,8 @@ +/** + *
  • @ClassName: package-info + *
  • @Description: TODO(类描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.entity.region; \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/entity/role/Permissions.java b/base.common/src/main/java/com/lyms/base/common/entity/role/Permissions.java new file mode 100644 index 0000000..4d75171 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/entity/role/Permissions.java @@ -0,0 +1,168 @@ +package com.lyms.base.common.entity.role; + +import java.io.Serializable; + +import org.apache.ibatis.type.Alias; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; + +/** + *

    + * 权限表 + *

    + * + * @author fangcheng + * @since 2017-03-08 + */ +@Alias(value = "Permissions") +@TableName("SYS_PERMISSIONS") +public class Permissions implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableField(value = "ID") + private String id; + /** + * + */ + @TableField(value = "NAME") + private String name; + /** + * + */ + @TableField(value = "URI") + private String uri; + /** + * + */ + @TableField(value = "TYPE") + private Integer type; + /** + * + */ + @TableField(value = "PURI") + private String puri; + /** + * + */ + @TableField(value = "ICON") + private String icon; + /** + * + */ + @TableField(value = "IFDEL") + private Integer ifdel; + /** + * + */ + @TableField(value = "ENABLE") + private Integer enable; + /** + * + */ + @TableField(value = "EXTRA_DATA") + private String extraData; + /** + * + */ + @TableField(value = "WEIGHT") + private Integer weight; + /** + * + */ + @TableField(value = "FOREIGN_ID") + private String foreignId; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getPuri() { + return puri; + } + + public void setPuri(String puri) { + this.puri = puri; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public Integer getIfdel() { + return ifdel; + } + + public void setIfdel(Integer ifdel) { + this.ifdel = ifdel; + } + + public Integer getEnable() { + return enable; + } + + public void setEnable(Integer enable) { + this.enable = enable; + } + + public String getExtraData() { + return extraData; + } + + public void setExtraData(String extraData) { + this.extraData = extraData; + } + + public Integer getWeight() { + return weight; + } + + public void setWeight(Integer weight) { + this.weight = weight; + } + + public String getForeignId() { + return foreignId; + } + + public void setForeignId(String foreignId) { + this.foreignId = foreignId; + } + +} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/role/RolePermissionMaps.java b/base.common/src/main/java/com/lyms/base/common/entity/role/RolePermissionMaps.java new file mode 100644 index 0000000..b33ee4e --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/entity/role/RolePermissionMaps.java @@ -0,0 +1,75 @@ +package com.lyms.base.common.entity.role; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; + +/** + *

    + * 角色权限映射表 + *

    + * + * @author fangcheng + * @since 2017-03-08 + */ +@TableName("SYS_ROLE_PERMISSION_MAPS") +public class RolePermissionMaps implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableField(value="ID") + private String id; + /** + * + */ + @TableField(value="ROLE_ID") + private String roleId; + /** + * + */ + @TableField(value="PERMISSION_ID") + private String permissionId; + /** + * + */ + @TableField(value="IFDEL") + private Integer ifdel; + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getRoleId() { + return roleId; + } + + public void setRoleId(String roleId) { + this.roleId = roleId; + } + + public String getPermissionId() { + return permissionId; + } + + public void setPermissionId(String permissionId) { + this.permissionId = permissionId; + } + + public Integer getIfdel() { + return ifdel; + } + + public void setIfdel(Integer ifdel) { + this.ifdel = ifdel; + } + +} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/role/Roles.java b/base.common/src/main/java/com/lyms/base/common/entity/role/Roles.java new file mode 100644 index 0000000..3d3fbd5 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/entity/role/Roles.java @@ -0,0 +1,180 @@ +package com.lyms.base.common.entity.role; + +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; +import java.util.Date; + +/** + *

    + * 角色表 + *

    + * + * @author fangcheng + * @since 2017-03-10 + */ +@TableName("SYS_ROLES") +public class Roles implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value="ID") + private String id; + /** + * 0:管理员角色,1:用户角色 + */ + @TableField(value="TYPE") + private Integer type; + /** + * 角色名称 + */ + @TableField(value="NAME") + private String name; + /** + * 备注 + */ + @TableField(value="REMARKS") + private String remarks; + /** + * 简码 + */ + @TableField(value="SHORT_CODE") + private String shortCode; + /** + * 机构id + */ + @TableField(value="ORG_ID") + private String orgId; + /** + * + */ + @TableField(value="CREATE_ID") + private String createId; + /** + * + */ + @TableField(value="CREATE_TIME") + private Date createTime; + /** + * + */ + @TableField(value="MODIFY_ID") + private String modifyId; + /** + * + */ + @TableField(value="MODIFY_TIME") + private Date modifyTime; + /** + * + */ + @TableField(value="IFDEL") + private Integer ifdel; + /** + * + */ + @TableField(value="ENABLE") + private Integer enable; + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public String getShortCode() { + return shortCode; + } + + public void setShortCode(String shortCode) { + this.shortCode = shortCode; + } + + public String getOrgId() { + return orgId; + } + + public void setOrgId(String orgId) { + this.orgId = orgId; + } + + public String getCreateId() { + return createId; + } + + public void setCreateId(String createId) { + this.createId = createId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getModifyId() { + return modifyId; + } + + public void setModifyId(String modifyId) { + this.modifyId = modifyId; + } + + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + public Integer getIfdel() { + return ifdel; + } + + public void setIfdel(Integer ifdel) { + this.ifdel = ifdel; + } + + public Integer getEnable() { + return enable; + } + + public void setEnable(Integer enable) { + this.enable = enable; + } + +} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/role/UserRoleMaps.java b/base.common/src/main/java/com/lyms/base/common/entity/role/UserRoleMaps.java new file mode 100644 index 0000000..b440d70 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/entity/role/UserRoleMaps.java @@ -0,0 +1,75 @@ +package com.lyms.base.common.entity.role; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; + +/** + *

    + * 用户角色关系表 + *

    + * + * @author fangcheng + * @since 2017-03-07 + */ +@TableName("SYS_USER_ROLE_MAPS") +public class UserRoleMaps implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableField(value="ID") + private String id; + /** + * + */ + @TableField(value="USER_ID") + private String userId; + /** + * + */ + @TableField(value="ROLE_ID") + private String roleId; + /** + * + */ + @TableField(value="IFDEL") + private Integer ifdel; + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getRoleId() { + return roleId; + } + + public void setRoleId(String roleId) { + this.roleId = roleId; + } + + public Integer getIfdel() { + return ifdel; + } + + public void setIfdel(Integer ifdel) { + this.ifdel = ifdel; + } + +} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/role/package-info.java b/base.common/src/main/java/com/lyms/base/common/entity/role/package-info.java new file mode 100644 index 0000000..ff1799c --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/entity/role/package-info.java @@ -0,0 +1,15 @@ +/** + *
  • @Title: package-info.java + *
  • @Package com.lyms.base.common.entity.role + *
  • @Description: TODO(文件描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + */ +/** + *
  • @ClassName: package-info + *
  • @Description: TODO(类描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.entity.role; \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/entity/user/Users.java b/base.common/src/main/java/com/lyms/base/common/entity/user/Users.java new file mode 100644 index 0000000..4d0f23c --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/entity/user/Users.java @@ -0,0 +1,338 @@ +package com.lyms.base.common.entity.user; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; + +/** + *

    + * 用户表 + *

    + * + * @author fangcheng + * @since 2017-03-08 + */ +@TableName("SYS_USERS") +public class Users implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "ID") + private String id; + /** + * 0:管理员,1:用户 + */ + @TableField(value = "TYPE") + private Integer type; + /** + * 名称 + */ + @TableField(value = "NAME") + private String name; + /** + * 帐号 + */ + @TableField(value = "ACCOUNT") + private String account; + /** + * 机构id + */ + @TableField(value = "ORG_ID") + private String orgId; + /** + * 部门id + */ + @TableField(value = "DEPT_ID") + private String deptId; + /** + * 名字 + */ + @TableField(value = "PWD") + private String pwd; + /** + * 手机号 + */ + @TableField(value = "PHONE") + private String phone; + /** + * 备注 + */ + @TableField(value = "REMARKS") + private String remarks; + /** + * 最后登录时间 + */ + @TableField(value = "LAST_LOGIN_TIME") + private Date lastLoginTime; + /** + * 导入数据的源id + */ + @TableField(value = "FOREIGN_ID") + private String foreignId; + /** + * 医院的帐号 + */ + @TableField(value = "OTHER_ACCOUNT") + private String otherAccount; + /** + * + */ + @TableField(value = "EMPLOYEE_ID") + private String employeeId; + /** + * + */ + @TableField(value = "EXPIR_TIME") + private Date expirTime; + /** + * + */ + @TableField(value = "LEVEL") + private Integer level; + /** + * + */ + @TableField(value = "AVATAR") + private String avatar; + /** + * + */ + @TableField(value = "WORK_TIME") + private String workTime; + /** + * + */ + @TableField(value = "GOOD_AT") + private String goodAt; + /** + * + */ + @TableField(value = "CREATE_ID") + private String createId; + /** + * + */ + @TableField(value = "CREATE_TIME") + private Date createTime; + /** + * + */ + @TableField(value = "MODIFY_ID") + private String modifyId; + /** + * + */ + @TableField(value = "MODIFY_TIME") + private Date modifyTime; + /** + * + */ + @TableField(value = "IFDEL") + private Integer ifdel; + /** + * + */ + @TableField(value = "ENABLE") + private Integer enable; + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getOrgId() { + return orgId; + } + + public void setOrgId(String orgId) { + this.orgId = orgId; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getPwd() { + return pwd; + } + + public void setPwd(String pwd) { + this.pwd = pwd; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getRemarks() { + return remarks; + } + + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + public Date getLastLoginTime() { + return lastLoginTime; + } + + public void setLastLoginTime(Date lastLoginTime) { + this.lastLoginTime = lastLoginTime; + } + + public String getForeignId() { + return foreignId; + } + + public void setForeignId(String foreignId) { + this.foreignId = foreignId; + } + + public String getOtherAccount() { + return otherAccount; + } + + public void setOtherAccount(String otherAccount) { + this.otherAccount = otherAccount; + } + + public String getEmployeeId() { + return employeeId; + } + + public void setEmployeeId(String employeeId) { + this.employeeId = employeeId; + } + + public Date getExpirTime() { + return expirTime; + } + + public void setExpirTime(Date expirTime) { + this.expirTime = expirTime; + } + + public Integer getLevel() { + return level; + } + + public void setLevel(Integer level) { + this.level = level; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getWorkTime() { + return workTime; + } + + public void setWorkTime(String workTime) { + this.workTime = workTime; + } + + public String getGoodAt() { + return goodAt; + } + + public void setGoodAt(String goodAt) { + this.goodAt = goodAt; + } + + public String getCreateId() { + return createId; + } + + public void setCreateId(String createId) { + this.createId = createId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getModifyId() { + return modifyId; + } + + public void setModifyId(String modifyId) { + this.modifyId = modifyId; + } + + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + public Integer getIfdel() { + return ifdel; + } + + public void setIfdel(Integer ifdel) { + this.ifdel = ifdel; + } + + public Integer getEnable() { + return enable; + } + + public void setEnable(Integer enable) { + this.enable = enable; + } + + +} diff --git a/base.common/src/main/java/com/lyms/base/common/entity/user/package-info.java b/base.common/src/main/java/com/lyms/base/common/entity/user/package-info.java new file mode 100644 index 0000000..28e81f3 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/entity/user/package-info.java @@ -0,0 +1,15 @@ +/** + *
  • @Title: package-info.java + *
  • @Package com.lyms.base.common.entity.user + *
  • @Description: TODO(文件描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + */ +/** + *
  • @ClassName: package-info + *
  • @Description: TODO(类描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.entity.user; \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/enums/PermissionEnum.java b/base.common/src/main/java/com/lyms/base/common/enums/PermissionEnum.java new file mode 100644 index 0000000..d0ec390 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/enums/PermissionEnum.java @@ -0,0 +1,23 @@ +package com.lyms.base.common.enums; + +public enum PermissionEnum { + + /** + * 中心根节点 + */ + CENTER_MANAGER_ROOT("center"), + /** + * 院内根节点 + */ + HOSPITAL_ROOT("hospital"); + + private String code; + + private PermissionEnum(String code) { + this.code = code; + } + + public String getCode() { + return code; + } +} diff --git a/base.common/src/main/java/com/lyms/base/common/enums/RoleType.java b/base.common/src/main/java/com/lyms/base/common/enums/RoleType.java new file mode 100644 index 0000000..f3917f9 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/enums/RoleType.java @@ -0,0 +1,22 @@ +package com.lyms.base.common.enums; + +/** + * 角色类型 + * + * @author maliang + * + */ +public enum RoleType { + + SYSTEM(0), USER(1); + + private int code; + + private RoleType(int code) { + this.code = code; + } + + public int getCode() { + return code; + } +} diff --git a/base.common/src/main/java/com/lyms/base/common/enums/StatusEnum.java b/base.common/src/main/java/com/lyms/base/common/enums/StatusEnum.java new file mode 100644 index 0000000..5f43b9b --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/enums/StatusEnum.java @@ -0,0 +1,34 @@ +package com.lyms.base.common.enums; + +/** + * 用户状态标识 + * + * @author maliang + * + */ +public enum StatusEnum { + + // 启用 + ENABLED(1), + // 禁用 + DISENABLED(2); + + private int status; + + private StatusEnum(int status) { + this.status = status; + } + + public int getStatus() { + return this.status; + } + + public static boolean isEnabled(Integer status) { + return status != null && ENABLED.getStatus() == status; + } + + public static boolean isDisEnabled(Integer status) { + return status != null && DISENABLED.getStatus() == status; + } + +} diff --git a/base.common/src/main/java/com/lyms/base/common/enums/TypeEnum.java b/base.common/src/main/java/com/lyms/base/common/enums/TypeEnum.java new file mode 100644 index 0000000..c9d3254 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/enums/TypeEnum.java @@ -0,0 +1,31 @@ +package com.lyms.base.common.enums; + +/** + * 用户类型 + * + * @author maliang + * + */ +public enum TypeEnum { + + // 管理员 + MANAGER(0), + // 用户 + USER(1); + + private int type; + + private TypeEnum(int type) { + this.type = type; + } + + /** + * 获取类型 + * + * @return + */ + public int getType() { + return this.type; + } + +} diff --git a/base.common/src/main/java/com/lyms/base/common/enums/ValidityEnum.java b/base.common/src/main/java/com/lyms/base/common/enums/ValidityEnum.java new file mode 100644 index 0000000..c0fb4d2 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/enums/ValidityEnum.java @@ -0,0 +1,26 @@ +package com.lyms.base.common.enums; + +/** + * 用户是否有效 + * + * @author maliang + * + */ +public enum ValidityEnum { + + // 有效 + VALIDITY(0), + // 无效 + UNVALIDITY(1); + + private int validity; + + private ValidityEnum(int validity) { + this.validity = validity; + } + + public int getValidity() { + return this.validity; + } + +} diff --git a/base.common/src/main/java/com/lyms/base/common/enums/package-info.java b/base.common/src/main/java/com/lyms/base/common/enums/package-info.java new file mode 100644 index 0000000..de63751 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/enums/package-info.java @@ -0,0 +1,8 @@ +/** + *
  • @ClassName: package-info + *
  • @Description: TODO(类描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.enums; \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/service/organ/DepartmentsService.java b/base.common/src/main/java/com/lyms/base/common/service/organ/DepartmentsService.java new file mode 100644 index 0000000..b351616 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/organ/DepartmentsService.java @@ -0,0 +1,59 @@ +package com.lyms.base.common.service.organ; + +import java.io.Serializable; + +import com.lyms.base.common.entity.organ.Departments; +import com.lyms.exception.SystemException; +import com.lyms.web.service.BaseService; + +/** + *

    + * 服务类 + *

    + * + * @author maliang + * @since 2017-03-08 + */ +public interface DepartmentsService extends BaseService { + + /** + *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 + *
  • @param id 删除主键id + *
  • @return 大于0修改成功，否则为失败 + */ + public Integer deleteLogicById(Serializable id); + + /** + *
  • @Description:添加机构/部门信息 + *
  • @param departments + *
  • @return + *
  • 创建人：maliang + *
  • 创建时间：2017年3月9日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean createDepart(Departments departments) throws SystemException; + + /** + *
  • @Description:删除机构/部门信息 + *
  • @param id + *
  • @return + *
  • 创建人：maliang + *
  • 创建时间：2017年3月9日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean deleteDepartById(String id) throws SystemException; + + /** + *
  • @Description:修改部门/机构信息 + *
  • @param departments + *
  • @return + *
  • 创建人：maliang + *
  • 创建时间：2017年3月9日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean updateDepart(Departments departments) throws SystemException; + +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupService.java b/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupService.java new file mode 100644 index 0000000..481eb76 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/organ/OrganGroupService.java @@ -0,0 +1,62 @@ +package com.lyms.base.common.service.organ; + +import java.io.Serializable; + +import com.lyms.base.common.entity.organ.OrganGroup; +import com.lyms.exception.SystemException; +import com.lyms.web.service.BaseService; + +/** + *

    + * 服务类 + *

    + * + * @author maliang + * @since 2017-03-09 + */ +public interface OrganGroupService extends BaseService { + + /** + *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 + *
  • @param id 删除主键id + *
  • @return 大于0修改成功，否则为失败 + */ + public Integer deleteLogicById(Serializable id); + + /** + *
  • @Description:创建机构组 + *
  • @param organGroup + *
  • @return + *
  • @throws SystemException + *
  • 创建人：maliang + *
  • 创建时间：2017年3月9日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean create(OrganGroup organGroup) throws SystemException; + + /** + *
  • @Description:根据ID删除机构信息 + *
  • @param groupId + *
  • @return + *
  • @throws SystemException + *
  • 创建人：maliang + *
  • 创建时间：2017年3月9日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean deleteGroupById(String groupId) throws SystemException; + + /** + *
  • @Description:修改机构组信息 + *
  • @param organGrooup + *
  • @return + *
  • @throws SystemException + *
  • 创建人：maliang + *
  • 创建时间：2017年3月9日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean updateGroup(OrganGroup organGrooup) throws SystemException; + +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/organ/OrganizationsService.java b/base.common/src/main/java/com/lyms/base/common/service/organ/OrganizationsService.java new file mode 100644 index 0000000..1be74da --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/organ/OrganizationsService.java @@ -0,0 +1,63 @@ +package com.lyms.base.common.service.organ; + +import java.io.Serializable; + +import com.lyms.base.common.entity.organ.Organizations; +import com.lyms.exception.SystemException; +import com.lyms.web.service.BaseService; + +/** + *

    + * 服务类 + *

    + * + * @author maliang + * @since 2017-03-08 + */ +public interface OrganizationsService extends BaseService { + + /** + *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 + *
  • @param id 删除主键id + *
  • @return 大于0修改成功，否则为失败 + */ + public Integer deleteLogicById(Serializable id); + + /** + *
  • @Description:添加机构信息 + *
  • @param organizations + *
  • @return + *
  • @throws SystemException + *
  • 创建人：maliang + *
  • 创建时间：2017年3月8日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean addOrg(Organizations organizations) throws SystemException; + + /** + * 修改机构信息 + *
  • @Description:TODO(方法描述) + *
  • @param organizations + *
  • @return + *
  • @throws SystemException + *
  • 创建人：maliang + *
  • 创建时间：2017年3月8日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean updateOrg(Organizations organizations) throws SystemException; + + /** + *
  • @Description:根据ID删除 + *
  • @param id + *
  • @return + *
  • @throws SystemException + *
  • 创建人：maliang + *
  • 创建时间：2017年3月8日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean deleteOrganById(String id) throws SystemException; + +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/organ/impl/DepartmentsServiceImpl.java b/base.common/src/main/java/com/lyms/base/common/service/organ/impl/DepartmentsServiceImpl.java new file mode 100644 index 0000000..14cf1bf --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/organ/impl/DepartmentsServiceImpl.java @@ -0,0 +1,56 @@ +package com.lyms.base.common.service.organ.impl; + +import java.io.Serializable; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.base.common.dao.organ.DepartmentsMapper; +import com.lyms.base.common.entity.organ.Departments; +import com.lyms.base.common.service.organ.DepartmentsService; +import com.lyms.exception.SystemException; + +/** + *

    + * 部门 科室表 服务实现类 + *

    + * + * @author maliang + * @since 2017-03-08 + */ +@Service +public class DepartmentsServiceImpl extends ServiceImpl implements DepartmentsService { + + public Integer deleteLogicById(Serializable id) { + return baseMapper.deleteLogicById(id); + } + + @Override + @Transactional + public boolean createDepart(Departments departments) throws SystemException { + if (departments == null) + return false; + Integer tag = baseMapper.insert(departments); + return tag != null && tag >= 1; + } + + @Override + @Transactional + public boolean deleteDepartById(String id) throws SystemException { + if (StringUtils.isBlank(id)) + return false; + Integer tag = baseMapper.deleteLogicById(id); + return tag != null && tag > 0; + } + + @Override + @Transactional + public boolean updateDepart(Departments departments) throws SystemException { + if (departments == null) + return false; + Integer tag = baseMapper.updateById(departments); + return tag != null && tag > 0; + } +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java b/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java new file mode 100644 index 0000000..47f6da6 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganGroupServiceImpl.java @@ -0,0 +1,62 @@ +package com.lyms.base.common.service.organ.impl; + +import java.io.Serializable; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.base.common.dao.organ.OrganGroupMapper; +import com.lyms.base.common.entity.organ.OrganGroup; +import com.lyms.base.common.service.organ.OrganGroupService; +import com.lyms.exception.SystemException; + +/** + *

    + * 服务实现类 + *

    + * + * @author maliang + * @since 2017-03-09 + */ +@Service +public class OrganGroupServiceImpl extends ServiceImpl implements OrganGroupService { + + public Integer deleteLogicById(Serializable id) { + return baseMapper.deleteLogicById(id); + } + + @Override + @Transactional + public boolean create(OrganGroup organGroup) throws SystemException { + + if (organGroup == null) + return false; + Integer tag = baseMapper.insert(organGroup); + return tag != null && tag > 0; + + } + + @Override + @Transactional + public boolean deleteGroupById(String groupId) throws SystemException { + + if (StringUtils.isBlank(groupId)) + return false; + Integer tag = baseMapper.deleteById(groupId); + return tag != null && tag > 0; + + } + + @Override + @Transactional + public boolean updateGroup(OrganGroup organGroup) throws SystemException { + + if (organGroup == null) + return false; + Integer tag = baseMapper.updateById(organGroup); + return tag != null && tag > 0; + + } +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java b/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java new file mode 100644 index 0000000..6c9f403 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/organ/impl/OrganizationsServiceImpl.java @@ -0,0 +1,57 @@ +package com.lyms.base.common.service.organ.impl; + +import java.io.Serializable; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.base.common.dao.organ.OrganizationsMapper; +import com.lyms.base.common.entity.organ.Organizations; +import com.lyms.base.common.service.organ.OrganizationsService; +import com.lyms.exception.SystemException; +import com.lyms.util.StrUtils; + +/** + *

    + * 机构表 服务实现类 + *

    + * + * @author maliang + * @since 2017-03-08 + */ +@Service +public class OrganizationsServiceImpl extends ServiceImpl + implements OrganizationsService { + + public Integer deleteLogicById(Serializable id) { + return baseMapper.deleteLogicById(id); + } + + @Override + @Transactional + public boolean addOrg(Organizations organizations) throws SystemException { + if (organizations == null) + return false; + organizations.setId(StrUtils.uuid()); + Integer tag = baseMapper.insert(organizations); + return tag != null && tag >= 1; + } + + @Override + @Transactional + public boolean updateOrg(Organizations organizations) throws SystemException { + if (organizations == null) + return false; + Integer tag = baseMapper.updateById(organizations); + return tag != null && tag >= 1; + } + + @Override + @Transactional + public boolean deleteOrganById(String id) throws SystemException { + Integer tag = baseMapper.deleteLogicById(id); + return tag != null && tag >= 1; + } + +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/organ/impl/package-info.java b/base.common/src/main/java/com/lyms/base/common/service/organ/impl/package-info.java new file mode 100644 index 0000000..d7ad8cf --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/organ/impl/package-info.java @@ -0,0 +1,15 @@ +/** + *
  • @Title: package-info.java + *
  • @Package com.lyms.base.common.service.organ.impl + *
  • @Description: TODO(文件描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + */ +/** + *
  • @ClassName: package-info + *
  • @Description: TODO(类描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.service.organ.impl; \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/service/organ/package-info.java b/base.common/src/main/java/com/lyms/base/common/service/organ/package-info.java new file mode 100644 index 0000000..0a26af6 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/organ/package-info.java @@ -0,0 +1,15 @@ +/** + *
  • @Title: package-info.java + *
  • @Package com.lyms.base.common.service.organ + *
  • @Description: TODO(文件描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + */ +/** + *
  • @ClassName: package-info + *
  • @Description: TODO(类描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.service.organ; \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/service/region/RegionsService.java b/base.common/src/main/java/com/lyms/base/common/service/region/RegionsService.java new file mode 100644 index 0000000..f165f73 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/region/RegionsService.java @@ -0,0 +1,39 @@ +package com.lyms.base.common.service.region; + +import java.io.Serializable; +import java.util.List; + +import com.lyms.base.common.entity.region.Regions; +import com.lyms.web.service.BaseService; + +/** + *

    + * 服务类 + *

    + * + * @author maliang + * @since 2017-03-08 + */ +public interface RegionsService extends BaseService { + + public static final String NOT_PARENT_TAG = "f6c505dd-835a-43d7-b0bb-fdb9eb0b7b31"; + + /** + *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 + *
  • @param id 删除主键id + *
  • @return 大于0修改成功，否则为失败 + */ + public Integer deleteLogicById(Serializable id); + + /** + *
  • @Description:获取区域信息 + *
  • @param id id为空，获取所有一级区域，不为空，获取parentId = id 的子区域 + *
  • @return + *
  • 创建人：maliang + *
  • 创建时间：2017年3月8日 + *
  • 修改人： + *
  • 修改时间： + */ + public List selectRegions(String id); + +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/region/impl/RegionsServiceImpl.java b/base.common/src/main/java/com/lyms/base/common/service/region/impl/RegionsServiceImpl.java new file mode 100644 index 0000000..8bb8249 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/region/impl/RegionsServiceImpl.java @@ -0,0 +1,40 @@ +package com.lyms.base.common.service.region.impl; + +import java.io.Serializable; +import java.util.List; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.base.common.dao.region.RegionsMapper; +import com.lyms.base.common.entity.region.Regions; +import com.lyms.base.common.service.region.RegionsService; + +/** + *

    + * 省市区地址表 服务实现类 + *

    + * + * @author maliang + * @since 2017-03-08 + */ +@Service +public class RegionsServiceImpl extends ServiceImpl implements RegionsService { + + @Autowired + private RegionsMapper regionsMapper; + + public Integer deleteLogicById(Serializable id) { + return baseMapper.deleteLogicById(id); + } + + @Override + public List selectRegions(String id) { + if (StringUtils.isBlank(id)) { + id = NOT_PARENT_TAG; + } + return regionsMapper.selectRegionsById(id); + } +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/region/impl/package-info.java b/base.common/src/main/java/com/lyms/base/common/service/region/impl/package-info.java new file mode 100644 index 0000000..90232a9 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/region/impl/package-info.java @@ -0,0 +1,8 @@ +/** + *
  • @ClassName: package-info + *
  • @Description: TODO(类描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.service.region.impl; \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/service/region/package-info.java b/base.common/src/main/java/com/lyms/base/common/service/region/package-info.java new file mode 100644 index 0000000..265e39d --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/region/package-info.java @@ -0,0 +1,15 @@ +/** + *
  • @Title: package-info.java + *
  • @Package com.lyms.base.common.service.region + *
  • @Description: TODO(文件描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + */ +/** + *
  • @ClassName: package-info + *
  • @Description: TODO(类描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.service.region; \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/service/role/PermissionsService.java b/base.common/src/main/java/com/lyms/base/common/service/role/PermissionsService.java new file mode 100644 index 0000000..c52d422 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/role/PermissionsService.java @@ -0,0 +1,52 @@ +package com.lyms.base.common.service.role; + +import java.io.Serializable; +import java.util.List; +import java.util.Set; + +import com.lyms.base.common.dao.role.TreeNode; +import com.lyms.base.common.entity.role.Permissions; +import com.lyms.base.common.entity.user.Users; +import com.lyms.web.service.BaseService; + +/** + *

    + * 服务类 + *

    + * + * @author fangcheng + * @since 2017-03-08 + */ +public interface PermissionsService extends BaseService { + + /** + *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 + *
  • @param id 删除主键id + *
  • @return 大于0修改成功，否则为失败 + */ + public Integer deleteLogicById(Serializable id); + + /** + *
  • @Description:根据puri和user的id获取所有有权限的菜单 + *
  • @param puri + *
  • @param user + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年3月10日 + *
  • 修改人： + *
  • 修改时间： + */ + public List getPermissionMenuTreeByPuri(String puri, Users user); + + /** + *
  • @Description:权限列表Set，方便Shiro使用 + *
  • @param uid + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年3月9日 + *
  • 修改人： + *
  • 修改时间： + */ + public Set getUserPermissionSet(String uid); + +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/role/RolePermissionMapsService.java b/base.common/src/main/java/com/lyms/base/common/service/role/RolePermissionMapsService.java new file mode 100644 index 0000000..2e16617 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/role/RolePermissionMapsService.java @@ -0,0 +1,25 @@ +package com.lyms.base.common.service.role; + +import java.io.Serializable; + +import com.lyms.base.common.entity.role.RolePermissionMaps; +import com.lyms.web.service.BaseService; + +/** + *

    + * 服务类 + *

    + * + * @author fangcheng + * @since 2017-03-08 + */ +public interface RolePermissionMapsService extends BaseService { + + /** + *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 + *
  • @param id 删除主键id + *
  • @return 大于0修改成功，否则为失败 + */ + public Integer deleteLogicById(Serializable id); + +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/role/RolesService.java b/base.common/src/main/java/com/lyms/base/common/service/role/RolesService.java new file mode 100644 index 0000000..b4119b3 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/role/RolesService.java @@ -0,0 +1,51 @@ +package com.lyms.base.common.service.role; + +import java.io.Serializable; +import java.util.List; + +import com.lyms.base.common.entity.role.RolePermissionMaps; +import com.lyms.base.common.entity.role.Roles; +import com.lyms.web.service.BaseService; + +/** + *

    + * 服务类 + *

    + * + * @author maliang + * @since 2017-03-07 + */ +public interface RolesService extends BaseService { + + /** + *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 + *
  • @param id 删除主键id + *
  • @return 大于0修改成功，否则为失败 + */ + public Integer deleteLogicById(Serializable id); + + /** + *
  • @Description:创建角色 + *
  • @param role 基本属性 + *
  • @param rpList 角色权限关系列表 + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年3月8日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean createRole(Roles role, List rpList); + + /** + *
  • @Description:创建角色 + *
  • @param role 基本属性 + *
  • @param rpList 角色权限关系列表 + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年3月8日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean updateRole(Roles role, List rpList); + +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/role/UserRoleMapsService.java b/base.common/src/main/java/com/lyms/base/common/service/role/UserRoleMapsService.java new file mode 100644 index 0000000..0f4a8d6 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/role/UserRoleMapsService.java @@ -0,0 +1,25 @@ +package com.lyms.base.common.service.role; + +import java.io.Serializable; + +import com.lyms.base.common.entity.role.UserRoleMaps; +import com.lyms.web.service.BaseService; + +/** + *

    + * 服务类 + *

    + * + * @author fangcheng + * @since 2017-03-07 + */ +public interface UserRoleMapsService extends BaseService { + + /** + *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 + *
  • @param id 删除主键id + *
  • @return 大于0修改成功，否则为失败 + */ + public Integer deleteLogicById(Serializable id); + +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/role/impl/PermissionsServiceImpl.java b/base.common/src/main/java/com/lyms/base/common/service/role/impl/PermissionsServiceImpl.java new file mode 100644 index 0000000..d97da32 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/role/impl/PermissionsServiceImpl.java @@ -0,0 +1,178 @@ +package com.lyms.base.common.service.role.impl; + +import java.io.Serializable; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.base.common.dao.role.PermissionsMapper; +import com.lyms.base.common.dao.role.TreeNode; +import com.lyms.base.common.entity.role.Permissions; +import com.lyms.base.common.entity.user.Users; +import com.lyms.base.common.service.role.PermissionsService; +import com.lyms.util.InstanceUtils; +import com.lyms.util.StrUtils; + +/** + *

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

    + * + * @author fangcheng + * @since 2017-03-08 + */ +@Service +public class PermissionsServiceImpl extends ServiceImpl implements PermissionsService { + + public Integer deleteLogicById(Serializable id) { + return baseMapper.deleteLogicById(id); + } + + /** + *
  • @Description:根据puri获取所有菜单 + *
  • @param puri + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年3月10日 + *
  • 修改人： + *
  • 修改时间： + */ + public List getAllMenuTreeByPuri(String puri) { + // treenode的id保存的uri，pid保存的puri + List allMenu = baseMapper.getMenuTreeByPuri(puri); + // 迭代获取子节点 + for (TreeNode menuNode : allMenu) { + List subMenu = baseMapper.getMenuTreeByPuri(menuNode.getId() + ""); + if (subMenu != null && subMenu.size() > 0) { + menuNode.setChildren(subMenu); + getSubMenuTreeByNodeList(subMenu); + } + } + return allMenu; + } + + /** + *
  • @Description:迭代处理所有子菜单 + *
  • @param treeNodeList + *
  • 创建人：方承 + *
  • 创建时间：2017年3月10日 + *
  • 修改人： + *
  • 修改时间： + */ + private void getSubMenuTreeByNodeList(List treeNodeList) { + if (treeNodeList != null && treeNodeList.size() > 0) { + // 迭代获取子节点 + for (TreeNode menuNode : treeNodeList) { + List subMenu = baseMapper.getMenuTreeByPuri(menuNode.getId() + ""); + if (subMenu != null && subMenu.size() > 0) { + menuNode.setChildren(subMenu); + getSubMenuTreeByNodeList(subMenu); + } + } + } + } + + @Override + public List getPermissionMenuTreeByPuri(String puri, Users user) { + // 用户权限列表 + Map permissionsMap = getUserPermissionMap(getUserPermissionSet(user.getId())); + // 所有菜单 + List allMenu = getAllMenuTreeByPuri(puri); + // 初始化要返回的有权限的菜单 + List allPermissionMenu = InstanceUtils.newArrayList(); + // 迭代获取子节点 + for (TreeNode menuNode : allMenu) { + if (permissionsMap.get(menuNode.getId()) != null) { + allPermissionMenu.add(menuNode); + List subMenus = baseMapper.getMenuTreeByPuri(menuNode.getId() + ""); + if (subMenus != null && subMenus.size() > 0) { + List permissionSubMenu = InstanceUtils.newArrayList(); + for (TreeNode submenu : subMenus) { + if (permissionsMap.get(submenu.getId()) != null) { + permissionSubMenu.add(submenu); + } + } + menuNode.setChildren(permissionSubMenu); + getPermissionSubMenuTreeByNodeList(permissionSubMenu, permissionsMap); + } + } + } + return allPermissionMenu; + + } + + /** + *
  • @Description:迭代处理获取有权限的子节点 + *
  • @param treeNodeList + *
  • @param permissionMap + *
  • 创建人：方承 + *
  • 创建时间：2017年3月10日 + *
  • 修改人： + *
  • 修改时间： + */ + private void getPermissionSubMenuTreeByNodeList(List treeNodeList, Map permissionMap) { + if (treeNodeList != null && treeNodeList.size() > 0) { + // 迭代获取子节点 + for (TreeNode menuNode : treeNodeList) { + List subMenus = baseMapper.getMenuTreeByPuri(menuNode.getId() + ""); + if (subMenus != null && subMenus.size() > 0) { + List permissionSubMenu = InstanceUtils.newArrayList(); + for (TreeNode subMenu : subMenus) { + if (permissionMap.get(subMenu.getId()) != null) { + permissionSubMenu.add(subMenu); + } + } + menuNode.setChildren(permissionSubMenu); + getPermissionSubMenuTreeByNodeList(permissionSubMenu, permissionMap); + } + } + } + } + + /** + *
  • @Description:根据用户id获取用户所有权限列表 + *
  • @param uid + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年3月9日 + *
  • 修改人： + *
  • 修改时间： + */ + public List getUserPermission(String uid) { + return baseMapper.getUserPermission(uid); + } + + @Override + public Set getUserPermissionSet(String uid) { + Set pSet = InstanceUtils.newHashSet(); + List pList = getUserPermission(uid); + for (Permissions p : pList) { + if (StrUtils.isNotEmpty(p.getUri())) + pSet.add(p.getUri()); + } + return pSet; + } + + /** + *
  • @Description:根据Set获取Map，key存uri + *
  • @param pset + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年3月9日 + *
  • 修改人： + *
  • 修改时间： + */ + private Map getUserPermissionMap(Set pset) { + Map pMap = InstanceUtils.newHashMap(); + Iterator it = pset.iterator(); + while (it.hasNext()) { + pMap.put(it.next(), ""); + } + return pMap; + } + +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/role/impl/RolePermissionMapsServiceImpl.java b/base.common/src/main/java/com/lyms/base/common/service/role/impl/RolePermissionMapsServiceImpl.java new file mode 100644 index 0000000..59e49da --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/role/impl/RolePermissionMapsServiceImpl.java @@ -0,0 +1,27 @@ +package com.lyms.base.common.service.role.impl; + +import java.io.Serializable; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.base.common.dao.role.RolePermissionMapsMapper; +import com.lyms.base.common.entity.role.RolePermissionMaps; +import com.lyms.base.common.service.role.RolePermissionMapsService; + +/** + *

    + * 角色权限映射表 服务实现类 + *

    + * + * @author fangcheng + * @since 2017-03-08 + */ +@Service +public class RolePermissionMapsServiceImpl extends ServiceImpl + implements RolePermissionMapsService { + + public Integer deleteLogicById(Serializable id) { + return baseMapper.deleteLogicById(id); + } +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/role/impl/RolesServiceImpl.java b/base.common/src/main/java/com/lyms/base/common/service/role/impl/RolesServiceImpl.java new file mode 100644 index 0000000..9bfc835 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/role/impl/RolesServiceImpl.java @@ -0,0 +1,57 @@ +package com.lyms.base.common.service.role.impl; + +import java.io.Serializable; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.base.common.dao.role.RolesMapper; +import com.lyms.base.common.entity.role.RolePermissionMaps; +import com.lyms.base.common.entity.role.Roles; +import com.lyms.base.common.service.role.RolePermissionMapsService; +import com.lyms.base.common.service.role.RolesService; + +/** + *

    + * 角色表 服务实现类 + *

    + * + * @author maliang + * @since 2017-03-07 + */ +@Service +public class RolesServiceImpl extends ServiceImpl implements RolesService { + + @Autowired + private RolePermissionMapsService sysRolePermissionMapsService; + + public Integer deleteLogicById(Serializable id) { + return baseMapper.deleteLogicById(id); + } + + @Override + @Transactional + public boolean createRole(Roles role, List rpList) { + baseMapper.insert(role); + sysRolePermissionMapsService.insertBatch(rpList); + return true; + } + + @Override + @Transactional + public boolean updateRole(Roles role, List rpList) { + EntityWrapper ew = new EntityWrapper(); + ew.where("role_id={0}", "'" + role.getId() + "'"); + baseMapper.updateById(role); + sysRolePermissionMapsService.delete(ew); + if (!rpList.isEmpty()) { + sysRolePermissionMapsService.insertBatch(rpList); + } + return true; + } + +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/role/impl/UserRoleMapsServiceImpl.java b/base.common/src/main/java/com/lyms/base/common/service/role/impl/UserRoleMapsServiceImpl.java new file mode 100644 index 0000000..f314318 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/role/impl/UserRoleMapsServiceImpl.java @@ -0,0 +1,27 @@ +package com.lyms.base.common.service.role.impl; + +import java.io.Serializable; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.base.common.dao.role.UserRoleMapsMapper; +import com.lyms.base.common.entity.role.UserRoleMaps; +import com.lyms.base.common.service.role.UserRoleMapsService; + +/** + *

    + * 用户角色关系表 服务实现类 + *

    + * + * @author fangcheng + * @since 2017-03-07 + */ +@Service +public class UserRoleMapsServiceImpl extends ServiceImpl + implements UserRoleMapsService { + + public Integer deleteLogicById(Serializable id) { + return baseMapper.deleteLogicById(id); + } +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/role/impl/package-info.java b/base.common/src/main/java/com/lyms/base/common/service/role/impl/package-info.java new file mode 100644 index 0000000..df4032d --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/role/impl/package-info.java @@ -0,0 +1,8 @@ +/** + *
  • @ClassName: package-info + *
  • @Description: TODO(类描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.service.role.impl; \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/service/role/package-info.java b/base.common/src/main/java/com/lyms/base/common/service/role/package-info.java new file mode 100644 index 0000000..3cfec39 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/role/package-info.java @@ -0,0 +1,15 @@ +/** + *
  • @Title: package-info.java + *
  • @Package com.lyms.base.common.service.role + *
  • @Description: TODO(文件描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + */ +/** + *
  • @ClassName: package-info + *
  • @Description: TODO(类描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.service.role; \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/service/user/UsersService.java b/base.common/src/main/java/com/lyms/base/common/service/user/UsersService.java new file mode 100644 index 0000000..02d6c02 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/user/UsersService.java @@ -0,0 +1,98 @@ +package com.lyms.base.common.service.user; + +import java.io.Serializable; +import java.util.List; + +import com.lyms.base.common.entity.role.UserRoleMaps; +import com.lyms.base.common.entity.user.Users; +import com.lyms.exception.SystemException; +import com.lyms.web.service.BaseService; + +/** + *

    + * 用户服务类 + *

    + * + * @author maliang + * @since 2017-03-02 + */ +public interface UsersService extends BaseService { + + /** + *
  • @Description:根据登录名称查找未逻辑删除用户 + *
  • @param name + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年3月10日 + *
  • 修改人： + *
  • 修改时间： + */ + public Users getUserByUsername(String name); + + /** + * 添加用户 + * + * @param user + * @return + * @author maliang + */ + public boolean addUser(Users user, List userRoleMaps) throws SystemException; + + /** + * 修改用户信息 + * + * @param user + * @return + * @author maliang + */ + public boolean updateUser(Users user, List userRoleMaps) throws SystemException; + + /** + * 根据ID获取用户信息 + * + * @param userId + * @return + * @author maliang + */ + // public SysUsers getUserById(String userId) throws SystemException; + + /** + * 删除用户信息 + * + * @param userId + * @return + * @throws SystemException + */ + public boolean delete(String userId) throws SystemException; + + /** + *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 + *
  • @param id 删除主键id + *
  • @return 大于0修改成功，否则为失败 + */ + public Integer deleteLogicById(Serializable id); + + /** + *
  • @Description:是否允许添加和修改 + *
  • @param account 登录账户 + *
  • @param userid 如果不为null，则是修改， 否则为新增 + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年3月9日 + *
  • 修改人： + *
  • 修改时间： + */ + public boolean isAllowUpdate(String account, String userid); + + /** + *
  • @Description:根据用户id获取角色id列表 + *
  • @param uid + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年3月10日 + *
  • 修改人： + *
  • 修改时间： + */ + public List getRoleIdListByUserid(String uid); + +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java b/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java new file mode 100644 index 0000000..811a87b --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/user/impl/UsersServiceImpl.java @@ -0,0 +1,195 @@ +package com.lyms.base.common.service.user.impl; + +import java.io.Serializable; +import java.util.List; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.lyms.base.common.dao.user.UsersMapper; +import com.lyms.base.common.entity.role.UserRoleMaps; +import com.lyms.base.common.entity.user.Users; +import com.lyms.base.common.enums.ValidityEnum; +import com.lyms.base.common.service.role.UserRoleMapsService; +import com.lyms.base.common.service.user.UsersService; +import com.lyms.exception.SystemException; +import com.lyms.util.InstanceUtils; +import com.lyms.util.MD5Utils; +import com.lyms.util.StrUtils; + +/** + *

    + * 用户表 服务实现类 + *

    + * + * @author maliang + * @since 2017-03-02 + */ +@Service +public class UsersServiceImpl extends ServiceImpl implements UsersService { + + @Autowired + private UsersMapper userMapper; + + @Autowired + private UserRoleMapsService sysUserRoleMapsService; + + /** + * 系统默认密码 + */ + private static final String DEFAULT_PWD = "123456"; + + // 模块基础操作信息 + private boolean empty(Users user) { + return user == null; + } + + /** + * 初始密码设置 + */ + private void initPwd(Users user) { + if (empty(user)) + return; + String pwd = user.getPwd(); + if (StringUtils.isBlank(pwd)) { + pwd = DEFAULT_PWD; + } + String encode = MD5Utils.md5(pwd); + user.setPwd(encode); + } + + @Override + @Transactional + public boolean addUser(Users user, List userRoleMapsList) throws SystemException { + if (empty(user)) + return false; + // 设置user ID + user.setIfdel(0); + if (null == user.getType()) {// 没有勾选管理，就是用户 + user.setType(1); + } + if (null == user.getEnable()) { + user.setEnable(1); + } + // 设置用户密码 + this.initPwd(user); + + Integer tag = userMapper.insert(user); + if (userRoleMapsList != null && !userRoleMapsList.isEmpty()) { + sysUserRoleMapsService.insertBatch(userRoleMapsList); + } + return tag != null && tag >= 1; + } + + @Override + @Transactional + public boolean updateUser(Users user, List userRoleMapsList) throws SystemException { + if (empty(user)) + return false; + if (null == user.getType()) {// 没有勾选管理，就是用户 + user.setType(1); + } + if (null == user.getEnable()) { + user.setEnable(1); + } + if (StrUtils.isNotEmpty(user.getPwd())) { + // 初始密码 + this.initPwd(user); + } + + Integer tag = userMapper.updateById(user); + EntityWrapper ew = new EntityWrapper(); + ew.where("user_id={0}", "'" + user.getId() + "'"); + sysUserRoleMapsService.delete(ew); + if (!userRoleMapsList.isEmpty()) { + sysUserRoleMapsService.insertBatch(userRoleMapsList); + } + return tag != null && tag >= 1; + } + + /* + * @Override public SysUsers getUserById(String userId) throws + * SystemException { if (StringUtils.isBlank(userId)) return null; return + * userMapper.selectById(userId); } + */ + + @Override + @Transactional + public boolean delete(String userId) throws SystemException { + + if (StringUtils.isBlank(userId)) + return false; + // TODO 通过sql 修改 + Users user = userMapper.selectById(userId); + if (user != null) { + Integer ifDel = user.getIfdel(); + if (ifDel == null || ifDel == ValidityEnum.VALIDITY.getValidity()) { + ifDel = ValidityEnum.UNVALIDITY.getValidity(); + } else { + ifDel = ValidityEnum.VALIDITY.getValidity(); + } + user.setIfdel(ifDel); + Integer tag = userMapper.updateById(user); + return tag != null && tag >= 1; + } + return false; + } + + @Override + public Integer deleteLogicById(Serializable id) { + return baseMapper.deleteLogicById(id); + } + + @Override + public boolean isAllowUpdate(String account, String userid) { + boolean flag = true; + if (StrUtils.isNotEmpty(userid)) {// 修改用户 + Users oldDbUser = selectById(userid); + if (!oldDbUser.getAccount().equalsIgnoreCase(account)) {// 登录账号改变 + flag = !isExistAccount(account); + } + } else {// 新增 + flag = !isExistAccount(account); + } + return flag; + } + + /** + *
  • @Description:是否存在登录名 + *
  • @param account + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年3月9日 + *
  • 修改人： + *
  • 修改时间： + */ + private boolean isExistAccount(String account) { + Users entity = selectOne(new EntityWrapper().where("account={0}", "'" + account + "'").and("ifDel=0")); + if (null == entity) { + return false; + } + return true; + } + + @Override + public Users getUserByUsername(String name) { + Users user = selectOne(new EntityWrapper().where("account={0}", name).and("ifDel=0")); + return user; + } + + @Override + public List getRoleIdListByUserid(String uid) { + List urList = sysUserRoleMapsService + .selectList(new EntityWrapper().where("user_id={0}", uid)); + List roleIdList = InstanceUtils.newArrayList(); + for (UserRoleMaps ur : urList) { + roleIdList.add(ur.getRoleId()); + } + return roleIdList; + } + +} diff --git a/base.common/src/main/java/com/lyms/base/common/service/user/impl/package-info.java b/base.common/src/main/java/com/lyms/base/common/service/user/impl/package-info.java new file mode 100644 index 0000000..4ee0a63 --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/user/impl/package-info.java @@ -0,0 +1,8 @@ +/** + *
  • @ClassName: package-info + *
  • @Description: TODO(类描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.service.user.impl; \ No newline at end of file diff --git a/base.common/src/main/java/com/lyms/base/common/service/user/package-info.java b/base.common/src/main/java/com/lyms/base/common/service/user/package-info.java new file mode 100644 index 0000000..c1da02e --- /dev/null +++ b/base.common/src/main/java/com/lyms/base/common/service/user/package-info.java @@ -0,0 +1,8 @@ +/** + *
  • @ClassName: package-info + *
  • @Description: TODO(类描述) + *
  • @author maliang + *
  • @date 2017年3月20日 + *
  • + */ +package com.lyms.base.common.service.user; \ No newline at end of file diff --git a/center.manager/pom.xml b/center.manager/pom.xml index 66a2baa..cdd00d8 100644 --- a/center.manager/pom.xml +++ b/center.manager/pom.xml @@ -1,5 +1,6 @@ 4.0.0 + com.lyms parent @@ -8,17 +9,26 @@ center.manager war + center.manager-1.0 2.6.1 2.7.4 + 0.0.1-SNAPSHOT + + + com.lyms.base.common + base.common + base.common-1.0 + + - com.lyms + com.lyms.core.sdk core.sdk - ${project.parent.version} + core.sdk-1.0 diff --git a/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java b/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java index a41a0a1..7a33ae5 100644 --- a/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java +++ b/center.manager/src/main/java/com/lyms/cm/controller/LoginController.java @@ -16,10 +16,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import com.lyms.cm.entity.sys.SysUsers; -import com.lyms.cm.entity.sys.TreeNode; -import com.lyms.cm.enums.PermissionEnum; -import com.lyms.cm.service.sys.SysPermissionsService; +import com.lyms.base.common.dao.role.TreeNode; +import com.lyms.base.common.entity.user.Users; +import com.lyms.base.common.enums.PermissionEnum; +import com.lyms.base.common.service.role.PermissionsService; import com.lyms.constants.Constants; import com.lyms.shiro.ShiroWebUtils; import com.lyms.util.StrUtils; @@ -27,22 +27,20 @@ import com.lyms.web.controller.BaseController; @Controller public class LoginController extends BaseController { - + private static final String VIEW_LOGIN = "/login/login"; - - - + @Autowired - private SysPermissionsService sysPermissionsService; + private PermissionsService sysPermissionsService; - @RequestMapping("/") public String index(Model model) { - if(!ShiroWebUtils.isLogin()){ + if (!ShiroWebUtils.isLogin()) { return redirectTo(VIEW_LOGIN); } - SysUsers user = ShiroWebUtils.getCurrentUser(); - List menus = sysPermissionsService.getPermissionMenuTreeByPuri(PermissionEnum.CENTER_MANAGER_ROOT.getCode(),user); + Users user = ShiroWebUtils.getCurrentUser(); + List menus = sysPermissionsService + .getPermissionMenuTreeByPuri(PermissionEnum.CENTER_MANAGER_ROOT.getCode(), user); model.addAttribute("menus", menus); return "/index"; } @@ -51,7 +49,8 @@ public class LoginController extends BaseController { public String home() { return "/home"; } - /** + + /** *
  • @Description:导航到登录(GET) *
  • @param model *
  • @return @@ -59,14 +58,14 @@ public class LoginController extends BaseController { *
  • 创建时间：2016年11月27日 *
  • 修改人： *
  • 修改时间： - */ + */ @RequestMapping(value = "/login", method = RequestMethod.GET) - public String login(Model model){ + public String login(Model model) { model.addAttribute(Constants.CAPTCHA_TOKEN, StrUtils.uuid()); return VIEW_LOGIN; } - /** + /** *
  • @Description:登录验证方法,详细查看ShiroRealm.class *
  • @param req *
  • @param model @@ -75,20 +74,21 @@ public class LoginController extends BaseController { *
  • 创建时间：2016年11月25日 *
  • 修改人： *
  • 修改时间： - */ + */ @RequestMapping(value = "/login", method = RequestMethod.POST) - public String login(String username, String password,@RequestParam(value = "rememberMe",defaultValue = "0") int rememberMe, Model model) { + public String login(String username, String password, + @RequestParam(value = "rememberMe", defaultValue = "0") int rememberMe, Model model) { String view = VIEW_LOGIN; - if(StrUtils.isEmpty(username) || StrUtils.isEmpty(password)){ + if (StrUtils.isEmpty(username) || StrUtils.isEmpty(password)) { model.addAttribute(Constants.CAPTCHA_TOKEN, StrUtils.uuid()); return view; } AuthenticationToken token = new UsernamePasswordToken(username, password); if (rememberMe == 1) { - ((UsernamePasswordToken) token).setRememberMe(true); - } + ((UsernamePasswordToken) token).setRememberMe(true); + } try { - //查看ShiroRealm.class + // 查看ShiroRealm.class SecurityUtils.getSubject().login(token); return redirectTo("/"); } catch (AuthenticationException e) { diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysDepartmentsController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysDepartmentsController.java index a58ca50..10fcc84 100644 --- a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysDepartmentsController.java +++ b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysDepartmentsController.java @@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.lyms.cm.entity.sys.SysDepartments; -import com.lyms.cm.enums.ValidityEnum; -import com.lyms.cm.service.sys.SysDepartmentsService; +import com.lyms.base.common.entity.organ.Departments; +import com.lyms.base.common.enums.ValidityEnum; +import com.lyms.base.common.service.organ.DepartmentsService; import com.lyms.constants.OperationName; import com.lyms.web.bean.AjaxResult; import com.lyms.web.controller.BaseController; @@ -33,7 +33,7 @@ import com.lyms.web.controller.BaseController; public class SysDepartmentsController extends BaseController { @Autowired - private SysDepartmentsService departmentService; + private DepartmentsService departmentService; /** *
  • @Description:到部门科室列表 @@ -61,8 +61,8 @@ public class SysDepartmentsController extends BaseController { @ResponseBody @RequestMapping(value = "/list", method = { RequestMethod.GET, RequestMethod.POST }) public Map list() { - Page page = getPage(); - EntityWrapper ew = new EntityWrapper(); + Page page = getPage(); + EntityWrapper ew = new EntityWrapper(); ew.where("ifdel=" + ValidityEnum.VALIDITY.getValidity()); page = departmentService.selectPage(page, ew); return toGridData(page); @@ -79,7 +79,7 @@ public class SysDepartmentsController extends BaseController { @RequestMapping(value = "/toEdit", method = { RequestMethod.GET }) public String toEdit(String id, Model model) { if (StringUtils.isNotBlank(id)) { - SysDepartments departments = departmentService.selectById(id); + Departments departments = departmentService.selectById(id); model.addAttribute("depart", departments); } return "/depart/depart_edit"; @@ -97,7 +97,7 @@ public class SysDepartmentsController extends BaseController { */ @ResponseBody @RequestMapping(value = "/update", method = { RequestMethod.POST }) - public AjaxResult edit(SysDepartments departments, AjaxResult ajaxResult) { + public AjaxResult edit(Departments departments, AjaxResult ajaxResult) { boolean tag = departmentService.updateDepart(departments); return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); } @@ -114,7 +114,7 @@ public class SysDepartmentsController extends BaseController { */ @ResponseBody @RequestMapping(value = "/create", method = { RequestMethod.POST }) - public AjaxResult add(SysDepartments departments, AjaxResult ajaxResult) { + public AjaxResult add(Departments departments, AjaxResult ajaxResult) { boolean tag = departmentService.createDepart(departments); return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); } diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganGroupController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganGroupController.java index 444b3d2..4da7a0b 100644 --- a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganGroupController.java +++ b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganGroupController.java @@ -1,6 +1,5 @@ package com.lyms.cm.controller.sys; -import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; @@ -14,12 +13,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.lyms.cm.entity.sys.SysOrganGroup; -import com.lyms.cm.entity.sys.SysRoles; -import com.lyms.cm.entity.sys.SysUserRoleMaps; -import com.lyms.cm.entity.sys.SysUsers; -import com.lyms.cm.enums.ValidityEnum; -import com.lyms.cm.service.sys.SysOrganGroupService; +import com.lyms.base.common.entity.organ.OrganGroup; +import com.lyms.base.common.enums.ValidityEnum; +import com.lyms.base.common.service.organ.OrganGroupService; import com.lyms.web.controller.BaseController; /** @@ -35,7 +31,7 @@ import com.lyms.web.controller.BaseController; public class SysOrganGroupController extends BaseController { @Autowired - private SysOrganGroupService groupService; + private OrganGroupService groupService; /** *
  • @Description:跳转到租列表 @@ -63,27 +59,26 @@ public class SysOrganGroupController extends BaseController { @ResponseBody @RequestMapping(value = "/list", method = { RequestMethod.GET, RequestMethod.POST }) public Map list() { - Page page = getPage(); - EntityWrapper ew = new EntityWrapper(); + Page page = getPage(); + EntityWrapper ew = new EntityWrapper(); ew.where("ifdel=" + ValidityEnum.VALIDITY.getValidity()); page = groupService.selectPage(page, ew); return toGridData(page); } - - + /** - * 跳转到编辑页面 - * - * @return - */ - @RequestMapping(value = { "/{id}/toEdit" }, method = RequestMethod.GET) - public String toEdit(@PathVariable String id, Model model) { - if (!StringUtils.isBlank(id)) { - SysOrganGroup group = groupService.selectById(id); - model.addAttribute("group", group); - - } - return "/group/group_edit"; - } + * 跳转到编辑页面 + * + * @return + */ + @RequestMapping(value = { "/{id}/toEdit" }, method = RequestMethod.GET) + public String toEdit(@PathVariable String id, Model model) { + if (!StringUtils.isBlank(id)) { + OrganGroup group = groupService.selectById(id); + model.addAttribute("group", group); + + } + return "/group/group_edit"; + } } diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganizationsController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganizationsController.java index fbea8a1..af1ba57 100644 --- a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganizationsController.java +++ b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysOrganizationsController.java @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.lyms.cm.entity.sys.SysOrganizations; -import com.lyms.cm.service.sys.SysOrganizationsService; +import com.lyms.base.common.entity.organ.Organizations; +import com.lyms.base.common.service.organ.OrganizationsService; import com.lyms.constants.OperationName; import com.lyms.web.bean.AjaxResult; import com.lyms.web.controller.BaseController; @@ -32,7 +32,7 @@ import com.lyms.web.controller.BaseController; public class SysOrganizationsController extends BaseController { @Autowired - private SysOrganizationsService organService; + private OrganizationsService organService; /** *
  • @Description:跳转到机构列表页 @@ -57,9 +57,9 @@ public class SysOrganizationsController extends BaseController { */ @RequestMapping(value = "/list", method = { RequestMethod.GET, RequestMethod.POST }) @ResponseBody - public Map list(SysOrganizations organizations) { - Page page = getPage(); - EntityWrapper ew = new EntityWrapper(); + public Map list(Organizations organizations) { + Page page = getPage(); + EntityWrapper ew = new EntityWrapper(); ew.where("ifDel=0"); String provinceId = organizations.getProvinceId(); @@ -88,7 +88,7 @@ public class SysOrganizationsController extends BaseController { */ @RequestMapping(value = "/toEdit", method = { RequestMethod.GET }) public String toEdit(String orgId, Model model) { - SysOrganizations org = organService.selectById(orgId); + Organizations org = organService.selectById(orgId); model.addAttribute("org", org); return "/organ/org_edit"; } @@ -105,7 +105,7 @@ public class SysOrganizationsController extends BaseController { */ @ResponseBody @RequestMapping(value = "/update", method = { RequestMethod.POST }) - public AjaxResult edit(SysOrganizations organizations, AjaxResult ajaxResult) { + public AjaxResult edit(Organizations organizations, AjaxResult ajaxResult) { boolean tag = organService.updateOrg(organizations); return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); } @@ -122,7 +122,7 @@ public class SysOrganizationsController extends BaseController { */ @ResponseBody @RequestMapping(value = "/create", method = { RequestMethod.POST }) - public AjaxResult add(SysOrganizations organizations, AjaxResult ajaxResult) { + public AjaxResult add(Organizations organizations, AjaxResult ajaxResult) { boolean tag = organService.addOrg(organizations); return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); } diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRegionsController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRegionsController.java index deef8a1..5bca421 100644 --- a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRegionsController.java +++ b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRegionsController.java @@ -8,8 +8,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.plugins.Page; -import com.lyms.cm.entity.sys.SysRegions; -import com.lyms.cm.service.sys.SysRegionsService; +import com.lyms.base.common.entity.region.Regions; +import com.lyms.base.common.service.region.RegionsService; import com.lyms.web.controller.BaseController; /** @@ -25,7 +25,7 @@ import com.lyms.web.controller.BaseController; public class SysRegionsController extends BaseController { @Autowired - private SysRegionsService regionService; + private RegionsService regionService; /** *
  • @Description:获取区域信息 @@ -38,10 +38,10 @@ public class SysRegionsController extends BaseController { * @return */ @RequestMapping(value = "/find", method = RequestMethod.GET) - public Page findRegions(String id) { - Page page = getPage(); + public Page findRegions(String id) { + Page page = getPage(); page.setSize(Integer.MAX_VALUE); - List regions = regionService.selectRegions(id); + List regions = regionService.selectRegions(id); page.setRecords(regions); return page; } diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java index 1f3b481..635368a 100644 --- a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java +++ b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysRolesController.java @@ -13,12 +13,12 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.lyms.cm.entity.sys.SysPermissions; -import com.lyms.cm.entity.sys.SysRolePermissionMaps; -import com.lyms.cm.entity.sys.SysRoles; -import com.lyms.cm.service.sys.SysPermissionsService; -import com.lyms.cm.service.sys.SysRolePermissionMapsService; -import com.lyms.cm.service.sys.SysRolesService; +import com.lyms.base.common.entity.role.Permissions; +import com.lyms.base.common.entity.role.RolePermissionMaps; +import com.lyms.base.common.entity.role.Roles; +import com.lyms.base.common.service.role.PermissionsService; +import com.lyms.base.common.service.role.RolePermissionMapsService; +import com.lyms.base.common.service.role.RolesService; import com.lyms.constants.OperationName; import com.lyms.util.InstanceUtils; import com.lyms.util.StrUtils; @@ -27,7 +27,7 @@ import com.lyms.web.controller.BaseController; /** *

    - * 角色表 前端控制器 + * 角色表 前端控制器 *

    * * @author maliang @@ -37,144 +37,144 @@ import com.lyms.web.controller.BaseController; @RequestMapping("/sysRoles") public class SysRolesController extends BaseController { - @Autowired - private SysRolesService sysRolesService; - @Autowired - private SysPermissionsService sysPermissionsService; + @Autowired + private RolesService sysRolesService; + @Autowired + private PermissionsService sysPermissionsService; - @Autowired - private SysRolePermissionMapsService sysRolePermissionMapsService; + @Autowired + private RolePermissionMapsService sysRolePermissionMapsService; - @RequestMapping("/toList") - public String list() { - return "/role/role_list"; - } - - @RequestMapping(value = { "/treeTest" }, method = RequestMethod.GET) - public String treeTest(Model model) { - return "/role/tree_test"; - } + @RequestMapping("/toList") + public String list() { + return "/role/role_list"; + } - @RequestMapping(value = "/getRoleList", method = { RequestMethod.POST }) - @ResponseBody - public java.util.Map getRoleList() { - Page page = getPage(); - EntityWrapper ew = new EntityWrapper(); - ew.where("ifDel=0"); - String id = getParameter("id"); - String name = getParameter("name"); - String type = getParameter("type"); - if(StrUtils.isNotEmpty(id)){ - ew.and("id like {0}", name.trim() + "%"); - } - if(StrUtils.isNotEmpty(name)){ - ew.and("name like {0}", name.trim() + "%"); - } - if(StrUtils.isNotEmpty(type)){ - ew.and("type={0}", type); - } - return toGridData(sysRolesService.selectPage(page, ew)); - } + @RequestMapping(value = { "/treeTest" }, method = RequestMethod.GET) + public String treeTest(Model model) { + return "/role/tree_test"; + } - /** - * 跳转到编辑页面 - * - * @return - */ - @RequestMapping(value = { "/{id}/toEdit" }, method = RequestMethod.GET) - public String toEdit(@PathVariable String id, Model model) { - if (!StringUtils.isBlank(id) && !"0".equals(id)) { - SysRoles role = sysRolesService.selectById(id); - model.addAttribute("role", role); - //当前用户权限数据 - List rpList = sysRolePermissionMapsService - .selectList(new EntityWrapper().where("role_id={0}", "'" + id + "'")); - StringBuilder permissionSB = new StringBuilder(); - for(SysRolePermissionMaps rpEntity : rpList){ - permissionSB.append(","+rpEntity.getPermissionId()); - } - model.addAttribute("rolePermissions", permissionSB.toString().replaceFirst(",", "")); - } - //所有权限数据 - List perList = sysPermissionsService.selectList(null); - model.addAttribute("perString", toJson(perList)); - return "/role/role_edit"; - } + @RequestMapping(value = "/getRoleList", method = { RequestMethod.POST }) + @ResponseBody + public java.util.Map getRoleList() { + Page page = getPage(); + EntityWrapper ew = new EntityWrapper(); + ew.where("ifDel=0"); + String id = getParameter("id"); + String name = getParameter("name"); + String type = getParameter("type"); + if (StrUtils.isNotEmpty(id)) { + ew.and("id like {0}", name.trim() + "%"); + } + if (StrUtils.isNotEmpty(name)) { + ew.and("name like {0}", name.trim() + "%"); + } + if (StrUtils.isNotEmpty(type)) { + ew.and("type={0}", type); + } + return toGridData(sysRolesService.selectPage(page, ew)); + } - /** - * 创建用户 - *

    - * TODO - * - * @param user - * @return - */ - @RequestMapping(value = "/create", method = RequestMethod.POST) - @ResponseBody - public AjaxResult create(SysRoles role, AjaxResult ajaxResult) { - boolean tag = false; - String roleId = StrUtils.uuid(); - role.setId(roleId); - role.setIfdel(0); - if(null == role.getEnable()){ - role.setEnable(1); - } - tag = sysRolesService.createRole(role, getRolePermissionList(roleId, getParameter("resource"))); - return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); - } + /** + * 跳转到编辑页面 + * + * @return + */ + @RequestMapping(value = { "/{id}/toEdit" }, method = RequestMethod.GET) + public String toEdit(@PathVariable String id, Model model) { + if (!StringUtils.isBlank(id) && !"0".equals(id)) { + Roles role = sysRolesService.selectById(id); + model.addAttribute("role", role); + // 当前用户权限数据 + List rpList = sysRolePermissionMapsService + .selectList(new EntityWrapper().where("role_id={0}", "'" + id + "'")); + StringBuilder permissionSB = new StringBuilder(); + for (RolePermissionMaps rpEntity : rpList) { + permissionSB.append("," + rpEntity.getPermissionId()); + } + model.addAttribute("rolePermissions", permissionSB.toString().replaceFirst(",", "")); + } + // 所有权限数据 + List perList = sysPermissionsService.selectList(null); + model.addAttribute("perString", toJson(perList)); + return "/role/role_edit"; + } - /** - * 修改信息 - */ - @RequestMapping(value = "/update", method = { RequestMethod.POST }) - @ResponseBody - public AjaxResult update(SysRoles role, AjaxResult ajaxResult) { - boolean tag = false; - if(null == role.getEnable()){ - role.setEnable(1); - } - tag = sysRolesService.updateRole(role, getRolePermissionList(role.getId(), getParameter("resource"))); - return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); - } + /** + * 创建用户 + *

    + * TODO + * + * @param user + * @return + */ + @RequestMapping(value = "/create", method = RequestMethod.POST) + @ResponseBody + public AjaxResult create(Roles role, AjaxResult ajaxResult) { + boolean tag = false; + String roleId = StrUtils.uuid(); + role.setId(roleId); + role.setIfdel(0); + if (null == role.getEnable()) { + role.setEnable(1); + } + tag = sysRolesService.createRole(role, getRolePermissionList(roleId, getParameter("resource"))); + return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); + } - /** - * 删除用户 - * - * @return - */ - @RequestMapping(value = "/{id}/delete", method = { RequestMethod.GET, RequestMethod.POST }) - @ResponseBody - public AjaxResult delete(@PathVariable String id, AjaxResult ajaxResult) { - int tag = sysRolesService.deleteLogicById(id); - return handleAjaxResult(ajaxResult, tag, OperationName.DELETE); - } + /** + * 修改信息 + */ + @RequestMapping(value = "/update", method = { RequestMethod.POST }) + @ResponseBody + public AjaxResult update(Roles role, AjaxResult ajaxResult) { + boolean tag = false; + if (null == role.getEnable()) { + role.setEnable(1); + } + tag = sysRolesService.updateRole(role, getRolePermissionList(role.getId(), getParameter("resource"))); + return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); + } - /** - *

  • @Description:获取角色权限对应关系列表 - *
  • @param roleId 角色id - *
  • @param permissionIds 逗号分隔的权限id字符串 - *
  • @return - *
  • 创建人：方承 - *
  • 创建时间：2017年3月8日 - *
  • 修改人： - *
  • 修改时间： - */ - private List getRolePermissionList(String roleId, String permissionIds) { - List rpList = InstanceUtils.newArrayList(); - if (StrUtils.isNotEmpty(permissionIds)) { - String[] permissionArray = permissionIds.split(","); - for (String permissionId : permissionArray) { - if (StrUtils.isNotEmpty(permissionId)) { - SysRolePermissionMaps rpentity = new SysRolePermissionMaps(); - rpentity.setId(StrUtils.uuid()); - rpentity.setRoleId(roleId); - rpentity.setPermissionId(permissionId); - rpentity.setIfdel(0); - rpList.add(rpentity); - } - } - } - return rpList; - } + /** + * 删除用户 + * + * @return + */ + @RequestMapping(value = "/{id}/delete", method = { RequestMethod.GET, RequestMethod.POST }) + @ResponseBody + public AjaxResult delete(@PathVariable String id, AjaxResult ajaxResult) { + int tag = sysRolesService.deleteLogicById(id); + return handleAjaxResult(ajaxResult, tag, OperationName.DELETE); + } + + /** + *
  • @Description:获取角色权限对应关系列表 + *
  • @param roleId 角色id + *
  • @param permissionIds 逗号分隔的权限id字符串 + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年3月8日 + *
  • 修改人： + *
  • 修改时间： + */ + private List getRolePermissionList(String roleId, String permissionIds) { + List rpList = InstanceUtils.newArrayList(); + if (StrUtils.isNotEmpty(permissionIds)) { + String[] permissionArray = permissionIds.split(","); + for (String permissionId : permissionArray) { + if (StrUtils.isNotEmpty(permissionId)) { + RolePermissionMaps rpentity = new RolePermissionMaps(); + rpentity.setId(StrUtils.uuid()); + rpentity.setRoleId(roleId); + rpentity.setPermissionId(permissionId); + rpentity.setIfdel(0); + rpList.add(rpentity); + } + } + } + return rpList; + } } diff --git a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java index 0bf45dd..3079423 100644 --- a/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java +++ b/center.manager/src/main/java/com/lyms/cm/controller/sys/SysUsersController.java @@ -14,12 +14,12 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.lyms.cm.entity.sys.SysRoles; -import com.lyms.cm.entity.sys.SysUserRoleMaps; -import com.lyms.cm.entity.sys.SysUsers; -import com.lyms.cm.service.sys.SysRolesService; -import com.lyms.cm.service.sys.SysUserRoleMapsService; -import com.lyms.cm.service.sys.SysUsersService; +import com.lyms.base.common.entity.role.Roles; +import com.lyms.base.common.entity.role.UserRoleMaps; +import com.lyms.base.common.entity.user.Users; +import com.lyms.base.common.service.role.RolesService; +import com.lyms.base.common.service.role.UserRoleMapsService; +import com.lyms.base.common.service.user.UsersService; import com.lyms.constants.OperationName; import com.lyms.util.InstanceUtils; import com.lyms.util.StrUtils; @@ -39,13 +39,12 @@ import com.lyms.web.controller.BaseController; public class SysUsersController extends BaseController { @Autowired - private SysUsersService userService; - + private UsersService userService; + @Autowired - private SysRolesService sysRolesService; + private RolesService sysRolesService; @Autowired - private SysUserRoleMapsService sysUserRoleMapsService; - + private UserRoleMapsService sysUserRoleMapsService; /** * 创建用户 @@ -57,15 +56,15 @@ public class SysUsersController extends BaseController { */ @RequestMapping(value = "/create", method = RequestMethod.POST) @ResponseBody - public AjaxResult create(SysUsers user, AjaxResult ajaxResult) { - if(!userService.isAllowUpdate(user.getAccount(),null)){ - ajaxResult.setSuccess(true); - ajaxResult.setMessage("新增失败！" + user.getAccount() + " 已经存在，请修改登录账号！"); - return ajaxResult; - } - String userid = StrUtils.uuid(); - user.setId(userid); - boolean tag = userService.addUser(user,getUserRoleList(userid, getParameter("roles"))); + public AjaxResult create(Users user, AjaxResult ajaxResult) { + if (!userService.isAllowUpdate(user.getAccount(), null)) { + ajaxResult.setSuccess(true); + ajaxResult.setMessage("新增失败！" + user.getAccount() + " 已经存在，请修改登录账号！"); + return ajaxResult; + } + String userid = StrUtils.uuid(); + user.setId(userid); + boolean tag = userService.addUser(user, getUserRoleList(userid, getParameter("roles"))); return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); } @@ -89,22 +88,22 @@ public class SysUsersController extends BaseController { @RequestMapping(value = "/list", method = { RequestMethod.POST, RequestMethod.GET }) @ResponseBody public Map list(Model model) { - Page page = getPage(); - EntityWrapper ew = new EntityWrapper(); - ew.where("ifDel=0"); - String searchName = getParameter("name"); - String searchAccount = getParameter("account"); - String searchPhone = getParameter("phone"); - if(StrUtils.isNotEmpty(searchName)){ - ew.and("name like {0}", searchName.trim() + "%"); - } - if(StrUtils.isNotEmpty(searchAccount)){ - ew.and("account like {0}", searchAccount.trim() + "%"); - } - if(StrUtils.isNotEmpty(searchPhone)){ - ew.and("phone like {0}", searchPhone.trim() + "%"); - } - page = userService.selectPage(page,ew); + Page page = getPage(); + EntityWrapper ew = new EntityWrapper(); + ew.where("ifDel=0"); + String searchName = getParameter("name"); + String searchAccount = getParameter("account"); + String searchPhone = getParameter("phone"); + if (StrUtils.isNotEmpty(searchName)) { + ew.and("name like {0}", searchName.trim() + "%"); + } + if (StrUtils.isNotEmpty(searchAccount)) { + ew.and("account like {0}", searchAccount.trim() + "%"); + } + if (StrUtils.isNotEmpty(searchPhone)) { + ew.and("phone like {0}", searchPhone.trim() + "%"); + } + page = userService.selectPage(page, ew); return toGridData(page); } @@ -116,20 +115,20 @@ public class SysUsersController extends BaseController { @RequestMapping(value = { "/{id}/toEdit" }, method = RequestMethod.GET) public String toEdit(@PathVariable String id, Model model) { if (!StringUtils.isBlank(id)) { - SysUsers user = userService.selectById(id); + Users user = userService.selectById(id); model.addAttribute("user", user); - //当前用户角色数据 - List urList = sysUserRoleMapsService - .selectList(new EntityWrapper().where("user_id={0}", "'" + id + "'")); - StringBuilder urSB = new StringBuilder(); - for(SysUserRoleMaps urEntity : urList){ - urSB.append("," + urEntity.getRoleId()); - } - model.addAttribute("userRoles", urSB.toString().replaceFirst(",", "")); + // 当前用户角色数据 + List urList = sysUserRoleMapsService + .selectList(new EntityWrapper().where("user_id={0}", "'" + id + "'")); + StringBuilder urSB = new StringBuilder(); + for (UserRoleMaps urEntity : urList) { + urSB.append("," + urEntity.getRoleId()); + } + model.addAttribute("userRoles", urSB.toString().replaceFirst(",", "")); } - //所有角色数据 - List roleList = sysRolesService.selectList(new EntityWrapper().where("ifDel=0")); - model.addAttribute("roleString",toJson(roleList)); + // 所有角色数据 + List roleList = sysRolesService.selectList(new EntityWrapper().where("ifDel=0")); + model.addAttribute("roleString", toJson(roleList)); return "/user/user_edit"; } @@ -138,13 +137,13 @@ public class SysUsersController extends BaseController { */ @RequestMapping(value = "/update", method = { RequestMethod.POST }) @ResponseBody - public AjaxResult update(SysUsers user, AjaxResult ajaxResult) { - if(!userService.isAllowUpdate(user.getAccount(),user.getId())){ - ajaxResult.setSuccess(true); - ajaxResult.setMessage("修改失败！ " + user.getAccount()+" 已经存在，请修改登录账号！"); - return ajaxResult; - } - boolean tag = userService.updateUser(user,getUserRoleList(user.getId(), getParameter("roles"))); + public AjaxResult update(Users user, AjaxResult ajaxResult) { + if (!userService.isAllowUpdate(user.getAccount(), user.getId())) { + ajaxResult.setSuccess(true); + ajaxResult.setMessage("修改失败！ " + user.getAccount() + " 已经存在，请修改登录账号！"); + return ajaxResult; + } + boolean tag = userService.updateUser(user, getUserRoleList(user.getId(), getParameter("roles"))); return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); } @@ -160,33 +159,33 @@ public class SysUsersController extends BaseController { int tag = userService.deleteLogicById(id); return handleAjaxResult(ajaxResult, tag, OperationName.DELETE); } - - /** - *
  • @Description:获取用户角色对应关系列表 - *
  • @param roleId - *
  • @param permissionIds - *
  • @return - *
  • 创建人：方承 - *
  • 创建时间：2017年3月9日 - *
  • 修改人： - *
  • 修改时间： - */ - private List getUserRoleList(String userId, String roles) { - List urList = InstanceUtils.newArrayList(); - if (StrUtils.isNotEmpty(roles)) { - String[] roleArray = roles.split(","); - for (String roleId : roleArray) { - if (StrUtils.isNotEmpty(roleId)) { - SysUserRoleMaps urentity = new SysUserRoleMaps(); - urentity.setId(StrUtils.uuid()); - urentity.setIfdel(0); - urentity.setRoleId(roleId); - urentity.setUserId(userId); - urList.add(urentity); - } - } - } - return urList; - } + + /** + *
  • @Description:获取用户角色对应关系列表 + *
  • @param roleId + *
  • @param permissionIds + *
  • @return + *
  • 创建人：方承 + *
  • 创建时间：2017年3月9日 + *
  • 修改人： + *
  • 修改时间： + */ + private List getUserRoleList(String userId, String roles) { + List urList = InstanceUtils.newArrayList(); + if (StrUtils.isNotEmpty(roles)) { + String[] roleArray = roles.split(","); + for (String roleId : roleArray) { + if (StrUtils.isNotEmpty(roleId)) { + UserRoleMaps urentity = new UserRoleMaps(); + urentity.setId(StrUtils.uuid()); + urentity.setIfdel(0); + urentity.setRoleId(roleId); + urentity.setUserId(userId); + urList.add(urentity); + } + } + } + return urList; + } } diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysDepartmentsMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysDepartmentsMapper.java deleted file mode 100644 index 76db8d9..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysDepartmentsMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.cm.dao.sys; - -import com.lyms.cm.entity.sys.SysDepartments; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import org.springframework.stereotype.Repository; -import java.io.Serializable; -/** - *

    - * Mapper接口 - *

    - * - * @author maliang - * @since 2017-03-08 - */ -@Repository -public interface SysDepartmentsMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - -} \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysDepartmentsMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysDepartmentsMapper.xml deleted file mode 100644 index 7715969..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysDepartmentsMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - ID AS id, PARENT_ID AS parentId, NAME AS name, ORG_ID AS orgId, DESCRIPTION AS description, PUBLISH_ID AS publishId, IFDEL AS ifdel, MODIFIED AS modified, CREATED AS created, SHORT_CODE AS shortCode, FOREIGN_ID AS foreignId - - diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysOrganGroupMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysOrganGroupMapper.java deleted file mode 100644 index 2524d61..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysOrganGroupMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.cm.dao.sys; - -import com.lyms.cm.entity.sys.SysOrganGroup; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import org.springframework.stereotype.Repository; -import java.io.Serializable; -/** - *

    - * Mapper接口 - *

    - * - * @author maliang - * @since 2017-03-09 - */ -@Repository -public interface SysOrganGroupMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - -} \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysOrganGroupMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysOrganGroupMapper.xml deleted file mode 100644 index c9642dc..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysOrganGroupMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - ID AS id, NAME AS name, TYPE AS type, ORGNUMBER AS orgnumber, CLIENTADDRESS AS clientaddress ,IFDEL AS ifdel - - diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysOrganizationsMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysOrganizationsMapper.java deleted file mode 100644 index e8abc00..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysOrganizationsMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.cm.dao.sys; - -import com.lyms.cm.entity.sys.SysOrganizations; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import org.springframework.stereotype.Repository; -import java.io.Serializable; -/** - *

    - * Mapper接口 - *

    - * - * @author maliang - * @since 2017-03-08 - */ -@Repository -public interface SysOrganizationsMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - -} \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysOrganizationsMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysOrganizationsMapper.xml deleted file mode 100644 index b70eddf..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysOrganizationsMapper.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, NAME AS name, TYPE AS type, LEVEL AS level, PROVINCE_ID AS provinceId, CITY_ID AS cityId, AREA_ID AS areaId, ADDRESS AS address, DESCRIPTION AS description, PUBLISH_ID AS publishId, IFDEL AS ifdel, MODIFIED AS modified, CREATED AS created, FOREIGN_ID AS foreignId, STREET_ID AS streetId, STATUS AS status, SHORT_CODE AS shortCode, LAT AS lat, LNG AS lng, LOGO AS logo, IMAGE AS image, GRADE_LEVEL AS gradeLevel, STAR_LEVEL AS starLevel, MOBILE AS mobile - - diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysPermissionsMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysPermissionsMapper.java deleted file mode 100644 index 499f2af..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysPermissionsMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.lyms.cm.dao.sys; - -import java.io.Serializable; -import java.util.List; - -import org.springframework.stereotype.Repository; - -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.lyms.cm.entity.sys.SysPermissions; -import com.lyms.cm.entity.sys.TreeNode; -/** - *

    - * Mapper接口 - *

    - * - * @author fangcheng - * @since 2017-03-08 - */ -@Repository -public interface SysPermissionsMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - - List getMenuTreeByPuri(String puri); - - List getUserPermission(String uid); - -} \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysPermissionsMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysPermissionsMapper.xml deleted file mode 100644 index 8284fec..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysPermissionsMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - ID AS id, NAME AS name, URI AS uri, TYPE AS type, PURI AS puri, ICON AS icon, IFDEL AS ifdel, ENABLE AS enable, EXTRA_DATA AS extraData, WEIGHT AS weight, FOREIGN_ID AS foreignId - - - - - - - - diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRegionsMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRegionsMapper.java deleted file mode 100644 index 9a34c7f..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRegionsMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.lyms.cm.dao.sys; - -import java.io.Serializable; -/** - *

    - * Mapper接口 - *

    - * - * @author maliang - * @since 2017-03-08 - */ -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.lyms.cm.entity.sys.SysRegions; - -@Repository -public interface SysRegionsMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - - /** - *
  • @Description:获取父/子级Region - *
  • @param id - *
  • @return - *
  • 创建人：maliang - *
  • 创建时间：2017年3月8日 - *
  • 修改人： - *
  • 修改时间： - */ - public List selectRegionsById(@Param("id") Serializable id); - -} \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRegionsMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRegionsMapper.xml deleted file mode 100644 index bf1fa0a..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRegionsMapper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - SYS_REGIONS - - - - ID AS id, PARENT_ID AS parentId, NAME AS name, ENABLE AS enable, IFDEL AS ifdel, CODE AS code, MODIFIE AS modifie, CREATED AS created, FOREIGN_ID AS foreignId - - - - - - diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolePermissionMapsMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolePermissionMapsMapper.java deleted file mode 100644 index 7e67a1d..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolePermissionMapsMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.cm.dao.sys; - -import com.lyms.cm.entity.sys.SysRolePermissionMaps; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import org.springframework.stereotype.Repository; -import java.io.Serializable; -/** - *

    - * Mapper接口 - *

    - * - * @author fangcheng - * @since 2017-03-08 - */ -@Repository -public interface SysRolePermissionMapsMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - -} \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolePermissionMapsMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolePermissionMapsMapper.xml deleted file mode 100644 index 1def22e..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolePermissionMapsMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - ID AS id, ROLE_ID AS roleId, PERMISSION_ID AS permissionId, IFDEL AS ifdel - - diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.java deleted file mode 100644 index 072656f..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.cm.dao.sys; - -import com.lyms.cm.entity.sys.SysRoles; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import org.springframework.stereotype.Repository; -import java.io.Serializable; -/** - *

    - * Mapper接口 - *

    - * - * @author fangcheng - * @since 2017-03-07 - */ -@Repository -public interface SysRolesMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - -} \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.xml deleted file mode 100644 index c343f7c..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysRolesMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - ID AS id, TYPE AS type, NAME AS name, REMARKS AS remarks, SHORT_CODE AS shortCode, ORG_ID AS orgId, CREATE_ID AS createId, CREATE_TIME AS createTime, MODIFY_ID AS modifyId, MODIFY_TIME AS modifyTime, IFDEL AS ifdel, ENABLE AS enable - - diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.java deleted file mode 100644 index 2ed3b88..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lyms.cm.dao.sys; - -import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.lyms.cm.entity.sys.SysUserRoleMaps; - -import org.springframework.stereotype.Repository; -import java.io.Serializable; -/** - *

    - * Mapper接口 - *

    - * - * @author fangcheng - * @since 2017-03-07 - */ -@Repository -public interface SysUserRoleMapsMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - -} \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.xml deleted file mode 100644 index 82c0510..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUserRoleMapsMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - ID AS id, USER_ID AS userId, ROLE_ID AS roleId, IFDEL AS ifdel - - diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.java b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.java deleted file mode 100644 index 3c74f04..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.cm.dao.sys; - -import com.lyms.cm.entity.sys.SysUsers; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import org.springframework.stereotype.Repository; -import java.io.Serializable; -/** - *

    - * Mapper接口 - *

    - * - * @author fangcheng - * @since 2017-03-07 - */ -@Repository -public interface SysUsersMapper extends BaseMapper { - - public Integer deleteLogicById(Serializable id); - -} \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.xml b/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.xml deleted file mode 100644 index bd8b75c..0000000 --- a/center.manager/src/main/java/com/lyms/cm/dao/sys/SysUsersMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ID AS id, TYPE AS type, ORG_ID AS orgId, DEPT_ID AS deptId, NAME AS name, ACCOUNT AS account, PWD AS pwd, PHONE AS phone, PUBLISH_ID AS publishId, IFDEL AS ifdel, ENABLE AS enable, MODIFIED AS modified, CREATED AS created, REMARKS AS remarks, LAST_LOGIN_TIME AS lastLoginTime, FOREIGN_ID AS foreignId, OTHER_ACCOUNT AS otherAccount, EMPLOYEE_ID AS employeeId, EXPIR_TIME AS expirTime, LEVEL AS level, AVATAR AS avatar, WORK_TIME AS workTime, GOOD_AT AS goodAt - - diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysDepartments.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysDepartments.java deleted file mode 100644 index d82a2f0..0000000 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysDepartments.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.lyms.cm.entity.sys; - -import java.io.Serializable; -import java.util.Date; - -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; - -/** - *

    - * 部门 科室表 - *

    - * - * @author maliang - * @since 2017-03-08 - */ -@TableName("SYS_DEPARTMENTS") -public class SysDepartments implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableField(value = "ID") - private String id; - /** - * 上级部门,0为root - */ - @TableField(value = "PARENT_ID") - private String parentId; - /** - * - */ - @TableField(value = "NAME") - private String name; - /** - * 机构id - */ - @TableField(value = "ORG_ID") - private String orgId; - /** - * - */ - @TableField(value = "DESCRIPTION") - private String description; - /** - * - */ - @TableField(value = "PUBLISH_ID") - private String publishId; - /** - * - */ - @TableField(value = "IFDEL") - private Integer ifdel; - /** - * - */ - @TableField(value = "MODIFIED") - private Date modified; - /** - * - */ - @TableField(value = "CREATED") - private Date created; - /** - * 简码 - */ - @TableField(value = "SHORT_CODE") - private String shortCode; - /** - * - */ - @TableField(value = "FOREIGN_ID") - private String foreignId; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getOrgId() { - return orgId; - } - - public void setOrgId(String orgId) { - this.orgId = orgId; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getPublishId() { - return publishId; - } - - public void setPublishId(String publishId) { - this.publishId = publishId; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - - public Date getModified() { - return modified; - } - - public void setModified(Date modified) { - this.modified = modified; - } - - public Date getCreated() { - return created; - } - - public void setCreated(Date created) { - this.created = created; - } - - public String getShortCode() { - return shortCode; - } - - public void setShortCode(String shortCode) { - this.shortCode = shortCode; - } - - public String getForeignId() { - return foreignId; - } - - public void setForeignId(String foreignId) { - this.foreignId = foreignId; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysOrganGroup.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysOrganGroup.java deleted file mode 100644 index 52d7f2b..0000000 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysOrganGroup.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.lyms.cm.entity.sys; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableName; - -/** - *

    - * - *

    - * - * @author maliang - * @since 2017-03-09 - */ -@TableName("SYS_ORGAN_GROUP") -public class SysOrganGroup implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableId(value = "ID") - private String id; - /** - * - */ - @TableField(value = "NAME") - private String name; - /** - * 建档方式 - */ - @TableField(value = "TYPE") - private String type; - /** - * - */ - @TableField(value = "ORGNUMBER") - private Integer orgnumber; - /** - * 数据推送地址 - */ - @TableField(value = "CLIENTADDRESS") - private String clientaddress; - - /** - * 0:可用 1:不可用 - */ - @TableField(value = "IFDEL") - private Integer ifdel; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public Integer getOrgnumber() { - return orgnumber; - } - - public void setOrgnumber(Integer orgnumber) { - this.orgnumber = orgnumber; - } - - public String getClientaddress() { - return clientaddress; - } - - public void setClientaddress(String clientaddress) { - this.clientaddress = clientaddress; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysOrganizations.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysOrganizations.java deleted file mode 100644 index 8b6859b..0000000 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysOrganizations.java +++ /dev/null @@ -1,336 +0,0 @@ -package com.lyms.cm.entity.sys; - -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; -import java.io.Serializable; -import java.util.Date; - -/** - *

    - * 机构表 - *

    - * - * @author maliang - * @since 2017-03-08 - */ -@TableName("SYS_ORGANIZATIONS") -public class SysOrganizations implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableId(value="ID") - private String id; - /** - * 机构名 - */ - @TableField(value="NAME") - private String name; - /** - * 1:卫生与计划生育委员会,2:妇幼保健院/站,3:妇产(科)医院,4:综合医院,5:计生站,6:卫生院,7:卫生所,8:其他 - */ - @TableField(value="TYPE") - private Integer type; - /** - * 1省,2市,3区县,4乡镇,5村,6其他 - */ - @TableField(value="LEVEL") - private Integer level; - /** - * 省ID - */ - @TableField(value="PROVINCE_ID") - private String provinceId; - /** - * 城市ID - */ - @TableField(value="CITY_ID") - private String cityId; - /** - * 区县ID - */ - @TableField(value="AREA_ID") - private String areaId; - /** - * 街道地址 - */ - @TableField(value="ADDRESS") - private String address; - /** - * 简介 - */ - @TableField(value="DESCRIPTION") - private String description; - /** - * 发布人ID - */ - @TableField(value="PUBLISH_ID") - private String publishId; - /** - * 1：有效，2：无效 - */ - @TableField(value="IFDEL") - private Integer ifdel; - /** - * 最后修改时间 - */ - @TableField(value="MODIFIED") - private Date modified; - /** - * 创建时间 - */ - @TableField(value="CREATED") - private Date created; - /** - * - */ - @TableField(value="FOREIGN_ID") - private String foreignId; - /** - * - */ - @TableField(value="STREET_ID") - private String streetId; - /** - * 0,"正式运行" 1,"试运行" 2,"停止运行" - */ - @TableField(value="STATUS") - private Integer status; - /** - * 简码 - */ - @TableField(value="SHORT_CODE") - private String shortCode; - /** - * 经度 - */ - @TableField(value="LAT") - private Double lat; - /** - * '纬度 - */ - @TableField(value="LNG") - private Double lng; - /** - * - */ - @TableField(value="LOGO") - private String logo; - /** - * - */ - @TableField(value="IMAGE") - private String image; - /** - * 医院等级 - */ - @TableField(value="GRADE_LEVEL") - private Integer gradeLevel; - /** - * 星级 - */ - @TableField(value="STAR_LEVEL") - private Integer starLevel; - /** - * 服务热线 - */ - @TableField(value="MOBILE") - private String mobile; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public Integer getLevel() { - return level; - } - - public void setLevel(Integer level) { - this.level = level; - } - - public String getProvinceId() { - return provinceId; - } - - public void setProvinceId(String provinceId) { - this.provinceId = provinceId; - } - - public String getCityId() { - return cityId; - } - - public void setCityId(String cityId) { - this.cityId = cityId; - } - - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getPublishId() { - return publishId; - } - - public void setPublishId(String publishId) { - this.publishId = publishId; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - - public Date getModified() { - return modified; - } - - public void setModified(Date modified) { - this.modified = modified; - } - - public Date getCreated() { - return created; - } - - public void setCreated(Date created) { - this.created = created; - } - - public String getForeignId() { - return foreignId; - } - - public void setForeignId(String foreignId) { - this.foreignId = foreignId; - } - - public String getStreetId() { - return streetId; - } - - public void setStreetId(String streetId) { - this.streetId = streetId; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public String getShortCode() { - return shortCode; - } - - public void setShortCode(String shortCode) { - this.shortCode = shortCode; - } - - public Double getLat() { - return lat; - } - - public void setLat(Double lat) { - this.lat = lat; - } - - public Double getLng() { - return lng; - } - - public void setLng(Double lng) { - this.lng = lng; - } - - public String getLogo() { - return logo; - } - - public void setLogo(String logo) { - this.logo = logo; - } - - public String getImage() { - return image; - } - - public void setImage(String image) { - this.image = image; - } - - public Integer getGradeLevel() { - return gradeLevel; - } - - public void setGradeLevel(Integer gradeLevel) { - this.gradeLevel = gradeLevel; - } - - public Integer getStarLevel() { - return starLevel; - } - - public void setStarLevel(Integer starLevel) { - this.starLevel = starLevel; - } - - public String getMobile() { - return mobile; - } - - public void setMobile(String mobile) { - this.mobile = mobile; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysPermissions.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysPermissions.java deleted file mode 100644 index df59f61..0000000 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysPermissions.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.lyms.cm.entity.sys; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; - -/** - *

    - * 权限表 - *

    - * - * @author fangcheng - * @since 2017-03-08 - */ -@TableName("SYS_PERMISSIONS") -public class SysPermissions implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableField(value="ID") - private String id; - /** - * - */ - @TableField(value="NAME") - private String name; - /** - * - */ - @TableField(value="URI") - private String uri; - /** - * - */ - @TableField(value="TYPE") - private Integer type; - /** - * - */ - @TableField(value="PURI") - private String puri; - /** - * - */ - @TableField(value="ICON") - private String icon; - /** - * - */ - @TableField(value="IFDEL") - private Integer ifdel; - /** - * - */ - @TableField(value="ENABLE") - private Integer enable; - /** - * - */ - @TableField(value="EXTRA_DATA") - private String extraData; - /** - * - */ - @TableField(value="WEIGHT") - private Integer weight; - /** - * - */ - @TableField(value="FOREIGN_ID") - private String foreignId; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getUri() { - return uri; - } - - public void setUri(String uri) { - this.uri = uri; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public String getPuri() { - return puri; - } - - public void setPuri(String puri) { - this.puri = puri; - } - - public String getIcon() { - return icon; - } - - public void setIcon(String icon) { - this.icon = icon; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - - public Integer getEnable() { - return enable; - } - - public void setEnable(Integer enable) { - this.enable = enable; - } - - public String getExtraData() { - return extraData; - } - - public void setExtraData(String extraData) { - this.extraData = extraData; - } - - public Integer getWeight() { - return weight; - } - - public void setWeight(Integer weight) { - this.weight = weight; - } - - public String getForeignId() { - return foreignId; - } - - public void setForeignId(String foreignId) { - this.foreignId = foreignId; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRegions.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRegions.java deleted file mode 100644 index b0e4a79..0000000 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRegions.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.lyms.cm.entity.sys; - -import java.io.Serializable; -import java.util.Date; - -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; - -/** - *

    - * 省市区地址表 - *

    - * - * @author maliang - * @since 2017-03-08 - */ -@TableName("SYS_REGIONS") -public class SysRegions implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableField(value = "ID") - private String id; - /** - * - */ - @TableField(value = "PARENT_ID") - private String parentId; - /** - * - */ - @TableField(value = "NAME") - private String name; - /** - * - */ - @TableField(value = "ENABLE") - private Integer enable; - /** - * - */ - @TableField(value = "IFDEL") - private Integer ifdel; - /** - * - */ - @TableField(value = "CODE") - private String code; - /** - * - */ - @TableField(value = "MODIFIE") - private Date modifie; - /** - * - */ - @TableField(value = "CREATED") - private Date created; - /** - * - */ - @TableField(value = "FOREIGN_ID") - private String foreignId; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Integer getEnable() { - return enable; - } - - public void setEnable(Integer enable) { - this.enable = enable; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public Date getModifie() { - return modifie; - } - - public void setModifie(Date modifie) { - this.modifie = modifie; - } - - public Date getCreated() { - return created; - } - - public void setCreated(Date created) { - this.created = created; - } - - public String getForeignId() { - return foreignId; - } - - public void setForeignId(String foreignId) { - this.foreignId = foreignId; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRolePermissionMaps.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRolePermissionMaps.java deleted file mode 100644 index c90e015..0000000 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRolePermissionMaps.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.lyms.cm.entity.sys; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; - -/** - *

    - * 角色权限映射表 - *

    - * - * @author fangcheng - * @since 2017-03-08 - */ -@TableName("SYS_ROLE_PERMISSION_MAPS") -public class SysRolePermissionMaps implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableField(value="ID") - private String id; - /** - * - */ - @TableField(value="ROLE_ID") - private String roleId; - /** - * - */ - @TableField(value="PERMISSION_ID") - private String permissionId; - /** - * - */ - @TableField(value="IFDEL") - private Integer ifdel; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getRoleId() { - return roleId; - } - - public void setRoleId(String roleId) { - this.roleId = roleId; - } - - public String getPermissionId() { - return permissionId; - } - - public void setPermissionId(String permissionId) { - this.permissionId = permissionId; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRoles.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRoles.java deleted file mode 100644 index 8fa48ff..0000000 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysRoles.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.lyms.cm.entity.sys; - -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; -import java.io.Serializable; -import java.util.Date; - -/** - *

    - * 角色表 - *

    - * - * @author fangcheng - * @since 2017-03-10 - */ -@TableName("SYS_ROLES") -public class SysRoles implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableId(value="ID") - private String id; - /** - * 0:管理员角色,1:用户角色 - */ - @TableField(value="TYPE") - private Integer type; - /** - * 角色名称 - */ - @TableField(value="NAME") - private String name; - /** - * 备注 - */ - @TableField(value="REMARKS") - private String remarks; - /** - * 简码 - */ - @TableField(value="SHORT_CODE") - private String shortCode; - /** - * 机构id - */ - @TableField(value="ORG_ID") - private String orgId; - /** - * - */ - @TableField(value="CREATE_ID") - private String createId; - /** - * - */ - @TableField(value="CREATE_TIME") - private Date createTime; - /** - * - */ - @TableField(value="MODIFY_ID") - private String modifyId; - /** - * - */ - @TableField(value="MODIFY_TIME") - private Date modifyTime; - /** - * - */ - @TableField(value="IFDEL") - private Integer ifdel; - /** - * - */ - @TableField(value="ENABLE") - private Integer enable; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getRemarks() { - return remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - public String getShortCode() { - return shortCode; - } - - public void setShortCode(String shortCode) { - this.shortCode = shortCode; - } - - public String getOrgId() { - return orgId; - } - - public void setOrgId(String orgId) { - this.orgId = orgId; - } - - public String getCreateId() { - return createId; - } - - public void setCreateId(String createId) { - this.createId = createId; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public String getModifyId() { - return modifyId; - } - - public void setModifyId(String modifyId) { - this.modifyId = modifyId; - } - - public Date getModifyTime() { - return modifyTime; - } - - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - - public Integer getEnable() { - return enable; - } - - public void setEnable(Integer enable) { - this.enable = enable; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUserRoleMaps.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUserRoleMaps.java deleted file mode 100644 index 2a64661..0000000 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUserRoleMaps.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.lyms.cm.entity.sys; - -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableName; - -/** - *

    - * 用户角色关系表 - *

    - * - * @author fangcheng - * @since 2017-03-07 - */ -@TableName("SYS_USER_ROLE_MAPS") -public class SysUserRoleMaps implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableField(value="ID") - private String id; - /** - * - */ - @TableField(value="USER_ID") - private String userId; - /** - * - */ - @TableField(value="ROLE_ID") - private String roleId; - /** - * - */ - @TableField(value="IFDEL") - private Integer ifdel; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getUserId() { - return userId; - } - - public void setUserId(String userId) { - this.userId = userId; - } - - public String getRoleId() { - return roleId; - } - - public void setRoleId(String roleId) { - this.roleId = roleId; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java deleted file mode 100644 index 93b1bf5..0000000 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/SysUsers.java +++ /dev/null @@ -1,338 +0,0 @@ -package com.lyms.cm.entity.sys; - -import java.io.Serializable; -import java.util.Date; - -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableName; - -/** - *

    - * 用户表 - *

    - * - * @author fangcheng - * @since 2017-03-08 - */ -@TableName("SYS_USERS") -public class SysUsers implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @TableId(value = "ID") - private String id; - /** - * 0:管理员,1:用户 - */ - @TableField(value = "TYPE") - private Integer type; - /** - * 名称 - */ - @TableField(value = "NAME") - private String name; - /** - * 帐号 - */ - @TableField(value = "ACCOUNT") - private String account; - /** - * 机构id - */ - @TableField(value = "ORG_ID") - private String orgId; - /** - * 部门id - */ - @TableField(value = "DEPT_ID") - private String deptId; - /** - * 名字 - */ - @TableField(value = "PWD") - private String pwd; - /** - * 手机号 - */ - @TableField(value = "PHONE") - private String phone; - /** - * 备注 - */ - @TableField(value = "REMARKS") - private String remarks; - /** - * 最后登录时间 - */ - @TableField(value = "LAST_LOGIN_TIME") - private Date lastLoginTime; - /** - * 导入数据的源id - */ - @TableField(value = "FOREIGN_ID") - private String foreignId; - /** - * 医院的帐号 - */ - @TableField(value = "OTHER_ACCOUNT") - private String otherAccount; - /** - * - */ - @TableField(value = "EMPLOYEE_ID") - private String employeeId; - /** - * - */ - @TableField(value = "EXPIR_TIME") - private Date expirTime; - /** - * - */ - @TableField(value = "LEVEL") - private Integer level; - /** - * - */ - @TableField(value = "AVATAR") - private String avatar; - /** - * - */ - @TableField(value = "WORK_TIME") - private String workTime; - /** - * - */ - @TableField(value = "GOOD_AT") - private String goodAt; - /** - * - */ - @TableField(value = "CREATE_ID") - private String createId; - /** - * - */ - @TableField(value = "CREATE_TIME") - private Date createTime; - /** - * - */ - @TableField(value = "MODIFY_ID") - private String modifyId; - /** - * - */ - @TableField(value = "MODIFY_TIME") - private Date modifyTime; - /** - * - */ - @TableField(value = "IFDEL") - private Integer ifdel; - /** - * - */ - @TableField(value = "ENABLE") - private Integer enable; - - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Integer getType() { - return type; - } - - public void setType(Integer type) { - this.type = type; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getAccount() { - return account; - } - - public void setAccount(String account) { - this.account = account; - } - - public String getOrgId() { - return orgId; - } - - public void setOrgId(String orgId) { - this.orgId = orgId; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getPwd() { - return pwd; - } - - public void setPwd(String pwd) { - this.pwd = pwd; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getRemarks() { - return remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - public Date getLastLoginTime() { - return lastLoginTime; - } - - public void setLastLoginTime(Date lastLoginTime) { - this.lastLoginTime = lastLoginTime; - } - - public String getForeignId() { - return foreignId; - } - - public void setForeignId(String foreignId) { - this.foreignId = foreignId; - } - - public String getOtherAccount() { - return otherAccount; - } - - public void setOtherAccount(String otherAccount) { - this.otherAccount = otherAccount; - } - - public String getEmployeeId() { - return employeeId; - } - - public void setEmployeeId(String employeeId) { - this.employeeId = employeeId; - } - - public Date getExpirTime() { - return expirTime; - } - - public void setExpirTime(Date expirTime) { - this.expirTime = expirTime; - } - - public Integer getLevel() { - return level; - } - - public void setLevel(Integer level) { - this.level = level; - } - - public String getAvatar() { - return avatar; - } - - public void setAvatar(String avatar) { - this.avatar = avatar; - } - - public String getWorkTime() { - return workTime; - } - - public void setWorkTime(String workTime) { - this.workTime = workTime; - } - - public String getGoodAt() { - return goodAt; - } - - public void setGoodAt(String goodAt) { - this.goodAt = goodAt; - } - - public String getCreateId() { - return createId; - } - - public void setCreateId(String createId) { - this.createId = createId; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public String getModifyId() { - return modifyId; - } - - public void setModifyId(String modifyId) { - this.modifyId = modifyId; - } - - public Date getModifyTime() { - return modifyTime; - } - - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - public Integer getIfdel() { - return ifdel; - } - - public void setIfdel(Integer ifdel) { - this.ifdel = ifdel; - } - - public Integer getEnable() { - return enable; - } - - public void setEnable(Integer enable) { - this.enable = enable; - } - - -} diff --git a/center.manager/src/main/java/com/lyms/cm/entity/sys/TreeNode.java b/center.manager/src/main/java/com/lyms/cm/entity/sys/TreeNode.java deleted file mode 100644 index cb2200a..0000000 --- a/center.manager/src/main/java/com/lyms/cm/entity/sys/TreeNode.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.lyms.cm.entity.sys; - -import java.util.List; -public class TreeNode implements java.io.Serializable { - - private static final long serialVersionUID = 980682543891282923L; - private String id; - private String text; - private String description; - private String url; - private String state = "closed";// open,closed - private boolean checked = false; - private Object attributes; - private List children; - private String permissions; - private String icon; - private String pid; - - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - public String getText() { - return text; - } - public void setText(String text) { - this.text = text; - } - public String getDescription() { - return description; - } - public void setDescription(String description) { - this.description = description; - } - public String getUrl() { - return url; - } - public void setUrl(String url) { - this.url = url; - } - public String getState() { - return state; - } - public void setState(String state) { - this.state = state; - } - public boolean isChecked() { - return checked; - } - public void setChecked(boolean checked) { - this.checked = checked; - } - public Object getAttributes() { - return attributes; - } - public void setAttributes(Object attributes) { - this.attributes = attributes; - } - public List getChildren() { - return children; - } - public void setChildren(List children) { - this.children = children; - } - public String getPermissions() { - return permissions; - } - public void setPermissions(String permissions) { - this.permissions = permissions; - } - public String getIcon() { - return icon; - } - public void setIcon(String icon) { - this.icon = icon; - } - public String getPid() { - return pid; - } - public void setPid(String pid) { - this.pid = pid; - } - - - -} diff --git a/center.manager/src/main/java/com/lyms/cm/enums/PermissionEnum.java b/center.manager/src/main/java/com/lyms/cm/enums/PermissionEnum.java deleted file mode 100644 index d713811..0000000 --- a/center.manager/src/main/java/com/lyms/cm/enums/PermissionEnum.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.lyms.cm.enums; - -public enum PermissionEnum { - - /** - * 中心根节点 - */ - CENTER_MANAGER_ROOT("center"), - /** - * 院内根节点 - */ - HOSPITAL_ROOT("hospital"); - - private String code; - - private PermissionEnum(String code) { - this.code = code; - } - - public String getCode() { - return code; - } -} diff --git a/center.manager/src/main/java/com/lyms/cm/enums/RoleType.java b/center.manager/src/main/java/com/lyms/cm/enums/RoleType.java deleted file mode 100644 index 36594df..0000000 --- a/center.manager/src/main/java/com/lyms/cm/enums/RoleType.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.lyms.cm.enums; - -/** - * 角色类型 - * - * @author maliang - * - */ -public enum RoleType { - - SYSTEM(0), USER(1); - - private int code; - - private RoleType(int code) { - this.code = code; - } - - public int getCode() { - return code; - } -} diff --git a/center.manager/src/main/java/com/lyms/cm/enums/StatusEnum.java b/center.manager/src/main/java/com/lyms/cm/enums/StatusEnum.java deleted file mode 100644 index bd79f88..0000000 --- a/center.manager/src/main/java/com/lyms/cm/enums/StatusEnum.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.lyms.cm.enums; - -/** - * 用户状态标识 - * - * @author maliang - * - */ -public enum StatusEnum { - - // 启用 - ENABLED(1), - // 禁用 - DISENABLED(2); - - private int status; - - private StatusEnum(int status) { - this.status = status; - } - - public int getStatus() { - return this.status; - } - - public static boolean isEnabled(Integer status) { - return status != null && ENABLED.getStatus() == status; - } - - public static boolean isDisEnabled(Integer status) { - return status != null && DISENABLED.getStatus() == status; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/enums/TypeEnum.java b/center.manager/src/main/java/com/lyms/cm/enums/TypeEnum.java deleted file mode 100644 index a772733..0000000 --- a/center.manager/src/main/java/com/lyms/cm/enums/TypeEnum.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.lyms.cm.enums; - -/** - * 用户类型 - * - * @author maliang - * - */ -public enum TypeEnum { - - // 管理员 - MANAGER(0), - // 用户 - USER(1); - - private int type; - - private TypeEnum(int type) { - this.type = type; - } - - /** - * 获取类型 - * - * @return - */ - public int getType() { - return this.type; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/enums/ValidityEnum.java b/center.manager/src/main/java/com/lyms/cm/enums/ValidityEnum.java deleted file mode 100644 index a514ad3..0000000 --- a/center.manager/src/main/java/com/lyms/cm/enums/ValidityEnum.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.lyms.cm.enums; - -/** - * 用户是否有效 - * - * @author maliang - * - */ -public enum ValidityEnum { - - // 有效 - VALIDITY(0), - // 无效 - UNVALIDITY(1); - - private int validity; - - private ValidityEnum(int validity) { - this.validity = validity; - } - - public int getValidity() { - return this.validity; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/enums/package-info.java b/center.manager/src/main/java/com/lyms/cm/enums/package-info.java deleted file mode 100644 index e7fea8e..0000000 --- a/center.manager/src/main/java/com/lyms/cm/enums/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * 标识信息 - * - * @author maliang - */ -package com.lyms.cm.enums; \ No newline at end of file diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/SysDepartmentsService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/SysDepartmentsService.java deleted file mode 100644 index 3840ce8..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/SysDepartmentsService.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.lyms.cm.service.sys; - -import java.io.Serializable; - -import com.lyms.cm.entity.sys.SysDepartments; -import com.lyms.exception.SystemException; -import com.lyms.web.service.BaseService; - -/** - *

    - * 服务类 - *

    - * - * @author maliang - * @since 2017-03-08 - */ -public interface SysDepartmentsService extends BaseService { - - /** - *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 - *
  • @param id 删除主键id - *
  • @return 大于0修改成功，否则为失败 - */ - public Integer deleteLogicById(Serializable id); - - /** - *
  • @Description:添加机构/部门信息 - *
  • @param departments - *
  • @return - *
  • 创建人：maliang - *
  • 创建时间：2017年3月9日 - *
  • 修改人： - *
  • 修改时间： - */ - public boolean createDepart(SysDepartments departments) throws SystemException; - - /** - *
  • @Description:删除机构/部门信息 - *
  • @param id - *
  • @return - *
  • 创建人：maliang - *
  • 创建时间：2017年3月9日 - *
  • 修改人： - *
  • 修改时间： - */ - public boolean deleteDepartById(String id) throws SystemException; - - /** - *
  • @Description:修改部门/机构信息 - *
  • @param departments - *
  • @return - *
  • 创建人：maliang - *
  • 创建时间：2017年3月9日 - *
  • 修改人： - *
  • 修改时间： - */ - public boolean updateDepart(SysDepartments departments) throws SystemException; - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/SysOrganGroupService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/SysOrganGroupService.java deleted file mode 100644 index 89dd128..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/SysOrganGroupService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.lyms.cm.service.sys; - -import java.io.Serializable; - -import com.lyms.cm.entity.sys.SysOrganGroup; -import com.lyms.exception.SystemException; -import com.lyms.web.service.BaseService; - -/** - *

    - * 服务类 - *

    - * - * @author maliang - * @since 2017-03-09 - */ -public interface SysOrganGroupService extends BaseService { - - /** - *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 - *
  • @param id 删除主键id - *
  • @return 大于0修改成功，否则为失败 - */ - public Integer deleteLogicById(Serializable id); - - /** - *
  • @Description:创建机构组 - *
  • @param organGroup - *
  • @return - *
  • @throws SystemException - *
  • 创建人：maliang - *
  • 创建时间：2017年3月9日 - *
  • 修改人： - *
  • 修改时间： - */ - public boolean create(SysOrganGroup organGroup) throws SystemException; - - /** - *
  • @Description:根据ID删除机构信息 - *
  • @param groupId - *
  • @return - *
  • @throws SystemException - *
  • 创建人：maliang - *
  • 创建时间：2017年3月9日 - *
  • 修改人： - *
  • 修改时间： - */ - public boolean deleteGroupById(String groupId) throws SystemException; - - /** - *
  • @Description:修改机构组信息 - *
  • @param organGrooup - *
  • @return - *
  • @throws SystemException - *
  • 创建人：maliang - *
  • 创建时间：2017年3月9日 - *
  • 修改人： - *
  • 修改时间： - */ - public boolean updateGroup(SysOrganGroup organGrooup) throws SystemException; - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/SysOrganizationsService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/SysOrganizationsService.java deleted file mode 100644 index c8ad5e7..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/SysOrganizationsService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.lyms.cm.service.sys; - -import java.io.Serializable; - -import com.lyms.cm.entity.sys.SysOrganizations; -import com.lyms.exception.SystemException; -import com.lyms.web.service.BaseService; - -/** - *

    - * 服务类 - *

    - * - * @author maliang - * @since 2017-03-08 - */ -public interface SysOrganizationsService extends BaseService { - - /** - *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 - *
  • @param id 删除主键id - *
  • @return 大于0修改成功，否则为失败 - */ - public Integer deleteLogicById(Serializable id); - - /** - *
  • @Description:添加机构信息 - *
  • @param organizations - *
  • @return - *
  • @throws SystemException - *
  • 创建人：maliang - *
  • 创建时间：2017年3月8日 - *
  • 修改人： - *
  • 修改时间： - */ - public boolean addOrg(SysOrganizations organizations) throws SystemException; - - /** - * 修改机构信息 - *
  • @Description:TODO(方法描述) - *
  • @param organizations - *
  • @return - *
  • @throws SystemException - *
  • 创建人：maliang - *
  • 创建时间：2017年3月8日 - *
  • 修改人： - *
  • 修改时间： - */ - public boolean updateOrg(SysOrganizations organizations) throws SystemException; - - /** - *
  • @Description:根据ID删除 - *
  • @param id - *
  • @return - *
  • @throws SystemException - *
  • 创建人：maliang - *
  • 创建时间：2017年3月8日 - *
  • 修改人： - *
  • 修改时间： - */ - public boolean deleteOrganById(String id) throws SystemException; - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/SysPermissionsService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/SysPermissionsService.java deleted file mode 100644 index 1297ad3..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/SysPermissionsService.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.lyms.cm.service.sys; - -import com.lyms.cm.entity.sys.SysPermissions; -import com.lyms.cm.entity.sys.SysUsers; -import com.lyms.cm.entity.sys.TreeNode; -import com.lyms.web.service.BaseService; -import java.io.Serializable; -import java.util.List; -import java.util.Set; - -/** - *

    - * 服务类 - *

    - * - * @author fangcheng - * @since 2017-03-08 - */ -public interface SysPermissionsService extends BaseService { - - /** - *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 - *
  • @param id 删除主键id - *
  • @return 大于0修改成功，否则为失败 - */ - public Integer deleteLogicById(Serializable id); - - /** - *
  • @Description:根据puri和user的id获取所有有权限的菜单 - *
  • @param puri - *
  • @param user - *
  • @return - *
  • 创建人：方承 - *
  • 创建时间：2017年3月10日 - *
  • 修改人： - *
  • 修改时间： - */ - public List getPermissionMenuTreeByPuri(String puri, SysUsers user); - - /** - *
  • @Description:权限列表Set，方便Shiro使用 - *
  • @param uid - *
  • @return - *
  • 创建人：方承 - *
  • 创建时间：2017年3月9日 - *
  • 修改人： - *
  • 修改时间： - */ - public Set getUserPermissionSet(String uid); - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/SysRegionsService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/SysRegionsService.java deleted file mode 100644 index 4935a4a..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/SysRegionsService.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.lyms.cm.service.sys; - -import java.io.Serializable; -import java.util.List; - -import com.lyms.cm.entity.sys.SysRegions; -import com.lyms.web.service.BaseService; - -/** - *

    - * 服务类 - *

    - * - * @author maliang - * @since 2017-03-08 - */ -public interface SysRegionsService extends BaseService { - - public static final String NOT_PARENT_TAG = "f6c505dd-835a-43d7-b0bb-fdb9eb0b7b31"; - - /** - *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 - *
  • @param id 删除主键id - *
  • @return 大于0修改成功，否则为失败 - */ - public Integer deleteLogicById(Serializable id); - - /** - *
  • @Description:获取区域信息 - *
  • @param id id为空，获取所有一级区域，不为空，获取parentId = id 的子区域 - *
  • @return - *
  • 创建人：maliang - *
  • 创建时间：2017年3月8日 - *
  • 修改人： - *
  • 修改时间： - */ - public List selectRegions(String id); - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/SysRolePermissionMapsService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/SysRolePermissionMapsService.java deleted file mode 100644 index 7676dd1..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/SysRolePermissionMapsService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lyms.cm.service.sys; - -import com.lyms.cm.entity.sys.SysRolePermissionMaps; -import com.lyms.web.service.BaseService; -import java.io.Serializable; - -/** - *

    - * 服务类 - *

    - * - * @author fangcheng - * @since 2017-03-08 - */ -public interface SysRolePermissionMapsService extends BaseService { - - /** - *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 - *
  • @param id 删除主键id - *
  • @return 大于0修改成功，否则为失败 - */ - public Integer deleteLogicById(Serializable id); - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/SysRolesService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/SysRolesService.java deleted file mode 100644 index 0659947..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/SysRolesService.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.lyms.cm.service.sys; - -import java.io.Serializable; -import java.util.List; - -import com.lyms.cm.entity.sys.SysRolePermissionMaps; -import com.lyms.cm.entity.sys.SysRoles; -import com.lyms.web.service.BaseService; - -/** - *

    - * 服务类 - *

    - * - * @author maliang - * @since 2017-03-07 - */ -public interface SysRolesService extends BaseService { - - /** - *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 - *
  • @param id 删除主键id - *
  • @return 大于0修改成功，否则为失败 - */ - public Integer deleteLogicById(Serializable id); - - - - /** - *
  • @Description:创建角色 - *
  • @param role 基本属性 - *
  • @param rpList 角色权限关系列表 - *
  • @return - *
  • 创建人：方承 - *
  • 创建时间：2017年3月8日 - *
  • 修改人： - *
  • 修改时间： - */ - public boolean createRole(SysRoles role,List rpList); - - - /** - *
  • @Description:创建角色 - *
  • @param role 基本属性 - *
  • @param rpList 角色权限关系列表 - *
  • @return - *
  • 创建人：方承 - *
  • 创建时间：2017年3月8日 - *
  • 修改人： - *
  • 修改时间： - */ - public boolean updateRole(SysRoles role,List rpList); - - - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/SysUserRoleMapsService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/SysUserRoleMapsService.java deleted file mode 100644 index 9b72c21..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/SysUserRoleMapsService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lyms.cm.service.sys; - -import com.lyms.cm.entity.sys.SysUserRoleMaps; -import com.lyms.web.service.BaseService; -import java.io.Serializable; - -/** - *

    - * 服务类 - *

    - * - * @author fangcheng - * @since 2017-03-07 - */ -public interface SysUserRoleMapsService extends BaseService { - - /** - *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 - *
  • @param id 删除主键id - *
  • @return 大于0修改成功，否则为失败 - */ - public Integer deleteLogicById(Serializable id); - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/SysUsersService.java b/center.manager/src/main/java/com/lyms/cm/service/sys/SysUsersService.java deleted file mode 100644 index bd54015..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/SysUsersService.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.lyms.cm.service.sys; - -import java.io.Serializable; -import java.util.List; - -import com.lyms.cm.entity.sys.SysUserRoleMaps; -import com.lyms.cm.entity.sys.SysUsers; -import com.lyms.exception.SystemException; -import com.lyms.web.service.BaseService; - -/** - *

    - * 用户服务类 - *

    - * - * @author maliang - * @since 2017-03-02 - */ -public interface SysUsersService extends BaseService { - - - /** - *
  • @Description:根据登录名称查找未逻辑删除用户 - *
  • @param name - *
  • @return - *
  • 创建人：方承 - *
  • 创建时间：2017年3月10日 - *
  • 修改人： - *
  • 修改时间： - */ - public SysUsers getUserByUsername(String name); - - /** - * 添加用户 - * - * @param user - * @return - * @author maliang - */ - public boolean addUser(SysUsers user,List userRoleMaps) throws SystemException; - - /** - * 修改用户信息 - * - * @param user - * @return - * @author maliang - */ - public boolean updateUser(SysUsers user,List userRoleMaps) throws SystemException; - - /** - * 根据ID获取用户信息 - * - * @param userId - * @return - * @author maliang - */ - // public SysUsers getUserById(String userId) throws SystemException; - - - /** - * 删除用户信息 - * - * @param userId - * @return - * @throws SystemException - */ - public boolean delete(String userId) throws SystemException; - - /** - *
  • @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除 - *
  • @param id 删除主键id - *
  • @return 大于0修改成功，否则为失败 - */ - public Integer deleteLogicById(Serializable id); - - - /** - *
  • @Description:是否允许添加和修改 - *
  • @param account 登录账户 - *
  • @param userid 如果不为null，则是修改， 否则为新增 - *
  • @return - *
  • 创建人：方承 - *
  • 创建时间：2017年3月9日 - *
  • 修改人： - *
  • 修改时间： - */ - public boolean isAllowUpdate(String account,String userid); - - - /** - *
  • @Description:根据用户id获取角色id列表 - *
  • @param uid - *
  • @return - *
  • 创建人：方承 - *
  • 创建时间：2017年3月10日 - *
  • 修改人： - *
  • 修改时间： - */ - public List getRoleIdListByUserid(String uid); - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysDepartmentsServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysDepartmentsServiceImpl.java deleted file mode 100644 index 1bc1027..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysDepartmentsServiceImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.lyms.cm.service.sys.impl; - -import java.io.Serializable; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.lyms.cm.dao.sys.SysDepartmentsMapper; -import com.lyms.cm.entity.sys.SysDepartments; -import com.lyms.cm.service.sys.SysDepartmentsService; -import com.lyms.exception.SystemException; - -/** - *

    - * 部门 科室表 服务实现类 - *

    - * - * @author maliang - * @since 2017-03-08 - */ -@Service -public class SysDepartmentsServiceImpl extends ServiceImpl - implements SysDepartmentsService { - - public Integer deleteLogicById(Serializable id) { - return baseMapper.deleteLogicById(id); - } - - @Override - @Transactional - public boolean createDepart(SysDepartments departments) throws SystemException { - if (departments == null) - return false; - Integer tag = baseMapper.insert(departments); - return tag != null && tag >= 1; - } - - @Override - @Transactional - public boolean deleteDepartById(String id) throws SystemException { - if (StringUtils.isBlank(id)) - return false; - Integer tag = baseMapper.deleteLogicById(id); - return tag != null && tag > 0; - } - - @Override - @Transactional - public boolean updateDepart(SysDepartments departments) throws SystemException { - if (departments == null) - return false; - Integer tag = baseMapper.updateById(departments); - return tag != null && tag > 0; - } -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysOrganGroupServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysOrganGroupServiceImpl.java deleted file mode 100644 index d694aa3..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysOrganGroupServiceImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.lyms.cm.service.sys.impl; - -import java.io.Serializable; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.lyms.cm.dao.sys.SysOrganGroupMapper; -import com.lyms.cm.entity.sys.SysOrganGroup; -import com.lyms.cm.service.sys.SysOrganGroupService; -import com.lyms.exception.SystemException; - -/** - *

    - * 服务实现类 - *

    - * - * @author maliang - * @since 2017-03-09 - */ -@Service -public class SysOrganGroupServiceImpl extends ServiceImpl - implements SysOrganGroupService { - - public Integer deleteLogicById(Serializable id) { - return baseMapper.deleteLogicById(id); - } - - @Override - @Transactional - public boolean create(SysOrganGroup organGroup) throws SystemException { - - if (organGroup == null) - return false; - Integer tag = baseMapper.insert(organGroup); - return tag != null && tag > 0; - - } - - @Override - @Transactional - public boolean deleteGroupById(String groupId) throws SystemException { - - if (StringUtils.isBlank(groupId)) - return false; - Integer tag = baseMapper.deleteById(groupId); - return tag != null && tag > 0; - - } - - @Override - @Transactional - public boolean updateGroup(SysOrganGroup organGroup) throws SystemException { - - if (organGroup == null) - return false; - Integer tag = baseMapper.updateById(organGroup); - return tag != null && tag > 0; - - } -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysOrganizationsServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysOrganizationsServiceImpl.java deleted file mode 100644 index 68bea1d..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysOrganizationsServiceImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.lyms.cm.service.sys.impl; - -import java.io.Serializable; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.lyms.cm.dao.sys.SysOrganizationsMapper; -import com.lyms.cm.entity.sys.SysOrganizations; -import com.lyms.cm.service.sys.SysOrganizationsService; -import com.lyms.exception.SystemException; -import com.lyms.util.StrUtils; - -/** - *

    - * 机构表 服务实现类 - *

    - * - * @author maliang - * @since 2017-03-08 - */ -@Service -public class SysOrganizationsServiceImpl extends ServiceImpl - implements SysOrganizationsService { - - public Integer deleteLogicById(Serializable id) { - return baseMapper.deleteLogicById(id); - } - - @Override - @Transactional - public boolean addOrg(SysOrganizations organizations) throws SystemException { - if (organizations == null) - return false; - organizations.setId(StrUtils.uuid()); - Integer tag = baseMapper.insert(organizations); - return tag != null && tag >= 1; - } - - @Override - @Transactional - public boolean updateOrg(SysOrganizations organizations) throws SystemException { - if (organizations == null) - return false; - Integer tag = baseMapper.updateById(organizations); - return tag != null && tag >= 1; - } - - @Override - @Transactional - public boolean deleteOrganById(String id) throws SystemException { - Integer tag = baseMapper.deleteLogicById(id); - return tag != null && tag >= 1; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysPermissionsServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysPermissionsServiceImpl.java deleted file mode 100644 index 88651ef..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysPermissionsServiceImpl.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.lyms.cm.service.sys.impl; - -import com.lyms.cm.entity.sys.SysPermissions; -import com.lyms.cm.entity.sys.SysUsers; -import com.lyms.cm.entity.sys.TreeNode; -import com.lyms.cm.dao.sys.SysPermissionsMapper; -import com.lyms.cm.service.sys.SysPermissionsService; -import com.lyms.util.InstanceUtils; -import com.lyms.util.StrUtils; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; -import java.io.Serializable; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - *

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

    - * - * @author fangcheng - * @since 2017-03-08 - */ -@Service -public class SysPermissionsServiceImpl extends ServiceImpl implements SysPermissionsService { - - public Integer deleteLogicById(Serializable id){ - return baseMapper.deleteLogicById(id); - } - - - /** - *
  • @Description:根据puri获取所有菜单 - *
  • @param puri - *
  • @return - *
  • 创建人：方承 - *
  • 创建时间：2017年3月10日 - *
  • 修改人： - *
  • 修改时间： - */ - public List getAllMenuTreeByPuri(String puri) { - //treenode的id保存的uri，pid保存的puri - List allMenu = baseMapper.getMenuTreeByPuri(puri); - //迭代获取子节点 - for (TreeNode menuNode : allMenu) { - List subMenu = baseMapper.getMenuTreeByPuri(menuNode.getId()+""); - if(subMenu != null && subMenu.size() > 0){ - menuNode.setChildren(subMenu); - getSubMenuTreeByNodeList(subMenu); - } - } - return allMenu; - } - - /** - *
  • @Description:迭代处理所有子菜单 - *
  • @param treeNodeList - *
  • 创建人：方承 - *
  • 创建时间：2017年3月10日 - *
  • 修改人： - *
  • 修改时间： - */ - private void getSubMenuTreeByNodeList(List treeNodeList) { - if(treeNodeList != null && treeNodeList.size() > 0){ - //迭代获取子节点 - for (TreeNode menuNode : treeNodeList) { - List subMenu = baseMapper.getMenuTreeByPuri(menuNode.getId()+""); - if(subMenu != null && subMenu.size() > 0){ - menuNode.setChildren(subMenu); - getSubMenuTreeByNodeList(subMenu); - } - } - } - } - - @Override - public List getPermissionMenuTreeByPuri(String puri, SysUsers user) { - //用户权限列表 - Map permissionsMap = getUserPermissionMap(getUserPermissionSet(user.getId())); - //所有菜单 - List allMenu = getAllMenuTreeByPuri(puri); - //初始化要返回的有权限的菜单 - List allPermissionMenu = InstanceUtils.newArrayList(); - //迭代获取子节点 - for (TreeNode menuNode : allMenu) { - if(permissionsMap.get(menuNode.getId()) != null){ - allPermissionMenu.add(menuNode); - List subMenus = baseMapper.getMenuTreeByPuri(menuNode.getId()+""); - if(subMenus != null && subMenus.size() > 0){ - List permissionSubMenu = InstanceUtils.newArrayList(); - for(TreeNode submenu : subMenus){ - if(permissionsMap.get(submenu.getId()) != null){ - permissionSubMenu.add(submenu); - } - } - menuNode.setChildren(permissionSubMenu); - getPermissionSubMenuTreeByNodeList(permissionSubMenu,permissionsMap); - } - } - } - return allPermissionMenu; - - } - /** - *
  • @Description:迭代处理获取有权限的子节点 - *
  • @param treeNodeList - *
  • @param permissionMap - *
  • 创建人：方承 - *
  • 创建时间：2017年3月10日 - *
  • 修改人： - *
  • 修改时间： - */ - private void getPermissionSubMenuTreeByNodeList(List treeNodeList,Map permissionMap) { - if(treeNodeList != null && treeNodeList.size() > 0){ - //迭代获取子节点 - for (TreeNode menuNode : treeNodeList) { - List subMenus = baseMapper.getMenuTreeByPuri(menuNode.getId()+""); - if(subMenus != null && subMenus.size() > 0){ - List permissionSubMenu = InstanceUtils.newArrayList(); - for(TreeNode subMenu : subMenus){ - if(permissionMap.get(subMenu.getId()) != null){ - permissionSubMenu.add(subMenu); - } - } - menuNode.setChildren(permissionSubMenu); - getPermissionSubMenuTreeByNodeList(permissionSubMenu,permissionMap); - } - } - } - } - - /** - *
  • @Description:根据用户id获取用户所有权限列表 - *
  • @param uid - *
  • @return - *
  • 创建人：方承 - *
  • 创建时间：2017年3月9日 - *
  • 修改人： - *
  • 修改时间： - */ - public List getUserPermission(String uid){ - return baseMapper.getUserPermission(uid); - } - - @Override - public Set getUserPermissionSet(String uid){ - Set pSet = InstanceUtils.newHashSet(); - List pList = getUserPermission(uid); - for(SysPermissions p : pList){ - if(StrUtils.isNotEmpty(p.getUri())) - pSet.add(p.getUri()); - } - return pSet; - } - - /** - *
  • @Description:根据Set获取Map，key存uri - *
  • @param pset - *
  • @return - *
  • 创建人：方承 - *
  • 创建时间：2017年3月9日 - *
  • 修改人： - *
  • 修改时间： - */ - private Map getUserPermissionMap(Set pset){ - Map pMap = InstanceUtils.newHashMap(); - Iterator it=pset.iterator(); - while(it.hasNext()){ - pMap.put(it.next(), ""); - } - return pMap; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRegionsServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRegionsServiceImpl.java deleted file mode 100644 index de0c0f7..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRegionsServiceImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.lyms.cm.service.sys.impl; - -import java.io.Serializable; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.lyms.cm.dao.sys.SysRegionsMapper; -import com.lyms.cm.entity.sys.SysRegions; -import com.lyms.cm.service.sys.SysRegionsService; - -/** - *

    - * 省市区地址表 服务实现类 - *

    - * - * @author maliang - * @since 2017-03-08 - */ -@Service -public class SysRegionsServiceImpl extends ServiceImpl implements SysRegionsService { - - @Autowired - private SysRegionsMapper regionsMapper; - - public Integer deleteLogicById(Serializable id) { - return baseMapper.deleteLogicById(id); - } - - @Override - public List selectRegions(String id) { - if (StringUtils.isBlank(id)) { - id = NOT_PARENT_TAG; - } - return regionsMapper.selectRegionsById(id); - } -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolePermissionMapsServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolePermissionMapsServiceImpl.java deleted file mode 100644 index 4b49dff..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolePermissionMapsServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lyms.cm.service.sys.impl; - -import com.lyms.cm.entity.sys.SysRolePermissionMaps; -import com.lyms.cm.dao.sys.SysRolePermissionMapsMapper; -import com.lyms.cm.service.sys.SysRolePermissionMapsService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; -import java.io.Serializable; - -/** - *

    - * 角色权限映射表 服务实现类 - *

    - * - * @author fangcheng - * @since 2017-03-08 - */ -@Service -public class SysRolePermissionMapsServiceImpl extends ServiceImpl implements SysRolePermissionMapsService { - - public Integer deleteLogicById(Serializable id){ - return baseMapper.deleteLogicById(id); - } -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolesServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolesServiceImpl.java deleted file mode 100644 index 7bccf23..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysRolesServiceImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.lyms.cm.service.sys.impl; - -import java.io.Serializable; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.lyms.cm.dao.sys.SysRolesMapper; -import com.lyms.cm.entity.sys.SysRolePermissionMaps; -import com.lyms.cm.entity.sys.SysRoles; -import com.lyms.cm.service.sys.SysRolePermissionMapsService; -import com.lyms.cm.service.sys.SysRolesService; - -/** - *

    - * 角色表 服务实现类 - *

    - * - * @author maliang - * @since 2017-03-07 - */ -@Service -public class SysRolesServiceImpl extends ServiceImpl implements SysRolesService { - - @Autowired - private SysRolePermissionMapsService sysRolePermissionMapsService; - - public Integer deleteLogicById(Serializable id) { - return baseMapper.deleteLogicById(id); - } - - @Override - @Transactional - public boolean createRole(SysRoles role, List rpList) { - baseMapper.insert(role); - sysRolePermissionMapsService.insertBatch(rpList); - return true; - } - - @Override - @Transactional - public boolean updateRole(SysRoles role, List rpList) { - EntityWrapper ew = new EntityWrapper(); - ew.where("role_id={0}", "'" + role.getId() + "'"); - baseMapper.updateById(role); - sysRolePermissionMapsService.delete(ew); - if (!rpList.isEmpty()) { - sysRolePermissionMapsService.insertBatch(rpList); - } - return true; - } - - -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUserRoleMapsServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUserRoleMapsServiceImpl.java deleted file mode 100644 index 3ad9cea..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUserRoleMapsServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lyms.cm.service.sys.impl; - -import com.lyms.cm.dao.sys.SysUserRoleMapsMapper; -import com.lyms.cm.entity.sys.SysUserRoleMaps; -import com.lyms.cm.service.sys.SysUserRoleMapsService; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; -import java.io.Serializable; - -/** - *

    - * 用户角色关系表 服务实现类 - *

    - * - * @author fangcheng - * @since 2017-03-07 - */ -@Service -public class SysUserRoleMapsServiceImpl extends ServiceImpl implements SysUserRoleMapsService { - - public Integer deleteLogicById(Serializable id){ - return baseMapper.deleteLogicById(id); - } -} diff --git a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUsersServiceImpl.java b/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUsersServiceImpl.java deleted file mode 100644 index 0216631..0000000 --- a/center.manager/src/main/java/com/lyms/cm/service/sys/impl/SysUsersServiceImpl.java +++ /dev/null @@ -1,196 +0,0 @@ -package com.lyms.cm.service.sys.impl; - -import java.io.Serializable; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.lyms.cm.dao.sys.SysUsersMapper; -import com.lyms.cm.entity.sys.SysUserRoleMaps; -import com.lyms.cm.entity.sys.SysUsers; -import com.lyms.cm.enums.ValidityEnum; -import com.lyms.cm.service.sys.SysUserRoleMapsService; -import com.lyms.cm.service.sys.SysUsersService; -import com.lyms.exception.SystemException; -import com.lyms.util.InstanceUtils; -import com.lyms.util.MD5Utils; -import com.lyms.util.StrUtils; - -/** - *

    - * 用户表 服务实现类 - *

    - * - * @author maliang - * @since 2017-03-02 - */ -@Service -public class SysUsersServiceImpl extends ServiceImpl implements SysUsersService { - - @Autowired - private SysUsersMapper userMapper; - - @Autowired - private SysUserRoleMapsService sysUserRoleMapsService; - - /** - * 系统默认密码 - */ - private static final String DEFAULT_PWD = "123456"; - - // 模块基础操作信息 - private boolean empty(SysUsers user) { - return user == null; - } - - /** - * 初始密码设置 - */ - private void initPwd(SysUsers user) { - if (empty(user)) - return; - String pwd = user.getPwd(); - if (StringUtils.isBlank(pwd)) { - pwd = DEFAULT_PWD; - } - String encode = MD5Utils.md5(pwd); - user.setPwd(encode); - } - - @Override - @Transactional - public boolean addUser(SysUsers user, List userRoleMapsList) throws SystemException { - if (empty(user)) - return false; - // 设置user ID - user.setIfdel(0); - if (null == user.getType()) {// 没有勾选管理，就是用户 - user.setType(1); - } - if (null == user.getEnable()) { - user.setEnable(1); - } - // 设置用户密码 - this.initPwd(user); - - Integer tag = userMapper.insert(user); - if (userRoleMapsList != null && !userRoleMapsList.isEmpty()) { - sysUserRoleMapsService.insertBatch(userRoleMapsList); - } - return tag != null && tag >= 1; - } - - @Override - @Transactional - public boolean updateUser(SysUsers user, List userRoleMapsList) throws SystemException { - if (empty(user)) - return false; - if (null == user.getType()) {// 没有勾选管理，就是用户 - user.setType(1); - } - if (null == user.getEnable()) { - user.setEnable(1); - } - if (StrUtils.isNotEmpty(user.getPwd())) { - // 初始密码 - this.initPwd(user); - } - - Integer tag = userMapper.updateById(user); - EntityWrapper ew = new EntityWrapper(); - ew.where("user_id={0}", "'" + user.getId() + "'"); - sysUserRoleMapsService.delete(ew); - if (!userRoleMapsList.isEmpty()) { - sysUserRoleMapsService.insertBatch(userRoleMapsList); - } - return tag != null && tag >= 1; - } - - /* - * @Override public SysUsers getUserById(String userId) throws - * SystemException { if (StringUtils.isBlank(userId)) return null; return - * userMapper.selectById(userId); } - */ - - @Override - @Transactional - public boolean delete(String userId) throws SystemException { - - if (StringUtils.isBlank(userId)) - return false; - // TODO 通过sql 修改 - SysUsers user = userMapper.selectById(userId); - if (user != null) { - Integer ifDel = user.getIfdel(); - if (ifDel == null || ifDel == ValidityEnum.VALIDITY.getValidity()) { - ifDel = ValidityEnum.UNVALIDITY.getValidity(); - } else { - ifDel = ValidityEnum.VALIDITY.getValidity(); - } - user.setIfdel(ifDel); - Integer tag = userMapper.updateById(user); - return tag != null && tag >= 1; - } - return false; - } - - @Override - public Integer deleteLogicById(Serializable id) { - return baseMapper.deleteLogicById(id); - } - - @Override - public boolean isAllowUpdate(String account, String userid) { - boolean flag = true; - if (StrUtils.isNotEmpty(userid)) {// 修改用户 - SysUsers oldDbUser = selectById(userid); - if (!oldDbUser.getAccount().equalsIgnoreCase(account)) {// 登录账号改变 - flag = !isExistAccount(account); - } - } else {// 新增 - flag = !isExistAccount(account); - } - return flag; - } - - /** - *
  • @Description:是否存在登录名 - *
  • @param account - *
  • @return - *
  • 创建人：方承 - *
  • 创建时间：2017年3月9日 - *
  • 修改人： - *
  • 修改时间： - */ - private boolean isExistAccount(String account) { - SysUsers entity = selectOne( - new EntityWrapper().where("account={0}", "'" + account + "'").and("ifDel=0")); - if (null == entity) { - return false; - } - return true; - } - - @Override - public SysUsers getUserByUsername(String name) { - SysUsers user = selectOne(new EntityWrapper().where("account={0}", name).and("ifDel=0")); - return user; - } - - @Override - public List getRoleIdListByUserid(String uid) { - List urList = sysUserRoleMapsService - .selectList(new EntityWrapper().where("user_id={0}", uid)); - List roleIdList = InstanceUtils.newArrayList(); - for (SysUserRoleMaps ur : urList) { - roleIdList.add(ur.getRoleId()); - } - return roleIdList; - } - -} diff --git a/center.manager/src/main/java/com/lyms/cm/shiro/ShiroRealm.java b/center.manager/src/main/java/com/lyms/cm/shiro/ShiroRealm.java index ff84052..6cac75d 100644 --- a/center.manager/src/main/java/com/lyms/cm/shiro/ShiroRealm.java +++ b/center.manager/src/main/java/com/lyms/cm/shiro/ShiroRealm.java @@ -1,16 +1,13 @@ package com.lyms.cm.shiro; -import java.util.Arrays; import java.util.HashSet; import java.util.List; -import org.apache.commons.lang3.ArrayUtils; import org.apache.shiro.authc.AccountException; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.authc.SimpleAuthenticationInfo; -import org.apache.shiro.authc.UnknownAccountException; import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.authc.credential.AllowAllCredentialsMatcher; import org.apache.shiro.authz.AuthorizationInfo; @@ -21,12 +18,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.lyms.cm.entity.sys.SysUsers; -import com.lyms.cm.enums.StatusEnum; -import com.lyms.cm.service.sys.SysPermissionsService; -import com.lyms.cm.service.sys.SysUsersService; -import com.lyms.shiro.HashUtils; +import com.lyms.base.common.entity.user.Users; +import com.lyms.base.common.enums.StatusEnum; +import com.lyms.base.common.service.role.PermissionsService; +import com.lyms.base.common.service.user.UsersService; import com.lyms.shiro.ShiroWebUtils; import com.lyms.util.CollectionUtils; import com.lyms.util.MD5Utils; @@ -41,70 +36,73 @@ import com.lyms.util.StrUtils; */ public class ShiroRealm extends AuthorizingRealm { - @SuppressWarnings("unused") - private static Logger logger = LoggerFactory.getLogger(ShiroRealm.class); + @SuppressWarnings("unused") + private static Logger logger = LoggerFactory.getLogger(ShiroRealm.class); - public ShiroRealm() { - super(new AllowAllCredentialsMatcher()); - setAuthenticationTokenClass(UsernamePasswordToken.class); - //FIXME: 暂时禁用Cache - setCachingEnabled(false); - } + public ShiroRealm() { + super(new AllowAllCredentialsMatcher()); + setAuthenticationTokenClass(UsernamePasswordToken.class); + // FIXME: 暂时禁用Cache + setCachingEnabled(false); + } - @Autowired - private SysUsersService sysUsersService; + @Autowired + private UsersService sysUsersService; - private SysPermissionsService sysPermissionsService; + private PermissionsService sysPermissionsService; - // @Autowired - // private ResourceService resourceService; + // @Autowired + // private ResourceService resourceService; - @Override - protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { - String username = (String) principals.getPrimaryPrincipal(); - SysUsers user = sysUsersService.getUserByUsername(username); - // 授权 - SimpleAuthorizationInfo authorizationInfo = new SimpleAuthorizationInfo(); - List roleIdList = sysUsersService.getRoleIdListByUserid(user.getId()); - if (CollectionUtils.isNotEmpty(roleIdList)) { - authorizationInfo.setRoles(new HashSet(roleIdList)); - } - authorizationInfo.setStringPermissions(sysPermissionsService.getUserPermissionSet(user.getId())); - return authorizationInfo; - } + @Override + protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { + String username = (String) principals.getPrimaryPrincipal(); + Users user = sysUsersService.getUserByUsername(username); + // 授权 + SimpleAuthorizationInfo authorizationInfo = new SimpleAuthorizationInfo(); + List roleIdList = sysUsersService.getRoleIdListByUserid(user.getId()); + if (CollectionUtils.isNotEmpty(roleIdList)) { + authorizationInfo.setRoles(new HashSet(roleIdList)); + } + authorizationInfo.setStringPermissions(sysPermissionsService.getUserPermissionSet(user.getId())); + return authorizationInfo; + } - @Override - protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authcToken) throws AuthenticationException { - UsernamePasswordToken token = (UsernamePasswordToken) authcToken; - String username = token.getUsername(); - SysUsers user = sysUsersService.getUserByUsername(username); - if (StatusEnum.isDisEnabled(user.getEnable())) { - throw new AccountException("用户已经被禁用，请联系管理员！"); - } - StringBuilder pwd = new StringBuilder(100); - for (int i = 0; i < token.getPassword().length; i++) { - pwd.append(token.getPassword()[i]); - } - if (!StrUtils.equals(user.getPwd(), MD5Utils.md5(pwd.toString()))){ - throw new AccountException("用户名密码不一致"); - } - ShiroWebUtils.saveCurrentUser(user); - AuthenticationInfo authcInfo = new SimpleAuthenticationInfo(username, pwd.toString(), username); - return authcInfo; - // User user = userService.getUserByUserName(username); - // if (user == null) { - // throw new UnknownAccountException("未知用户"); - // } - // StringBuilder pwd = new StringBuilder(100); - // for (int i = 0; i < token.getPassword().length; i++) { - // pwd.append(token.getPassword()[i]); - // } - // if (!StrUtils.equals(user.getPassword(), HashUtils.md5(pwd.toString()))) { - // throw new AccountException("用户名密码不一致"); - // } - // ShiroWebUtils.saveCurrentUser(user); - // AuthenticationInfo authcInfo = new SimpleAuthenticationInfo(username, pwd.toString(), username); - // return authcInfo; - } + @Override + protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authcToken) + throws AuthenticationException { + UsernamePasswordToken token = (UsernamePasswordToken) authcToken; + String username = token.getUsername(); + Users user = sysUsersService.getUserByUsername(username); + if (StatusEnum.isDisEnabled(user.getEnable())) { + throw new AccountException("用户已经被禁用，请联系管理员！"); + } + StringBuilder pwd = new StringBuilder(100); + for (int i = 0; i < token.getPassword().length; i++) { + pwd.append(token.getPassword()[i]); + } + if (!StrUtils.equals(user.getPwd(), MD5Utils.md5(pwd.toString()))) { + throw new AccountException("用户名密码不一致"); + } + ShiroWebUtils.saveCurrentUser(user); + AuthenticationInfo authcInfo = new SimpleAuthenticationInfo(username, pwd.toString(), username); + return authcInfo; + // User user = userService.getUserByUserName(username); + // if (user == null) { + // throw new UnknownAccountException("未知用户"); + // } + // StringBuilder pwd = new StringBuilder(100); + // for (int i = 0; i < token.getPassword().length; i++) { + // pwd.append(token.getPassword()[i]); + // } + // if (!StrUtils.equals(user.getPassword(), + // HashUtils.md5(pwd.toString()))) { + // throw new AccountException("用户名密码不一致"); + // } + // ShiroWebUtils.saveCurrentUser(user); + // AuthenticationInfo authcInfo = new SimpleAuthenticationInfo(username, + // pwd.toString(), username); + // return authcInfo; + } } diff --git a/center.manager/src/main/resources/app-context.xml b/center.manager/src/main/resources/app-context.xml index 1c44a1b..28bd261 100644 --- a/center.manager/src/main/resources/app-context.xml +++ b/center.manager/src/main/resources/app-context.xml @@ -15,15 +15,14 @@ - - + - - + + - + + - - + \ No newline at end of file diff --git a/center.manager/src/main/resources/xml/app-datasource.xml b/center.manager/src/main/resources/xml/app-datasource.xml index dabfe8c..5455f53 100644 --- a/center.manager/src/main/resources/xml/app-datasource.xml +++ b/center.manager/src/main/resources/xml/app-datasource.xml @@ -84,16 +84,17 @@ - classpath*:com/lyms/cm/dao/*Mapper.xml - classpath*:com/lyms/cm/dao/*/*Mapper.xml + + classpath*:com/lyms/base/common/dao/*/*Mapper.xml + - + - + diff --git a/center.manager/src/main/resources/xml/app-timer.xml b/center.manager/src/main/resources/xml/app-timer.xml index 26ad360..b588b51 100644 --- a/center.manager/src/main/resources/xml/app-timer.xml +++ b/center.manager/src/main/resources/xml/app-timer.xml @@ -14,10 +14,11 @@ - + + \ No newline at end of file diff --git a/center.manager/src/test/java/center/manager/test/user/DepartmentsTest.java b/center.manager/src/test/java/center/manager/test/user/DepartmentsTest.java index ac50014..7375982 100644 --- a/center.manager/src/test/java/center/manager/test/user/DepartmentsTest.java +++ b/center.manager/src/test/java/center/manager/test/user/DepartmentsTest.java @@ -3,18 +3,18 @@ package center.manager.test.user; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.lyms.cm.entity.sys.SysDepartments; -import com.lyms.cm.service.sys.SysDepartmentsService; +import com.lyms.base.common.entity.organ.Departments; +import com.lyms.base.common.service.organ.DepartmentsService; import com.lyms.util.StrUtils; public class DepartmentsTest extends BaseTest { @Autowired - private SysDepartmentsService departmentService; + private DepartmentsService departmentService; @Test public void add() { - SysDepartments sysDepartments = new SysDepartments(); + Departments sysDepartments = new Departments(); sysDepartments.setId(StrUtils.uuid()); sysDepartments.setName("测试机构"); sysDepartments.setOrgId("C1DEC677343843A8A073FB21A796842C"); diff --git a/center.manager/src/test/java/center/manager/test/user/ReginsTest.java b/center.manager/src/test/java/center/manager/test/user/ReginsTest.java index 34a6d0e..9414e43 100644 --- a/center.manager/src/test/java/center/manager/test/user/ReginsTest.java +++ b/center.manager/src/test/java/center/manager/test/user/ReginsTest.java @@ -5,19 +5,19 @@ import java.util.List; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.lyms.cm.entity.sys.SysRegions; -import com.lyms.cm.service.sys.SysRegionsService; +import com.lyms.base.common.entity.region.Regions; +import com.lyms.base.common.service.region.RegionsService; public class ReginsTest extends BaseTest { @Autowired - private SysRegionsService regionsService; + private RegionsService regionsService; @Test public void select() { - List regions = regionsService.selectRegions(null); + List regions = regionsService.selectRegions(null); if (regions != null && !regions.isEmpty()) { - for (SysRegions region2 : regions) { + for (Regions region2 : regions) { System.out.println(region2.getName()); } } diff --git a/center.manager/src/test/java/center/manager/test/user/UserTest.java b/center.manager/src/test/java/center/manager/test/user/UserTest.java index 061e642..9e582f9 100644 --- a/center.manager/src/test/java/center/manager/test/user/UserTest.java +++ b/center.manager/src/test/java/center/manager/test/user/UserTest.java @@ -9,19 +9,19 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.plugins.Page; -import com.lyms.cm.entity.sys.SysUsers; -import com.lyms.cm.service.sys.SysUsersService; +import com.lyms.base.common.entity.user.Users; +import com.lyms.base.common.service.user.UsersService; public class UserTest extends BaseTest { @Autowired - private SysUsersService userService; + private UsersService userService; - SysUsers user = null; + Users user = null; @Before public void init() { - user = new SysUsers(); + user = new Users(); // user.setId(UUID.randomUUID().toString().replaceAll("-", "")); user.setName("fdfjsdlf"); user.setExpirTime(new Date()); @@ -30,7 +30,7 @@ public class UserTest extends BaseTest { @Test public void addUserTest() { - boolean tag = userService.addUser(user,null); + boolean tag = userService.addUser(user, null); System.out.println(tag); Assert.assertTrue("添加成功", tag); } @@ -38,18 +38,16 @@ public class UserTest extends BaseTest { @Test public void updateUserTest() { - SysUsers user = userService.selectById("6204903E7E1741688350349EF920ED88"); + Users user = userService.selectById("6204903E7E1741688350349EF920ED88"); user.setName("hellow"); - boolean tag = userService.updateUser(user,null ); + boolean tag = userService.updateUser(user, null); System.out.println(tag); } - - @Test public void selectUserByPage() { - Page page = new Page<>(1, 1); - Page result = userService.selectPage(page); + Page page = new Page<>(1, 1); + Page result = userService.selectPage(page); System.out.println(result.getRecords().size()); System.out.println(ToStringBuilder.reflectionToString(result)); } diff --git a/core.sdk/pom.xml b/core.sdk/pom.xml index f80791c..dfee38d 100644 --- a/core.sdk/pom.xml +++ b/core.sdk/pom.xml @@ -5,6 +5,8 @@ parent 0.0.1-SNAPSHOT + + com.lyms.core.sdk core.sdk jar @@ -29,4 +31,5 @@ + core.sdk-1.0 \ No newline at end of file diff --git a/core.sdk/src/main/java/com/lyms/aop/ParamRequiredAspect.java b/core.sdk/src/main/java/com/lyms/aop/ParamRequiredAspect.java index 6319385..ccacb1a 100644 --- a/core.sdk/src/main/java/com/lyms/aop/ParamRequiredAspect.java +++ b/core.sdk/src/main/java/com/lyms/aop/ParamRequiredAspect.java @@ -1,4 +1,5 @@ package com.lyms.aop; + import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Collection; @@ -22,127 +23,132 @@ import org.springframework.stereotype.Component; import com.lyms.annotation.ParamRequired; - /** * 参数非空校验的切面类 - *

    扫描带有{@code ParamRequired}注解的方法，判断对应索引的参数的值是否为空，为空，则抛出IllegalArgumentException + *

    + * 扫描带有{@code ParamRequired}注解的方法，判断对应索引的参数的值是否为空，为空，则抛出IllegalArgumentException *

  • 注解到方法上:@ParamRequired(indexs = { 0, 1, 2 }) */ @Aspect @Component public class ParamRequiredAspect { - /** - * 拦截带@ParamRequired注解的方法，根据value校验指定的参数是否为空 - * @param joinPoint - * @throws Exception - * @Author : ll. create at 2016年12月2日 下午3:01:44 - */ - @Before("@annotation(com.cdelabcare.common.annotation.ParamRequired)") - public void beforeDo(JoinPoint joinPoint) throws Exception { + /** + * 拦截带@ParamRequired注解的方法，根据value校验指定的参数是否为空 + * + * @param joinPoint + * @throws Exception + * @Author : ll. create at 2016年12月2日 下午3:01:44 + */ + // @Before("@annotation(com.cdelabcare.common.annotation.ParamRequired)") + // com.lyms.annotation + @Before("@annotation(com.lyms.annotation.ParamRequired)") + public void beforeDo(JoinPoint joinPoint) throws Exception { - //拦截的实体类 - Object target = joinPoint.getTarget(); + // 拦截的实体类 + Object target = joinPoint.getTarget(); - //拦截的方法名称 - String methodName = joinPoint.getSignature().getName(); + // 拦截的方法名称 + String methodName = joinPoint.getSignature().getName(); - // 获取参数名称 - String[] paramNames = getFieldsName(this.getClass(), target.getClass().getName(), - methodName); + // 获取参数名称 + String[] paramNames = getFieldsName(this.getClass(), target.getClass().getName(), methodName); - //拦截的方法参数（值） - Object[] args = joinPoint.getArgs(); + // 拦截的方法参数（值） + Object[] args = joinPoint.getArgs(); - //拦截的放参数类型 - Class[] parameterTypes = ((MethodSignature) joinPoint.getSignature()).getMethod() - .getParameterTypes(); - //拦截的方法 - Method method = target.getClass().getMethod(methodName, parameterTypes); - // 获取方法的注解 - ParamRequired paramRequired = method.getAnnotation(ParamRequired.class); - // 获取方法注解的value属性的值 - int[] indexs = paramRequired.indexs(); - if (indexs == null) { - return; - } - // 注解的三个参数，分别为：String是否不能为空字符串，集合是否不能为空集合，Map是否不能为空 - boolean stringNotEmpty = paramRequired.stringNotEmpty(); - boolean collectionNotEmpty = paramRequired.collectionNotEmpty(); - boolean mapNotEmpty = paramRequired.mapNotEmpty(); + // 拦截的放参数类型 + Class[] parameterTypes = ((MethodSignature) joinPoint.getSignature()).getMethod().getParameterTypes(); + // 拦截的方法 + Method method = target.getClass().getMethod(methodName, parameterTypes); + // 获取方法的注解 + ParamRequired paramRequired = method.getAnnotation(ParamRequired.class); + // 获取方法注解的value属性的值 + int[] indexs = paramRequired.indexs(); + if (indexs == null) { + return; + } + // 注解的三个参数，分别为：String是否不能为空字符串，集合是否不能为空集合，Map是否不能为空 + boolean stringNotEmpty = paramRequired.stringNotEmpty(); + boolean collectionNotEmpty = paramRequired.collectionNotEmpty(); + boolean mapNotEmpty = paramRequired.mapNotEmpty(); - // 依次校验是否有空值 - Object tmpValue = null; - int illegalIndex = -1; - for (int i : indexs) { - tmpValue = args[i]; - if (tmpValue == null) { - illegalIndex = i; - } - if (tmpValue instanceof String) { - if (stringNotEmpty && StringUtils.isBlank((String) tmpValue)) { - illegalIndex = i; - } - } else if (tmpValue instanceof Collection) { - if (collectionNotEmpty && CollectionUtils.isEmpty((Collection) tmpValue)) { - illegalIndex = i; - } - } else if (tmpValue instanceof Map) { - if (mapNotEmpty && MapUtils.isEmpty((Map) tmpValue)) { - illegalIndex = i; - } - } - // 校验不通过，直接处理结果 - if (illegalIndex != -1) { - resultHandler(target, methodName, paramNames, illegalIndex); - } - } - } + // 依次校验是否有空值 + Object tmpValue = null; + int illegalIndex = -1; + for (int i : indexs) { + tmpValue = args[i]; + if (tmpValue == null) { + illegalIndex = i; + } + if (tmpValue instanceof String) { + if (stringNotEmpty && StringUtils.isBlank((String) tmpValue)) { + illegalIndex = i; + } + } else if (tmpValue instanceof Collection) { + if (collectionNotEmpty && CollectionUtils.isEmpty((Collection) tmpValue)) { + illegalIndex = i; + } + } else if (tmpValue instanceof Map) { + if (mapNotEmpty && MapUtils.isEmpty((Map) tmpValue)) { + illegalIndex = i; + } + } + // 校验不通过，直接处理结果 + if (illegalIndex != -1) { + resultHandler(target, methodName, paramNames, illegalIndex); + } + } + } - /** - * 处理校验结果 - * @param obj 被拦截的对象 - * @param methodName 方法名称 - * @param paramNames 参数数组 - * @param index 参数索引 - * @Author : ll. create at 2016年12月2日 下午2:52:23 - */ - private void resultHandler(Object obj, String methodName, String[] paramNames, int index) { - String msgTemplate = "调用%s.%s时，参数%s为空"; - String msg = String.format(msgTemplate, obj.getClass().getName(), methodName, - paramNames[index]); - throw new IllegalArgumentException(msg); - } + /** + * 处理校验结果 + * + * @param obj + * 被拦截的对象 + * @param methodName + * 方法名称 + * @param paramNames + * 参数数组 + * @param index + * 参数索引 + * @Author : ll. create at 2016年12月2日 下午2:52:23 + */ + private void resultHandler(Object obj, String methodName, String[] paramNames, int index) { + String msgTemplate = "调用%s.%s时，参数%s为空"; + String msg = String.format(msgTemplate, obj.getClass().getName(), methodName, paramNames[index]); + throw new IllegalArgumentException(msg); + } - /** - * 得到方法参数的名称（摘抄自网络） - * @param cls 类 - * @param clazzName - * @param methodName - * @return 方法的参数名称 - */ - private static String[] getFieldsName(Class cls, String clazzName, String methodName) - throws Exception { - ClassPool pool = ClassPool.getDefault(); - //ClassClassPath classPath = new ClassClassPath(this.getClass()); - ClassClassPath classPath = new ClassClassPath(cls); - pool.insertClassPath(classPath); + /** + * 得到方法参数的名称（摘抄自网络） + * + * @param cls + * 类 + * @param clazzName + * @param methodName + * @return 方法的参数名称 + */ + private static String[] getFieldsName(Class cls, String clazzName, String methodName) throws Exception { + ClassPool pool = ClassPool.getDefault(); + // ClassClassPath classPath = new ClassClassPath(this.getClass()); + ClassClassPath classPath = new ClassClassPath(cls); + pool.insertClassPath(classPath); - CtClass cc = pool.get(clazzName); - CtMethod cm = cc.getDeclaredMethod(methodName); - MethodInfo methodInfo = cm.getMethodInfo(); - CodeAttribute codeAttribute = methodInfo.getCodeAttribute(); - LocalVariableAttribute attr = (LocalVariableAttribute) codeAttribute - .getAttribute(LocalVariableAttribute.tag); - if (attr == null) { - // exception - } - String[] paramNames = new String[cm.getParameterTypes().length]; - int pos = Modifier.isStatic(cm.getModifiers()) ? 0 : 1; - for (int i = 0; i < paramNames.length; i++) { - paramNames[i] = attr.variableName(i + pos); //paramNames即参数名 - } - return paramNames; - } + CtClass cc = pool.get(clazzName); + CtMethod cm = cc.getDeclaredMethod(methodName); + MethodInfo methodInfo = cm.getMethodInfo(); + CodeAttribute codeAttribute = methodInfo.getCodeAttribute(); + LocalVariableAttribute attr = (LocalVariableAttribute) codeAttribute.getAttribute(LocalVariableAttribute.tag); + if (attr == null) { + // exception + } + String[] paramNames = new String[cm.getParameterTypes().length]; + int pos = Modifier.isStatic(cm.getModifiers()) ? 0 : 1; + for (int i = 0; i < paramNames.length; i++) { + paramNames[i] = attr.variableName(i + pos); // paramNames即参数名 + } + return paramNames; + } } diff --git a/hospital.mac/pom.xml b/hospital.mac/pom.xml index 57c47a2..78f9b1c 100644 --- a/hospital.mac/pom.xml +++ b/hospital.mac/pom.xml @@ -15,9 +15,9 @@ - com.lyms + com.lyms.core.sdk core.sdk - ${project.parent.version} + core.sdk-1.0 diff --git a/hospital.web/pom.xml b/hospital.web/pom.xml index 799e404..dc0e9c8 100644 --- a/hospital.web/pom.xml +++ b/hospital.web/pom.xml @@ -17,9 +17,9 @@ - com.lyms + com.lyms.core.sdk core.sdk - ${project.parent.version} + core.sdk-1.0 com.lyms -- 1.8.3.1